Gentoo Archives: gentoo-commits

From: "Alon Bar-Lev (alonbl)" <alonbl@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/gnutls: gnutls-3.2.17.ebuild gnutls-3.3.7.ebuild ChangeLog gnutls-3.3.4-r1.ebuild gnutls-3.2.15.ebuild
Date: Sun, 24 Aug 2014 19:09:50
Message-Id: 20140824190945.CDEF43D1A@oystercatcher.gentoo.org
1 alonbl 14/08/24 19:09:45
2
3 Modified: ChangeLog
4 Added: gnutls-3.2.17.ebuild gnutls-3.3.7.ebuild
5 Removed: gnutls-3.3.4-r1.ebuild gnutls-3.2.15.ebuild
6 Log:
7 Version bump, bug#520784, cleanup
8
9 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)
10
11 Revision Changes Path
12 1.511 net-libs/gnutls/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?rev=1.511&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?rev=1.511&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?r1=1.510&r2=1.511
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v
21 retrieving revision 1.510
22 retrieving revision 1.511
23 diff -u -r1.510 -r1.511
24 --- ChangeLog 8 Aug 2014 08:40:50 -0000 1.510
25 +++ ChangeLog 24 Aug 2014 19:09:45 -0000 1.511
26 @@ -1,6 +1,14 @@
27 # ChangeLog for net-libs/gnutls
28 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.510 2014/08/08 08:40:50 alonbl Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.511 2014/08/24 19:09:45 alonbl Exp $
31 +
32 +*gnutls-3.2.17 (24 Aug 2014)
33 +*gnutls-3.3.7 (24 Aug 2014)
34 +
35 + 24 Aug 2014; Alon Bar-Lev <alonbl@g.o> +files/gnutls-3.3.7-build.patch,
36 + +gnutls-3.2.17.ebuild, +gnutls-3.3.7.ebuild, -gnutls-3.2.15.ebuild,
37 + -gnutls-3.3.4-r1.ebuild:
38 + Version bump, bug#520784, cleanup
39
40 *gnutls-3.2.16 (08 Aug 2014)
41 *gnutls-3.3.6 (08 Aug 2014)
42
43
44
45 1.1 net-libs/gnutls/gnutls-3.2.17.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.2.17.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.2.17.ebuild?rev=1.1&content-type=text/plain
49
50 Index: gnutls-3.2.17.ebuild
51 ===================================================================
52 # Copyright 1999-2014 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.17.ebuild,v 1.1 2014/08/24 19:09:45 alonbl Exp $
55
56 EAPI=5
57
58 inherit autotools libtool eutils versionator
59
60 DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
61 HOMEPAGE="http://www.gnutls.org/"
62 SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
63
64 # LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
65 # soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
66 LICENSE="GPL-3 LGPL-3"
67 SLOT="0"
68 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
69 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
70 IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
71 # heartbeat support is not disabled until re-licensing happens fullyf
72
73 # NOTICE: sys-devel/autogen is required at runtime as we
74 # use system libopts
75 RDEPEND=">=dev-libs/libtasn1-2.14
76 >=dev-libs/nettle-2.7[gmp]
77 dev-libs/gmp
78 sys-devel/autogen
79 crywrap? ( net-dns/libidn )
80 dane? ( net-dns/unbound )
81 guile? ( >=dev-scheme/guile-1.8[networking] )
82 nls? ( virtual/libintl )
83 pkcs11? ( >=app-crypt/p11-kit-0.19.2 )
84 zlib? ( >=sys-libs/zlib-1.2.3.1 )"
85 DEPEND="${RDEPEND}
86 >=sys-devel/automake-1.11.6
87 virtual/pkgconfig
88 doc? ( dev-util/gtk-doc )
89 nls? ( sys-devel/gettext )
90 test? ( app-misc/datefudge )"
91
92 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
93
94 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
95
96 src_prepare() {
97 # tests/suite directory is not distributed
98 sed -i \
99 -e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
100 -e '/^AM_INIT_AUTOMAKE/s/-Werror//' \
101 configure.ac || die
102
103 sed -i \
104 -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
105 doc/Makefile.am || die
106
107 # force regeneration of autogen-ed files
108 local file
109 for file in $(grep -l AutoGen-ed src/*.c) ; do
110 rm src/$(basename ${file} .c).{c,h} || die
111 done
112
113 epatch "${FILESDIR}/${PN}-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch"
114
115 # support user patches
116 epatch_user
117
118 eautoreconf
119
120 # Use sane .so versioning on FreeBSD.
121 elibtoolize
122
123 # bug 497472
124 use cxx || epunt_cxx
125 }
126
127 src_configure() {
128 LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
129
130 # TPM needs to be tested before being enabled
131 # hardware-accell is disabled on OSX because the asm files force
132 # GNU-stack (as doesn't support that) and when that's removed ld
133 # complains about duplicate symbols
134 econf \
135 --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
136 --disable-valgrind-tests \
137 --enable-heartbeat-support \
138 $(use_enable cxx) \
139 $(use_enable dane libdane) \
140 $(use_enable doc gtk-doc) \
141 $(use_enable doc gtk-doc-pdf) \
142 $(use_enable guile) \
143 $(use_enable crywrap) \
144 $(use_enable nls) \
145 $(use_enable static-libs static) \
146 $(use_with pkcs11 p11-kit) \
147 $(use_with zlib) \
148 --without-tpm \
149 $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
150 }
151
152 src_test() {
153 # parallel testing often fails
154 emake -j1 check
155 }
156
157 src_install() {
158 default
159
160 find "${ED}" -name '*.la' -delete
161
162 dodoc doc/certtool.cfg
163
164 if use doc; then
165 dodoc doc/gnutls.pdf
166 dohtml doc/gnutls.html
167 fi
168
169 if use examples; then
170 docinto examples
171 dodoc doc/examples/*.c
172 fi
173 }
174
175
176
177 1.1 net-libs/gnutls/gnutls-3.3.7.ebuild
178
179 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.3.7.ebuild?rev=1.1&view=markup
180 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.3.7.ebuild?rev=1.1&content-type=text/plain
181
182 Index: gnutls-3.3.7.ebuild
183 ===================================================================
184 # Copyright 1999-2014 Gentoo Foundation
185 # Distributed under the terms of the GNU General Public License v2
186 # $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.7.ebuild,v 1.1 2014/08/24 19:09:45 alonbl Exp $
187
188 EAPI=5
189
190 inherit autotools libtool eutils multilib-minimal versionator
191
192 DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
193 HOMEPAGE="http://www.gnutls.org/"
194 SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
195
196 # LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
197 # soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
198 LICENSE="GPL-3 LGPL-3"
199 SLOT="0"
200 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
201 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
202 IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
203 # heartbeat support is not disabled until re-licensing happens fullyf
204
205 # NOTICE: sys-devel/autogen is required at runtime as we
206 # use system libopts
207 RDEPEND=">=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}]
208 >=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
209 >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
210 sys-devel/autogen
211 crywrap? ( net-dns/libidn )
212 dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
213 guile? ( >=dev-scheme/guile-1.8[networking] )
214 nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
215 pkcs11? ( >=app-crypt/p11-kit-0.19.3[${MULTILIB_USEDEP}] )
216 zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
217 abi_x86_32? (
218 !<=app-emulation/emul-linux-x86-baselibs-20140508
219 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
220 )"
221 DEPEND="${RDEPEND}
222 >=sys-devel/automake-1.11.6
223 >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
224 doc? ( dev-util/gtk-doc )
225 nls? ( sys-devel/gettext )
226 test? ( app-misc/datefudge )"
227
228 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
229
230 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
231
232 src_prepare() {
233 sed -i \
234 -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
235 doc/Makefile.am || die
236
237 # force regeneration of autogen-ed files
238 local file
239 for file in $(grep -l AutoGen-ed src/*.c) ; do
240 rm src/$(basename ${file} .c).{c,h} || die
241 done
242
243 epatch "${FILESDIR}/${P}-build.patch"
244
245 # support user patches
246 epatch_user
247
248 eautoreconf
249
250 # Use sane .so versioning on FreeBSD.
251 elibtoolize
252
253 # bug 497472
254 use cxx || epunt_cxx
255 }
256
257 multilib_src_configure() {
258 LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
259
260 # TPM needs to be tested before being enabled
261 # hardware-accell is disabled on OSX because the asm files force
262 # GNU-stack (as doesn't support that) and when that's removed ld
263 # complains about duplicate symbols
264 ECONF_SOURCE=${S} \
265 econf \
266 --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
267 --disable-valgrind-tests \
268 --enable-heartbeat-support \
269 $(use_enable cxx) \
270 $(use_enable dane libdane) \
271 $(multilib_native_use_enable doc gtk-doc) \
272 $(multilib_native_use_enable doc gtk-doc-pdf) \
273 $(multilib_native_use_enable guile) \
274 $(multilib_native_use_enable crywrap) \
275 $(use_enable nls) \
276 $(use_enable static-libs static) \
277 $(use_with pkcs11 p11-kit) \
278 $(use_with zlib) \
279 --without-tpm \
280 --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
281 $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
282 }
283
284 multilib_src_compile() {
285 if multilib_is_native_abi; then
286 default
287
288 # symlink certtool for use in other ABIs
289 if use test; then
290 ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
291 fi
292 else
293 emake -C gl
294 emake -C lib
295 emake -C extra
296 use dane && emake -C libdane
297 fi
298 }
299
300 multilib_src_test() {
301 if multilib_is_native_abi; then
302 # parallel testing often fails
303 emake -j1 check
304 else
305 # use native ABI tools
306 ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
307 "${BUILD_DIR}"/src/ || die
308
309 emake -C gl -j1 check
310 emake -C tests -j1 check
311 fi
312 }
313
314 multilib_src_install() {
315 if multilib_is_native_abi; then
316 emake DESTDIR="${D}" install
317 else
318 emake -C lib DESTDIR="${D}" install
319 emake -C extra DESTDIR="${D}" install
320 use dane && emake -C libdane DESTDIR="${D}" install
321 fi
322 }
323
324 multilib_src_install_all() {
325 einstalldocs
326 prune_libtool_files --all
327
328 dodoc doc/certtool.cfg
329
330 if use doc; then
331 dodoc doc/gnutls.pdf
332 dohtml doc/gnutls.html
333 fi
334
335 if use examples; then
336 docinto examples
337 dodoc doc/examples/*.c
338 fi
339 }