Cleanup ebuild, add epatch_user, resolves bug#486882

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

3 files changed, 167 insertions, 9 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index e9358eaa3964..6c4650ab7d3d 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.486 2013/08/19 16:59:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.487 2013/10/03 19:20:06 alonbl Exp $
+
+*gnupg-2.0.21-r1 (03 Oct 2013)
+
+  03 Oct 2013; Alon Bar-Lev <alonbl@gentoo.org> +gnupg-2.0.21-r1.ebuild:
+  Cleanup ebuild, add epatch_user, resolves bug#486882
 
   19 Aug 2013; Tim Harder <radhermit@gentoo.org> -gnupg-1.4.13.ebuild,
   -gnupg-1.4.13-r1.ebuild, -gnupg-2.0.19.ebuild, -gnupg-2.0.19-r1.ebuild,
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 2429be8b3712..700f0cc20113 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -7,17 +7,14 @@ DIST gnupg-2.0.20.tar.bz2 4286191 SHA256 6e949b7f062cab8a3cf0910f91ecf04cabaad45
 DIST gnupg-2.0.21.tar.bz2 4300604 SHA256 00df8902c7cef4d2440d36ca2a45985853eb36c34a4163bc995c3578030eeef5 SHA512 e31b7d9143462e4846111cdbcf0af9ad93fb1f5b9324a1c126c060e4cefb09d3c6b2f85e655d3960b5f21f09317cefd2c5b786e129efb62feab20f4b9a6770ba WHIRLPOOL 911d0122d6aa8bc883b192b47a785c323a0a5fb015ecc6cf08cd19a3d8f03a80b320555c8ebb6804b0a9841fa2b17b633be4f23b458e1778a73a583e4ba608cc
 EBUILD gnupg-1.4.14.ebuild 3761 SHA256 4be020e6d1202f937d8b3a59d297bdded0f78a9c1c9e44518080d9fb7bf8605e SHA512 695afc4e15ec18dc29343a2fb551f587ba00f6c8bb1a0122e94556cd5a138cfbc4db5b6a30ebbbf3287f05f580a39ce554d022f1acc467117fc68e9d54531762 WHIRLPOOL ca6f2e8c8d9f1df1f6391e503a48fdb6134cc4da2a851da5d18573a20313909d2357c1cc794f3e92c13d173b2373e059ecd9d091b18b0f01184d15fa1370f105
 EBUILD gnupg-2.0.20.ebuild 4574 SHA256 184e6a23b57a5c86300f5bd76b0eeed3b568a5bc9a06ae43210e1afce4c59fa7 SHA512 2e9682726ba32d27bb99060302960e3e8855718eb7a7a979c13dae2d3fb88216369ba3af690cff013110577359d830732159d2048dd9a9782828f63a3b1cdf3f WHIRLPOOL f2a9a3d767259073f3b6ddf8c97f053de9d3f57a09e6642f014ea4d0eae52bb7730fe1a4eb3dafaf0be627aa8008532859bf0d50853ff9ea520eb77b1a798bbc
+EBUILD gnupg-2.0.21-r1.ebuild 4604 SHA256 cd2752796e930801b8c56ac69e576997d1449da5a946b5fbf1fde91f76631aa8 SHA512 917493457a820c588b52f73f6030d0d9454ad49f09418649b5cca65aaeb77194d90e5917a0ca2d4babad8cf63ef55ba8557ae4446c7bf9605aa68c5f38618447 WHIRLPOOL 7a443236a6895949a03b9329a9b5881e0829bde71c0e1610ed02f8688d26258e1e93fead20a5c592ff89f957e19dda4c4b035aad45d11b63443cef7e37eb40ab
 EBUILD gnupg-2.0.21.ebuild 4591 SHA256 3a68cb34b57916cefcff1652e6a9e92ec0926e1157a9b13869b935a62a71a695 SHA512 3089940b5e5d5e1311668f2eaa5a937f31aa9916df930b5debdc7b4764ff141423f92a539cb804495cccf22f174c1afc4a0f4c6b14812bb2cd84ab39c198ba2b WHIRLPOOL 942bb8e0edbef388bd3e0b6e4a325e1f8556bd37d5081cadf14aa483a9b06480ed34d32d20b59781d8697b8cbe88b3ac17f66c7b8580bc5e86fbe7ffd715f23b
-MISC ChangeLog 72204 SHA256 80a18a6152a51bbdaf7b71c6c64887f7fe27d03abc955af5bf4f6bfc4cd5d8bb SHA512 652d037ccda2a69cece89ff534ce4091dbb5c0e839cf0bd62700fd61b5af1e4268262efc8c6450d4fd653f117772fee73e788c8274b51564944c63bcd1a35a94 WHIRLPOOL 09e58ab4f2de0499e98ec07f2bb94cdde12672ab9dadc563abdcb6ecb14d32a523a7e01b5a8179d5f57d5cd3a39d9fe4d0d7f1bfcbeda66c8d473f3180b4df79
+MISC ChangeLog 72362 SHA256 6928394eb73b03a6b83dc4cbd1e72438edfba94ed92da45445df858b73cdf67e SHA512 b5c92ebfa322bb8adcbdcdfd611eb49c21f8ae77374c14fcbd85597fcf5dcf7d7f315033df7bc2b446e66e191bfec8e6ac6685f40c536b58a99f6126b1b7f9c5 WHIRLPOOL cee362fd01c060f621ca853d46d364887b89272468e840daa8dd0167dacdf3e1f1f7e13a5eb16bbc0ba5f162f6f98a04cb99e4ec2f1c894c6b45618ba5402e15
 MISC metadata.xml 1078 SHA256 6d0df2861d7b3fc7777f9c703b06f789a8e4e4d08a98b1f5f5cc661943a5b7e0 SHA512 2998315ea1dad11806385d84827189efb626620d6596bf51a67180567a5ed3cbcb5eea50de907477b93d876ce66fb7e944cce159fe29450a301cda9bdd76db87 WHIRLPOOL fc0761ee1950b067a4434192c22b3d516017b539694e3615f9429ad8b05ace449e8d9abf01086baf91eb93cb9ad4fe2c37467b0313ccaf0411a99be63a7440e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSEk7/AAoJEEqz6FtPBkyjImoIAKudMprhkCz32FRl2KttNOYk
-4Fp+2FYYkWVxJAcctQDskKsPo6AvEc9NlSIJNfGQU/ls/10IXG68st8kx0IOanqd
-+HKuVhY0yvR1n2FPz3wPhQkxrd93vYS0GKrpHqpnQfxVVX2EjLGi6gjd0Pd/bT34
-ZbRncIBmroTKpFiMFp1md20kJHCfcEvAqPr14CzLDFhljA7j6BCnLrPOLvN7B+Hl
-FcsSO19lMG0qaJUmAot9o+k42Mo/z4JLbWeiJtdmu/CwJyPBv36Q5iUOpMaII50X
-49W1MQD1ehmX2sjyEUqPxs0ZrGq0AMqUJMeSkbrY4z0IpeqoGMBN1hN5fNG2+Xo=
-=O3yA
+iF4EAREIAAYFAlJNw2oACgkQXYk9GL8g3FGxEwD/e4pyZal0kzZdY4n5DuZehqZ5
+Pn+BEjekstpK6wfFkpIA/2apFyAgdIwUnrIRg6SGrKH6g33a2ib4EBSM77BFCjHK
+=aY+c
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/gnupg-2.0.21-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.21-r1.ebuild
new file mode 100644
index 000000000000..d79ba58dd290
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.21-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.21-r1.ebuild,v 1.1 2013/10/03 19:20:06 alonbl Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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"
+IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/libassuan-2
+	>=dev-libs/libgcrypt-1.4
+	>=dev-libs/libgpg-error-1.11
+	>=dev-libs/libksba-1.0.7
+	>=dev-libs/pth-1.3.7
+	>=net-misc/curl-7.10
+	sys-libs/zlib
+	adns? ( >=net-libs/adns-1.4 )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	ldap? ( net-nds/openldap )"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	static? (
+		>=dev-libs/libassuan-2[static-libs]
+		>=dev-libs/libgcrypt-1.4[static-libs]
+		>=dev-libs/libgpg-error-1.7[static-libs]
+		>=dev-libs/libksba-1.0.7[static-libs]
+		>=dev-libs/pth-1.3.7[static-libs]
+		>=net-misc/curl-7.10[static-libs]
+		sys-libs/zlib[static-libs]
+		bzip2? ( app-arch/bzip2[static-libs] )
+	)
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+	${COMMON_DEPEND_BINS}
+	mta? ( virtual/mta )
+	!<=app-crypt/gnupg-2.0.1
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# 'USE=static' support was requested:
+	# gnupg1: bug #29299
+	# gnupg2: bug #159623
+	use static && append-ldflags -static
+
+	if use smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-agent \
+		"${myconf[@]}" \
+		$(use_with adns) \
+		$(use_enable bzip2) \
+		$(use_enable !elibc_SunOS symcryptrun) \
+		$(use_enable nls) \
+		$(use_enable mta mailto) \
+		$(use_enable ldap) \
+		$(use_with readline) \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd doc
+		emake html
+	fi
+}
+
+src_install() {
+	default
+
+	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+	rm "${ED}"/usr/share/gnupg/help* || die
+
+	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+	dosym gpg2 /usr/bin/gpg
+	dosym gpgv2 /usr/bin/gpgv
+	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
+	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
+	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
+	if use ldap; then
+		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
+	fi
+	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+	if use doc; then
+		dohtml doc/gnupg.html/* doc/*.png
+	fi
+}
+
+pkg_postinst() {
+	elog "If you wish to view images emerge:"
+	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+	elog "Remember to use photo-viewer option in configuration file to activate"
+	elog "the right viewer."
+	elog
+
+	if use smartcard; then
+		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+		elog " - sys-apps/pcsc-lite and a compatible reader device;"
+		elog " - dev-libs/openct and a compatible reader device;"
+		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+		elog ""
+		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+		elog "app-crypt/ccid first."
+	fi
+
+	ewarn "Please remember to restart gpg-agent if a different version"
+	ewarn "of the agent is currently used. If you are unsure of the gpg"
+	ewarn "agent you are using please run 'killall gpg-agent',"
+	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+}