Gentoo Archives: gentoo-commits

From: Alon Bar-Lev <alonbl@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/gnutls/
Date: Fri, 16 Feb 2018 17:42:20
Message-Id: 1518802923.241a164863611bb438cf7674149adbceb2bcb64a.alonbl@gentoo
1 commit: 241a164863611bb438cf7674149adbceb2bcb64a
2 Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 16 13:44:37 2018 +0000
4 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 16 17:42:03 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=241a1648
7
8 net-libs/gnutls: cleanup
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 net-libs/gnutls/Manifest | 4 -
13 net-libs/gnutls/gnutls-3.5.16.ebuild | 137 -----------------------------------
14 net-libs/gnutls/gnutls-3.5.17.ebuild | 137 -----------------------------------
15 net-libs/gnutls/gnutls-3.6.0.ebuild | 133 ----------------------------------
16 net-libs/gnutls/gnutls-3.6.1.ebuild | 133 ----------------------------------
17 5 files changed, 544 deletions(-)
18
19 diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
20 index caaad93fe72..6d412421bc4 100644
21 --- a/net-libs/gnutls/Manifest
22 +++ b/net-libs/gnutls/Manifest
23 @@ -1,7 +1,3 @@
24 DIST gnutls-3.5.15.tar.xz 7238928 BLAKE2B d9a081ec0f956cabe0e0a240c6f20bd2f2855ca8b692b22322f4c80b521cfc8a9bf45da32518225550f289bb0db7010f40a3b371a9e79e394c6ec88004a15fab SHA512 046cf3adf6cc3d38fd431f2ff28ddabb65f3c13379516d105316a04c7128be89c5f7ed3df6a034fc06e9ab2e154c2cde2f5cbe8530a1e58cc4b4fb72e158134b
25 -DIST gnutls-3.5.16.tar.xz 7559812 BLAKE2B 5b2fded412823b3f947c000f71bb816e2e248c8f740c2e678ec1e8289dd0b4af73a4f4ab46012c7430aa2a5c57dc7fed532eb1666c13328ec90ed159d1ee48a8 SHA512 451d3167be599ed8e0333dd7c9f8501fcb47b7aa871aeb461c368381c0b7ecd7e2026ec35dbbb2aa685cb2c3a22e9296e0a0699409e3744b731c1bb7e7e69f07
26 -DIST gnutls-3.5.17.tar.xz 7261864 BLAKE2B 3b7cbdda3763f05c769c020c517afced3fe27e8b1ec03754d44ef0c183e7985cf0a71f1d176bbcda8aa9bb814a6c53d7da3f2193e084f6d9eea214edbdeba1f2 SHA512 0cb3405dee64737e314bfa9eed6afa57a8951190fe576122aecaf587c07ec1a5df1ac4819078bff0d292271639019c76d9a708027b502e3f55e2cf6576555ea6
27 DIST gnutls-3.5.18.tar.xz 7261980 BLAKE2B 1c7df33aa331634885426196d1e39cf7c5748ba467323d7a48c4e865efcea03e3a59a7bb21cebb4cfe9d11a83a532bb785ae9a5824703c759e573de0f347004d SHA512 434cf33a4221fe2edce1b531cb53690d14a0991cb2056006021f625fb018987351f8ec917c3a7803e5e64179cf1647a3002ae783736ffca3188d2d294b76df52
28 -DIST gnutls-3.6.0.tar.xz 8024972 BLAKE2B 754ec0c097430ef0d5c8c998b94e85c53ac6d34ec0e8b47c83c55f5e6235f783013572040998eb4a163e46ff569827c7c20c81f4e02a129b65e8b0c5d6d59f99 SHA512 e5f36d7e8d64e8432098e30549c321745d3605eeb85aba2a04bfa92146ca771961f0e2f3682bcae36be5b6095acd25996104a4213ce7b3466d61332a5188dc03
29 -DIST gnutls-3.6.1.tar.xz 8064408 BLAKE2B 1a573f476261532d516ec7a2c4640cbf8aaaebbbdd129ccfeb1b88d3a66f919ff0eed142a91df19ca9c2f69f90c8c65b965c5659024d54db03606aae811bbc14 SHA512 1f2bd3203ea96844c531be700b44623b79f46743143edf97011aab07895ca18d62f1659c7fafc5e1c4b0686fde490836f00358bdd60d6ac0b842526db002da23
30 DIST gnutls-3.6.2.tar.xz 8093304 BLAKE2B a5e40cadb184eb960e51cc0d94d441e50378f33582eeda1382e9ee3a9a4b2d26f6b44948921d8983de3e1b8fbc0199e0d894ce8b8da1fddeb84dbe304b2f9222 SHA512 6a574d355226bdff6198ab3f70633ff2a3cff4b5d06793bdaf19d007063bd4dd515d1bd3f331a9eb1a9ad01f83007801cfa55e5fd16c1cd3461ac33d1813fb06
31
32 diff --git a/net-libs/gnutls/gnutls-3.5.16.ebuild b/net-libs/gnutls/gnutls-3.5.16.ebuild
33 deleted file mode 100644
34 index 5f47775ad57..00000000000
35 --- a/net-libs/gnutls/gnutls-3.5.16.ebuild
36 +++ /dev/null
37 @@ -1,137 +0,0 @@
38 -# Copyright 1999-2018 Gentoo Foundation
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=6
42 -
43 -inherit libtool ltprune multilib-minimal versionator
44 -
45 -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
46 -HOMEPAGE="http://www.gnutls.org/"
47 -SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
48 -
49 -LICENSE="GPL-3 LGPL-2.1"
50 -SLOT="0/30" # libgnutls.so number
51 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
52 -IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
53 -
54 -REQUIRED_USE="
55 - test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )"
56 -
57 -# NOTICE: sys-devel/autogen is required at runtime as we
58 -# use system libopts
59 -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
60 - dev-libs/libunistring:=[${MULTILIB_USEDEP}]
61 - >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
62 - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
63 - tools? ( sys-devel/autogen )
64 - dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
65 - guile? ( >=dev-scheme/guile-1.8:=[networking] )
66 - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
67 - pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
68 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
69 - idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
70 - abi_x86_32? (
71 - !<=app-emulation/emul-linux-x86-baselibs-20140508
72 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
73 - )"
74 -DEPEND="${RDEPEND}
75 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
76 - doc? ( dev-util/gtk-doc )
77 - nls? ( sys-devel/gettext )
78 - valgrind? ( dev-util/valgrind )
79 - test? (
80 - seccomp? ( sys-libs/libseccomp )
81 - )
82 - test-full? (
83 - guile? ( >=dev-scheme/guile-2 )
84 - app-crypt/dieharder
85 - app-misc/datefudge
86 - dev-libs/softhsm:2[-bindist]
87 - net-dialup/ppp
88 - net-misc/socat
89 - )"
90 -
91 -DOCS=(
92 - README.md
93 - doc/certtool.cfg
94 -)
95 -
96 -HTML_DOCS=()
97 -
98 -pkg_setup() {
99 - # bug#520818
100 - export TZ=UTC
101 -
102 - use doc && HTML_DOCS+=(
103 - doc/gnutls.html
104 - )
105 -}
106 -
107 -src_prepare() {
108 - default
109 -
110 - # force regeneration of autogen-ed files
111 - local file
112 - for file in $(grep -l AutoGen-ed src/*.c) ; do
113 - rm src/$(basename ${file} .c).{c,h} || die
114 - done
115 -
116 - # Use sane .so versioning on FreeBSD.
117 - elibtoolize
118 -}
119 -
120 -multilib_src_configure() {
121 - LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
122 -
123 - # remove magic of library detection
124 - # bug#438222
125 - local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
126 -
127 - # TPM needs to be tested before being enabled
128 - libconf+=( --without-tpm )
129 -
130 - # hardware-accell is disabled on OSX because the asm files force
131 - # GNU-stack (as doesn't support that) and when that's removed ld
132 - # complains about duplicate symbols
133 - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
134 -
135 - # Cygwin as does not understand these asm files at all
136 - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
137 -
138 - ECONF_SOURCE=${S} econf \
139 - $(multilib_native_enable manpages) \
140 - $(multilib_native_use_enable doc gtk-doc) \
141 - $(multilib_native_use_enable doc) \
142 - $(multilib_native_use_enable guile) \
143 - $(multilib_native_use_enable seccomp seccomp-tests) \
144 - $(multilib_native_use_enable test tests) \
145 - $(multilib_native_use_enable test-full full-test-suite) \
146 - $(multilib_native_use_enable tools) \
147 - $(multilib_native_use_enable valgrind valgrind-tests) \
148 - $(use_enable cxx) \
149 - $(use_enable dane libdane) \
150 - $(use_enable nls) \
151 - $(use_enable openpgp openpgp-authentication) \
152 - $(use_enable openssl openssl-compatibility) \
153 - $(use_enable sslv2 ssl2-support) \
154 - $(use_enable sslv3 ssl3-support) \
155 - $(use_enable static-libs static) \
156 - $(use_enable tls-heartbeat heartbeat-support) \
157 - $(use_with idn libidn2) \
158 - $(use_with idn) \
159 - $(use_with pkcs11 p11-kit) \
160 - $(use_with zlib) \
161 - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
162 - --without-included-libtasn1 \
163 - "${libconf[@]}"
164 -}
165 -
166 -multilib_src_install_all() {
167 - einstalldocs
168 - prune_libtool_files --all
169 -
170 - if use examples; then
171 - docinto examples
172 - dodoc doc/examples/*.c
173 - fi
174 -}
175
176 diff --git a/net-libs/gnutls/gnutls-3.5.17.ebuild b/net-libs/gnutls/gnutls-3.5.17.ebuild
177 deleted file mode 100644
178 index 5f47775ad57..00000000000
179 --- a/net-libs/gnutls/gnutls-3.5.17.ebuild
180 +++ /dev/null
181 @@ -1,137 +0,0 @@
182 -# Copyright 1999-2018 Gentoo Foundation
183 -# Distributed under the terms of the GNU General Public License v2
184 -
185 -EAPI=6
186 -
187 -inherit libtool ltprune multilib-minimal versionator
188 -
189 -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
190 -HOMEPAGE="http://www.gnutls.org/"
191 -SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
192 -
193 -LICENSE="GPL-3 LGPL-2.1"
194 -SLOT="0/30" # libgnutls.so number
195 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
196 -IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
197 -
198 -REQUIRED_USE="
199 - test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )"
200 -
201 -# NOTICE: sys-devel/autogen is required at runtime as we
202 -# use system libopts
203 -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
204 - dev-libs/libunistring:=[${MULTILIB_USEDEP}]
205 - >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
206 - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
207 - tools? ( sys-devel/autogen )
208 - dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
209 - guile? ( >=dev-scheme/guile-1.8:=[networking] )
210 - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
211 - pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
212 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
213 - idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
214 - abi_x86_32? (
215 - !<=app-emulation/emul-linux-x86-baselibs-20140508
216 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
217 - )"
218 -DEPEND="${RDEPEND}
219 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
220 - doc? ( dev-util/gtk-doc )
221 - nls? ( sys-devel/gettext )
222 - valgrind? ( dev-util/valgrind )
223 - test? (
224 - seccomp? ( sys-libs/libseccomp )
225 - )
226 - test-full? (
227 - guile? ( >=dev-scheme/guile-2 )
228 - app-crypt/dieharder
229 - app-misc/datefudge
230 - dev-libs/softhsm:2[-bindist]
231 - net-dialup/ppp
232 - net-misc/socat
233 - )"
234 -
235 -DOCS=(
236 - README.md
237 - doc/certtool.cfg
238 -)
239 -
240 -HTML_DOCS=()
241 -
242 -pkg_setup() {
243 - # bug#520818
244 - export TZ=UTC
245 -
246 - use doc && HTML_DOCS+=(
247 - doc/gnutls.html
248 - )
249 -}
250 -
251 -src_prepare() {
252 - default
253 -
254 - # force regeneration of autogen-ed files
255 - local file
256 - for file in $(grep -l AutoGen-ed src/*.c) ; do
257 - rm src/$(basename ${file} .c).{c,h} || die
258 - done
259 -
260 - # Use sane .so versioning on FreeBSD.
261 - elibtoolize
262 -}
263 -
264 -multilib_src_configure() {
265 - LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
266 -
267 - # remove magic of library detection
268 - # bug#438222
269 - local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
270 -
271 - # TPM needs to be tested before being enabled
272 - libconf+=( --without-tpm )
273 -
274 - # hardware-accell is disabled on OSX because the asm files force
275 - # GNU-stack (as doesn't support that) and when that's removed ld
276 - # complains about duplicate symbols
277 - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
278 -
279 - # Cygwin as does not understand these asm files at all
280 - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
281 -
282 - ECONF_SOURCE=${S} econf \
283 - $(multilib_native_enable manpages) \
284 - $(multilib_native_use_enable doc gtk-doc) \
285 - $(multilib_native_use_enable doc) \
286 - $(multilib_native_use_enable guile) \
287 - $(multilib_native_use_enable seccomp seccomp-tests) \
288 - $(multilib_native_use_enable test tests) \
289 - $(multilib_native_use_enable test-full full-test-suite) \
290 - $(multilib_native_use_enable tools) \
291 - $(multilib_native_use_enable valgrind valgrind-tests) \
292 - $(use_enable cxx) \
293 - $(use_enable dane libdane) \
294 - $(use_enable nls) \
295 - $(use_enable openpgp openpgp-authentication) \
296 - $(use_enable openssl openssl-compatibility) \
297 - $(use_enable sslv2 ssl2-support) \
298 - $(use_enable sslv3 ssl3-support) \
299 - $(use_enable static-libs static) \
300 - $(use_enable tls-heartbeat heartbeat-support) \
301 - $(use_with idn libidn2) \
302 - $(use_with idn) \
303 - $(use_with pkcs11 p11-kit) \
304 - $(use_with zlib) \
305 - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
306 - --without-included-libtasn1 \
307 - "${libconf[@]}"
308 -}
309 -
310 -multilib_src_install_all() {
311 - einstalldocs
312 - prune_libtool_files --all
313 -
314 - if use examples; then
315 - docinto examples
316 - dodoc doc/examples/*.c
317 - fi
318 -}
319
320 diff --git a/net-libs/gnutls/gnutls-3.6.0.ebuild b/net-libs/gnutls/gnutls-3.6.0.ebuild
321 deleted file mode 100644
322 index 1c8e4281985..00000000000
323 --- a/net-libs/gnutls/gnutls-3.6.0.ebuild
324 +++ /dev/null
325 @@ -1,133 +0,0 @@
326 -# Copyright 1999-2018 Gentoo Foundation
327 -# Distributed under the terms of the GNU General Public License v2
328 -
329 -EAPI=6
330 -
331 -inherit libtool ltprune multilib-minimal versionator
332 -
333 -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
334 -HOMEPAGE="http://www.gnutls.org/"
335 -SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
336 -
337 -LICENSE="GPL-3 LGPL-2.1"
338 -SLOT="0/30" # libgnutls.so number
339 -KEYWORDS=""
340 -IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
341 -
342 -REQUIRED_USE="
343 - test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
344 -
345 -# NOTICE: sys-devel/autogen is required at runtime as we
346 -# use system libopts
347 -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
348 - dev-libs/libunistring:=[${MULTILIB_USEDEP}]
349 - >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
350 - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
351 - tools? ( sys-devel/autogen )
352 - dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
353 - guile? ( >=dev-scheme/guile-1.8:=[networking] )
354 - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
355 - pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
356 - idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
357 - abi_x86_32? (
358 - !<=app-emulation/emul-linux-x86-baselibs-20140508
359 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
360 - )"
361 -DEPEND="${RDEPEND}
362 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
363 - doc? ( dev-util/gtk-doc )
364 - nls? ( sys-devel/gettext )
365 - valgrind? ( dev-util/valgrind )
366 - test? (
367 - seccomp? ( sys-libs/libseccomp )
368 - )
369 - test-full? (
370 - guile? ( >=dev-scheme/guile-2 )
371 - app-crypt/dieharder
372 - app-misc/datefudge
373 - dev-libs/softhsm:2[-bindist]
374 - net-dialup/ppp
375 - net-misc/socat
376 - )"
377 -
378 -DOCS=(
379 - README.md
380 - doc/certtool.cfg
381 -)
382 -
383 -HTML_DOCS=()
384 -
385 -pkg_setup() {
386 - # bug#520818
387 - export TZ=UTC
388 -
389 - use doc && HTML_DOCS+=(
390 - doc/gnutls.html
391 - )
392 -}
393 -
394 -src_prepare() {
395 - default
396 -
397 - # force regeneration of autogen-ed files
398 - local file
399 - for file in $(grep -l AutoGen-ed src/*.c) ; do
400 - rm src/$(basename ${file} .c).{c,h} || die
401 - done
402 -
403 - # Use sane .so versioning on FreeBSD.
404 - elibtoolize
405 -}
406 -
407 -multilib_src_configure() {
408 - LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
409 -
410 - # remove magic of library detection
411 - # bug#438222
412 - local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
413 -
414 - # TPM needs to be tested before being enabled
415 - libconf+=( --without-tpm )
416 -
417 - # hardware-accell is disabled on OSX because the asm files force
418 - # GNU-stack (as doesn't support that) and when that's removed ld
419 - # complains about duplicate symbols
420 - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
421 -
422 - # Cygwin as does not understand these asm files at all
423 - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
424 -
425 - ECONF_SOURCE=${S} econf \
426 - $(multilib_native_enable manpages) \
427 - $(multilib_native_use_enable doc gtk-doc) \
428 - $(multilib_native_use_enable doc) \
429 - $(multilib_native_use_enable guile) \
430 - $(multilib_native_use_enable seccomp seccomp-tests) \
431 - $(multilib_native_use_enable test tests) \
432 - $(multilib_native_use_enable test-full full-test-suite) \
433 - $(multilib_native_use_enable tools) \
434 - $(multilib_native_use_enable valgrind valgrind-tests) \
435 - $(use_enable cxx) \
436 - $(use_enable dane libdane) \
437 - $(use_enable nls) \
438 - $(use_enable openssl openssl-compatibility) \
439 - $(use_enable sslv2 ssl2-support) \
440 - $(use_enable sslv3 ssl3-support) \
441 - $(use_enable static-libs static) \
442 - $(use_enable tls-heartbeat heartbeat-support) \
443 - $(use_with idn) \
444 - $(use_with pkcs11 p11-kit) \
445 - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
446 - --without-included-libtasn1 \
447 - "${libconf[@]}"
448 -}
449 -
450 -multilib_src_install_all() {
451 - einstalldocs
452 - prune_libtool_files --all
453 -
454 - if use examples; then
455 - docinto examples
456 - dodoc doc/examples/*.c
457 - fi
458 -}
459
460 diff --git a/net-libs/gnutls/gnutls-3.6.1.ebuild b/net-libs/gnutls/gnutls-3.6.1.ebuild
461 deleted file mode 100644
462 index 1c8e4281985..00000000000
463 --- a/net-libs/gnutls/gnutls-3.6.1.ebuild
464 +++ /dev/null
465 @@ -1,133 +0,0 @@
466 -# Copyright 1999-2018 Gentoo Foundation
467 -# Distributed under the terms of the GNU General Public License v2
468 -
469 -EAPI=6
470 -
471 -inherit libtool ltprune multilib-minimal versionator
472 -
473 -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
474 -HOMEPAGE="http://www.gnutls.org/"
475 -SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
476 -
477 -LICENSE="GPL-3 LGPL-2.1"
478 -SLOT="0/30" # libgnutls.so number
479 -KEYWORDS=""
480 -IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
481 -
482 -REQUIRED_USE="
483 - test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
484 -
485 -# NOTICE: sys-devel/autogen is required at runtime as we
486 -# use system libopts
487 -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
488 - dev-libs/libunistring:=[${MULTILIB_USEDEP}]
489 - >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
490 - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
491 - tools? ( sys-devel/autogen )
492 - dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
493 - guile? ( >=dev-scheme/guile-1.8:=[networking] )
494 - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
495 - pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
496 - idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
497 - abi_x86_32? (
498 - !<=app-emulation/emul-linux-x86-baselibs-20140508
499 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
500 - )"
501 -DEPEND="${RDEPEND}
502 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
503 - doc? ( dev-util/gtk-doc )
504 - nls? ( sys-devel/gettext )
505 - valgrind? ( dev-util/valgrind )
506 - test? (
507 - seccomp? ( sys-libs/libseccomp )
508 - )
509 - test-full? (
510 - guile? ( >=dev-scheme/guile-2 )
511 - app-crypt/dieharder
512 - app-misc/datefudge
513 - dev-libs/softhsm:2[-bindist]
514 - net-dialup/ppp
515 - net-misc/socat
516 - )"
517 -
518 -DOCS=(
519 - README.md
520 - doc/certtool.cfg
521 -)
522 -
523 -HTML_DOCS=()
524 -
525 -pkg_setup() {
526 - # bug#520818
527 - export TZ=UTC
528 -
529 - use doc && HTML_DOCS+=(
530 - doc/gnutls.html
531 - )
532 -}
533 -
534 -src_prepare() {
535 - default
536 -
537 - # force regeneration of autogen-ed files
538 - local file
539 - for file in $(grep -l AutoGen-ed src/*.c) ; do
540 - rm src/$(basename ${file} .c).{c,h} || die
541 - done
542 -
543 - # Use sane .so versioning on FreeBSD.
544 - elibtoolize
545 -}
546 -
547 -multilib_src_configure() {
548 - LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
549 -
550 - # remove magic of library detection
551 - # bug#438222
552 - local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
553 -
554 - # TPM needs to be tested before being enabled
555 - libconf+=( --without-tpm )
556 -
557 - # hardware-accell is disabled on OSX because the asm files force
558 - # GNU-stack (as doesn't support that) and when that's removed ld
559 - # complains about duplicate symbols
560 - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
561 -
562 - # Cygwin as does not understand these asm files at all
563 - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
564 -
565 - ECONF_SOURCE=${S} econf \
566 - $(multilib_native_enable manpages) \
567 - $(multilib_native_use_enable doc gtk-doc) \
568 - $(multilib_native_use_enable doc) \
569 - $(multilib_native_use_enable guile) \
570 - $(multilib_native_use_enable seccomp seccomp-tests) \
571 - $(multilib_native_use_enable test tests) \
572 - $(multilib_native_use_enable test-full full-test-suite) \
573 - $(multilib_native_use_enable tools) \
574 - $(multilib_native_use_enable valgrind valgrind-tests) \
575 - $(use_enable cxx) \
576 - $(use_enable dane libdane) \
577 - $(use_enable nls) \
578 - $(use_enable openssl openssl-compatibility) \
579 - $(use_enable sslv2 ssl2-support) \
580 - $(use_enable sslv3 ssl3-support) \
581 - $(use_enable static-libs static) \
582 - $(use_enable tls-heartbeat heartbeat-support) \
583 - $(use_with idn) \
584 - $(use_with pkcs11 p11-kit) \
585 - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
586 - --without-included-libtasn1 \
587 - "${libconf[@]}"
588 -}
589 -
590 -multilib_src_install_all() {
591 - einstalldocs
592 - prune_libtool_files --all
593 -
594 - if use examples; then
595 - docinto examples
596 - dodoc doc/examples/*.c
597 - fi
598 -}