1 |
commit: 0d72ce7cbd61355efa88da7369d37b1849ec2f4a |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 9 19:31:23 2017 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 9 19:34:22 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d72ce7c |
7 |
|
8 |
net-libs/gnutls: cleanup 3.3 series |
9 |
|
10 |
Gentoo-Bug: 612340 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
13 |
|
14 |
net-libs/gnutls/Manifest | 3 - |
15 |
...ow-installing-man-1-even-with-disable-doc.patch | 94 ----------- |
16 |
net-libs/gnutls/gnutls-3.3.26.ebuild | 181 --------------------- |
17 |
net-libs/gnutls/gnutls-3.3.27.ebuild | 181 --------------------- |
18 |
net-libs/gnutls/gnutls-3.3.28.ebuild | 181 --------------------- |
19 |
net-libs/gnutls/metadata.xml | 5 +- |
20 |
6 files changed, 1 insertion(+), 644 deletions(-) |
21 |
|
22 |
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest |
23 |
index 9fc72d07f4d..c0a68df90fb 100644 |
24 |
--- a/net-libs/gnutls/Manifest |
25 |
+++ b/net-libs/gnutls/Manifest |
26 |
@@ -1,6 +1,3 @@ |
27 |
-DIST gnutls-3.3.26.tar.xz 6361068 SHA256 6a7d882b6b581d684883fde195abf930dab37dfbe6aaea88ab164252bec720d9 SHA512 41259f760f5ed9b87d4203de567efb1a2087e01a025f2ea0f14167f146ecd640fbddeab390fbae6acc262507229894774db883d0892d448068ee73abb110738f WHIRLPOOL afca5aabebf36064847933662736c7713b837375db2c91c416d43a980407d912edf8fb64f53615c0bed770f46a9d2e0a3eb309f6a66281f5377e50a02863c8e7 |
28 |
-DIST gnutls-3.3.27.tar.xz 6364824 SHA256 8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f SHA512 2cc5706b502a500375f706d1a7321af4c55554d3052f35cf24cbb288f9568ce891999d0f401119d04f594e9bc79e2e68d3c008648604032222ad2a6d8224bbdf WHIRLPOOL 508ac8939e471155bd5d49510111fca4eb5b5362f0bae8ec16f98eb16aeaa44ff06448fd7793398e56f9713b344b0b27a32e66c24cbdc062d33bc74dd6b83f57 |
29 |
-DIST gnutls-3.3.28.tar.xz 6369560 SHA256 608f63441abc209c5bd5f61e35f2b6128c22e06fa2ad6248a08d8a643feeb807 SHA512 c88c8dca22446f1eda0bd06b57402a9d67c866b87836963cba66ff3209c0781c3106f8d4355c50ed15bd11b3208c029652cd7f00450de68f01651aad7c8e562f WHIRLPOOL cb6c6a796a0c75f0b70bce617ddcde2c34c21626d6ac351cb9c6df585e84a63d4dbe15d0b70a5ad901be4ff914f83f8a7fbb477624ca3e16e25b81c8afbc3f4e |
30 |
DIST gnutls-3.5.12.tar.xz 7212652 SHA256 63cb39a5eaa029381df2e49a74cfb7be89fc4a592445191818ffe1e66bde57cb SHA512 8fec23e7e494a2e15e0f938115cae1ba3fee952d634db387f983b01096f68ca4313b23bc4c439d3c7fdd07c861eac4913a7c2343c8704961588ae195886ec90c WHIRLPOOL f7309aa89e75ed75371893ba4e4ac89f9f8bc7a61ef10ae4c4986aec290ae2dc5108cd3cc6463af6700ddab3754c6fcbd10ac95d3c40c4549cfdf6b3289f8a72 |
31 |
DIST gnutls-3.5.13.tar.xz 7226468 SHA256 79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096 SHA512 e98f23a589042f879936c3f8b474535e695fb7dd68a9e81323668c013241f765c2d3af6c6a072ecf867acc1e551ec46e15bb842144d3a06bdd5d2f4fc3d828a7 WHIRLPOOL 89439e7adba634698642a247c418569c0ea6ca6155bfb5dce17c8ed69d2506a37d9ad793122aaaec92adffefa75cb23a857c49ef722c5cf506700fe0c34b6028 |
32 |
DIST gnutls-3.5.14.tar.xz 7228200 SHA256 4aa12dec92f42a0434df794aca3d02f6f2a35b47b48c01252de65f355c051bda SHA512 c55384bdf835c0f7715bfb10b7fa0ac30d26d53ffa5f32af78844cf27985407eed034af77413fb2e94e3a0c0a5fb0597d66f5dbbbe72e5e0658bfeeafa6f7829 WHIRLPOOL c6ae68898983184d00dde78a38a3398b677541ae6316a25544668f183423da1f6c3c7f3709f896f6c135e6907d832d6980f102d77b40758f9cf81c25f68cb086 |
33 |
|
34 |
diff --git a/net-libs/gnutls/files/gnutls-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch b/net-libs/gnutls/files/gnutls-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch |
35 |
deleted file mode 100644 |
36 |
index dda8bfced64..00000000000 |
37 |
--- a/net-libs/gnutls/files/gnutls-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch |
38 |
+++ /dev/null |
39 |
@@ -1,94 +0,0 @@ |
40 |
-From 0f230c6375fd3680837d98f20ee3862e9041af3d Mon Sep 17 00:00:00 2001 |
41 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
42 |
-Date: Fri, 18 Dec 2015 12:14:08 +0200 |
43 |
-Subject: [PATCH] build: allow installing man(1) even with --disable-doc |
44 |
- |
45 |
-Currently these man pages are installed only if --enable-doc |
46 |
-is provided, while these are not actually docs, do not require any |
47 |
-special dependency, nor consume large space. |
48 |
- |
49 |
-This adds --enable-manpages to enable/disable manpages installation, and |
50 |
-install the man(1) regardless of --disable-doc. |
51 |
- |
52 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
53 |
-Signed-off-by: Nikos Mavrogiannopoulos <nmav@××××××.com> |
54 |
- |
55 |
---- |
56 |
- Makefile.am | 3 +++ |
57 |
- configure.ac | 10 ++++++++++ |
58 |
- doc/Makefile.am | 2 +- |
59 |
- doc/manpages/Makefile.am | 2 ++ |
60 |
- 5 files changed, 17 insertions(+), 1 deletion(-) |
61 |
- |
62 |
-diff --git a/Makefile.am b/Makefile.am |
63 |
-index d446711..6e19f26 100644 |
64 |
---- a/Makefile.am |
65 |
-+++ b/Makefile.am |
66 |
-@@ -28,6 +28,9 @@ SUBDIRS += libdane |
67 |
- endif |
68 |
- |
69 |
- SUBDIRS += po src |
70 |
-+if ENABLE_MANPAGES |
71 |
-+SUBDIRS += doc/manpages |
72 |
-+endif |
73 |
- if ENABLE_DOC |
74 |
- SUBDIRS += doc |
75 |
- endif |
76 |
-diff --git a/configure.ac b/configure.ac |
77 |
-index c7a83b8..d161c05 100644 |
78 |
---- a/configure.ac |
79 |
-+++ b/configure.ac |
80 |
-@@ -152,6 +152,15 @@ AC_ARG_ENABLE(doc, |
81 |
- enable_doc=$enableval, enable_doc=yes) |
82 |
- AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") |
83 |
- |
84 |
-+AC_ARG_ENABLE(manpages, |
85 |
-+ AS_HELP_STRING([--enable-manpages], [install manpages even if disable-doc is given]), |
86 |
-+ enable_manpages=$enableval,enable_manpages=auto) |
87 |
-+ |
88 |
-+if test "${enable_manpages}" = "auto";then |
89 |
-+ enable_manpages="${enable_doc}" |
90 |
-+fi |
91 |
-+AM_CONDITIONAL(ENABLE_MANPAGES, test "$enable_manpages" != "no") |
92 |
-+ |
93 |
- AC_ARG_ENABLE(tests, |
94 |
- AS_HELP_STRING([--disable-tests], [don't compile or run any tests]), |
95 |
- enable_tests=$enableval, enable_tests=yes) |
96 |
-@@ -838,6 +847,7 @@ AC_MSG_NOTICE([summary of build options: |
97 |
- Local libtasn1: ${included_libtasn1} |
98 |
- Use nettle-mini: ${mini_nettle} |
99 |
- nettle-version: ${nettle_version} |
100 |
-+ Documentation: ${enable_doc} (manpages: ${enable_manpages}) |
101 |
- ]) |
102 |
- |
103 |
- AC_MSG_NOTICE([External hardware support: |
104 |
-diff --git a/doc/Makefile.am b/doc/Makefile.am |
105 |
-index d9b4022..492a74a 100644 |
106 |
---- a/doc/Makefile.am |
107 |
-+++ b/doc/Makefile.am |
108 |
-@@ -24,7 +24,7 @@ EXTRA_DIST = TODO certtool.cfg gnutls.pdf gnutls.html \ |
109 |
- gnutls-guile.pdf gnutls-guile.html stamp_enums stamp_functions \ |
110 |
- doc.mk |
111 |
- |
112 |
--SUBDIRS = examples cyclo scripts manpages credentials latex |
113 |
-+SUBDIRS = examples cyclo scripts credentials latex |
114 |
- if ENABLE_GTK_DOC |
115 |
- SUBDIRS += reference |
116 |
- endif |
117 |
-diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am |
118 |
-index 6d16787..2840197 100644 |
119 |
---- a/doc/manpages/Makefile.am |
120 |
-+++ b/doc/manpages/Makefile.am |
121 |
-@@ -1053,7 +1053,9 @@ APIMANS += gnutls_x509_trust_list_verify_crt.3 |
122 |
- APIMANS += gnutls_x509_trust_list_verify_crt2.3 |
123 |
- APIMANS += gnutls_x509_trust_list_verify_named_crt.3 |
124 |
- |
125 |
-+if ENABLE_DOC |
126 |
- dist_man_MANS += $(APIMANS) |
127 |
-+endif |
128 |
- |
129 |
- $(APIMANS): stamp_mans |
130 |
- |
131 |
--- |
132 |
-2.4.10 |
133 |
- |
134 |
|
135 |
diff --git a/net-libs/gnutls/gnutls-3.3.26.ebuild b/net-libs/gnutls/gnutls-3.3.26.ebuild |
136 |
deleted file mode 100644 |
137 |
index cd9ee855600..00000000000 |
138 |
--- a/net-libs/gnutls/gnutls-3.3.26.ebuild |
139 |
+++ /dev/null |
140 |
@@ -1,181 +0,0 @@ |
141 |
-# Copyright 1999-2017 Gentoo Foundation |
142 |
-# Distributed under the terms of the GNU General Public License v2 |
143 |
- |
144 |
-EAPI=6 |
145 |
- |
146 |
-inherit autotools epunt-cxx libtool ltprune multilib-minimal versionator |
147 |
- |
148 |
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" |
149 |
-HOMEPAGE="http://www.gnutls.org/" |
150 |
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" |
151 |
- |
152 |
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library. |
153 |
-# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled. |
154 |
-LICENSE="GPL-3 LGPL-3" |
155 |
-SLOT="0" |
156 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
157 |
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN" |
158 |
-IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}" |
159 |
-# heartbeat support is not disabled until re-licensing happens fullyf |
160 |
- |
161 |
-# NOTICE: sys-devel/autogen is required at runtime as we |
162 |
-# use system libopts |
163 |
-RDEPEND=">=dev-libs/libtasn1-4.3:=[${MULTILIB_USEDEP}] |
164 |
- >=dev-libs/nettle-2.7:=[gmp,${MULTILIB_USEDEP}] |
165 |
- >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] |
166 |
- sys-devel/autogen |
167 |
- crywrap? ( net-dns/libidn ) |
168 |
- dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] ) |
169 |
- guile? ( >=dev-scheme/guile-1.8:=[networking] ) |
170 |
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
171 |
- pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] ) |
172 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
173 |
- abi_x86_32? ( |
174 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508 |
175 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
176 |
- )" |
177 |
-DEPEND="${RDEPEND} |
178 |
- >=sys-devel/automake-1.11.6 |
179 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
180 |
- doc? ( |
181 |
- sys-apps/texinfo |
182 |
- dev-util/gtk-doc |
183 |
- ) |
184 |
- nls? ( sys-devel/gettext ) |
185 |
- test? ( app-misc/datefudge )" |
186 |
- |
187 |
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO ) |
188 |
- |
189 |
-PATCHES=( |
190 |
- "${FILESDIR}/${PN}-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch" |
191 |
-) |
192 |
- |
193 |
-pkg_setup() { |
194 |
- # bug#520818 |
195 |
- export TZ=UTC |
196 |
-} |
197 |
- |
198 |
-src_prepare() { |
199 |
- default |
200 |
- |
201 |
- sed -i \ |
202 |
- -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \ |
203 |
- doc/Makefile.am || die |
204 |
- |
205 |
- # force regeneration of autogen-ed files |
206 |
- local file |
207 |
- for file in $(grep -l AutoGen-ed src/*.c) ; do |
208 |
- rm src/$(basename ${file} .c).{c,h} || die |
209 |
- done |
210 |
- |
211 |
- # force regeneration of makeinfo files |
212 |
- # have no idea why on some system these files are not |
213 |
- # accepted as-is, see bug#520818 |
214 |
- for file in $(grep -l "produced by makeinfo" doc/*.info) ; do |
215 |
- rm "${file}" || die |
216 |
- done |
217 |
- |
218 |
- eautoreconf |
219 |
- |
220 |
- # Use sane .so versioning on FreeBSD. |
221 |
- elibtoolize |
222 |
- |
223 |
- # bug 497472 |
224 |
- use cxx || epunt_cxx |
225 |
-} |
226 |
- |
227 |
-multilib_src_configure() { |
228 |
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}" |
229 |
- |
230 |
- # remove magic of library detection |
231 |
- # bug#438222 |
232 |
- libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) |
233 |
- |
234 |
- # TPM needs to be tested before being enabled |
235 |
- # hardware-accell is disabled on OSX because the asm files force |
236 |
- # GNU-stack (as doesn't support that) and when that's removed ld |
237 |
- # complains about duplicate symbols |
238 |
- ECONF_SOURCE=${S} \ |
239 |
- econf \ |
240 |
- --disable-valgrind-tests \ |
241 |
- --without-included-libtasn1 \ |
242 |
- --enable-heartbeat-support \ |
243 |
- $(use_enable cxx) \ |
244 |
- $(use_enable dane libdane) \ |
245 |
- $(multilib_native_enable manpages) \ |
246 |
- $(multilib_native_use_enable doc) \ |
247 |
- $(multilib_native_use_enable doc gtk-doc) \ |
248 |
- $(multilib_native_use_enable guile) \ |
249 |
- $(multilib_native_use_enable crywrap) \ |
250 |
- $(use_enable nls) \ |
251 |
- $(use_enable openssl openssl-compatibility) \ |
252 |
- $(use_enable static-libs static) \ |
253 |
- $(use_with pkcs11 p11-kit) \ |
254 |
- $(use_with zlib) \ |
255 |
- --without-tpm \ |
256 |
- --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \ |
257 |
- "${libconf[@]}" \ |
258 |
- $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration) |
259 |
- |
260 |
- if multilib_is_native_abi; then |
261 |
- ln -s "${S}"/doc/reference/html doc/reference/html || die |
262 |
- fi |
263 |
-} |
264 |
- |
265 |
-multilib_src_compile() { |
266 |
- if multilib_is_native_abi; then |
267 |
- default |
268 |
- |
269 |
- # symlink certtool for use in other ABIs |
270 |
- if use test; then |
271 |
- ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die |
272 |
- fi |
273 |
- else |
274 |
- emake -C gl |
275 |
- emake -C lib |
276 |
- emake -C extra |
277 |
- use dane && emake -C libdane |
278 |
- fi |
279 |
-} |
280 |
- |
281 |
-multilib_src_test() { |
282 |
- if multilib_is_native_abi; then |
283 |
- # parallel testing often fails |
284 |
- emake -j1 check |
285 |
- else |
286 |
- # use native ABI tools |
287 |
- ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \ |
288 |
- "${BUILD_DIR}"/src/ || die |
289 |
- |
290 |
- emake -C gl -j1 check |
291 |
- emake -C tests -j1 check |
292 |
- fi |
293 |
-} |
294 |
- |
295 |
-multilib_src_install() { |
296 |
- if multilib_is_native_abi; then |
297 |
- emake DESTDIR="${D}" install |
298 |
- else |
299 |
- emake -C lib DESTDIR="${D}" install |
300 |
- emake -C extra DESTDIR="${D}" install |
301 |
- use dane && emake -C libdane DESTDIR="${D}" install |
302 |
- fi |
303 |
-} |
304 |
- |
305 |
-multilib_src_install_all() { |
306 |
- einstalldocs |
307 |
- prune_libtool_files --all |
308 |
- |
309 |
- dodoc doc/certtool.cfg |
310 |
- |
311 |
- if use doc; then |
312 |
- dohtml doc/gnutls.html |
313 |
- else |
314 |
- rm -fr "${ED}/usr/share/doc/${PF}/html" |
315 |
- fi |
316 |
- |
317 |
- if use examples; then |
318 |
- docinto examples |
319 |
- dodoc doc/examples/*.c |
320 |
- fi |
321 |
-} |
322 |
|
323 |
diff --git a/net-libs/gnutls/gnutls-3.3.27.ebuild b/net-libs/gnutls/gnutls-3.3.27.ebuild |
324 |
deleted file mode 100644 |
325 |
index 434bd0c5af9..00000000000 |
326 |
--- a/net-libs/gnutls/gnutls-3.3.27.ebuild |
327 |
+++ /dev/null |
328 |
@@ -1,181 +0,0 @@ |
329 |
-# Copyright 1999-2017 Gentoo Foundation |
330 |
-# Distributed under the terms of the GNU General Public License v2 |
331 |
- |
332 |
-EAPI=6 |
333 |
- |
334 |
-inherit autotools epunt-cxx libtool ltprune multilib-minimal versionator |
335 |
- |
336 |
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" |
337 |
-HOMEPAGE="http://www.gnutls.org/" |
338 |
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" |
339 |
- |
340 |
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library. |
341 |
-# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled. |
342 |
-LICENSE="GPL-3 LGPL-3" |
343 |
-SLOT="0" |
344 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
345 |
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN" |
346 |
-IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}" |
347 |
-# heartbeat support is not disabled until re-licensing happens fullyf |
348 |
- |
349 |
-# NOTICE: sys-devel/autogen is required at runtime as we |
350 |
-# use system libopts |
351 |
-RDEPEND=">=dev-libs/libtasn1-4.3:=[${MULTILIB_USEDEP}] |
352 |
- >=dev-libs/nettle-2.7:=[gmp,${MULTILIB_USEDEP}] |
353 |
- >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] |
354 |
- sys-devel/autogen |
355 |
- crywrap? ( net-dns/libidn ) |
356 |
- dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] ) |
357 |
- guile? ( >=dev-scheme/guile-1.8:=[networking] ) |
358 |
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
359 |
- pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] ) |
360 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
361 |
- abi_x86_32? ( |
362 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508 |
363 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
364 |
- )" |
365 |
-DEPEND="${RDEPEND} |
366 |
- >=sys-devel/automake-1.11.6 |
367 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
368 |
- doc? ( |
369 |
- sys-apps/texinfo |
370 |
- dev-util/gtk-doc |
371 |
- ) |
372 |
- nls? ( sys-devel/gettext ) |
373 |
- test? ( app-misc/datefudge )" |
374 |
- |
375 |
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO ) |
376 |
- |
377 |
-PATCHES=( |
378 |
- "${FILESDIR}/${PN}-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch" |
379 |
-) |
380 |
- |
381 |
-pkg_setup() { |
382 |
- # bug#520818 |
383 |
- export TZ=UTC |
384 |
-} |
385 |
- |
386 |
-src_prepare() { |
387 |
- default |
388 |
- |
389 |
- sed -i \ |
390 |
- -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \ |
391 |
- doc/Makefile.am || die |
392 |
- |
393 |
- # force regeneration of autogen-ed files |
394 |
- local file |
395 |
- for file in $(grep -l AutoGen-ed src/*.c) ; do |
396 |
- rm src/$(basename ${file} .c).{c,h} || die |
397 |
- done |
398 |
- |
399 |
- # force regeneration of makeinfo files |
400 |
- # have no idea why on some system these files are not |
401 |
- # accepted as-is, see bug#520818 |
402 |
- for file in $(grep -l "produced by makeinfo" doc/*.info) ; do |
403 |
- rm "${file}" || die |
404 |
- done |
405 |
- |
406 |
- eautoreconf |
407 |
- |
408 |
- # Use sane .so versioning on FreeBSD. |
409 |
- elibtoolize |
410 |
- |
411 |
- # bug 497472 |
412 |
- use cxx || epunt_cxx |
413 |
-} |
414 |
- |
415 |
-multilib_src_configure() { |
416 |
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}" |
417 |
- |
418 |
- # remove magic of library detection |
419 |
- # bug#438222 |
420 |
- libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) |
421 |
- |
422 |
- # TPM needs to be tested before being enabled |
423 |
- # hardware-accell is disabled on OSX because the asm files force |
424 |
- # GNU-stack (as doesn't support that) and when that's removed ld |
425 |
- # complains about duplicate symbols |
426 |
- ECONF_SOURCE=${S} \ |
427 |
- econf \ |
428 |
- --disable-valgrind-tests \ |
429 |
- --without-included-libtasn1 \ |
430 |
- --enable-heartbeat-support \ |
431 |
- $(use_enable cxx) \ |
432 |
- $(use_enable dane libdane) \ |
433 |
- $(multilib_native_enable manpages) \ |
434 |
- $(multilib_native_use_enable doc) \ |
435 |
- $(multilib_native_use_enable doc gtk-doc) \ |
436 |
- $(multilib_native_use_enable guile) \ |
437 |
- $(multilib_native_use_enable crywrap) \ |
438 |
- $(use_enable nls) \ |
439 |
- $(use_enable openssl openssl-compatibility) \ |
440 |
- $(use_enable static-libs static) \ |
441 |
- $(use_with pkcs11 p11-kit) \ |
442 |
- $(use_with zlib) \ |
443 |
- --without-tpm \ |
444 |
- --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \ |
445 |
- "${libconf[@]}" \ |
446 |
- $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration) |
447 |
- |
448 |
- if multilib_is_native_abi; then |
449 |
- ln -s "${S}"/doc/reference/html doc/reference/html || die |
450 |
- fi |
451 |
-} |
452 |
- |
453 |
-multilib_src_compile() { |
454 |
- if multilib_is_native_abi; then |
455 |
- default |
456 |
- |
457 |
- # symlink certtool for use in other ABIs |
458 |
- if use test; then |
459 |
- ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die |
460 |
- fi |
461 |
- else |
462 |
- emake -C gl |
463 |
- emake -C lib |
464 |
- emake -C extra |
465 |
- use dane && emake -C libdane |
466 |
- fi |
467 |
-} |
468 |
- |
469 |
-multilib_src_test() { |
470 |
- if multilib_is_native_abi; then |
471 |
- # parallel testing often fails |
472 |
- emake -j1 check |
473 |
- else |
474 |
- # use native ABI tools |
475 |
- ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \ |
476 |
- "${BUILD_DIR}"/src/ || die |
477 |
- |
478 |
- emake -C gl -j1 check |
479 |
- emake -C tests -j1 check |
480 |
- fi |
481 |
-} |
482 |
- |
483 |
-multilib_src_install() { |
484 |
- if multilib_is_native_abi; then |
485 |
- emake DESTDIR="${D}" install |
486 |
- else |
487 |
- emake -C lib DESTDIR="${D}" install |
488 |
- emake -C extra DESTDIR="${D}" install |
489 |
- use dane && emake -C libdane DESTDIR="${D}" install |
490 |
- fi |
491 |
-} |
492 |
- |
493 |
-multilib_src_install_all() { |
494 |
- einstalldocs |
495 |
- prune_libtool_files --all |
496 |
- |
497 |
- dodoc doc/certtool.cfg |
498 |
- |
499 |
- if use doc; then |
500 |
- dohtml doc/gnutls.html |
501 |
- else |
502 |
- rm -fr "${ED}/usr/share/doc/${PF}/html" |
503 |
- fi |
504 |
- |
505 |
- if use examples; then |
506 |
- docinto examples |
507 |
- dodoc doc/examples/*.c |
508 |
- fi |
509 |
-} |
510 |
|
511 |
diff --git a/net-libs/gnutls/gnutls-3.3.28.ebuild b/net-libs/gnutls/gnutls-3.3.28.ebuild |
512 |
deleted file mode 100644 |
513 |
index 434bd0c5af9..00000000000 |
514 |
--- a/net-libs/gnutls/gnutls-3.3.28.ebuild |
515 |
+++ /dev/null |
516 |
@@ -1,181 +0,0 @@ |
517 |
-# Copyright 1999-2017 Gentoo Foundation |
518 |
-# Distributed under the terms of the GNU General Public License v2 |
519 |
- |
520 |
-EAPI=6 |
521 |
- |
522 |
-inherit autotools epunt-cxx libtool ltprune multilib-minimal versionator |
523 |
- |
524 |
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" |
525 |
-HOMEPAGE="http://www.gnutls.org/" |
526 |
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" |
527 |
- |
528 |
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library. |
529 |
-# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled. |
530 |
-LICENSE="GPL-3 LGPL-3" |
531 |
-SLOT="0" |
532 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
533 |
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN" |
534 |
-IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}" |
535 |
-# heartbeat support is not disabled until re-licensing happens fullyf |
536 |
- |
537 |
-# NOTICE: sys-devel/autogen is required at runtime as we |
538 |
-# use system libopts |
539 |
-RDEPEND=">=dev-libs/libtasn1-4.3:=[${MULTILIB_USEDEP}] |
540 |
- >=dev-libs/nettle-2.7:=[gmp,${MULTILIB_USEDEP}] |
541 |
- >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] |
542 |
- sys-devel/autogen |
543 |
- crywrap? ( net-dns/libidn ) |
544 |
- dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] ) |
545 |
- guile? ( >=dev-scheme/guile-1.8:=[networking] ) |
546 |
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
547 |
- pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] ) |
548 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
549 |
- abi_x86_32? ( |
550 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508 |
551 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
552 |
- )" |
553 |
-DEPEND="${RDEPEND} |
554 |
- >=sys-devel/automake-1.11.6 |
555 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
556 |
- doc? ( |
557 |
- sys-apps/texinfo |
558 |
- dev-util/gtk-doc |
559 |
- ) |
560 |
- nls? ( sys-devel/gettext ) |
561 |
- test? ( app-misc/datefudge )" |
562 |
- |
563 |
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO ) |
564 |
- |
565 |
-PATCHES=( |
566 |
- "${FILESDIR}/${PN}-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch" |
567 |
-) |
568 |
- |
569 |
-pkg_setup() { |
570 |
- # bug#520818 |
571 |
- export TZ=UTC |
572 |
-} |
573 |
- |
574 |
-src_prepare() { |
575 |
- default |
576 |
- |
577 |
- sed -i \ |
578 |
- -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \ |
579 |
- doc/Makefile.am || die |
580 |
- |
581 |
- # force regeneration of autogen-ed files |
582 |
- local file |
583 |
- for file in $(grep -l AutoGen-ed src/*.c) ; do |
584 |
- rm src/$(basename ${file} .c).{c,h} || die |
585 |
- done |
586 |
- |
587 |
- # force regeneration of makeinfo files |
588 |
- # have no idea why on some system these files are not |
589 |
- # accepted as-is, see bug#520818 |
590 |
- for file in $(grep -l "produced by makeinfo" doc/*.info) ; do |
591 |
- rm "${file}" || die |
592 |
- done |
593 |
- |
594 |
- eautoreconf |
595 |
- |
596 |
- # Use sane .so versioning on FreeBSD. |
597 |
- elibtoolize |
598 |
- |
599 |
- # bug 497472 |
600 |
- use cxx || epunt_cxx |
601 |
-} |
602 |
- |
603 |
-multilib_src_configure() { |
604 |
- LINGUAS="${LINGUAS//en/en@boldquot en@quot}" |
605 |
- |
606 |
- # remove magic of library detection |
607 |
- # bug#438222 |
608 |
- libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) |
609 |
- |
610 |
- # TPM needs to be tested before being enabled |
611 |
- # hardware-accell is disabled on OSX because the asm files force |
612 |
- # GNU-stack (as doesn't support that) and when that's removed ld |
613 |
- # complains about duplicate symbols |
614 |
- ECONF_SOURCE=${S} \ |
615 |
- econf \ |
616 |
- --disable-valgrind-tests \ |
617 |
- --without-included-libtasn1 \ |
618 |
- --enable-heartbeat-support \ |
619 |
- $(use_enable cxx) \ |
620 |
- $(use_enable dane libdane) \ |
621 |
- $(multilib_native_enable manpages) \ |
622 |
- $(multilib_native_use_enable doc) \ |
623 |
- $(multilib_native_use_enable doc gtk-doc) \ |
624 |
- $(multilib_native_use_enable guile) \ |
625 |
- $(multilib_native_use_enable crywrap) \ |
626 |
- $(use_enable nls) \ |
627 |
- $(use_enable openssl openssl-compatibility) \ |
628 |
- $(use_enable static-libs static) \ |
629 |
- $(use_with pkcs11 p11-kit) \ |
630 |
- $(use_with zlib) \ |
631 |
- --without-tpm \ |
632 |
- --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \ |
633 |
- "${libconf[@]}" \ |
634 |
- $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration) |
635 |
- |
636 |
- if multilib_is_native_abi; then |
637 |
- ln -s "${S}"/doc/reference/html doc/reference/html || die |
638 |
- fi |
639 |
-} |
640 |
- |
641 |
-multilib_src_compile() { |
642 |
- if multilib_is_native_abi; then |
643 |
- default |
644 |
- |
645 |
- # symlink certtool for use in other ABIs |
646 |
- if use test; then |
647 |
- ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die |
648 |
- fi |
649 |
- else |
650 |
- emake -C gl |
651 |
- emake -C lib |
652 |
- emake -C extra |
653 |
- use dane && emake -C libdane |
654 |
- fi |
655 |
-} |
656 |
- |
657 |
-multilib_src_test() { |
658 |
- if multilib_is_native_abi; then |
659 |
- # parallel testing often fails |
660 |
- emake -j1 check |
661 |
- else |
662 |
- # use native ABI tools |
663 |
- ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \ |
664 |
- "${BUILD_DIR}"/src/ || die |
665 |
- |
666 |
- emake -C gl -j1 check |
667 |
- emake -C tests -j1 check |
668 |
- fi |
669 |
-} |
670 |
- |
671 |
-multilib_src_install() { |
672 |
- if multilib_is_native_abi; then |
673 |
- emake DESTDIR="${D}" install |
674 |
- else |
675 |
- emake -C lib DESTDIR="${D}" install |
676 |
- emake -C extra DESTDIR="${D}" install |
677 |
- use dane && emake -C libdane DESTDIR="${D}" install |
678 |
- fi |
679 |
-} |
680 |
- |
681 |
-multilib_src_install_all() { |
682 |
- einstalldocs |
683 |
- prune_libtool_files --all |
684 |
- |
685 |
- dodoc doc/certtool.cfg |
686 |
- |
687 |
- if use doc; then |
688 |
- dohtml doc/gnutls.html |
689 |
- else |
690 |
- rm -fr "${ED}/usr/share/doc/${PF}/html" |
691 |
- fi |
692 |
- |
693 |
- if use examples; then |
694 |
- docinto examples |
695 |
- dodoc doc/examples/*.c |
696 |
- fi |
697 |
-} |
698 |
|
699 |
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml |
700 |
index 536d49f0da3..9f796b4b07f 100644 |
701 |
--- a/net-libs/gnutls/metadata.xml |
702 |
+++ b/net-libs/gnutls/metadata.xml |
703 |
@@ -6,10 +6,7 @@ |
704 |
<name>Crypto</name> |
705 |
</maintainer> |
706 |
<use> |
707 |
- <flag name="crywrap" restrict=">=net-libs/gnutls-3.2.10"> |
708 |
- Build the crywrap TLS proxy service |
709 |
- </flag> |
710 |
- <flag name="dane" restrict=">=net-libs/gnutls-3.1.3"> |
711 |
+ <flag name="dane"> |
712 |
Build libgnutls-dane, implementing DNS-based Authentication of |
713 |
Named Entities. Requires <pkg>net-dns/unbound</pkg> |
714 |
</flag> |