Gentoo Archives: gentoo-commits

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