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: Tue, 27 Sep 2016 16:57:55
Message-Id: 1474995463.b48b885f8ff9b4d3b8437d9779932a877efcf7a4.k_f@gentoo
1 commit: b48b885f8ff9b4d3b8437d9779932a877efcf7a4
2 Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 27 16:57:11 2016 +0000
4 Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 27 16:57:43 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b48b885f
7
8 app-crypt/gnupg: Cleanup old
9
10 Package-Manager: portage-2.3.0
11
12 app-crypt/gnupg/Manifest | 4 -
13 app-crypt/gnupg/gnupg-2.0.26-r3.ebuild | 168 ---------------------------------
14 app-crypt/gnupg/gnupg-2.1.12-r1.ebuild | 159 -------------------------------
15 app-crypt/gnupg/gnupg-2.1.13.ebuild | 158 -------------------------------
16 app-crypt/gnupg/gnupg-2.1.14-r1.ebuild | 158 -------------------------------
17 5 files changed, 647 deletions(-)
18
19 diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
20 index f23c020..9f7f424 100644
21 --- a/app-crypt/gnupg/Manifest
22 +++ b/app-crypt/gnupg/Manifest
23 @@ -1,11 +1,7 @@
24 DIST gnupg-1.4.19.tar.bz2 3713811 SHA256 7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86 SHA512 cce2a83efb05f963ad0f8afd04999cc852889d46b4cad4cf399a37fd6e69f0911a5ccaa0192cb891a941cfa93125349b481efa789a127e3c0aa2c5ba53672741 WHIRLPOOL 14eaddca0981f05757aa0751b9563837efd3f5943a422d5f29e0de94eb6233b85b8848a1f4816ab7e897d6e656c7c08705115d53ed89f554604ffd2009c3c39f
25 DIST gnupg-1.4.20.tar.bz2 3692881 SHA256 04988b1030fa28ddf961ca8ff6f0f8984e0cddcb1eb02859d5d8fe0fe237edcc SHA512 8a66d5a45dcf0508601452061eb1965c3c56c56f0e5ded00b7f54c6104de0a305c1d526abd37be2f55cd9bde79600d9cfaf60536af77ff733d778ace5fcd9dad WHIRLPOOL 26344b6ba0e5f0f11fa411f5af265c922b3b1d62ff030433eb8dc6fef00dbf2ec3370ecb081dd5c6cf85a4a37e7f12aacc83e07b803cc80adda29a11a4a3c715
26 DIST gnupg-1.4.21.tar.bz2 3689305 SHA256 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984 WHIRLPOOL eb596be347dd90be93d381fe405e50f5808160b546705493bc9d817d521ea236a2374648e6c2cab396f54bba74de4caf2b92e894df3a17aa339f014ef8cc8802
27 -DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
28 DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66
29 DIST gnupg-2.0.29.tar.bz2 4416251 SHA256 68ed6b386ba78425b05a60e8ee22785ff0fef190bdc6f1c612f19a58819d4ac9 SHA512 23b452c740ab5c1e1e37337ae0583dd3b15df58a5bb5639c0c2aef1fb603e0a7d90a257ac99b0d9dfb68b81fa061c0c64e0bfd256c00d64e2f432192f5052f37 WHIRLPOOL f3d59a9453b4a65c726788c35b065ffc9cde0b746705080cd3491c73439786d791da29cf8f5bf1e5594a0e39cfaec214e346fe18ec3acf0b425dc396aa189f33
30 DIST gnupg-2.0.30.tar.bz2 4414652 SHA256 e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71 SHA512 e60a57f7dc74b44f884fd50d5a9c51cef7df8c098644ebab9ef7d945a40b0e4a285d0dc80b10fe39d8e4c2cc9d6cbbe800a0ddae54883180dc755fe47ced3314 WHIRLPOOL 007315882becc1204edf6833a13610284ce7e1c73429fc3b4170c35ba61c645299f811f01b1bc0506b1cf94ce0de23af4cea33f51cf97397ec61caa15ce3ac6c
31 -DIST gnupg-2.1.12.tar.bz2 5510723 SHA256 ac34929d2400a58a349963865442ee6cdd75e500a8d5df083d29835e88bfc506 SHA512 fdf24d4980ba4011840fd2316a856db2bf50e531071c2bfb899af2b4f5580a9f2992f85a451670a7121d04b608bfb147cefdca1c6f6eb55bc23ecfe5052639e6 WHIRLPOOL ee5a748afee3aa4f8318c1bc1bcbd09232a71853291211f3c5cd8cc44fb70d126185ae9c13086247cd22a9b13c2102f4fa0553e25496c5152f2ce34dc2505d10
32 -DIST gnupg-2.1.13.tar.bz2 5545361 SHA256 4f9d83a6221daa60130fa79f0b1d37d6c20fffdd0320b640c7a597c5b6219675 SHA512 37b6271cdd68fc1d0ec848fa742932afbe8fc662597bcf20398585b51171e7abce40d99ab02f816160b34f7a8d1c60c6e43d8e0192ed107a521579b870b3ebd3 WHIRLPOOL 4b97e579bf988a2142bdb83420feef5e0549db0f0a17f2ee8b890e22cb54b38166459d25b05c7f9dcbb14dd5363bf08c24f377d09038884110e29dbbfeb9b73d
33 -DIST gnupg-2.1.14.tar.bz2 5706058 SHA256 9450dee9693b6a12bf0c374dae77b66c30f69ff8f35fc9266ab8dd76998eba42 SHA512 9f098bf589ecb841eb65fccad3ffd72c6645c8e186ddababf93c657173c485ed103f8f8a7d8bfeb86cfb9e065a1211c7d48b116c86d6aa97ed1b8c8a85e0a840 WHIRLPOOL 4a41fb68f14a53e6e1c26abb77ec66312167d61032720841f55102f2159938a1a0773c0610d9b5200a7fcf7a12c28913bccdf69e984b8f04b2dc56c72d4a8329
34 DIST gnupg-2.1.15.tar.bz2 5723689 SHA256 c28c1a208f1b8ad63bdb6b88d252f6734ff4d33de6b54e38494b11d49e00ffdd SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1 WHIRLPOOL 4c5a8cd4e8b7196f4a355ce7739cf6e23c43817414e10bbba219117e4e51c4c618ffb5dbce27cb836a2171eda58e003d5ddf78d4af09a813c2a1729963413151
35
36 diff --git a/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild b/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild
37 deleted file mode 100644
38 index 61372d9..00000000
39 --- a/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild
40 +++ /dev/null
41 @@ -1,168 +0,0 @@
42 -# Copyright 1999-2016 Gentoo Foundation
43 -# Distributed under the terms of the GNU General Public License v2
44 -# $Id$
45 -
46 -EAPI="5"
47 -
48 -inherit eutils flag-o-matic toolchain-funcs
49 -
50 -DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
51 -HOMEPAGE="http://www.gnupg.org/"
52 -SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
53 -# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
54 -
55 -LICENSE="GPL-3"
56 -SLOT="0"
57 -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"
58 -IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
59 -
60 -COMMON_DEPEND_LIBS="
61 - >=dev-libs/libassuan-2
62 - >=dev-libs/libgcrypt-1.4:0=
63 - >=dev-libs/libgpg-error-1.11
64 - >=dev-libs/libksba-1.0.7
65 - >=dev-libs/pth-1.3.7
66 - >=net-misc/curl-7.10
67 - sys-libs/zlib
68 - bzip2? ( app-arch/bzip2 )
69 - readline? ( sys-libs/readline )
70 - smartcard? ( usb? ( virtual/libusb:0 ) )
71 - ldap? ( net-nds/openldap )"
72 -COMMON_DEPEND_BINS="app-crypt/pinentry"
73 -
74 -# Existence of executables is checked during configuration.
75 -DEPEND="${COMMON_DEPEND_LIBS}
76 - ${COMMON_DEPEND_BINS}
77 - static? (
78 - >=dev-libs/libassuan-2[static-libs]
79 - >=dev-libs/libgcrypt-1.4:0=[static-libs]
80 - >=dev-libs/libgpg-error-1.11[static-libs]
81 - >=dev-libs/libksba-1.0.7[static-libs]
82 - >=dev-libs/pth-1.3.7[static-libs]
83 - >=net-misc/curl-7.10[static-libs]
84 - sys-libs/zlib[static-libs]
85 - bzip2? ( app-arch/bzip2[static-libs] )
86 - )
87 - nls? ( sys-devel/gettext )
88 - doc? ( sys-apps/texinfo )"
89 -
90 -RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
91 - ${COMMON_DEPEND_BINS}
92 - mta? ( virtual/mta )
93 - !<=app-crypt/gnupg-2.0.1
94 - selinux? ( sec-policy/selinux-gpg )
95 - nls? ( virtual/libintl )"
96 -
97 -REQUIRED_USE="smartcard? ( !static )"
98 -
99 -src_prepare() {
100 - epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
101 - epatch "${FILESDIR}/${P}-Need-to-init-the-trustdb-for-import.patch"
102 - epatch "${FILESDIR}/${P}-misc-cve.patch"
103 - epatch_user
104 -}
105 -
106 -src_configure() {
107 - local myconf=()
108 -
109 - # 'USE=static' support was requested:
110 - # gnupg1: bug #29299
111 - # gnupg2: bug #159623
112 - use static && append-ldflags -static
113 -
114 - if use smartcard; then
115 - myconf+=(
116 - --enable-scdaemon
117 - $(use_enable usb ccid-driver)
118 - )
119 - else
120 - myconf+=( --disable-scdaemon )
121 - fi
122 -
123 - if use elibc_SunOS || use elibc_AIX; then
124 - myconf+=( --disable-symcryptrun )
125 - else
126 - myconf+=( --enable-symcryptrun )
127 - fi
128 -
129 - # glib fails and picks up clang's internal stdint.h causing weird errors
130 - [[ ${CC} == *clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
131 -
132 - econf \
133 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
134 - --enable-gpg \
135 - --enable-gpgsm \
136 - --enable-agent \
137 - --without-adns \
138 - "${myconf[@]}" \
139 - $(use_enable bzip2) \
140 - $(use_enable nls) \
141 - $(use_enable mta mailto) \
142 - $(use_enable ldap) \
143 - $(use_with readline) \
144 - CC_FOR_BUILD="$(tc-getBUILD_CC)"
145 -}
146 -
147 -src_compile() {
148 - default
149 -
150 - if use doc; then
151 - cd doc
152 - emake html
153 - fi
154 -}
155 -
156 -src_install() {
157 - default
158 -
159 - use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
160 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
161 -
162 - emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
163 - rm "${ED}"/usr/share/gnupg/help* || die
164 -
165 - dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
166 - doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
167 -
168 - dosym gpg2 /usr/bin/gpg
169 - dosym gpgv2 /usr/bin/gpgv
170 - dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
171 - dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
172 - dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
173 - if use ldap; then
174 - dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
175 - fi
176 - echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
177 - echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
178 -
179 - dodir /etc/env.d
180 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
181 -
182 - if use doc; then
183 - dohtml doc/gnupg.html/* doc/*.png
184 - fi
185 -}
186 -
187 -pkg_postinst() {
188 - elog "If you wish to view images emerge:"
189 - elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
190 - elog "Remember to use photo-viewer option in configuration file to activate"
191 - elog "the right viewer."
192 - elog
193 -
194 - if use smartcard; then
195 - elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
196 - use usb && elog " - a CCID-compatible reader, used directly through libusb;"
197 - elog " - sys-apps/pcsc-lite and a compatible reader device;"
198 - elog " - dev-libs/openct and a compatible reader device;"
199 - elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
200 - elog ""
201 - elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
202 - elog "app-crypt/ccid first."
203 - fi
204 -
205 - ewarn "Please remember to restart gpg-agent if a different version"
206 - ewarn "of the agent is currently used. If you are unsure of the gpg"
207 - ewarn "agent you are using please run 'killall gpg-agent',"
208 - ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
209 -}
210
211 diff --git a/app-crypt/gnupg/gnupg-2.1.12-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.12-r1.ebuild
212 deleted file mode 100644
213 index b711914..00000000
214 --- a/app-crypt/gnupg/gnupg-2.1.12-r1.ebuild
215 +++ /dev/null
216 @@ -1,159 +0,0 @@
217 -# Copyright 1999-2016 Gentoo Foundation
218 -# Distributed under the terms of the GNU General Public License v2
219 -# $Id$
220 -
221 -EAPI="5"
222 -
223 -inherit eutils flag-o-matic toolchain-funcs
224 -
225 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
226 -HOMEPAGE="http://www.gnupg.org/"
227 -MY_P="${P/_/-}"
228 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
229 -
230 -LICENSE="GPL-3"
231 -SLOT="0"
232 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
233 -IUSE="bzip2 doc +gnutls ldap nls readline selinux smartcard tofu tools usb"
234 -
235 -COMMON_DEPEND_LIBS="
236 - dev-libs/npth
237 - >=dev-libs/libassuan-2.4.1
238 - >=dev-libs/libgcrypt-1.7.1
239 - >=dev-libs/libgpg-error-1.21
240 - >=dev-libs/libksba-1.2.0
241 - >=net-misc/curl-7.10
242 - gnutls? ( >=net-libs/gnutls-3.0:0= )
243 - sys-libs/zlib
244 - ldap? ( net-nds/openldap )
245 - bzip2? ( app-arch/bzip2 )
246 - readline? ( sys-libs/readline:0= )
247 - smartcard? ( usb? ( virtual/libusb:0 ) )
248 - tofu? ( >=dev-db/sqlite-3.7 )
249 - "
250 -COMMON_DEPEND_BINS="app-crypt/pinentry
251 - !app-crypt/dirmngr"
252 -
253 -# Existence of executables is checked during configuration.
254 -DEPEND="${COMMON_DEPEND_LIBS}
255 - ${COMMON_DEPEND_BINS}
256 - nls? ( sys-devel/gettext )
257 - doc? ( sys-apps/texinfo )"
258 -
259 -RDEPEND="${COMMON_DEPEND_LIBS}
260 - ${COMMON_DEPEND_BINS}
261 - selinux? ( sec-policy/selinux-gpg )
262 - nls? ( virtual/libintl )"
263 -
264 -S="${WORKDIR}/${MY_P}"
265 -
266 -src_prepare() {
267 - epatch "${FILESDIR}/${P}-fix-signature-checking.patch" \
268 - "${FILESDIR}/${PN}-2.1-fix-gentoo-dash-issue.patch"
269 - epatch_user
270 -}
271 -
272 -src_configure() {
273 - local myconf=()
274 -
275 - if use smartcard; then
276 - myconf+=(
277 - --enable-scdaemon
278 - $(use_enable usb ccid-driver)
279 - )
280 - else
281 - myconf+=( --disable-scdaemon )
282 - fi
283 -
284 - if use elibc_SunOS || use elibc_AIX; then
285 - myconf+=( --disable-symcryptrun )
286 - else
287 - myconf+=( --enable-symcryptrun )
288 - fi
289 -
290 - # glib fails and picks up clang's internal stdint.h causing weird errors
291 - [[ ${CC} == *clang ]] && \
292 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
293 -
294 - econf \
295 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
296 - --enable-gpg \
297 - --enable-gpgsm \
298 - --enable-large-secmem \
299 - --without-adns \
300 - "${myconf[@]}" \
301 - $(use_enable bzip2) \
302 - $(use_enable gnutls) \
303 - $(use_with ldap) \
304 - $(use_enable nls) \
305 - $(use_with readline) \
306 - $(use_enable tofu) \
307 - CC_FOR_BUILD="$(tc-getBUILD_CC)"
308 -}
309 -
310 -src_compile() {
311 - default
312 -
313 - if use doc; then
314 - cd doc
315 - emake html
316 - fi
317 -}
318 -
319 -src_install() {
320 - default
321 -
322 - use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
323 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
324 -
325 - emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
326 - # The help*txt files are read from the datadir by GnuPG directly.
327 - # They do not work if compressed or moved!
328 - #rm "${ED}"/usr/share/gnupg/help* || die
329 -
330 - dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
331 - doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
332 -
333 - dosym gpg2 /usr/bin/gpg
334 - dosym gpgv2 /usr/bin/gpgv
335 - echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
336 - echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
337 -
338 - dodir /etc/env.d
339 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
340 -
341 - if use doc; then
342 - dohtml doc/gnupg.html/* doc/*.png
343 - fi
344 -}
345 -
346 -pkg_postinst() {
347 - elog "If you wish to view images emerge:"
348 - elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
349 - elog "Remember to use photo-viewer option in configuration file to activate"
350 - elog "the right viewer."
351 - elog
352 -
353 - if use smartcard; then
354 - elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
355 - use usb && elog " - a CCID-compatible reader, used directly through libusb;"
356 - elog " - sys-apps/pcsc-lite and a compatible reader device;"
357 - elog " - dev-libs/openct and a compatible reader device;"
358 - elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
359 - elog ""
360 - elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
361 - elog "app-crypt/ccid first."
362 - fi
363 -
364 - ewarn "Please remember to restart gpg-agent if a different version"
365 - ewarn "of the agent is currently used. If you are unsure of the gpg"
366 - ewarn "agent you are using please run 'killall gpg-agent',"
367 - ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
368 -
369 - if [[ -n ${REPLACING_VERSIONS} ]]; then
370 - elog "If upgrading from a version prior than 2.1 you might have to re-import"
371 - elog "secret keys after restarting the gpg-agent as the new version is using"
372 - elog "a new storage mechanism."
373 - elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
374 - fi
375 -}
376
377 diff --git a/app-crypt/gnupg/gnupg-2.1.13.ebuild b/app-crypt/gnupg/gnupg-2.1.13.ebuild
378 deleted file mode 100644
379 index d136944..00000000
380 --- a/app-crypt/gnupg/gnupg-2.1.13.ebuild
381 +++ /dev/null
382 @@ -1,158 +0,0 @@
383 -# Copyright 1999-2016 Gentoo Foundation
384 -# Distributed under the terms of the GNU General Public License v2
385 -# $Id$
386 -
387 -EAPI="5"
388 -
389 -inherit eutils flag-o-matic toolchain-funcs
390 -
391 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
392 -HOMEPAGE="http://www.gnupg.org/"
393 -MY_P="${P/_/-}"
394 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
395 -
396 -LICENSE="GPL-3"
397 -SLOT="0"
398 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
399 -IUSE="bzip2 doc +gnutls ldap nls readline selinux smartcard tofu tools usb"
400 -
401 -COMMON_DEPEND_LIBS="
402 - dev-libs/npth
403 - >=dev-libs/libassuan-2.4.1
404 - >=dev-libs/libgcrypt-1.7.1
405 - >=dev-libs/libgpg-error-1.21
406 - >=dev-libs/libksba-1.2.0
407 - >=net-misc/curl-7.10
408 - gnutls? ( >=net-libs/gnutls-3.0:0= )
409 - sys-libs/zlib
410 - ldap? ( net-nds/openldap )
411 - bzip2? ( app-arch/bzip2 )
412 - readline? ( sys-libs/readline:0= )
413 - smartcard? ( usb? ( virtual/libusb:0 ) )
414 - tofu? ( >=dev-db/sqlite-3.7 )
415 - "
416 -COMMON_DEPEND_BINS="app-crypt/pinentry
417 - !app-crypt/dirmngr"
418 -
419 -# Existence of executables is checked during configuration.
420 -DEPEND="${COMMON_DEPEND_LIBS}
421 - ${COMMON_DEPEND_BINS}
422 - nls? ( sys-devel/gettext )
423 - doc? ( sys-apps/texinfo )"
424 -
425 -RDEPEND="${COMMON_DEPEND_LIBS}
426 - ${COMMON_DEPEND_BINS}
427 - selinux? ( sec-policy/selinux-gpg )
428 - nls? ( virtual/libintl )"
429 -
430 -S="${WORKDIR}/${MY_P}"
431 -
432 -src_prepare() {
433 - epatch "${FILESDIR}/${PN}-2.1-fix-gentoo-dash-issue.patch"
434 - epatch_user
435 -}
436 -
437 -src_configure() {
438 - local myconf=()
439 -
440 - if use smartcard; then
441 - myconf+=(
442 - --enable-scdaemon
443 - $(use_enable usb ccid-driver)
444 - )
445 - else
446 - myconf+=( --disable-scdaemon )
447 - fi
448 -
449 - if use elibc_SunOS || use elibc_AIX; then
450 - myconf+=( --disable-symcryptrun )
451 - else
452 - myconf+=( --enable-symcryptrun )
453 - fi
454 -
455 - # glib fails and picks up clang's internal stdint.h causing weird errors
456 - [[ ${CC} == *clang ]] && \
457 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
458 -
459 - econf \
460 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
461 - --enable-gpg \
462 - --enable-gpgsm \
463 - --enable-large-secmem \
464 - --without-adns \
465 - "${myconf[@]}" \
466 - $(use_enable bzip2) \
467 - $(use_enable gnutls) \
468 - $(use_with ldap) \
469 - $(use_enable nls) \
470 - $(use_with readline) \
471 - $(use_enable tofu) \
472 - CC_FOR_BUILD="$(tc-getBUILD_CC)"
473 -}
474 -
475 -src_compile() {
476 - default
477 -
478 - if use doc; then
479 - cd doc
480 - emake html
481 - fi
482 -}
483 -
484 -src_install() {
485 - default
486 -
487 - use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
488 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
489 -
490 - emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
491 - # The help*txt files are read from the datadir by GnuPG directly.
492 - # They do not work if compressed or moved!
493 - #rm "${ED}"/usr/share/gnupg/help* || die
494 -
495 - dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
496 - doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
497 -
498 - dosym gpg2 /usr/bin/gpg
499 - dosym gpgv2 /usr/bin/gpgv
500 - echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
501 - echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
502 -
503 - dodir /etc/env.d
504 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
505 -
506 - if use doc; then
507 - dohtml doc/gnupg.html/* doc/*.png
508 - fi
509 -}
510 -
511 -pkg_postinst() {
512 - elog "If you wish to view images emerge:"
513 - elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
514 - elog "Remember to use photo-viewer option in configuration file to activate"
515 - elog "the right viewer."
516 - elog
517 -
518 - if use smartcard; then
519 - elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
520 - use usb && elog " - a CCID-compatible reader, used directly through libusb;"
521 - elog " - sys-apps/pcsc-lite and a compatible reader device;"
522 - elog " - dev-libs/openct and a compatible reader device;"
523 - elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
524 - elog ""
525 - elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
526 - elog "app-crypt/ccid first."
527 - fi
528 -
529 - ewarn "Please remember to restart gpg-agent if a different version"
530 - ewarn "of the agent is currently used. If you are unsure of the gpg"
531 - ewarn "agent you are using please run 'killall gpg-agent',"
532 - ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
533 -
534 - if [[ -n ${REPLACING_VERSIONS} ]]; then
535 - elog "If upgrading from a version prior than 2.1 you might have to re-import"
536 - elog "secret keys after restarting the gpg-agent as the new version is using"
537 - elog "a new storage mechanism."
538 - elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
539 - fi
540 -}
541
542 diff --git a/app-crypt/gnupg/gnupg-2.1.14-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.14-r1.ebuild
543 deleted file mode 100644
544 index 717db2e..00000000
545 --- a/app-crypt/gnupg/gnupg-2.1.14-r1.ebuild
546 +++ /dev/null
547 @@ -1,158 +0,0 @@
548 -# Copyright 1999-2016 Gentoo Foundation
549 -# Distributed under the terms of the GNU General Public License v2
550 -# $Id$
551 -
552 -EAPI="5"
553 -
554 -inherit eutils flag-o-matic toolchain-funcs
555 -
556 -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
557 -HOMEPAGE="http://www.gnupg.org/"
558 -MY_P="${P/_/-}"
559 -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
560 -
561 -LICENSE="GPL-3"
562 -SLOT="0"
563 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
564 -IUSE="bzip2 doc +gnutls ldap nls readline selinux smartcard tofu tools usb"
565 -
566 -COMMON_DEPEND_LIBS="
567 - >=dev-libs/npth-1.2
568 - >=dev-libs/libassuan-2.4.3
569 - >=dev-libs/libgcrypt-1.7.1
570 - >=dev-libs/libgpg-error-1.24
571 - >=dev-libs/libksba-1.3.4
572 - >=net-misc/curl-7.10
573 - gnutls? ( >=net-libs/gnutls-3.0:0= )
574 - sys-libs/zlib
575 - ldap? ( net-nds/openldap )
576 - bzip2? ( app-arch/bzip2 )
577 - readline? ( sys-libs/readline:0= )
578 - smartcard? ( usb? ( virtual/libusb:0 ) )
579 - tofu? ( >=dev-db/sqlite-3.7 )
580 - "
581 -COMMON_DEPEND_BINS="app-crypt/pinentry
582 - !app-crypt/dirmngr"
583 -
584 -# Existence of executables is checked during configuration.
585 -DEPEND="${COMMON_DEPEND_LIBS}
586 - ${COMMON_DEPEND_BINS}
587 - nls? ( sys-devel/gettext )
588 - doc? ( sys-apps/texinfo )"
589 -
590 -RDEPEND="${COMMON_DEPEND_LIBS}
591 - ${COMMON_DEPEND_BINS}
592 - selinux? ( sec-policy/selinux-gpg )
593 - nls? ( virtual/libintl )"
594 -
595 -S="${WORKDIR}/${MY_P}"
596 -
597 -src_prepare() {
598 - epatch_user
599 -}
600 -
601 -src_configure() {
602 - local myconf=()
603 -
604 - if use smartcard; then
605 - myconf+=(
606 - --enable-scdaemon
607 - $(use_enable usb ccid-driver)
608 - )
609 - else
610 - myconf+=( --disable-scdaemon )
611 - fi
612 -
613 - if use elibc_SunOS || use elibc_AIX; then
614 - myconf+=( --disable-symcryptrun )
615 - else
616 - myconf+=( --enable-symcryptrun )
617 - fi
618 -
619 - # glib fails and picks up clang's internal stdint.h causing weird errors
620 - [[ ${CC} == *clang ]] && \
621 - export gl_cv_absolute_stdint_h=/usr/include/stdint.h
622 -
623 - econf \
624 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
625 - --enable-gpg \
626 - --enable-gpgsm \
627 - --enable-large-secmem \
628 - --without-adns \
629 - "${myconf[@]}" \
630 - $(use_enable bzip2) \
631 - $(use_enable gnutls) \
632 - $(use_with ldap) \
633 - $(use_enable nls) \
634 - $(use_with readline) \
635 - $(use_enable tofu) \
636 - $(use_enable tools wks-tools) \
637 - CC_FOR_BUILD="$(tc-getBUILD_CC)"
638 -}
639 -
640 -src_compile() {
641 - default
642 -
643 - if use doc; then
644 - cd doc
645 - emake html
646 - fi
647 -}
648 -
649 -src_install() {
650 - default
651 -
652 - use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
653 - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
654 -
655 - emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
656 - # The help*txt files are read from the datadir by GnuPG directly.
657 - # They do not work if compressed or moved!
658 - #rm "${ED}"/usr/share/gnupg/help* || die
659 -
660 - dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
661 - doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
662 -
663 - dosym gpg2 /usr/bin/gpg
664 - dosym gpgv2 /usr/bin/gpgv
665 - echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
666 - echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
667 -
668 - dodir /etc/env.d
669 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
670 -
671 - if use doc; then
672 - dohtml doc/gnupg.html/* doc/*.png
673 - fi
674 -}
675 -
676 -pkg_postinst() {
677 - elog "If you wish to view images emerge:"
678 - elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
679 - elog "Remember to use photo-viewer option in configuration file to activate"
680 - elog "the right viewer."
681 - elog
682 -
683 - if use smartcard; then
684 - elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
685 - use usb && elog " - a CCID-compatible reader, used directly through libusb;"
686 - elog " - sys-apps/pcsc-lite and a compatible reader device;"
687 - elog " - dev-libs/openct and a compatible reader device;"
688 - elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
689 - elog ""
690 - elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
691 - elog "app-crypt/ccid first."
692 - fi
693 -
694 - ewarn "Please remember to restart gpg-agent if a different version"
695 - ewarn "of the agent is currently used. If you are unsure of the gpg"
696 - ewarn "agent you are using please run 'killall gpg-agent',"
697 - ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
698 -
699 - if [[ -n ${REPLACING_VERSIONS} ]]; then
700 - elog "If upgrading from a version prior than 2.1 you might have to re-import"
701 - elog "secret keys after restarting the gpg-agent as the new version is using"
702 - elog "a new storage mechanism."
703 - elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
704 - fi
705 -}