Gentoo Archives: gentoo-commits

From: Kristian Fiskerstrand <k_f@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/
Date: Wed, 14 Aug 2019 13:33:43
Message-Id: 1565789402.6d79a7f81cec439f3dbbb10bcc6478f4ebb01061.k_f@gentoo
1 commit: 6d79a7f81cec439f3dbbb10bcc6478f4ebb01061
2 Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 14 13:30:02 2019 +0000
4 Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 14 13:30:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d79a7f8
7
8 app-crypt/gnupg: Remove old versions (security cleanup)
9
10 Bug: https://bugs.gentoo.org/689392
11 Signed-off-by: Kristian Fiskerstrand <k_f <AT> gentoo.org>
12 Package-Manager: Portage-2.3.66, Repoman-2.3.11
13
14 app-crypt/gnupg/Manifest | 6 --
15 app-crypt/gnupg/gnupg-1.4.21.ebuild | 114 ------------------------
16 app-crypt/gnupg/gnupg-2.2.10.ebuild | 134 -----------------------------
17 app-crypt/gnupg/gnupg-2.2.12.ebuild | 136 -----------------------------
18 app-crypt/gnupg/gnupg-2.2.14.ebuild | 136 -----------------------------
19 app-crypt/gnupg/gnupg-2.2.15-r1.ebuild | 153 ---------------------------------
20 app-crypt/gnupg/gnupg-2.2.15.ebuild | 137 -----------------------------
21 app-crypt/gnupg/gnupg-2.2.16-r1.ebuild | 153 ---------------------------------
22 app-crypt/gnupg/gnupg-2.2.16.ebuild | 153 ---------------------------------
23 app-crypt/gnupg/metadata.xml | 3 -
24 10 files changed, 1125 deletions(-)
25
26 diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
27 index 20bf73493f9..6bdc2fccf42 100644
28 --- a/app-crypt/gnupg/Manifest
29 +++ b/app-crypt/gnupg/Manifest
30 @@ -1,7 +1 @@
31 -DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
32 -DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370beec77ffba0abb7862defdab2d5a82b1508284961e30e7d0aab82bffdf09fe796741603e843a062073f179f0bfc2 SHA512 a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd
33 -DIST gnupg-2.2.12.tar.bz2 6682303 BLAKE2B 8470ab8bf386d3524ce57ef1a1f6ac74d8cf2d7c35062b95c668b37586603c8e0817e410f4a0a807256e42896c11116897b7118b29e471184b2fa871ad4ba048 SHA512 30de9757bb60a5cb6bf0dc2c8da5f4742c54affec3fcd0bcbf66f28f2812149afec5db70dcb6ba592101de4bdc479d1ba0b47c53c8b8d4765ddff32fa51c26c8
34 -DIST gnupg-2.2.14.tar.bz2 6707735 BLAKE2B feedb1c776e8d43e43905e8a8c1487bd88e8effc59e94baf308cb29a5feea5d9c666c78b50147d65a259dc89af241c2a2bf07a72c417617e5238e0fdbbc2b17f SHA512 9d5216dee085efe6de300579d8fb773a5a55df639d5a435708611a974df522dd60dc995fbfcaad98065475dbeb731bbba19ecc3273e78b9b45fccff640dde69b
35 -DIST gnupg-2.2.15.tar.bz2 6705912 BLAKE2B 145bd174cb74c6a1180de76a6d46b40d2434ced61bb9aa3eaddeb0079cd05634529c9b062e475d3ca9d35b3af3b62b39a79ef0efbb476cb9ebb9e2099ad13ae0 SHA512 7c6f0092d384fd71fc7a1c905ce23ae98df42ce131ee09fc190c275f9c8d0912be344b0782244cccb5b3938322ef3cfff8ed1ec7e949e761478b8c5110dde36a
36 -DIST gnupg-2.2.16.tar.bz2 6699113 BLAKE2B 7738c5d9d5789dc56b4429e2b62403859365b53c834b0c53a6387fb77f1242ec4b0195205394f01e64fac6c7ce1235738421ea04bc6fb843c3fea1c10a243217 SHA512 0e0040905cc4d1d9d29e184cfeda520b43990e4ec459212537c0ce6092de987157e05b1d1a3022398d9b3cbaeea0f58a7e686745f96933e5ac26be4229162247
37 DIST gnupg-2.2.17.tar.bz2 6717554 BLAKE2B ad052a0d1e970fe7748563a0ffa105d427e3d9299237f15ce93aa47b676cc1fbf0691cf2112dd5b55ba5fc9d2a6988f999415dd5026d44c5cb4bfef9f99189cd SHA512 a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d
38
39 diff --git a/app-crypt/gnupg/gnupg-1.4.21.ebuild b/app-crypt/gnupg/gnupg-1.4.21.ebuild
40 deleted file mode 100644
41 index d8cb5bc50c6..00000000000
42 --- a/app-crypt/gnupg/gnupg-1.4.21.ebuild
43 +++ /dev/null
44 @@ -1,114 +0,0 @@
45 -# Copyright 1999-2017 Gentoo Foundation
46 -# Distributed under the terms of the GNU General Public License v2
47 -
48 -EAPI="5"
49 -
50 -inherit eutils flag-o-matic toolchain-funcs
51 -
52 -ECCVER="0.2.0"
53 -ECCVER_GNUPG="1.4.9"
54 -ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
55 -MY_P=${P/_/}
56 -
57 -DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
58 -HOMEPAGE="http://www.gnupg.org/"
59 -SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
60 -
61 -LICENSE="GPL-2"
62 -SLOT="0"
63 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
64 -IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib"
65 -
66 -COMMON_DEPEND="
67 - ldap? ( net-nds/openldap )
68 - bzip2? ( app-arch/bzip2 )
69 - zlib? ( sys-libs/zlib )
70 - curl? ( net-misc/curl )
71 - mta? ( virtual/mta )
72 - readline? ( sys-libs/readline:0= )
73 - smartcard? ( =virtual/libusb-0* )
74 - usb? ( =virtual/libusb-0* )"
75 -
76 -RDEPEND="!static? ( ${COMMON_DEPEND} )
77 - selinux? ( sec-policy/selinux-gpg )
78 - nls? ( virtual/libintl )"
79 -
80 -DEPEND="${COMMON_DEPEND}
81 - dev-lang/perl
82 - nls? ( sys-devel/gettext )"
83 -
84 -S="${WORKDIR}/${MY_P}"
85 -
86 -src_prepare() {
87 - # bug#469388
88 - sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in
89 -
90 - # Fix PIC definitions
91 - sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
92 - || die "sed PIC failed"
93 - sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
94 - die "sed PIC failed"
95 -}
96 -
97 -src_configure() {
98 - # Certain sparc32 machines seem to have trouble building correctly with
99 - # -mcpu enabled. While this is not a gnupg problem, it is a temporary
100 - # fix until the gcc problem can be tracked down.
101 - if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
102 - filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
103 - fi
104 -
105 - # 'USE=static' support was requested in #29299
106 - use static && append-ldflags -static
107 -
108 - econf \
109 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
110 - $(use_enable ldap) \
111 - $(use_enable mta mailto) \
112 - --enable-hkp \
113 - --enable-finger \
114 - $(use_with !zlib included-zlib) \
115 - $(use_with curl libcurl /usr) \
116 - $(use_enable nls) \
117 - $(use_enable bzip2) \
118 - $(use_enable smartcard card-support) \
119 - $(use_enable selinux selinux-support) \
120 - --without-capabilities \
121 - $(use_with readline) \
122 - $(use_with usb libusb /usr) \
123 - --enable-static-rnd=linux \
124 - --libexecdir="${EPREFIX}/usr/libexec" \
125 - --enable-noexecstack \
126 - CC_FOR_BUILD=$(tc-getBUILD_CC) \
127 - ${myconf}
128 -}
129 -
130 -src_install() {
131 - default
132 -
133 - # keep the documentation in /usr/share/doc/...
134 - rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
135 -
136 - dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
137 - TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
138 -
139 - exeinto /usr/libexec/gnupg
140 - doexe tools/make-dns-cert
141 -}
142 -
143 -pkg_postinst() {
144 - ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
145 - ewarn "you MUST make the gpg binary setuid."
146 - echo
147 -# if use !bindist && use ecc; then
148 -# ewarn
149 -# ewarn "The elliptical curves patch is experimental"
150 -# ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
151 -# fi
152 - elog
153 - elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
154 - elog
155 - elog "If you wish to view images emerge:"
156 - elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
157 - elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
158 -}
159
160 diff --git a/app-crypt/gnupg/gnupg-2.2.10.ebuild b/app-crypt/gnupg/gnupg-2.2.10.ebuild
161 deleted file mode 100644
162 index b494196acc5..00000000000
163 --- a/app-crypt/gnupg/gnupg-2.2.10.ebuild
164 +++ /dev/null
165 @@ -1,134 +0,0 @@
166 -# Copyright 1999-2018 Gentoo Authors
167 -# Distributed under the terms of the GNU General Public License v2
168 -
169 -EAPI="6"
170 -
171 -inherit flag-o-matic systemd toolchain-funcs
172 -
173 -MY_P="${P/_/-}"
174 -
175 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
176 -HOMEPAGE="http://www.gnupg.org/"
177 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
178 -
179 -LICENSE="GPL-3"
180 -SLOT="0"
181 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
182 -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
183 -
184 -COMMON_DEPEND_LIBS="
185 - >=dev-libs/npth-1.2
186 - >=dev-libs/libassuan-2.5.0
187 - >=dev-libs/libgcrypt-1.7.3
188 - >=dev-libs/libgpg-error-1.28
189 - >=dev-libs/libksba-1.3.4
190 - >=net-misc/curl-7.10
191 - ssl? ( >=net-libs/gnutls-3.0:0= )
192 - sys-libs/zlib
193 - ldap? ( net-nds/openldap )
194 - bzip2? ( app-arch/bzip2 )
195 - readline? ( sys-libs/readline:0= )
196 - smartcard? ( usb? ( virtual/libusb:0 ) )
197 - tofu? ( >=dev-db/sqlite-3.7 )
198 - virtual/mta
199 - "
200 -COMMON_DEPEND_BINS="app-crypt/pinentry
201 - !app-crypt/dirmngr"
202 -
203 -# Existence of executables is checked during configuration.
204 -DEPEND="${COMMON_DEPEND_LIBS}
205 - ${COMMON_DEPEND_BINS}
206 - nls? ( sys-devel/gettext )
207 - doc? ( sys-apps/texinfo )"
208 -
209 -RDEPEND="${COMMON_DEPEND_LIBS}
210 - ${COMMON_DEPEND_BINS}
211 - selinux? ( sec-policy/selinux-gpg )
212 - nls? ( virtual/libintl )"
213 -
214 -S="${WORKDIR}/${MY_P}"
215 -
216 -DOCS=(
217 - ChangeLog NEWS README THANKS TODO VERSION
218 - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
219 -)
220 -
221 -PATCHES=(
222 - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
223 -)
224 -
225 -src_configure() {
226 - local myconf=()
227 -
228 - if use smartcard; then
229 - myconf+=(
230 - --enable-scdaemon
231 - $(use_enable usb ccid-driver)
232 - )
233 - if use prefix && use usb ; then
234 - # bug #649598
235 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
236 - fi
237 - else
238 - myconf+=( --disable-scdaemon )
239 - fi
240 -
241 - if use elibc_SunOS || use elibc_AIX; then
242 - myconf+=( --disable-symcryptrun )
243 - else
244 - myconf+=( --enable-symcryptrun )
245 - fi
246 -
247 - # glib fails and picks up clang's internal stdint.h causing weird errors
248 - [[ ${CC} == *clang ]] && \
249 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
250 -
251 - econf \
252 - "${myconf[@]}" \
253 - $(use_enable bzip2) \
254 - $(use_enable ssl gnutls) \
255 - $(use_enable nls) \
256 - $(use_enable tofu) \
257 - $(use_enable wks-server wks-tools) \
258 - $(use_with ldap) \
259 - $(use_with readline) \
260 - --enable-gpg \
261 - --enable-gpgsm \
262 - --enable-large-secmem \
263 - --enable-all-tests \
264 - CC_FOR_BUILD="$(tc-getBUILD_CC)"
265 -}
266 -
267 -src_compile() {
268 - default
269 -
270 - use doc && emake -C doc html
271 -}
272 -
273 -src_test() {
274 - #Bug: 638574
275 - use tofu && export TESTFLAGS=--parallel
276 - default
277 -}
278 -
279 -src_install() {
280 - default
281 -
282 - use tools &&
283 - dobin \
284 - tools/{convert-from-106,gpg-check-pattern} \
285 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
286 - tools/make-dns-cert
287 -
288 - dosym gpg /usr/bin/gpg2
289 - dosym gpgv /usr/bin/gpgv2
290 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
291 - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
292 -
293 - dodir /etc/env.d
294 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
295 -
296 - use doc && dodoc doc/gnupg.html/* doc/*.png
297 -
298 - systemd_douserunit doc/examples/systemd-user/*.{service,socket}
299 -}
300
301 diff --git a/app-crypt/gnupg/gnupg-2.2.12.ebuild b/app-crypt/gnupg/gnupg-2.2.12.ebuild
302 deleted file mode 100644
303 index 9e198106fa3..00000000000
304 --- a/app-crypt/gnupg/gnupg-2.2.12.ebuild
305 +++ /dev/null
306 @@ -1,136 +0,0 @@
307 -# Copyright 1999-2018 Gentoo Authors
308 -# Distributed under the terms of the GNU General Public License v2
309 -
310 -EAPI=7
311 -
312 -inherit flag-o-matic systemd toolchain-funcs
313 -
314 -MY_P="${P/_/-}"
315 -
316 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
317 -HOMEPAGE="http://www.gnupg.org/"
318 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
319 -
320 -LICENSE="GPL-3"
321 -SLOT="0"
322 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
323 -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
324 -
325 -# Existence of executables is checked during configuration.
326 -DEPEND="!app-crypt/dirmngr
327 - >=dev-libs/libassuan-2.5.0
328 - >=dev-libs/libgcrypt-1.7.3
329 - >=dev-libs/libgpg-error-1.28
330 - >=dev-libs/libksba-1.3.4
331 - >=dev-libs/npth-1.2
332 - >=net-misc/curl-7.10
333 - bzip2? ( app-arch/bzip2 )
334 - ldap? ( net-nds/openldap )
335 - readline? ( sys-libs/readline:0= )
336 - smartcard? ( usb? ( virtual/libusb:0 ) )
337 - ssl? ( >=net-libs/gnutls-3.0:0= )
338 - sys-libs/zlib
339 - tofu? ( >=dev-db/sqlite-3.7 )
340 - virtual/mta"
341 -
342 -RDEPEND="${DEPEND}
343 - app-crypt/pinentry
344 - nls? ( virtual/libintl )
345 - selinux? ( sec-policy/selinux-gpg )"
346 -
347 -BDEPEND="virtual/pkgconfig
348 - doc? ( sys-apps/texinfo )
349 - nls? ( sys-devel/gettext )"
350 -
351 -S="${WORKDIR}/${MY_P}"
352 -
353 -DOCS=(
354 - ChangeLog NEWS README THANKS TODO VERSION
355 - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
356 -)
357 -
358 -PATCHES=(
359 - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
360 -)
361 -
362 -src_configure() {
363 - local myconf=()
364 -
365 - if use prefix && use usb; then
366 - # bug #649598
367 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
368 - fi
369 -
370 - if use elibc_SunOS || use elibc_AIX; then
371 - myconf+=( --disable-symcryptrun )
372 - else
373 - myconf+=( --enable-symcryptrun )
374 - fi
375 -
376 - #bug 663142
377 - if use user-socket; then
378 - myconf+=( --enable-run-gnupg-user-socket )
379 - fi
380 -
381 - # glib fails and picks up clang's internal stdint.h causing weird errors
382 - [[ ${CC} == *clang ]] && \
383 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
384 -
385 - econf \
386 - "${myconf[@]}" \
387 - $(use_enable bzip2) \
388 - $(use_enable nls) \
389 - $(use_enable smartcard scdaemon) \
390 - $(use_enable ssl gnutls) \
391 - $(use_enable tofu) \
392 - $(use_enable usb ccid-driver) \
393 - $(use_enable wks-server wks-tools) \
394 - $(use_with ldap) \
395 - $(use_with readline) \
396 - --disable-ntbtls \
397 - --enable-all-tests \
398 - --enable-gpg \
399 - --enable-gpgsm \
400 - --enable-large-secmem \
401 - CC_FOR_BUILD="$(tc-getBUILD_CC)" \
402 - GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
403 - KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
404 - LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
405 - LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
406 - NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
407 - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
408 -}
409 -
410 -src_compile() {
411 - default
412 -
413 - use doc && emake -C doc html
414 -}
415 -
416 -src_test() {
417 - #Bug: 638574
418 - use tofu && export TESTFLAGS=--parallel
419 - default
420 -}
421 -
422 -src_install() {
423 - default
424 -
425 - use tools &&
426 - dobin \
427 - tools/{convert-from-106,gpg-check-pattern} \
428 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
429 - tools/make-dns-cert
430 -
431 - dosym gpg /usr/bin/gpg2
432 - dosym gpgv /usr/bin/gpgv2
433 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
434 - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
435 -
436 - dodir /etc/env.d
437 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
438 -
439 - use doc && dodoc doc/gnupg.html/* doc/*.png
440 -
441 - systemd_douserunit doc/examples/systemd-user/*.{service,socket}
442 -}
443
444 diff --git a/app-crypt/gnupg/gnupg-2.2.14.ebuild b/app-crypt/gnupg/gnupg-2.2.14.ebuild
445 deleted file mode 100644
446 index fa2bd5fd28a..00000000000
447 --- a/app-crypt/gnupg/gnupg-2.2.14.ebuild
448 +++ /dev/null
449 @@ -1,136 +0,0 @@
450 -# Copyright 1999-2019 Gentoo Authors
451 -# Distributed under the terms of the GNU General Public License v2
452 -
453 -EAPI=7
454 -
455 -inherit flag-o-matic systemd toolchain-funcs
456 -
457 -MY_P="${P/_/-}"
458 -
459 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
460 -HOMEPAGE="http://www.gnupg.org/"
461 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
462 -
463 -LICENSE="GPL-3"
464 -SLOT="0"
465 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
466 -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
467 -
468 -# Existence of executables is checked during configuration.
469 -DEPEND="!app-crypt/dirmngr
470 - >=dev-libs/libassuan-2.5.0
471 - >=dev-libs/libgcrypt-1.7.3
472 - >=dev-libs/libgpg-error-1.28
473 - >=dev-libs/libksba-1.3.4
474 - >=dev-libs/npth-1.2
475 - >=net-misc/curl-7.10
476 - bzip2? ( app-arch/bzip2 )
477 - ldap? ( net-nds/openldap )
478 - readline? ( sys-libs/readline:0= )
479 - smartcard? ( usb? ( virtual/libusb:1 ) )
480 - ssl? ( >=net-libs/gnutls-3.0:0= )
481 - sys-libs/zlib
482 - tofu? ( >=dev-db/sqlite-3.7 )
483 - virtual/mta"
484 -
485 -RDEPEND="${DEPEND}
486 - app-crypt/pinentry
487 - nls? ( virtual/libintl )
488 - selinux? ( sec-policy/selinux-gpg )"
489 -
490 -BDEPEND="virtual/pkgconfig
491 - doc? ( sys-apps/texinfo )
492 - nls? ( sys-devel/gettext )"
493 -
494 -S="${WORKDIR}/${MY_P}"
495 -
496 -DOCS=(
497 - ChangeLog NEWS README THANKS TODO VERSION
498 - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
499 -)
500 -
501 -PATCHES=(
502 - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
503 -)
504 -
505 -src_configure() {
506 - local myconf=()
507 -
508 - if use prefix && use usb; then
509 - # bug #649598
510 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
511 - fi
512 -
513 - if use elibc_SunOS || use elibc_AIX; then
514 - myconf+=( --disable-symcryptrun )
515 - else
516 - myconf+=( --enable-symcryptrun )
517 - fi
518 -
519 - #bug 663142
520 - if use user-socket; then
521 - myconf+=( --enable-run-gnupg-user-socket )
522 - fi
523 -
524 - # glib fails and picks up clang's internal stdint.h causing weird errors
525 - [[ ${CC} == *clang ]] && \
526 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
527 -
528 - econf \
529 - "${myconf[@]}" \
530 - $(use_enable bzip2) \
531 - $(use_enable nls) \
532 - $(use_enable smartcard scdaemon) \
533 - $(use_enable ssl gnutls) \
534 - $(use_enable tofu) \
535 - $(use_enable usb ccid-driver) \
536 - $(use_enable wks-server wks-tools) \
537 - $(use_with ldap) \
538 - $(use_with readline) \
539 - --disable-ntbtls \
540 - --enable-all-tests \
541 - --enable-gpg \
542 - --enable-gpgsm \
543 - --enable-large-secmem \
544 - CC_FOR_BUILD="$(tc-getBUILD_CC)" \
545 - GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
546 - KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
547 - LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
548 - LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
549 - NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
550 - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
551 -}
552 -
553 -src_compile() {
554 - default
555 -
556 - use doc && emake -C doc html
557 -}
558 -
559 -src_test() {
560 - #Bug: 638574
561 - use tofu && export TESTFLAGS=--parallel
562 - default
563 -}
564 -
565 -src_install() {
566 - default
567 -
568 - use tools &&
569 - dobin \
570 - tools/{convert-from-106,gpg-check-pattern} \
571 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
572 - tools/make-dns-cert
573 -
574 - dosym gpg /usr/bin/gpg2
575 - dosym gpgv /usr/bin/gpgv2
576 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
577 - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
578 -
579 - dodir /etc/env.d
580 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
581 -
582 - use doc && dodoc doc/gnupg.html/* doc/*.png
583 -
584 - systemd_douserunit doc/examples/systemd-user/*.{service,socket}
585 -}
586
587 diff --git a/app-crypt/gnupg/gnupg-2.2.15-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.15-r1.ebuild
588 deleted file mode 100644
589 index 2b55c80c4d0..00000000000
590 --- a/app-crypt/gnupg/gnupg-2.2.15-r1.ebuild
591 +++ /dev/null
592 @@ -1,153 +0,0 @@
593 -# Copyright 1999-2019 Gentoo Authors
594 -# Distributed under the terms of the GNU General Public License v2
595 -
596 -EAPI=7
597 -
598 -inherit flag-o-matic systemd toolchain-funcs
599 -
600 -MY_P="${P/_/-}"
601 -
602 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
603 -HOMEPAGE="http://www.gnupg.org/"
604 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
605 -
606 -LICENSE="GPL-3"
607 -SLOT="0"
608 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
609 -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
610 -
611 -# Existence of executables is checked during configuration.
612 -DEPEND="!app-crypt/dirmngr
613 - >=dev-libs/libassuan-2.5.0
614 - >=dev-libs/libgcrypt-1.7.3
615 - >=dev-libs/libgpg-error-1.28
616 - >=dev-libs/libksba-1.3.4
617 - >=dev-libs/npth-1.2
618 - >=net-misc/curl-7.10
619 - bzip2? ( app-arch/bzip2 )
620 - ldap? ( net-nds/openldap )
621 - readline? ( sys-libs/readline:0= )
622 - smartcard? ( usb? ( virtual/libusb:1 ) )
623 - ssl? ( >=net-libs/gnutls-3.0:0= )
624 - sys-libs/zlib
625 - tofu? ( >=dev-db/sqlite-3.7 )"
626 -
627 -RDEPEND="${DEPEND}
628 - app-crypt/pinentry
629 - nls? ( virtual/libintl )
630 - selinux? ( sec-policy/selinux-gpg )
631 - wks-server? ( virtual/mta )"
632 -
633 -BDEPEND="virtual/pkgconfig
634 - doc? ( sys-apps/texinfo )
635 - nls? ( sys-devel/gettext )"
636 -
637 -S="${WORKDIR}/${MY_P}"
638 -
639 -DOCS=(
640 - ChangeLog NEWS README THANKS TODO VERSION
641 - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
642 -)
643 -
644 -PATCHES=(
645 - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
646 - "${FILESDIR}/${PN}-2.2.14-quiet-sending.patch"
647 -)
648 -
649 -src_configure() {
650 - local myconf=()
651 -
652 - if use prefix && use usb; then
653 - # bug #649598
654 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
655 - fi
656 -
657 - if use elibc_SunOS || use elibc_AIX; then
658 - myconf+=( --disable-symcryptrun )
659 - else
660 - myconf+=( --enable-symcryptrun )
661 - fi
662 -
663 - #bug 663142
664 - if use user-socket; then
665 - myconf+=( --enable-run-gnupg-user-socket )
666 - fi
667 -
668 - # glib fails and picks up clang's internal stdint.h causing weird errors
669 - [[ ${CC} == *clang ]] && \
670 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
671 -
672 - # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
673 - # As of GnuPG 2.3, the mailprog substitution is used for the binary called
674 - # by wks-client & wks-server; and if it's autodetected but not not exist at
675 - # build time, then then 'gpg-wks-client --send' functionality will not
676 - # work. This has an unwanted side-effect in stage3 builds: there was a
677 - # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
678 - # the build where the install guide previously make the user chose the
679 - # logger & mta early in the install.
680 -
681 - econf \
682 - "${myconf[@]}" \
683 - $(use_enable bzip2) \
684 - $(use_enable nls) \
685 - $(use_enable smartcard scdaemon) \
686 - $(use_enable ssl gnutls) \
687 - $(use_enable tofu) \
688 - $(use_enable usb ccid-driver) \
689 - $(use_enable wks-server wks-tools) \
690 - $(use_with ldap) \
691 - $(use_with readline) \
692 - --with-mailprog=/usr/libexec/sendmail \
693 - --disable-ntbtls \
694 - --enable-all-tests \
695 - --enable-gpg \
696 - --enable-gpgsm \
697 - --enable-large-secmem \
698 - CC_FOR_BUILD="$(tc-getBUILD_CC)" \
699 - GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
700 - KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
701 - LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
702 - LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
703 - NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
704 - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
705 -}
706 -
707 -src_compile() {
708 - default
709 -
710 - use doc && emake -C doc html
711 -}
712 -
713 -src_test() {
714 - #Bug: 638574
715 - use tofu && export TESTFLAGS=--parallel
716 - default
717 -}
718 -
719 -src_install() {
720 - default
721 -
722 - use tools &&
723 - dobin \
724 - tools/{convert-from-106,gpg-check-pattern} \
725 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
726 - tools/make-dns-cert
727 -
728 - dosym gpg /usr/bin/gpg2
729 - dosym gpgv /usr/bin/gpgv2
730 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
731 - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
732 -
733 - dodir /etc/env.d
734 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
735 -
736 - use doc && dodoc doc/gnupg.html/* doc/*.png
737 -
738 - systemd_douserunit doc/examples/systemd-user/*.{service,socket}
739 -}
740 -
741 -pkg_postinst() {
742 - elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
743 - elog
744 - elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
745 -}
746
747 diff --git a/app-crypt/gnupg/gnupg-2.2.15.ebuild b/app-crypt/gnupg/gnupg-2.2.15.ebuild
748 deleted file mode 100644
749 index 6c10a02472a..00000000000
750 --- a/app-crypt/gnupg/gnupg-2.2.15.ebuild
751 +++ /dev/null
752 @@ -1,137 +0,0 @@
753 -# Copyright 1999-2019 Gentoo Authors
754 -# Distributed under the terms of the GNU General Public License v2
755 -
756 -EAPI=7
757 -
758 -inherit flag-o-matic systemd toolchain-funcs
759 -
760 -MY_P="${P/_/-}"
761 -
762 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
763 -HOMEPAGE="http://www.gnupg.org/"
764 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
765 -
766 -LICENSE="GPL-3"
767 -SLOT="0"
768 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
769 -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
770 -
771 -# Existence of executables is checked during configuration.
772 -DEPEND="!app-crypt/dirmngr
773 - >=dev-libs/libassuan-2.5.0
774 - >=dev-libs/libgcrypt-1.7.3
775 - >=dev-libs/libgpg-error-1.28
776 - >=dev-libs/libksba-1.3.4
777 - >=dev-libs/npth-1.2
778 - >=net-misc/curl-7.10
779 - bzip2? ( app-arch/bzip2 )
780 - ldap? ( net-nds/openldap )
781 - readline? ( sys-libs/readline:0= )
782 - smartcard? ( usb? ( virtual/libusb:1 ) )
783 - ssl? ( >=net-libs/gnutls-3.0:0= )
784 - sys-libs/zlib
785 - tofu? ( >=dev-db/sqlite-3.7 )
786 - virtual/mta"
787 -
788 -RDEPEND="${DEPEND}
789 - app-crypt/pinentry
790 - nls? ( virtual/libintl )
791 - selinux? ( sec-policy/selinux-gpg )"
792 -
793 -BDEPEND="virtual/pkgconfig
794 - doc? ( sys-apps/texinfo )
795 - nls? ( sys-devel/gettext )"
796 -
797 -S="${WORKDIR}/${MY_P}"
798 -
799 -DOCS=(
800 - ChangeLog NEWS README THANKS TODO VERSION
801 - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
802 -)
803 -
804 -PATCHES=(
805 - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
806 - "${FILESDIR}/${PN}-2.2.14-quiet-sending.patch"
807 -)
808 -
809 -src_configure() {
810 - local myconf=()
811 -
812 - if use prefix && use usb; then
813 - # bug #649598
814 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
815 - fi
816 -
817 - if use elibc_SunOS || use elibc_AIX; then
818 - myconf+=( --disable-symcryptrun )
819 - else
820 - myconf+=( --enable-symcryptrun )
821 - fi
822 -
823 - #bug 663142
824 - if use user-socket; then
825 - myconf+=( --enable-run-gnupg-user-socket )
826 - fi
827 -
828 - # glib fails and picks up clang's internal stdint.h causing weird errors
829 - [[ ${CC} == *clang ]] && \
830 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
831 -
832 - econf \
833 - "${myconf[@]}" \
834 - $(use_enable bzip2) \
835 - $(use_enable nls) \
836 - $(use_enable smartcard scdaemon) \
837 - $(use_enable ssl gnutls) \
838 - $(use_enable tofu) \
839 - $(use_enable usb ccid-driver) \
840 - $(use_enable wks-server wks-tools) \
841 - $(use_with ldap) \
842 - $(use_with readline) \
843 - --disable-ntbtls \
844 - --enable-all-tests \
845 - --enable-gpg \
846 - --enable-gpgsm \
847 - --enable-large-secmem \
848 - CC_FOR_BUILD="$(tc-getBUILD_CC)" \
849 - GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
850 - KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
851 - LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
852 - LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
853 - NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
854 - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
855 -}
856 -
857 -src_compile() {
858 - default
859 -
860 - use doc && emake -C doc html
861 -}
862 -
863 -src_test() {
864 - #Bug: 638574
865 - use tofu && export TESTFLAGS=--parallel
866 - default
867 -}
868 -
869 -src_install() {
870 - default
871 -
872 - use tools &&
873 - dobin \
874 - tools/{convert-from-106,gpg-check-pattern} \
875 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
876 - tools/make-dns-cert
877 -
878 - dosym gpg /usr/bin/gpg2
879 - dosym gpgv /usr/bin/gpgv2
880 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
881 - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
882 -
883 - dodir /etc/env.d
884 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
885 -
886 - use doc && dodoc doc/gnupg.html/* doc/*.png
887 -
888 - systemd_douserunit doc/examples/systemd-user/*.{service,socket}
889 -}
890
891 diff --git a/app-crypt/gnupg/gnupg-2.2.16-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.16-r1.ebuild
892 deleted file mode 100644
893 index f559e78030f..00000000000
894 --- a/app-crypt/gnupg/gnupg-2.2.16-r1.ebuild
895 +++ /dev/null
896 @@ -1,153 +0,0 @@
897 -# Copyright 1999-2019 Gentoo Authors
898 -# Distributed under the terms of the GNU General Public License v2
899 -
900 -EAPI=7
901 -
902 -inherit flag-o-matic systemd toolchain-funcs
903 -
904 -MY_P="${P/_/-}"
905 -
906 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
907 -HOMEPAGE="http://www.gnupg.org/"
908 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
909 -
910 -LICENSE="GPL-3"
911 -SLOT="0"
912 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
913 -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
914 -
915 -# Existence of executables is checked during configuration.
916 -DEPEND="!app-crypt/dirmngr
917 - >=dev-libs/libassuan-2.5.0
918 - >=dev-libs/libgcrypt-1.7.3
919 - >=dev-libs/libgpg-error-1.28
920 - >=dev-libs/libksba-1.3.4
921 - >=dev-libs/npth-1.2
922 - >=net-misc/curl-7.10
923 - bzip2? ( app-arch/bzip2 )
924 - ldap? ( net-nds/openldap )
925 - readline? ( sys-libs/readline:0= )
926 - smartcard? ( usb? ( virtual/libusb:1 ) )
927 - ssl? ( >=net-libs/gnutls-3.0:0= )
928 - sys-libs/zlib
929 - tofu? ( >=dev-db/sqlite-3.7 )"
930 -
931 -RDEPEND="${DEPEND}
932 - app-crypt/pinentry
933 - nls? ( virtual/libintl )
934 - selinux? ( sec-policy/selinux-gpg )
935 - wks-server? ( virtual/mta )"
936 -
937 -BDEPEND="virtual/pkgconfig
938 - doc? ( sys-apps/texinfo )
939 - nls? ( sys-devel/gettext )"
940 -
941 -S="${WORKDIR}/${MY_P}"
942 -
943 -DOCS=(
944 - ChangeLog NEWS README THANKS TODO VERSION
945 - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
946 -)
947 -
948 -PATCHES=(
949 - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
950 - "${FILESDIR}/${PN}-2.2.14-quiet-sending.patch"
951 -)
952 -
953 -src_configure() {
954 - local myconf=()
955 -
956 - if use prefix && use usb; then
957 - # bug #649598
958 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
959 - fi
960 -
961 - if use elibc_SunOS || use elibc_AIX; then
962 - myconf+=( --disable-symcryptrun )
963 - else
964 - myconf+=( --enable-symcryptrun )
965 - fi
966 -
967 - #bug 663142
968 - if use user-socket; then
969 - myconf+=( --enable-run-gnupg-user-socket )
970 - fi
971 -
972 - # glib fails and picks up clang's internal stdint.h causing weird errors
973 - [[ ${CC} == *clang ]] && \
974 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
975 -
976 - # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
977 - # As of GnuPG 2.3, the mailprog substitution is used for the binary called
978 - # by wks-client & wks-server; and if it's autodetected but not not exist at
979 - # build time, then then 'gpg-wks-client --send' functionality will not
980 - # work. This has an unwanted side-effect in stage3 builds: there was a
981 - # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
982 - # the build where the install guide previously make the user chose the
983 - # logger & mta early in the install.
984 -
985 - econf \
986 - "${myconf[@]}" \
987 - $(use_enable bzip2) \
988 - $(use_enable nls) \
989 - $(use_enable smartcard scdaemon) \
990 - $(use_enable ssl gnutls) \
991 - $(use_enable tofu) \
992 - $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \
993 - $(use_enable wks-server wks-tools) \
994 - $(use_with ldap) \
995 - $(use_with readline) \
996 - --with-mailprog=/usr/libexec/sendmail \
997 - --disable-ntbtls \
998 - --enable-all-tests \
999 - --enable-gpg \
1000 - --enable-gpgsm \
1001 - --enable-large-secmem \
1002 - CC_FOR_BUILD="$(tc-getBUILD_CC)" \
1003 - GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
1004 - KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
1005 - LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
1006 - LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
1007 - NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
1008 - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
1009 -}
1010 -
1011 -src_compile() {
1012 - default
1013 -
1014 - use doc && emake -C doc html
1015 -}
1016 -
1017 -src_test() {
1018 - #Bug: 638574
1019 - use tofu && export TESTFLAGS=--parallel
1020 - default
1021 -}
1022 -
1023 -src_install() {
1024 - default
1025 -
1026 - use tools &&
1027 - dobin \
1028 - tools/{convert-from-106,gpg-check-pattern} \
1029 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
1030 - tools/make-dns-cert
1031 -
1032 - dosym gpg /usr/bin/gpg2
1033 - dosym gpgv /usr/bin/gpgv2
1034 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
1035 - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
1036 -
1037 - dodir /etc/env.d
1038 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
1039 -
1040 - use doc && dodoc doc/gnupg.html/* doc/*.png
1041 -
1042 - systemd_douserunit doc/examples/systemd-user/*.{service,socket}
1043 -}
1044 -
1045 -pkg_postinst() {
1046 - elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
1047 - elog
1048 - elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
1049 -}
1050
1051 diff --git a/app-crypt/gnupg/gnupg-2.2.16.ebuild b/app-crypt/gnupg/gnupg-2.2.16.ebuild
1052 deleted file mode 100644
1053 index 2b55c80c4d0..00000000000
1054 --- a/app-crypt/gnupg/gnupg-2.2.16.ebuild
1055 +++ /dev/null
1056 @@ -1,153 +0,0 @@
1057 -# Copyright 1999-2019 Gentoo Authors
1058 -# Distributed under the terms of the GNU General Public License v2
1059 -
1060 -EAPI=7
1061 -
1062 -inherit flag-o-matic systemd toolchain-funcs
1063 -
1064 -MY_P="${P/_/-}"
1065 -
1066 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
1067 -HOMEPAGE="http://www.gnupg.org/"
1068 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
1069 -
1070 -LICENSE="GPL-3"
1071 -SLOT="0"
1072 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
1073 -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
1074 -
1075 -# Existence of executables is checked during configuration.
1076 -DEPEND="!app-crypt/dirmngr
1077 - >=dev-libs/libassuan-2.5.0
1078 - >=dev-libs/libgcrypt-1.7.3
1079 - >=dev-libs/libgpg-error-1.28
1080 - >=dev-libs/libksba-1.3.4
1081 - >=dev-libs/npth-1.2
1082 - >=net-misc/curl-7.10
1083 - bzip2? ( app-arch/bzip2 )
1084 - ldap? ( net-nds/openldap )
1085 - readline? ( sys-libs/readline:0= )
1086 - smartcard? ( usb? ( virtual/libusb:1 ) )
1087 - ssl? ( >=net-libs/gnutls-3.0:0= )
1088 - sys-libs/zlib
1089 - tofu? ( >=dev-db/sqlite-3.7 )"
1090 -
1091 -RDEPEND="${DEPEND}
1092 - app-crypt/pinentry
1093 - nls? ( virtual/libintl )
1094 - selinux? ( sec-policy/selinux-gpg )
1095 - wks-server? ( virtual/mta )"
1096 -
1097 -BDEPEND="virtual/pkgconfig
1098 - doc? ( sys-apps/texinfo )
1099 - nls? ( sys-devel/gettext )"
1100 -
1101 -S="${WORKDIR}/${MY_P}"
1102 -
1103 -DOCS=(
1104 - ChangeLog NEWS README THANKS TODO VERSION
1105 - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
1106 -)
1107 -
1108 -PATCHES=(
1109 - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
1110 - "${FILESDIR}/${PN}-2.2.14-quiet-sending.patch"
1111 -)
1112 -
1113 -src_configure() {
1114 - local myconf=()
1115 -
1116 - if use prefix && use usb; then
1117 - # bug #649598
1118 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
1119 - fi
1120 -
1121 - if use elibc_SunOS || use elibc_AIX; then
1122 - myconf+=( --disable-symcryptrun )
1123 - else
1124 - myconf+=( --enable-symcryptrun )
1125 - fi
1126 -
1127 - #bug 663142
1128 - if use user-socket; then
1129 - myconf+=( --enable-run-gnupg-user-socket )
1130 - fi
1131 -
1132 - # glib fails and picks up clang's internal stdint.h causing weird errors
1133 - [[ ${CC} == *clang ]] && \
1134 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
1135 -
1136 - # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
1137 - # As of GnuPG 2.3, the mailprog substitution is used for the binary called
1138 - # by wks-client & wks-server; and if it's autodetected but not not exist at
1139 - # build time, then then 'gpg-wks-client --send' functionality will not
1140 - # work. This has an unwanted side-effect in stage3 builds: there was a
1141 - # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
1142 - # the build where the install guide previously make the user chose the
1143 - # logger & mta early in the install.
1144 -
1145 - econf \
1146 - "${myconf[@]}" \
1147 - $(use_enable bzip2) \
1148 - $(use_enable nls) \
1149 - $(use_enable smartcard scdaemon) \
1150 - $(use_enable ssl gnutls) \
1151 - $(use_enable tofu) \
1152 - $(use_enable usb ccid-driver) \
1153 - $(use_enable wks-server wks-tools) \
1154 - $(use_with ldap) \
1155 - $(use_with readline) \
1156 - --with-mailprog=/usr/libexec/sendmail \
1157 - --disable-ntbtls \
1158 - --enable-all-tests \
1159 - --enable-gpg \
1160 - --enable-gpgsm \
1161 - --enable-large-secmem \
1162 - CC_FOR_BUILD="$(tc-getBUILD_CC)" \
1163 - GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
1164 - KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
1165 - LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
1166 - LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
1167 - NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
1168 - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
1169 -}
1170 -
1171 -src_compile() {
1172 - default
1173 -
1174 - use doc && emake -C doc html
1175 -}
1176 -
1177 -src_test() {
1178 - #Bug: 638574
1179 - use tofu && export TESTFLAGS=--parallel
1180 - default
1181 -}
1182 -
1183 -src_install() {
1184 - default
1185 -
1186 - use tools &&
1187 - dobin \
1188 - tools/{convert-from-106,gpg-check-pattern} \
1189 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
1190 - tools/make-dns-cert
1191 -
1192 - dosym gpg /usr/bin/gpg2
1193 - dosym gpgv /usr/bin/gpgv2
1194 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
1195 - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
1196 -
1197 - dodir /etc/env.d
1198 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
1199 -
1200 - use doc && dodoc doc/gnupg.html/* doc/*.png
1201 -
1202 - systemd_douserunit doc/examples/systemd-user/*.{service,socket}
1203 -}
1204 -
1205 -pkg_postinst() {
1206 - elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg"
1207 - elog
1208 - elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!"
1209 -}
1210
1211 diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
1212 index 710e79addfa..8f54fc7a736 100644
1213 --- a/app-crypt/gnupg/metadata.xml
1214 +++ b/app-crypt/gnupg/metadata.xml
1215 @@ -25,9 +25,6 @@
1216 <flag name="user-socket">
1217 try a socket directory which is not removed by init manager at session end
1218 </flag>
1219 - <flag name="mta">
1220 - Build mta support using <pkg>virtual/mta</pkg>.
1221 - </flag>
1222 <flag name="tofu">
1223 Enable support for Trust on First use trust model; requires <pkg>dev-db/sqlite</pkg>.
1224 </flag>