1 |
commit: 9761a47842983c0467fb7934a64ba31ef03f5ef6 |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 23 17:19:54 2017 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 23 17:53:25 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9761a478 |
7 |
|
8 |
app-crypt/gnupg: cleanup |
9 |
|
10 |
Bug: 606604 |
11 |
|
12 |
Package-Manager: portage-2.3.0 |
13 |
|
14 |
app-crypt/gnupg/Manifest | 3 - |
15 |
.../gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch | 34 ----- |
16 |
app-crypt/gnupg/gnupg-2.0.28.ebuild | 167 -------------------- |
17 |
app-crypt/gnupg/gnupg-2.0.30.ebuild | 170 --------------------- |
18 |
app-crypt/gnupg/gnupg-2.1.15.ebuild | 2 +- |
19 |
app-crypt/gnupg/gnupg-2.1.16.ebuild | 128 ---------------- |
20 |
app-crypt/gnupg/gnupg-2.1.17-r1.ebuild | 2 +- |
21 |
7 files changed, 2 insertions(+), 504 deletions(-) |
22 |
|
23 |
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest |
24 |
index 78fb10f..457703c 100644 |
25 |
--- a/app-crypt/gnupg/Manifest |
26 |
+++ b/app-crypt/gnupg/Manifest |
27 |
@@ -1,6 +1,3 @@ |
28 |
DIST gnupg-1.4.21.tar.bz2 3689305 SHA256 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984 WHIRLPOOL eb596be347dd90be93d381fe405e50f5808160b546705493bc9d817d521ea236a2374648e6c2cab396f54bba74de4caf2b92e894df3a17aa339f014ef8cc8802 |
29 |
-DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66 |
30 |
-DIST gnupg-2.0.30.tar.bz2 4414652 SHA256 e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71 SHA512 e60a57f7dc74b44f884fd50d5a9c51cef7df8c098644ebab9ef7d945a40b0e4a285d0dc80b10fe39d8e4c2cc9d6cbbe800a0ddae54883180dc755fe47ced3314 WHIRLPOOL 007315882becc1204edf6833a13610284ce7e1c73429fc3b4170c35ba61c645299f811f01b1bc0506b1cf94ce0de23af4cea33f51cf97397ec61caa15ce3ac6c |
31 |
DIST gnupg-2.1.15.tar.bz2 5723689 SHA256 c28c1a208f1b8ad63bdb6b88d252f6734ff4d33de6b54e38494b11d49e00ffdd SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1 WHIRLPOOL 4c5a8cd4e8b7196f4a355ce7739cf6e23c43817414e10bbba219117e4e51c4c618ffb5dbce27cb836a2171eda58e003d5ddf78d4af09a813c2a1729963413151 |
32 |
-DIST gnupg-2.1.16.tar.bz2 5840687 SHA256 49b9a6a6787ad00d4d2d69d8c7ee8905923782583f06078a064a0c80531d8844 SHA512 dbac27106e7800e30f286c3fd83ffab85d2b0acf29d6715ce3e388bfbece2a7deb19ebfe897c445d7a3d6d63e01560b9461567566e936504bc5d6cabe1444af7 WHIRLPOOL e6fe2e39deb1ce5ba41c8d160721c64bc3846c2f5d42027a45d6d3e3bd45b6acba38c41923af1165312c9e993d63f28c6fd6616e6f659f6eb4e6d3899d42897b |
33 |
DIST gnupg-2.1.17.tar.bz2 5970042 SHA256 c5dc54db432209fa8f9bdb071c8fb60a765ff28e363150e30bdd4543160243cb SHA512 f826100be4f0480b9a2c68a51dd668e0fd551fd250a37dbe906fe5a89c658b4861a0567038bf687473de9901e268809c1b8d8c200008e082a3ace189d9829b9c WHIRLPOOL d70fa5ae0a90d5c9fa594d79cdb9bc1528b7db1a35d23ee7d3f047b4fb275d02bd8f5e6ccb0a798fedf539c8c384d3713295785183266de43fe3cb978c47916b |
34 |
|
35 |
diff --git a/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch b/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch |
36 |
deleted file mode 100644 |
37 |
index 9506f81..00000000 |
38 |
--- a/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch |
39 |
+++ /dev/null |
40 |
@@ -1,34 +0,0 @@ |
41 |
-From c34486a64c223bcbfbb57d9abcf107d684b815b6 Mon Sep 17 00:00:00 2001 |
42 |
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@×××××.com> |
43 |
-Date: Sun, 17 Apr 2011 01:34:39 +0200 |
44 |
-Subject: [PATCH] gpgsm-gencert.sh: make sure not to abort after creating temp |
45 |
- file. |
46 |
- |
47 |
-https://bugs.g10code.com/gnupg/issue1466 |
48 |
- |
49 |
---- |
50 |
- tools/gpgsm-gencert.sh | 8 ++++---- |
51 |
- 1 files changed, 4 insertions(+), 4 deletions(-) |
52 |
- |
53 |
-diff --git a/tools/gpgsm-gencert.sh b/tools/gpgsm-gencert.sh |
54 |
-index b209c8e..e7c812f 100755 |
55 |
---- a/tools/gpgsm-gencert.sh |
56 |
-+++ b/tools/gpgsm-gencert.sh |
57 |
-@@ -178,10 +178,10 @@ Key-Length: $KEY_LENGTH |
58 |
- Key-Usage: $KEY_USAGE |
59 |
- Name-DN: $NAME |
60 |
- EOF |
61 |
--[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP" |
62 |
--[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES" |
63 |
--[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES" |
64 |
--[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES" |
65 |
-+[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP" || true |
66 |
-+[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES" || true |
67 |
-+[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES" || true |
68 |
-+[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES" || true |
69 |
- ) > "$file_parameter" |
70 |
- |
71 |
- |
72 |
--- |
73 |
-1.7.5.rc1 |
74 |
- |
75 |
|
76 |
diff --git a/app-crypt/gnupg/gnupg-2.0.28.ebuild b/app-crypt/gnupg/gnupg-2.0.28.ebuild |
77 |
deleted file mode 100644 |
78 |
index 1dac44f..00000000 |
79 |
--- a/app-crypt/gnupg/gnupg-2.0.28.ebuild |
80 |
+++ /dev/null |
81 |
@@ -1,167 +0,0 @@ |
82 |
-# Copyright 1999-2016 Gentoo Foundation |
83 |
-# Distributed under the terms of the GNU General Public License v2 |
84 |
-# $Id$ |
85 |
- |
86 |
-EAPI="5" |
87 |
- |
88 |
-inherit eutils flag-o-matic toolchain-funcs |
89 |
- |
90 |
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement" |
91 |
-HOMEPAGE="http://www.gnupg.org/" |
92 |
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2" |
93 |
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2" |
94 |
- |
95 |
-LICENSE="GPL-3" |
96 |
-SLOT="0" |
97 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
98 |
-IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb" |
99 |
- |
100 |
-COMMON_DEPEND_LIBS=" |
101 |
- >=dev-libs/libassuan-2 |
102 |
- >=dev-libs/libgcrypt-1.5:0= |
103 |
- >=dev-libs/libgpg-error-1.11 |
104 |
- >=dev-libs/libksba-1.0.7 |
105 |
- >=dev-libs/pth-1.3.7 |
106 |
- >=net-misc/curl-7.10 |
107 |
- sys-libs/zlib |
108 |
- bzip2? ( app-arch/bzip2 ) |
109 |
- readline? ( sys-libs/readline ) |
110 |
- smartcard? ( usb? ( virtual/libusb:0 ) ) |
111 |
- ldap? ( net-nds/openldap )" |
112 |
-COMMON_DEPEND_BINS="app-crypt/pinentry" |
113 |
- |
114 |
-# Existence of executables is checked during configuration. |
115 |
-DEPEND="${COMMON_DEPEND_LIBS} |
116 |
- ${COMMON_DEPEND_BINS} |
117 |
- static? ( |
118 |
- >=dev-libs/libassuan-2[static-libs] |
119 |
- >=dev-libs/libgcrypt-1.4:0=[static-libs] |
120 |
- >=dev-libs/libgpg-error-1.11[static-libs] |
121 |
- >=dev-libs/libksba-1.0.7[static-libs] |
122 |
- >=dev-libs/pth-1.3.7[static-libs] |
123 |
- >=net-misc/curl-7.10[static-libs] |
124 |
- sys-libs/zlib[static-libs] |
125 |
- bzip2? ( app-arch/bzip2[static-libs] ) |
126 |
- ) |
127 |
- nls? ( sys-devel/gettext ) |
128 |
- doc? ( sys-apps/texinfo )" |
129 |
- |
130 |
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} ) |
131 |
- ${COMMON_DEPEND_BINS} |
132 |
- mta? ( virtual/mta ) |
133 |
- !<=app-crypt/gnupg-2.0.1 |
134 |
- selinux? ( sec-policy/selinux-gpg ) |
135 |
- nls? ( virtual/libintl )" |
136 |
- |
137 |
-REQUIRED_USE="smartcard? ( !static )" |
138 |
- |
139 |
-src_prepare() { |
140 |
- epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch" |
141 |
- epatch_user |
142 |
-} |
143 |
- |
144 |
-src_configure() { |
145 |
- local myconf=() |
146 |
- |
147 |
- # 'USE=static' support was requested: |
148 |
- # gnupg1: bug #29299 |
149 |
- # gnupg2: bug #159623 |
150 |
- use static && append-ldflags -static |
151 |
- |
152 |
- if use smartcard; then |
153 |
- myconf+=( |
154 |
- --enable-scdaemon |
155 |
- $(use_enable usb ccid-driver) |
156 |
- ) |
157 |
- else |
158 |
- myconf+=( --disable-scdaemon ) |
159 |
- fi |
160 |
- |
161 |
- if use elibc_SunOS || use elibc_AIX; then |
162 |
- myconf+=( --disable-symcryptrun ) |
163 |
- else |
164 |
- myconf+=( --enable-symcryptrun ) |
165 |
- fi |
166 |
- |
167 |
- # glib fails and picks up clang's internal stdint.h causing weird errors |
168 |
- [[ ${CC} == *clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h |
169 |
- |
170 |
- econf \ |
171 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
172 |
- --enable-gpg \ |
173 |
- --enable-gpgsm \ |
174 |
- --enable-agent \ |
175 |
- --enable-large-secmem \ |
176 |
- --without-adns \ |
177 |
- "${myconf[@]}" \ |
178 |
- $(use_enable bzip2) \ |
179 |
- $(use_enable nls) \ |
180 |
- $(use_enable mta mailto) \ |
181 |
- $(use_enable ldap) \ |
182 |
- $(use_with readline) \ |
183 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" |
184 |
-} |
185 |
- |
186 |
-src_compile() { |
187 |
- default |
188 |
- |
189 |
- if use doc; then |
190 |
- cd doc |
191 |
- emake html |
192 |
- fi |
193 |
-} |
194 |
- |
195 |
-src_install() { |
196 |
- default |
197 |
- |
198 |
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \ |
199 |
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert} |
200 |
- |
201 |
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA |
202 |
- rm "${ED}"/usr/share/gnupg/help* || die |
203 |
- |
204 |
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \ |
205 |
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help* |
206 |
- |
207 |
- dosym gpg2 /usr/bin/gpg |
208 |
- dosym gpgv2 /usr/bin/gpgv |
209 |
- dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp |
210 |
- dosym gpg2keys_finger /usr/libexec/gpgkeys_finger |
211 |
- dosym gpg2keys_curl /usr/libexec/gpgkeys_curl |
212 |
- if use ldap; then |
213 |
- dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap |
214 |
- fi |
215 |
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 |
216 |
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 |
217 |
- |
218 |
- dodir /etc/env.d |
219 |
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg |
220 |
- |
221 |
- if use doc; then |
222 |
- dohtml doc/gnupg.html/* doc/*.png |
223 |
- fi |
224 |
-} |
225 |
- |
226 |
-pkg_postinst() { |
227 |
- elog "If you wish to view images emerge:" |
228 |
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer" |
229 |
- elog "Remember to use photo-viewer option in configuration file to activate" |
230 |
- elog "the right viewer." |
231 |
- elog |
232 |
- |
233 |
- if use smartcard; then |
234 |
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of" |
235 |
- use usb && elog " - a CCID-compatible reader, used directly through libusb;" |
236 |
- elog " - sys-apps/pcsc-lite and a compatible reader device;" |
237 |
- elog " - dev-libs/openct and a compatible reader device;" |
238 |
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces." |
239 |
- elog "" |
240 |
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and" |
241 |
- elog "app-crypt/ccid first." |
242 |
- fi |
243 |
- |
244 |
- ewarn "Please remember to restart gpg-agent if a different version" |
245 |
- ewarn "of the agent is currently used. If you are unsure of the gpg" |
246 |
- ewarn "agent you are using please run 'killall gpg-agent'," |
247 |
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'." |
248 |
-} |
249 |
|
250 |
diff --git a/app-crypt/gnupg/gnupg-2.0.30.ebuild b/app-crypt/gnupg/gnupg-2.0.30.ebuild |
251 |
deleted file mode 100644 |
252 |
index 267cac7..00000000 |
253 |
--- a/app-crypt/gnupg/gnupg-2.0.30.ebuild |
254 |
+++ /dev/null |
255 |
@@ -1,170 +0,0 @@ |
256 |
-# Copyright 1999-2016 Gentoo Foundation |
257 |
-# Distributed under the terms of the GNU General Public License v2 |
258 |
-# $Id$ |
259 |
- |
260 |
-EAPI="5" |
261 |
- |
262 |
-inherit eutils flag-o-matic toolchain-funcs |
263 |
- |
264 |
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement" |
265 |
-HOMEPAGE="http://www.gnupg.org/" |
266 |
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2" |
267 |
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2" |
268 |
- |
269 |
-LICENSE="GPL-3" |
270 |
-SLOT="0" |
271 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
272 |
-IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb" |
273 |
- |
274 |
-COMMON_DEPEND_LIBS=" |
275 |
- >=dev-libs/libassuan-2 |
276 |
- >=dev-libs/libgcrypt-1.5:0= |
277 |
- >=dev-libs/libgpg-error-1.19 |
278 |
- >=dev-libs/libksba-1.0.7 |
279 |
- >=dev-libs/pth-1.3.7 |
280 |
- >=net-misc/curl-7.10 |
281 |
- sys-libs/zlib |
282 |
- bzip2? ( app-arch/bzip2 ) |
283 |
- readline? ( sys-libs/readline:= ) |
284 |
- smartcard? ( usb? ( virtual/libusb:0 ) ) |
285 |
- ldap? ( net-nds/openldap )" |
286 |
-COMMON_DEPEND_BINS="app-crypt/pinentry" |
287 |
- |
288 |
-# Existence of executables is checked during configuration. |
289 |
-DEPEND="${COMMON_DEPEND_LIBS} |
290 |
- ${COMMON_DEPEND_BINS} |
291 |
- static? ( |
292 |
- >=dev-libs/libassuan-2[static-libs] |
293 |
- >=dev-libs/libgcrypt-1.4:0=[static-libs] |
294 |
- >=dev-libs/libgpg-error-1.11[static-libs] |
295 |
- >=dev-libs/libksba-1.0.7[static-libs] |
296 |
- >=dev-libs/pth-1.3.7[static-libs] |
297 |
- >=net-misc/curl-7.10[static-libs] |
298 |
- sys-libs/zlib[static-libs] |
299 |
- bzip2? ( app-arch/bzip2[static-libs] ) |
300 |
- ) |
301 |
- nls? ( sys-devel/gettext ) |
302 |
- doc? ( sys-apps/texinfo )" |
303 |
- |
304 |
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} ) |
305 |
- ${COMMON_DEPEND_BINS} |
306 |
- mta? ( virtual/mta ) |
307 |
- !<=app-crypt/gnupg-2.0.1 |
308 |
- selinux? ( sec-policy/selinux-gpg ) |
309 |
- nls? ( virtual/libintl )" |
310 |
- |
311 |
-REQUIRED_USE="smartcard? ( !static )" |
312 |
- |
313 |
-src_prepare() { |
314 |
- epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch" |
315 |
- epatch_user |
316 |
-} |
317 |
- |
318 |
-src_configure() { |
319 |
- local myconf=() |
320 |
- |
321 |
- # 'USE=static' support was requested: |
322 |
- # gnupg1: bug #29299 |
323 |
- # gnupg2: bug #159623 |
324 |
- use static && append-ldflags -static |
325 |
- |
326 |
- if use smartcard; then |
327 |
- myconf+=( |
328 |
- --enable-scdaemon |
329 |
- $(use_enable usb ccid-driver) |
330 |
- ) |
331 |
- else |
332 |
- myconf+=( --disable-scdaemon ) |
333 |
- fi |
334 |
- |
335 |
- if use elibc_SunOS || use elibc_AIX; then |
336 |
- myconf+=( --disable-symcryptrun ) |
337 |
- else |
338 |
- myconf+=( --enable-symcryptrun ) |
339 |
- fi |
340 |
- |
341 |
- # glib fails and picks up clang's internal stdint.h causing weird errors |
342 |
- [[ ${CC} == *clang ]] && \ |
343 |
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h |
344 |
- |
345 |
- econf \ |
346 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
347 |
- --enable-gpg \ |
348 |
- --enable-gpgsm \ |
349 |
- --enable-agent \ |
350 |
- --enable-large-secmem \ |
351 |
- --without-adns \ |
352 |
- "${myconf[@]}" \ |
353 |
- $(use_enable bzip2) \ |
354 |
- $(use_enable nls) \ |
355 |
- $(use_enable mta mailto) \ |
356 |
- $(use_enable ldap) \ |
357 |
- $(use_with readline) \ |
358 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" |
359 |
-} |
360 |
- |
361 |
-src_compile() { |
362 |
- default |
363 |
- |
364 |
- if use doc; then |
365 |
- cd doc |
366 |
- emake html |
367 |
- fi |
368 |
-} |
369 |
- |
370 |
-src_install() { |
371 |
- default |
372 |
- |
373 |
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \ |
374 |
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert} |
375 |
- |
376 |
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA |
377 |
- # The help*txt files are read from the datadir by GnuPG directly. |
378 |
- # They do not work if compressed or moved! |
379 |
- #rm "${ED}"/usr/share/gnupg/help* || die |
380 |
- |
381 |
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \ |
382 |
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help* |
383 |
- |
384 |
- dosym gpg2 /usr/bin/gpg |
385 |
- dosym gpgv2 /usr/bin/gpgv |
386 |
- dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp |
387 |
- dosym gpg2keys_finger /usr/libexec/gpgkeys_finger |
388 |
- dosym gpg2keys_curl /usr/libexec/gpgkeys_curl |
389 |
- if use ldap; then |
390 |
- dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap |
391 |
- fi |
392 |
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 |
393 |
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 |
394 |
- |
395 |
- dodir /etc/env.d |
396 |
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg |
397 |
- |
398 |
- if use doc; then |
399 |
- dohtml doc/gnupg.html/* doc/*.png |
400 |
- fi |
401 |
-} |
402 |
- |
403 |
-pkg_postinst() { |
404 |
- elog "If you wish to view images emerge:" |
405 |
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer" |
406 |
- elog "Remember to use photo-viewer option in configuration file to activate" |
407 |
- elog "the right viewer." |
408 |
- elog |
409 |
- |
410 |
- if use smartcard; then |
411 |
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of" |
412 |
- use usb && elog " - a CCID-compatible reader, used directly through libusb;" |
413 |
- elog " - sys-apps/pcsc-lite and a compatible reader device;" |
414 |
- elog " - dev-libs/openct and a compatible reader device;" |
415 |
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces." |
416 |
- elog "" |
417 |
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and" |
418 |
- elog "app-crypt/ccid first." |
419 |
- fi |
420 |
- |
421 |
- ewarn "Please remember to restart gpg-agent if a different version" |
422 |
- ewarn "of the agent is currently used. If you are unsure of the gpg" |
423 |
- ewarn "agent you are using please run 'killall gpg-agent'," |
424 |
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'." |
425 |
-} |
426 |
|
427 |
diff --git a/app-crypt/gnupg/gnupg-2.1.15.ebuild b/app-crypt/gnupg/gnupg-2.1.15.ebuild |
428 |
index 5fea708..8996799 100644 |
429 |
--- a/app-crypt/gnupg/gnupg-2.1.15.ebuild |
430 |
+++ b/app-crypt/gnupg/gnupg-2.1.15.ebuild |
431 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" |
432 |
|
433 |
LICENSE="GPL-3" |
434 |
SLOT="0" |
435 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86" |
436 |
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-fbsd ~x86-freebsd ~x86-macos" |
437 |
IUSE="bzip2 doc +gnutls ldap nls readline selinux smartcard tofu tools usb" |
438 |
|
439 |
COMMON_DEPEND_LIBS=" |
440 |
|
441 |
diff --git a/app-crypt/gnupg/gnupg-2.1.16.ebuild b/app-crypt/gnupg/gnupg-2.1.16.ebuild |
442 |
deleted file mode 100644 |
443 |
index 62dc0e9..00000000 |
444 |
--- a/app-crypt/gnupg/gnupg-2.1.16.ebuild |
445 |
+++ /dev/null |
446 |
@@ -1,128 +0,0 @@ |
447 |
-# Copyright 1999-2016 Gentoo Foundation |
448 |
-# Distributed under the terms of the GNU General Public License v2 |
449 |
-# $Id$ |
450 |
- |
451 |
-EAPI="5" |
452 |
- |
453 |
-inherit eutils flag-o-matic toolchain-funcs |
454 |
- |
455 |
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" |
456 |
-HOMEPAGE="http://www.gnupg.org/" |
457 |
-LICENSE="GPL-3" |
458 |
- |
459 |
-MY_P="${P/_/-}" |
460 |
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" |
461 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
462 |
- |
463 |
-SLOT="0" |
464 |
-IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" |
465 |
- |
466 |
-COMMON_DEPEND_LIBS=" |
467 |
- >=dev-libs/npth-1.2 |
468 |
- >=dev-libs/libassuan-2.4.3 |
469 |
- >=dev-libs/libgcrypt-1.7.3 |
470 |
- >=dev-libs/libgpg-error-1.24 |
471 |
- >=dev-libs/libksba-1.3.4 |
472 |
- >=net-misc/curl-7.10 |
473 |
- gnutls? ( >=net-libs/gnutls-3.0:0= ) |
474 |
- sys-libs/zlib |
475 |
- ldap? ( net-nds/openldap ) |
476 |
- bzip2? ( app-arch/bzip2 ) |
477 |
- readline? ( sys-libs/readline:0= ) |
478 |
- smartcard? ( usb? ( virtual/libusb:0 ) ) |
479 |
- tofu? ( >=dev-db/sqlite-3.7 ) |
480 |
- " |
481 |
-COMMON_DEPEND_BINS="app-crypt/pinentry |
482 |
- !app-crypt/dirmngr" |
483 |
- |
484 |
-# Existence of executables is checked during configuration. |
485 |
-DEPEND="${COMMON_DEPEND_LIBS} |
486 |
- ${COMMON_DEPEND_BINS} |
487 |
- nls? ( sys-devel/gettext ) |
488 |
- doc? ( sys-apps/texinfo )" |
489 |
- |
490 |
-RDEPEND="${COMMON_DEPEND_LIBS} |
491 |
- ${COMMON_DEPEND_BINS} |
492 |
- selinux? ( sec-policy/selinux-gpg ) |
493 |
- nls? ( virtual/libintl )" |
494 |
- |
495 |
-S="${WORKDIR}/${MY_P}" |
496 |
- |
497 |
-src_prepare() { |
498 |
- default |
499 |
- epatch "${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" |
500 |
- epatch_user |
501 |
-} |
502 |
- |
503 |
-src_configure() { |
504 |
- local myconf=() |
505 |
- |
506 |
- if use smartcard; then |
507 |
- myconf+=( |
508 |
- --enable-scdaemon |
509 |
- $(use_enable usb ccid-driver) |
510 |
- ) |
511 |
- else |
512 |
- myconf+=( --disable-scdaemon ) |
513 |
- fi |
514 |
- |
515 |
- if use elibc_SunOS || use elibc_AIX; then |
516 |
- myconf+=( --disable-symcryptrun ) |
517 |
- else |
518 |
- myconf+=( --enable-symcryptrun ) |
519 |
- fi |
520 |
- |
521 |
- # glib fails and picks up clang's internal stdint.h causing weird errors |
522 |
- [[ ${CC} == *clang ]] && \ |
523 |
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h |
524 |
- |
525 |
- econf \ |
526 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
527 |
- --enable-gpg \ |
528 |
- --enable-gpgsm \ |
529 |
- --enable-large-secmem \ |
530 |
- --without-adns \ |
531 |
- "${myconf[@]}" \ |
532 |
- $(use_enable bzip2) \ |
533 |
- $(use_enable gnutls) \ |
534 |
- $(use_with ldap) \ |
535 |
- $(use_enable nls) \ |
536 |
- $(use_with readline) \ |
537 |
- $(use_enable tofu) \ |
538 |
- --enable-tools \ |
539 |
- $(use_enable wks-server wks-tools) \ |
540 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" |
541 |
-} |
542 |
- |
543 |
-src_compile() { |
544 |
- default |
545 |
- |
546 |
- if use doc; then |
547 |
- cd doc |
548 |
- emake html |
549 |
- fi |
550 |
-} |
551 |
- |
552 |
-src_install() { |
553 |
- default |
554 |
- |
555 |
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \ |
556 |
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ |
557 |
- tools/make-dns-cert |
558 |
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA |
559 |
- |
560 |
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \ |
561 |
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help* |
562 |
- |
563 |
- dosym gpg2 /usr/bin/gpg |
564 |
- dosym gpgv2 /usr/bin/gpgv |
565 |
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 |
566 |
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 |
567 |
- |
568 |
- dodir /etc/env.d |
569 |
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg |
570 |
- |
571 |
- if use doc; then |
572 |
- dohtml doc/gnupg.html/* doc/*.png |
573 |
- fi |
574 |
-} |
575 |
|
576 |
diff --git a/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild |
577 |
index d682e32..164b876 100644 |
578 |
--- a/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild |
579 |
+++ b/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild |
580 |
@@ -12,7 +12,7 @@ LICENSE="GPL-3" |
581 |
|
582 |
MY_P="${P/_/-}" |
583 |
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" |
584 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
585 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-fbsd ~x86-freebsd ~x86-macos" |
586 |
|
587 |
SLOT="0" |
588 |
IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" |