1 |
arfrever 09/06/01 10:18:16 |
2 |
|
3 |
Modified: gnutls-2.8.0.ebuild gnutls-2.9.0.ebuild ChangeLog |
4 |
Log: |
5 |
Fix installation of documentation (bug #271944). |
6 |
(Portage version: 13625-svn/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 net-libs/gnutls/gnutls-2.8.0.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/gnutls/gnutls-2.8.0.ebuild?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/gnutls/gnutls-2.8.0.ebuild?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/gnutls/gnutls-2.8.0.ebuild?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: gnutls-2.8.0.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.8.0.ebuild,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- gnutls-2.8.0.ebuild 28 May 2009 17:33:30 -0000 1.1 |
22 |
+++ gnutls-2.8.0.ebuild 1 Jun 2009 10:18:16 -0000 1.2 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2009 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.8.0.ebuild,v 1.1 2009/05/28 17:33:30 arfrever Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.8.0.ebuild,v 1.2 2009/06/01 10:18:16 arfrever Exp $ |
28 |
|
29 |
EAPI="2" |
30 |
|
31 |
@@ -11,7 +11,7 @@ |
32 |
|
33 |
MINOR_VERSION="${PV#*.}" |
34 |
MINOR_VERSION="${MINOR_VERSION%.*}" |
35 |
-if [[ $((MINOR_VERSION % 2)) == 0 ]] ; then |
36 |
+if [[ $((MINOR_VERSION % 2)) == 0 ]]; then |
37 |
#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" |
38 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" |
39 |
else |
40 |
@@ -23,7 +23,7 @@ |
41 |
LICENSE="LGPL-2.1 GPL-3" |
42 |
SLOT="0" |
43 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
44 |
-IUSE="bindist +cxx doc guile lzo nls zlib" |
45 |
+IUSE="bindist +cxx doc examples guile lzo nls zlib" |
46 |
|
47 |
RDEPEND="dev-libs/libgpg-error |
48 |
>=dev-libs/libgcrypt-1.4.0 |
49 |
@@ -46,12 +46,14 @@ |
50 |
} |
51 |
|
52 |
src_prepare() { |
53 |
+ sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am |
54 |
+ |
55 |
local dir |
56 |
- for dir in m4 lib/m4 libextra/m4 ; do |
57 |
+ for dir in m4 lib/m4 libextra/m4; do |
58 |
rm -f "${dir}/lt"* "${dir}/libtool.m4" |
59 |
done |
60 |
find . -name ltmain.sh -exec rm {} \; |
61 |
- for dir in . lib libextra ; do |
62 |
+ for dir in . lib libextra; do |
63 |
pushd "${dir}" > /dev/null |
64 |
eautoreconf |
65 |
popd > /dev/null |
66 |
@@ -63,7 +65,7 @@ |
67 |
src_configure() { |
68 |
local myconf |
69 |
use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)" |
70 |
- econf \ |
71 |
+ econf --htmldir=/usr/share/doc/${P}/html \ |
72 |
$(use_enable cxx) \ |
73 |
$(use_enable doc gtk-doc) \ |
74 |
$(use_enable guile) \ |
75 |
@@ -77,8 +79,12 @@ |
76 |
|
77 |
dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO |
78 |
|
79 |
- if use doc ; then |
80 |
- dodoc doc/README.autoconf doc/tex/gnutls.ps |
81 |
+ if use doc; then |
82 |
+ dodoc doc/gnutls.{pdf,ps} |
83 |
+ dohtml doc/gnutls.html |
84 |
+ fi |
85 |
+ |
86 |
+ if use examples; then |
87 |
docinto examples |
88 |
dodoc doc/examples/*.c |
89 |
fi |
90 |
|
91 |
|
92 |
|
93 |
1.2 net-libs/gnutls/gnutls-2.9.0.ebuild |
94 |
|
95 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/gnutls/gnutls-2.9.0.ebuild?rev=1.2&view=markup |
96 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/gnutls/gnutls-2.9.0.ebuild?rev=1.2&content-type=text/plain |
97 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/gnutls/gnutls-2.9.0.ebuild?r1=1.1&r2=1.2 |
98 |
|
99 |
Index: gnutls-2.9.0.ebuild |
100 |
=================================================================== |
101 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.9.0.ebuild,v |
102 |
retrieving revision 1.1 |
103 |
retrieving revision 1.2 |
104 |
diff -u -r1.1 -r1.2 |
105 |
--- gnutls-2.9.0.ebuild 28 May 2009 17:33:30 -0000 1.1 |
106 |
+++ gnutls-2.9.0.ebuild 1 Jun 2009 10:18:16 -0000 1.2 |
107 |
@@ -1,6 +1,6 @@ |
108 |
# Copyright 1999-2009 Gentoo Foundation |
109 |
# Distributed under the terms of the GNU General Public License v2 |
110 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.9.0.ebuild,v 1.1 2009/05/28 17:33:30 arfrever Exp $ |
111 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.9.0.ebuild,v 1.2 2009/06/01 10:18:16 arfrever Exp $ |
112 |
|
113 |
EAPI="2" |
114 |
|
115 |
@@ -11,7 +11,7 @@ |
116 |
|
117 |
MINOR_VERSION="${PV#*.}" |
118 |
MINOR_VERSION="${MINOR_VERSION%.*}" |
119 |
-if [[ $((MINOR_VERSION % 2)) == 0 ]] ; then |
120 |
+if [[ $((MINOR_VERSION % 2)) == 0 ]]; then |
121 |
#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2" |
122 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" |
123 |
else |
124 |
@@ -23,7 +23,7 @@ |
125 |
LICENSE="LGPL-2.1 GPL-3" |
126 |
SLOT="0" |
127 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
128 |
-IUSE="bindist +cxx doc guile lzo nls zlib" |
129 |
+IUSE="bindist +cxx doc examples guile lzo nls zlib" |
130 |
|
131 |
RDEPEND="dev-libs/libgpg-error |
132 |
>=dev-libs/libgcrypt-1.4.0 |
133 |
@@ -46,12 +46,14 @@ |
134 |
} |
135 |
|
136 |
src_prepare() { |
137 |
+ sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am |
138 |
+ |
139 |
local dir |
140 |
- for dir in m4 lib/m4 libextra/m4 ; do |
141 |
+ for dir in m4 lib/m4 libextra/m4; do |
142 |
rm -f "${dir}/lt"* "${dir}/libtool.m4" |
143 |
done |
144 |
find . -name ltmain.sh -exec rm {} \; |
145 |
- for dir in . lib libextra ; do |
146 |
+ for dir in . lib libextra; do |
147 |
pushd "${dir}" > /dev/null |
148 |
eautoreconf |
149 |
popd > /dev/null |
150 |
@@ -63,7 +65,7 @@ |
151 |
src_configure() { |
152 |
local myconf |
153 |
use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)" |
154 |
- econf \ |
155 |
+ econf --htmldir=/usr/share/doc/${P}/html \ |
156 |
$(use_enable cxx) \ |
157 |
$(use_enable doc gtk-doc) \ |
158 |
$(use_enable guile) \ |
159 |
@@ -77,8 +79,12 @@ |
160 |
|
161 |
dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO |
162 |
|
163 |
- if use doc ; then |
164 |
- dodoc doc/README.autoconf doc/tex/gnutls.ps |
165 |
+ if use doc; then |
166 |
+ dodoc doc/gnutls.{pdf,ps} |
167 |
+ dohtml doc/gnutls.html |
168 |
+ fi |
169 |
+ |
170 |
+ if use examples; then |
171 |
docinto examples |
172 |
dodoc doc/examples/*.c |
173 |
fi |
174 |
|
175 |
|
176 |
|
177 |
1.202 net-libs/gnutls/ChangeLog |
178 |
|
179 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/gnutls/ChangeLog?rev=1.202&view=markup |
180 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/gnutls/ChangeLog?rev=1.202&content-type=text/plain |
181 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/gnutls/ChangeLog?r1=1.201&r2=1.202 |
182 |
|
183 |
Index: ChangeLog |
184 |
=================================================================== |
185 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v |
186 |
retrieving revision 1.201 |
187 |
retrieving revision 1.202 |
188 |
diff -u -r1.201 -r1.202 |
189 |
--- ChangeLog 28 May 2009 17:33:30 -0000 1.201 |
190 |
+++ ChangeLog 1 Jun 2009 10:18:16 -0000 1.202 |
191 |
@@ -1,6 +1,10 @@ |
192 |
# ChangeLog for net-libs/gnutls |
193 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
194 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.201 2009/05/28 17:33:30 arfrever Exp $ |
195 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.202 2009/06/01 10:18:16 arfrever Exp $ |
196 |
+ |
197 |
+ 01 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
198 |
+ gnutls-2.8.0.ebuild, gnutls-2.9.0.ebuild: |
199 |
+ Fix installation of documentation (bug #271944). |
200 |
|
201 |
*gnutls-2.9.0 (28 May 2009) |
202 |
*gnutls-2.8.0 (28 May 2009) |