Version bump.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 167 insertions, 5 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 510b4a7894c3..82faec6ec341 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.461 2013/05/13 19:29:38 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.462 2013/05/15 06:18:47 radhermit Exp $
+
+*gnupg-2.0.20 (15 May 2013)
+
+  15 May 2013; Tim Harder <radhermit@gentoo.org> +gnupg-2.0.20.ebuild:
+  Version bump.
 
   13 May 2013; Alon Bar-Lev <alonbl@gentoo.org> gnupg-1.4.13-r1.ebuild:
   Fix tests accessing wrong homedir, bug#469388
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 79a872340b8f..e8dc6addfa31 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -6,17 +6,23 @@ AUX gnupg-2.0.19-support-sc-key-3072.patch 5734 SHA256 1002f8a3cb4128195c6b7ee00
 AUX gnupg-2.0.19-texinfo-5.patch 1526 SHA256 7b8a2070a0cfa1cf8925620fdc12fc8fe5e77c262dfb8dc3e62b6c56b44ad87d SHA512 96a38fd95020a62abdfc18c391ef1dbc5da0e44f3c5e1fe4a3937d322e1ea34fd77efee72fa465c99fb7732e05225de1752b3a79c3255765762888b5d191bb74 WHIRLPOOL 6529d9be436ba42e4465412f73eea57d5932fc214a8297a88ea54f4dc75883427de2c4600e697d093831845eb8dd13115efcf175544914d3fa99b991bd7eabbe
 DIST gnupg-1.4.13.tar.bz2 3685873 SHA256 72a24dd318472f0c8f0d00ebe19fb4bcf43e30845bcc92a8ae43c810df295d5a SHA512 62c330e02c311206c653cbadf21783599362601f4375ecb32a5bc8ff3f5c64160d95d28555fe06d7fb612c3802c87e0be1d0a68d61b404fdfcecf3580f14b738 WHIRLPOOL 4ae940bda2cc713a387541101df3ff06753c4f701d5d53460af7118278ce5d9b8cd83dd15ea033de5ac15ec6f4a0e339621a359497f4c178c25bbdcc38763d12
 DIST gnupg-2.0.19.tar.bz2 4187460 SHA256 efa23a8a925adb51c7d3b708c25b6d000300f5ce37de9bdec6453be7b419c622 SHA512 9bfc83ebca29ca8e3dde803ba494adb3c4e2fdcacbf33b5592764fe187dbe2433e04ff53734a9c3197358d559c1046098707089ddbea9fa63c849d48ce73ca51 WHIRLPOOL 026f9a8740322b951b256ec87fabb8a1b3ad2114208f52c2082b73b2193d1be8e276f0f526762bbebb04e612351162eb78c9c50eeb058e35fad9c4df1d7db540
+DIST gnupg-2.0.20.tar.bz2 4286191 SHA256 6e949b7f062cab8a3cf0910f91ecf04cabaad458c0aeeec66298651b8b04b79a SHA512 f4eec0ed3503f2aeecfa63af53b844b19ee4be596ea487dce69ec14189c8163652c932d0e657be147b1ca3d7dc8adf9cc1bc8067086fe0c51a3487d56df388c4 WHIRLPOOL a088aab347be7d2c83078eadc79387e705d048868800c8335574f0b0f7c7cd21d8dd620783f83c908075841144b6f8577db8838c99459edd2309fec836761f0d
 EBUILD gnupg-1.4.13-r1.ebuild 3798 SHA256 6883c1614da054e9378dcce892befc85cefc6663f9e015d4002242a261caa3b7 SHA512 a482f8bcaf935a1a041394791fd5244fee2acfe3f6dc14de23b1ba46cb4330ad392aba2fa66bf6d31551aef1b65356bc3ef3cd151b0c497797ad592d2ea51a53 WHIRLPOOL 3eeab2cfcb379daaa7b7e6921ccc84c83f02db9bc5e094ee8cf302988c53fcefb94a57c7bc479df916450afbaa9a940f838daa652413d74309032516a4fadd78
 EBUILD gnupg-1.4.13.ebuild 4239 SHA256 926ecef683acf166bfc7ba9b7b232fb8b19b3e25b9a8cbabb1dd7d5ea7562f4b SHA512 f3c26c737a346bb352df018a9c3fbc645ee40a259ace2cb4d9429124a5d9e77b2d9e45810a7f1f16920b414c2d42b3da5cd88ba1d17e4bf4222d4507d9330dcc WHIRLPOOL 2b3fecbfb80daf95771f3c23dd8d9ea71229da28417bd0b6a6491b91675999aeb0a9bbdf658fa80279b5e343d74c30bbecd8002dbe4d42b39df00691d2dbd6ef
 EBUILD gnupg-2.0.19-r1.ebuild 4582 SHA256 44cfdd22b5a2697cfc8d91cd4a6dc5ba64dcfaf506b20b0560ccb58ce61f9a78 SHA512 bbe29c08c6ec1fc27d6ed87736eb4ffdc85802a5a4a5f976e7c2a8b953bb68e056dba3e9b16531f465dbd738922aeb48313db39d4f971b46f3d1335b93945574 WHIRLPOOL cda6bf962f7fdbe6af6af618b931d388b9e91cb015471b772ad78a0948e1c822e6ad9efc17af3d6587d28e562dcb1c9b6f9e2c6b140889b6595bbacb67332045
 EBUILD gnupg-2.0.19-r2.ebuild 4683 SHA256 af9e319c56147412b94e33e84dd3c2d3cfca3ddfd01716b5bdbf1d3644b49b91 SHA512 c45bce3095e84c8dcd71626c8d3b9f83c97ffb9d4073101e33a3959551a8d2b97e64bdbe952c877c0b33d67132d625441efdae2ee57b89a2fe62f8e6b7bae40c WHIRLPOOL 7d56104338e404f50f5fd8161febf2b9ed5638e5256e4d1567921c4982675ab472f09520e9ef92d90d9b3bdebd21e352b32cc43d0aa9d61b73772946ca169b5e
 EBUILD gnupg-2.0.19.ebuild 4472 SHA256 5a5159050703c2cc0831b6b6a7a42e6d1d9a92b3443e5039290fed2b7cfbc5b6 SHA512 48310f5582cf4a95cd20828a7e313bf7bca79e4edbef44ec4f95d048f1f9d7c932f469dc239827f38a3fd6a4b0c5c7624d3f338d8735525a877d623aeb5b0105 WHIRLPOOL 59a01c348c91268690cbc28706d635f511fef2faa2158446a915736652421abb123bf45c9598412b21c8d7b11b5635b55301ec5f44fedce0476eaab7d7e7fd8c
-MISC ChangeLog 69346 SHA256 f869e057087ac8d31e3695ee75230f32b0e1cc82603faa435e85d61f3084282e SHA512 964c5f8635618d44705944ae20a7bd1881f7e5253f9106cbcfc6aeaa1d4492f2a2ba2ed08ad16e4f05dee553271e18cd38788f52acafe061fbace06407cae940 WHIRLPOOL f2fbe0e31729b7c3b255fa4688cfb1ad29073d2288fba29238faaca82e175c3578b81f41088db29a43cad6f8d2140c3c01081bd3cb8ef30e5f08a1b3b51ccf5d
+EBUILD gnupg-2.0.20.ebuild 4590 SHA256 7ac7492d8104cb9d32d60a3d22ef954c3daf7774e16aefa6b01f98759b47e64a SHA512 c7c771d35e75283e3128bbdf25e7b62face010c1dc066cbd71c09e5c9b40edcba492b030ee811affd29b0032bc164b61f7610cbad40db2a9156a944e1845ad28 WHIRLPOOL 998c4d0496f1c9723961670d068a7e0a521aade5e591e91cef9de0ac79852a6fef9328e55fbb8a2e787595083acff577d9b75e4e7c102e12450f38bab6c76ca1
+MISC ChangeLog 69466 SHA256 69d013081a48caa4c7f659d6a6f8ce14c775db4521c7ee47cec8a606e5b9db4f SHA512 4f7dd9c5ab1b186400b5691c35716278cb0e2f7115911cdbd1f5a97403833e9b312265388b7159f6a73f535e168670068ba3b194649a9f4e3c0cc4f4904cc2dd WHIRLPOOL 8b1e759e179d030ea0f944f03b480aceab3d168bd6a35d675db22c84eb4fc40ad0707031c07fff9dfe9111ed1eb6f9e6ff24509a6cedb845cf167ead94b507bf
 MISC metadata.xml 1078 SHA256 6d0df2861d7b3fc7777f9c703b06f789a8e4e4d08a98b1f5f5cc661943a5b7e0 SHA512 2998315ea1dad11806385d84827189efb626620d6596bf51a67180567a5ed3cbcb5eea50de907477b93d876ce66fb7e944cce159fe29450a301cda9bdd76db87 WHIRLPOOL fc0761ee1950b067a4434192c22b3d516017b539694e3615f9429ad8b05ace449e8d9abf01086baf91eb93cb9ad4fe2c37467b0313ccaf0411a99be63a7440e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGRPykACgkQXYk9GL8g3FFzjAEAh0eZb/JEpD5j/p7r9smXNkal
-NINA/X+JcK4KDmAFjZcA/RXC8hTzUzCEZDd89zjTwijusZbJZWL3dnXdWjvdbMZs
-=bxk0
+iQEcBAEBCAAGBQJRkyjIAAoJEEqz6FtPBkyjR60IALYHv04kJzgMbyQj53h6Z3si
+QE1yXhTFlh/O+U/HAEfjd2zJGmxlYBe6RaZHOCMBpaGhZhyS9+bpj35lVIat59fJ
+kxIASo3Guwxtui9+4OWlgtNpuK11Gs3e132GHtRfSIiGteNkigFuZVXD9T39Ddps
+FH0nfoirjS6197iN3LkeAl8aI0wkduWFh0WgTQsbJbctAmW/CpuKPGzay4LtvM6J
+XHF22IGS+KQlGgkXVIQyJDW20vs7QgbmLBAIX5fC8UU0R4rHhvHaOQHhGEmjltOs
+I9C3cJVN/sXoQJW67ktsd2SfzqaPy6PMFkaLMLo9N+TTZ7NI0YbGc6WcMoJUNvk=
+=ly2D
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/gnupg-2.0.20.ebuild b/app-crypt/gnupg/gnupg-2.0.20.ebuild
new file mode 100644
index 000000000000..210053cb6de2
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.20.ebuild
@@ -0,0 +1,151 @@
+# 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.20.ebuild,v 1.1 2013/05/15 06:18:47 radhermit 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.7
+	>=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
+}
+
+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() {
+	emake
+
+	if use doc; then
+		cd doc
+		emake html
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	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'."
+}