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: app-crypt/gnupg/
Date: Tue, 20 Apr 2021 15:14:59
Message-Id: 1618931689.41e2bb9a3e1c06308af7756a48269730ef4bf58f.polynomial-c@gentoo
1 commit: 41e2bb9a3e1c06308af7756a48269730ef4bf58f
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 20 15:11:46 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 20 15:14:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41e2bb9a
7
8 app-crypt/gnupg: Removed old
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 app-crypt/gnupg/Manifest | 1 -
13 app-crypt/gnupg/gnupg-2.2.25.ebuild | 166 ------------------------------------
14 2 files changed, 167 deletions(-)
15
16 diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
17 index f4c3e9db0ff..4819a9ce121 100644
18 --- a/app-crypt/gnupg/Manifest
19 +++ b/app-crypt/gnupg/Manifest
20 @@ -1,4 +1,3 @@
21 DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663 SHA512 38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84
22 -DIST gnupg-2.2.25.tar.bz2 7195857 BLAKE2B c930edf9259a0e1c508af8d76a86f979860adfe2c525020b37d3741679200f96483f0ad8bc1f72e2dbf7fe77696cd04d4272a2ee23e4c4abe1ed6ba88b95f365 SHA512 ab1d7cc9d8be3e7189bc4bea431b9d5db313cbd1739823950f32fbb611b2f4374889f444efbf43ce1fbf498b9865d7e6e953cd4c86d58fd688f63923c434ea2c
23 DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
24 DIST gnupg-2.3.0.tar.bz2 7557228 BLAKE2B 10a1e37a7f6aa3d429905b3e048e69b8e321dd616e3a26b0f778c3bd9e8298562ade439f7e27b8605ed155e55a0939c35a7b8554f8a89eb33cdb724506126fdf SHA512 f8d2b31e9ae750b132ecb7b478be52cdb7628a5806967a2ee3be19d3e955c3f64214997b168b1ec00caa6830c26711f2ea8430cc6269d6b980b21239186ba29f
25
26 diff --git a/app-crypt/gnupg/gnupg-2.2.25.ebuild b/app-crypt/gnupg/gnupg-2.2.25.ebuild
27 deleted file mode 100644
28 index 98ebf484c16..00000000000
29 --- a/app-crypt/gnupg/gnupg-2.2.25.ebuild
30 +++ /dev/null
31 @@ -1,166 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit flag-o-matic systemd toolchain-funcs
38 -
39 -MY_P="${P/_/-}"
40 -
41 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
42 -HOMEPAGE="https://gnupg.org/"
43 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
44 - scd-shared-access? ( https://raw.githubusercontent.com/GPGTools/MacGPG2/5ca182f54b7b6cd635d1c0a4713953834489fdd9/patches/gnupg/scdaemon_shared-access.patch -> ${PN}-2.2.16-scdaemon_shared-access.patch )"
45 -
46 -LICENSE="GPL-3"
47 -SLOT="0"
48 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
49 -IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
50 -
51 -# Existence of executables is checked during configuration.
52 -DEPEND=">=dev-libs/libassuan-2.5.0
53 - >=dev-libs/libgcrypt-1.8.0
54 - >=dev-libs/libgpg-error-1.29
55 - >=dev-libs/libksba-1.3.4
56 - >=dev-libs/npth-1.2
57 - >=net-misc/curl-7.10
58 - bzip2? ( app-arch/bzip2 )
59 - ldap? ( net-nds/openldap )
60 - readline? ( sys-libs/readline:0= )
61 - smartcard? ( usb? ( virtual/libusb:1 ) )
62 - ssl? ( >=net-libs/gnutls-3.0:0= )
63 - sys-libs/zlib
64 - tofu? ( >=dev-db/sqlite-3.7 )"
65 -
66 -RDEPEND="${DEPEND}
67 - app-crypt/pinentry
68 - nls? ( virtual/libintl )
69 - selinux? ( sec-policy/selinux-gpg )
70 - wks-server? ( virtual/mta )"
71 -
72 -BDEPEND="virtual/pkgconfig
73 - doc? ( sys-apps/texinfo )
74 - nls? ( sys-devel/gettext )"
75 -
76 -S="${WORKDIR}/${MY_P}"
77 -
78 -DOCS=(
79 - ChangeLog NEWS README THANKS TODO VERSION
80 - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
81 -)
82 -
83 -PATCHES=(
84 - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
85 -)
86 -
87 -src_prepare() {
88 - default
89 -
90 - # Made optional because it's a non-official patch
91 - if use scd-shared-access ; then
92 - # Patch taken from
93 - # https://github.com/GPGTools/MacGPG2/tree/dev/patches/gnupg
94 - eapply "${DISTDIR}/${PN}-2.2.16-scdaemon_shared-access.patch"
95 - fi
96 -
97 - # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
98 - # idea borrowed from libdbus, see
99 - # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
100 - #
101 - # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
102 - # which in turn requires discovery in Autoconf, something that upstream deeply resents.
103 - sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
104 - -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
105 -}
106 -
107 -src_configure() {
108 - local myconf=(
109 - $(use_enable bzip2)
110 - $(use_enable nls)
111 - $(use_enable smartcard scdaemon)
112 - $(use_enable ssl gnutls)
113 - $(use_enable tofu)
114 - $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
115 - $(use_enable wks-server wks-tools)
116 - $(use_with ldap)
117 - $(use_with readline)
118 - --with-mailprog=/usr/libexec/sendmail
119 - --disable-ntbtls
120 - --enable-all-tests
121 - --enable-gpg
122 - --enable-gpgsm
123 - --enable-large-secmem
124 - CC_FOR_BUILD="$(tc-getBUILD_CC)"
125 - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
126 - KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
127 - LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
128 - LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
129 - NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
130 - $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
131 - )
132 -
133 - if use prefix && use usb; then
134 - # bug #649598
135 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
136 - fi
137 -
138 - if use elibc_SunOS; then
139 - myconf+=( --disable-symcryptrun )
140 - else
141 - myconf+=( --enable-symcryptrun )
142 - fi
143 -
144 - #bug 663142
145 - if use user-socket; then
146 - myconf+=( --enable-run-gnupg-user-socket )
147 - fi
148 -
149 - # glib fails and picks up clang's internal stdint.h causing weird errors
150 - [[ ${CC} == *clang ]] && \
151 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
152 -
153 - # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
154 - # As of GnuPG 2.3, the mailprog substitution is used for the binary called
155 - # by wks-client & wks-server; and if it's autodetected but not not exist at
156 - # build time, then then 'gpg-wks-client --send' functionality will not
157 - # work. This has an unwanted side-effect in stage3 builds: there was a
158 - # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
159 - # the build where the install guide previously make the user chose the
160 - # logger & mta early in the install.
161 -
162 - econf "${myconf[@]}"
163 -}
164 -
165 -src_compile() {
166 - default
167 -
168 - use doc && emake -C doc html
169 -}
170 -
171 -src_test() {
172 - #Bug: 638574
173 - use tofu && export TESTFLAGS=--parallel
174 - default
175 -}
176 -
177 -src_install() {
178 - default
179 -
180 - use tools &&
181 - dobin \
182 - tools/{convert-from-106,gpg-check-pattern} \
183 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
184 - tools/make-dns-cert
185 -
186 - dosym gpg /usr/bin/gpg2
187 - dosym gpgv /usr/bin/gpgv2
188 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
189 - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
190 -
191 - dodir /etc/env.d
192 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
193 -
194 - use doc && dodoc doc/gnupg.html/* doc/*.png
195 -
196 - systemd_douserunit doc/examples/systemd-user/*.{service,socket}
197 -}