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, 07 Sep 2018 21:08:47
Message-Id: 1536353220.bb4b2af859f065cdb03e59f47e07a1cbf8d0fd4c.alonbl@gentoo
1 commit: bb4b2af859f065cdb03e59f47e07a1cbf8d0fd4c
2 Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 7 20:41:31 2018 +0000
4 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 7 20:47:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4b2af8
7
8 net-libs/gnutls: cleanup old
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 net-libs/gnutls/Manifest | 2 -
13 net-libs/gnutls/gnutls-3.5.18.ebuild | 133 -----------------------------------
14 net-libs/gnutls/gnutls-3.6.2.ebuild | 129 ---------------------------------
15 3 files changed, 264 deletions(-)
16
17 diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
18 index 0e503588120..6e9f9e7a33b 100644
19 --- a/net-libs/gnutls/Manifest
20 +++ b/net-libs/gnutls/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST gnutls-3.5.18.tar.xz 7261980 BLAKE2B 1c7df33aa331634885426196d1e39cf7c5748ba467323d7a48c4e865efcea03e3a59a7bb21cebb4cfe9d11a83a532bb785ae9a5824703c759e573de0f347004d SHA512 434cf33a4221fe2edce1b531cb53690d14a0991cb2056006021f625fb018987351f8ec917c3a7803e5e64179cf1647a3002ae783736ffca3188d2d294b76df52
23 DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
24 -DIST gnutls-3.6.2.tar.xz 8093304 BLAKE2B a5e40cadb184eb960e51cc0d94d441e50378f33582eeda1382e9ee3a9a4b2d26f6b44948921d8983de3e1b8fbc0199e0d894ce8b8da1fddeb84dbe304b2f9222 SHA512 6a574d355226bdff6198ab3f70633ff2a3cff4b5d06793bdaf19d007063bd4dd515d1bd3f331a9eb1a9ad01f83007801cfa55e5fd16c1cd3461ac33d1813fb06
25 DIST gnutls-3.6.3.tar.xz 8010284 BLAKE2B 3cbfcfc90b5bbcdcf01ef13b4a306b05e471e6cd14bb5b0c37e1e7358f2b223605901c0495c7ac3227f48ab77db30481050bf1f38de5e18659d7b91b8907aaa9 SHA512 6238502464d229a9777e3076f4c745d16deaada83c9da756ecdcd370947576e0446bda3a7f85d5a099b745bbf8c0134ebdf6632e4b26d61daf170792fb4f5abe
26
27 diff --git a/net-libs/gnutls/gnutls-3.5.18.ebuild b/net-libs/gnutls/gnutls-3.5.18.ebuild
28 deleted file mode 100644
29 index c3038f686e3..00000000000
30 --- a/net-libs/gnutls/gnutls-3.5.18.ebuild
31 +++ /dev/null
32 @@ -1,133 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit libtool ltprune multilib-minimal versionator
39 -
40 -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
41 -HOMEPAGE="http://www.gnutls.org/"
42 -SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
43 -
44 -LICENSE="GPL-3 LGPL-2.1"
45 -SLOT="0/30" # libgnutls.so number
46 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
47 -IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
48 -
49 -REQUIRED_USE="
50 - test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )"
51 -
52 -# NOTICE: sys-devel/autogen is required at runtime as we
53 -# use system libopts
54 -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
55 - dev-libs/libunistring:=[${MULTILIB_USEDEP}]
56 - >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
57 - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
58 - tools? ( sys-devel/autogen )
59 - dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
60 - guile? ( >=dev-scheme/guile-1.8:=[networking] )
61 - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
62 - pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
63 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
64 - idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
65 -DEPEND="${RDEPEND}
66 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
67 - doc? ( dev-util/gtk-doc )
68 - nls? ( sys-devel/gettext )
69 - valgrind? ( dev-util/valgrind )
70 - test? (
71 - seccomp? ( sys-libs/libseccomp )
72 - )
73 - test-full? (
74 - guile? ( >=dev-scheme/guile-2 )
75 - app-crypt/dieharder
76 - app-misc/datefudge
77 - dev-libs/softhsm:2[-bindist]
78 - net-dialup/ppp
79 - net-misc/socat
80 - )"
81 -
82 -DOCS=(
83 - README.md
84 - doc/certtool.cfg
85 -)
86 -
87 -HTML_DOCS=()
88 -
89 -pkg_setup() {
90 - # bug#520818
91 - export TZ=UTC
92 -
93 - use doc && HTML_DOCS+=(
94 - doc/gnutls.html
95 - )
96 -}
97 -
98 -src_prepare() {
99 - default
100 -
101 - # force regeneration of autogen-ed files
102 - local file
103 - for file in $(grep -l AutoGen-ed src/*.c) ; do
104 - rm src/$(basename ${file} .c).{c,h} || die
105 - done
106 -
107 - # Use sane .so versioning on FreeBSD.
108 - elibtoolize
109 -}
110 -
111 -multilib_src_configure() {
112 - LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
113 -
114 - # remove magic of library detection
115 - # bug#438222
116 - local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
117 -
118 - # TPM needs to be tested before being enabled
119 - libconf+=( --without-tpm )
120 -
121 - # hardware-accell is disabled on OSX because the asm files force
122 - # GNU-stack (as doesn't support that) and when that's removed ld
123 - # complains about duplicate symbols
124 - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
125 -
126 - # Cygwin as does not understand these asm files at all
127 - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
128 -
129 - ECONF_SOURCE=${S} econf \
130 - $(multilib_native_enable manpages) \
131 - $(multilib_native_use_enable doc gtk-doc) \
132 - $(multilib_native_use_enable doc) \
133 - $(multilib_native_use_enable guile) \
134 - $(multilib_native_use_enable seccomp seccomp-tests) \
135 - $(multilib_native_use_enable test tests) \
136 - $(multilib_native_use_enable test-full full-test-suite) \
137 - $(multilib_native_use_enable tools) \
138 - $(multilib_native_use_enable valgrind valgrind-tests) \
139 - $(use_enable cxx) \
140 - $(use_enable dane libdane) \
141 - $(use_enable nls) \
142 - $(use_enable openpgp openpgp-authentication) \
143 - $(use_enable openssl openssl-compatibility) \
144 - $(use_enable sslv2 ssl2-support) \
145 - $(use_enable sslv3 ssl3-support) \
146 - $(use_enable static-libs static) \
147 - $(use_enable tls-heartbeat heartbeat-support) \
148 - $(use_with idn libidn2) \
149 - $(use_with idn) \
150 - $(use_with pkcs11 p11-kit) \
151 - $(use_with zlib) \
152 - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
153 - --without-included-libtasn1 \
154 - "${libconf[@]}"
155 -}
156 -
157 -multilib_src_install_all() {
158 - einstalldocs
159 - prune_libtool_files --all
160 -
161 - if use examples; then
162 - docinto examples
163 - dodoc doc/examples/*.c
164 - fi
165 -}
166
167 diff --git a/net-libs/gnutls/gnutls-3.6.2.ebuild b/net-libs/gnutls/gnutls-3.6.2.ebuild
168 deleted file mode 100644
169 index cc2a7e26e1e..00000000000
170 --- a/net-libs/gnutls/gnutls-3.6.2.ebuild
171 +++ /dev/null
172 @@ -1,129 +0,0 @@
173 -# Copyright 1999-2018 Gentoo Foundation
174 -# Distributed under the terms of the GNU General Public License v2
175 -
176 -EAPI=6
177 -
178 -inherit libtool ltprune multilib-minimal versionator
179 -
180 -DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
181 -HOMEPAGE="http://www.gnutls.org/"
182 -SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
183 -
184 -LICENSE="GPL-3 LGPL-2.1"
185 -SLOT="0/30" # libgnutls.so number
186 -KEYWORDS=""
187 -IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
188 -
189 -REQUIRED_USE="
190 - test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
191 -
192 -# NOTICE: sys-devel/autogen is required at runtime as we
193 -# use system libopts
194 -RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
195 - dev-libs/libunistring:=[${MULTILIB_USEDEP}]
196 - >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
197 - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
198 - tools? ( sys-devel/autogen )
199 - dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
200 - guile? ( >=dev-scheme/guile-1.8:=[networking] )
201 - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
202 - pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
203 - idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
204 -DEPEND="${RDEPEND}
205 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
206 - doc? ( dev-util/gtk-doc )
207 - nls? ( sys-devel/gettext )
208 - valgrind? ( dev-util/valgrind )
209 - test? (
210 - seccomp? ( sys-libs/libseccomp )
211 - )
212 - test-full? (
213 - guile? ( >=dev-scheme/guile-2 )
214 - app-crypt/dieharder
215 - app-misc/datefudge
216 - dev-libs/softhsm:2[-bindist]
217 - net-dialup/ppp
218 - net-misc/socat
219 - )"
220 -
221 -DOCS=(
222 - README.md
223 - doc/certtool.cfg
224 -)
225 -
226 -HTML_DOCS=()
227 -
228 -pkg_setup() {
229 - # bug#520818
230 - export TZ=UTC
231 -
232 - use doc && HTML_DOCS+=(
233 - doc/gnutls.html
234 - )
235 -}
236 -
237 -src_prepare() {
238 - default
239 -
240 - # force regeneration of autogen-ed files
241 - local file
242 - for file in $(grep -l AutoGen-ed src/*.c) ; do
243 - rm src/$(basename ${file} .c).{c,h} || die
244 - done
245 -
246 - # Use sane .so versioning on FreeBSD.
247 - elibtoolize
248 -}
249 -
250 -multilib_src_configure() {
251 - LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
252 -
253 - # remove magic of library detection
254 - # bug#438222
255 - local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
256 -
257 - # TPM needs to be tested before being enabled
258 - libconf+=( --without-tpm )
259 -
260 - # hardware-accell is disabled on OSX because the asm files force
261 - # GNU-stack (as doesn't support that) and when that's removed ld
262 - # complains about duplicate symbols
263 - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
264 -
265 - # Cygwin as does not understand these asm files at all
266 - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
267 -
268 - ECONF_SOURCE=${S} econf \
269 - $(multilib_native_enable manpages) \
270 - $(multilib_native_use_enable doc gtk-doc) \
271 - $(multilib_native_use_enable doc) \
272 - $(multilib_native_use_enable guile) \
273 - $(multilib_native_use_enable seccomp seccomp-tests) \
274 - $(multilib_native_use_enable test tests) \
275 - $(multilib_native_use_enable test-full full-test-suite) \
276 - $(multilib_native_use_enable tools) \
277 - $(multilib_native_use_enable valgrind valgrind-tests) \
278 - $(use_enable cxx) \
279 - $(use_enable dane libdane) \
280 - $(use_enable nls) \
281 - $(use_enable openssl openssl-compatibility) \
282 - $(use_enable sslv2 ssl2-support) \
283 - $(use_enable sslv3 ssl3-support) \
284 - $(use_enable static-libs static) \
285 - $(use_enable tls-heartbeat heartbeat-support) \
286 - $(use_with idn) \
287 - $(use_with pkcs11 p11-kit) \
288 - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
289 - --without-included-libtasn1 \
290 - "${libconf[@]}"
291 -}
292 -
293 -multilib_src_install_all() {
294 - einstalldocs
295 - prune_libtool_files --all
296 -
297 - if use examples; then
298 - docinto examples
299 - dodoc doc/examples/*.c
300 - fi
301 -}