Version bump.

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

3 files changed, 168 insertions, 16 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 40f05c482fd1..6d659946b2fe 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.484 2013/08/08 12:37:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.485 2013/08/19 16:55:43 radhermit Exp $
+
+*gnupg-2.0.21 (19 Aug 2013)
+
+  19 Aug 2013; Tim Harder <radhermit@gentoo.org> +gnupg-2.0.21.ebuild:
+  Version bump.
 
   08 Aug 2013; Agostino Sarubbo <ago@gentoo.org> gnupg-1.4.14.ebuild:
   Stable for sh, wrt bug #478184
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 09dafe6ac63a..381e62d62955 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1121 SHA256 fa8369a4466b3cce54215a348940422f46f4d359f9e9b3c7029a1138870888df SHA512 ecde032b205cc16c33ff21ded55b93e74058cd804d68e4a0738ac70d54b5b388b6f709d21719a5e418c662b7ee74bc4aef7a0c59de106e2d4bd06b7bc1a11138 WHIRLPOOL 5dc4d3de29290e8e274a0f4fef871cea7f49553846254d819ca776000978a72c694212559d9ad03312f94f71f406de4641c0575188d340017a7937b01753b8a0
 AUX gnupg-2.0.19-support-sc-key-3072.patch 5734 SHA256 1002f8a3cb4128195c6b7ee00120603d4680f535b8d8c5dd9d68897ff3288bbe SHA512 f376a2d1564dd9c391e080f65dd2ba5a8e38d52fb51cf70e1c9f7feae2e3a3c2f819fe561ad51872cd3f35e1e3fad065c90282ffc7907bb6b9557f561b7ddac5 WHIRLPOOL f080725e86953dc183fdc81eb9fa503b2234a8aa60a0722282faea0c29045091f446699cb98f7f760c0d2a2ca710dda6f2d83bfe449d70e60017cd2095c43ca3
@@ -8,6 +8,7 @@ DIST gnupg-1.4.13.tar.bz2 3685873 SHA256 72a24dd318472f0c8f0d00ebe19fb4bcf43e308
 DIST gnupg-1.4.14.tar.bz2 3687929 SHA256 f2c4cd3ed6a5fb66cb369bf8160e53127712adfe41ebf965c0f02ab71d984413 SHA512 324b32807759c8a9c3587e1576ab1f5815918028f015dcff36e7ff1e8610996c89e4bc7af77385adc9359f21cc022642b971509698a81510a88085f5a268405f WHIRLPOOL c14a89171b2bf7a4b0934e67cf970325e394c38a05daa455c87327eaa13fea27e5cadbfcf693dedb5840b4a249b53457baf91ecd307ec66e11dfccbfe661e037
 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
+DIST gnupg-2.0.21.tar.bz2 4300604 SHA256 00df8902c7cef4d2440d36ca2a45985853eb36c34a4163bc995c3578030eeef5 SHA512 e31b7d9143462e4846111cdbcf0af9ad93fb1f5b9324a1c126c060e4cefb09d3c6b2f85e655d3960b5f21f09317cefd2c5b786e129efb62feab20f4b9a6770ba WHIRLPOOL 911d0122d6aa8bc883b192b47a785c323a0a5fb015ecc6cf08cd19a3d8f03a80b320555c8ebb6804b0a9841fa2b17b633be4f23b458e1778a73a583e4ba608cc
 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-1.4.14.ebuild 3761 SHA256 4be020e6d1202f937d8b3a59d297bdded0f78a9c1c9e44518080d9fb7bf8605e SHA512 695afc4e15ec18dc29343a2fb551f587ba00f6c8bb1a0122e94556cd5a138cfbc4db5b6a30ebbbf3287f05f580a39ce554d022f1acc467117fc68e9d54531762 WHIRLPOOL ca6f2e8c8d9f1df1f6391e503a48fdb6134cc4da2a851da5d18573a20313909d2357c1cc794f3e92c13d173b2373e059ecd9d091b18b0f01184d15fa1370f105
@@ -15,22 +16,17 @@ EBUILD gnupg-2.0.19-r1.ebuild 4582 SHA256 44cfdd22b5a2697cfc8d91cd4a6dc5ba64dcfa
 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
 EBUILD gnupg-2.0.20.ebuild 4574 SHA256 184e6a23b57a5c86300f5bd76b0eeed3b568a5bc9a06ae43210e1afce4c59fa7 SHA512 2e9682726ba32d27bb99060302960e3e8855718eb7a7a979c13dae2d3fb88216369ba3af690cff013110577359d830732159d2048dd9a9782828f63a3b1cdf3f WHIRLPOOL f2a9a3d767259073f3b6ddf8c97f053de9d3f57a09e6642f014ea4d0eae52bb7730fe1a4eb3dafaf0be627aa8008532859bf0d50853ff9ea520eb77b1a798bbc
-MISC ChangeLog 71808 SHA256 c167098dd773ecce241744e1aa7c5d2b93b92d8d196394ccf3a825d2c47af812 SHA512 6ede00ba95364574d75b677b64620f67c296675ff3aeb81d65099d7611e902635c85f03349c460b4d34b23c196d2ca327fd8ac621d6830732bbacf21b04ba3f0 WHIRLPOOL f7c9dc8d234a72edc5c3bd4c04ec18f4a70116e6a333409808519c002ab2a06d44e535a05bb14363e055e874eb367e7e118f184092680b42b0dc255e2fbd3e5e
+EBUILD gnupg-2.0.21.ebuild 4591 SHA256 3a68cb34b57916cefcff1652e6a9e92ec0926e1157a9b13869b935a62a71a695 SHA512 3089940b5e5d5e1311668f2eaa5a937f31aa9916df930b5debdc7b4764ff141423f92a539cb804495cccf22f174c1afc4a0f4c6b14812bb2cd84ab39c198ba2b WHIRLPOOL 942bb8e0edbef388bd3e0b6e4a325e1f8556bd37d5081cadf14aa483a9b06480ed34d32d20b59781d8697b8cbe88b3ac17f66c7b8580bc5e86fbe7ffd715f23b
+MISC ChangeLog 71931 SHA256 047a52ced9e8659a506b05abcc3d5c6f26d7a47df1e9d5b6d96771ea27166547 SHA512 aafadd3eac04292a7a4631a292cb04227b89c2d54cb505779dab5f8b78903d5716d9472a462fab703a05922138b8112444b4ce036e677d3ad30545f23d0797c3 WHIRLPOOL ea199842f6e9d1df06002f2ec58e44ecd9e3ce62106f73178265622e13fc50bc958e621e9e616f1b36eb6037864812cf8e65ebd2734fecd39e6de030e6c1b54d
 MISC metadata.xml 1078 SHA256 6d0df2861d7b3fc7777f9c703b06f789a8e4e4d08a98b1f5f5cc661943a5b7e0 SHA512 2998315ea1dad11806385d84827189efb626620d6596bf51a67180567a5ed3cbcb5eea50de907477b93d876ce66fb7e944cce159fe29450a301cda9bdd76db87 WHIRLPOOL fc0761ee1950b067a4434192c22b3d516017b539694e3615f9429ad8b05ace449e8d9abf01086baf91eb93cb9ad4fe2c37467b0313ccaf0411a99be63a7440e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSA5D3AAoJELp701BxlEWfTncP/3rIdsAhMwhvEENc2b5+cCAP
-ptjr24mNFONQxMZNpdhPMLHg4TEtzjQ1UU0w6kKhYJmdZzrQN3Fq8V8GANX7TsSB
-VnLAV73l8C32jsRK08OhZmgj1dF2GR/RO6FIjo+GUvLmL5+2uHYWViVMMsHVt//d
-htp2lrn6lA3vMGs31Ppszt8PHwtdkYwNTOU0XrwPzLy7VK2IkIB0UBXvpd8RbRkA
-m/T9oP6HTTBH998JzUrBev1z3aSbUiGVKjh5tEz+tgU3MUMbIXBIP0mdl0KDkN3c
-XVDujmy/AcpWqazr5JOCGPohmW8Psy8xIjG0ox4DlNH/BHLTTpPUCfhY1n517YBT
-2++awLNl90cPrwho62bbfha63CfNzsVtoU9owTtxDWlp9hUAABz+A19L1M0NC0xv
-CcUHsui4q7uGf6+xB6S93Ni+5xkkdPzscbd+XlXwsQDDB+sCJI7CEWt/T+q4i05r
-hME9KzyKJVU3AyOFoPy4vKv/oiHAv974Ajf/OdILteMoh+FAZGoQ+2IlSo5YRY5o
-wn05wjzSIvqR+7DhwhQhsi2wmU+6FHoL/2EBaHaxpYyOTQ6WeSWxaLXwsvjQhfO+
-Bc1imI2h9xYXpcYwN0FvNpHzR8s3gN1ETafN6EWjZRgT+xglG0cNJlwutRycvg8V
-Z1WUzncW3CFX/gWnseoj
-=cw+7
+iQEcBAEBCAAGBQJSEk4UAAoJEEqz6FtPBkyjzXkH/0Mpr5vpIFRKebCzMDt5Po12
+lUCdmSNWQA2pu+8zTiauHeNYFvveY4YAhp/nrEaFf+EDnXo2HeFA5xVwmseY1Aj9
+CEHpZ0lkSBgfzePGb2rBURoa+BV4la8bYzgRUrVw8rR+551KRWgJ+aHdLaGOaSs9
+xKwaMoqzrzQI0iq/Qu0uztn/TKvL+qvPlKwdnA9Z9v6KWkzJMaMWG7ub7TB2EF06
+PFwzfntvjTXGsVWSU//7nSWBHZBOtLckYJwKoLQkKTGBTNLVqOYipmnT3C/zKbHl
+Tuiekx8NpOe0hvjDrw5BH/lrAQGhWwHB7lJRty+E4tyW/oA+PguivpaopX0R9Fs=
+=w//o
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/gnupg-2.0.21.ebuild b/app-crypt/gnupg/gnupg-2.0.21.ebuild
new file mode 100644
index 000000000000..028487ea996f
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.21.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.21.ebuild,v 1.1 2013/08/19 16:55:43 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.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
+}
+
+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'."
+}