Version bump, bug#514718

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

3 files changed, 176 insertions, 5 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 99bf6706b32f..88ee33737439 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.518 2014/06/23 17:50:24 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.519 2014/06/24 14:41:22 alonbl Exp $
+
+*gnupg-2.0.24 (24 Jun 2014)
+
+  24 Jun 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnupg-2.0.24.ebuild:
+  Version bump, bug#514718
 
 *gnupg-1.4.17 (23 Jun 2014)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index ec7ea099c09e..af65b9b685fa 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -6,16 +6,18 @@ DIST gnupg-1.4.16.tar.bz2 3656752 SHA256 7b3b748e6aaa338092a0b26b1730cd9355765b5
 DIST gnupg-1.4.17.tar.bz2 3648762 SHA256 e6dd9d19d62dc434d354076d1f7cea11e87934ff2a0912aa806f848dda0a7b5b SHA512 9a3827182d71557b9909de7c0939518c869e491874dd8120e991cb243ef79c4dd6275e4b77c4d23f124bb2a732cd1ec3357261f579e94c15f71e9afb03f2e19c WHIRLPOOL 2f93d0c16706590b85b5ed66b520e72df825af8d483a68c72ef6ae12a8979c27a9cd682332243514a235b11a28dc08e21d632cc212b34e5107071d2fc0506bf5
 DIST gnupg-2.0.22.tar.bz2 4277117 SHA256 437d0ab259854359fc48aa8795af80cff4975e559c111c92c03d0bc91408e251 SHA512 de534b2f4b8d3c320e97519fe0834bc403c96c6dbb2e24fc24eb68f4ff80374360ef66d83ddc3d6fa096c5199d3782abc5d06b866203378cba130b42802cc855 WHIRLPOOL c45e7b2560ae31f013f732863db99f6e23d0de83d03371fe592192c2b5f800503f7a1e273c59e4c99f3aa0401e8cfb2bdbf1c5029534f642305e768009f15fef
 DIST gnupg-2.0.23.tar.bz2 4297195 SHA256 cf196b8056eafb4236f000a3e12543e0022a1fec4d6edff1b91b48936c109841 SHA512 5982b25a470b8e6c2874cfadbd2da7db7fb219b5a0be254d73772488b47e2fa1b3825c6640c3659e27905d56d53eaffd34728540081ff160bffea80678d37847 WHIRLPOOL 95184a59be90de483be82b064e8222be0957b0d17466ba80de5b6d8cd8774ca9a3fd83ac967437e4b296905f06ca0f0b2e446fa905ef5871ab1492c7db7e1b3b
+DIST gnupg-2.0.24.tar.bz2 4301922 SHA256 d974a1d86c9470571411346368416d96200ef9510028763c1303cd66e3820232 SHA512 5bb879bcadd7006e57580537530517550970a6c71397b9c6630df14925d3d6a8929a51b21e01e4ba33cefa1d845c42f0fa0fdfa0128771794273d544eb514380 WHIRLPOOL 0e637e8aabe93ebe065ee612150554acc80760650752340b3fe50e390612d6778c37cdab5cf03787eca974073b6ce606fc3e744b9fbe5b2aa8a6c4cc55651874
 EBUILD gnupg-1.4.16.ebuild 3763 SHA256 7dd32d6bf5cac515edfaf32f6d8e5c218248490ed02d7a2681102b685ba1a97d SHA512 c5e52a81459c6fa99c3b875b1a17999076d4de49244fae3c195c129629b4b52d416c93faeec4e216b5daf7616db72809d213a1c6697c532571cb2ceab1c985e6 WHIRLPOOL cf45f4061edaa1bb984dc73b7656be6622900c54417d2f5b2571b0d9726f9f56329e2dc41a1346c3b3918c6ebdcbe1b52cb0ad61f093f46e9865dd38ac8423b5
 EBUILD gnupg-1.4.17.ebuild 3774 SHA256 fbd086870261453c6b520947df3d0ba19d9c2227cdc43c3b4333243445ba41e2 SHA512 424fe862443e958cd29921330356a6b08f78fede4ba6d0fd765957fd26731f12d1fd59e849acfd0d973f8c9f9db0cb455c72919642960bcf27b9d84f140f075c WHIRLPOOL e7a40670c14eec19eaf147452678b20d7db8069fe767abea03294b0930e6634037bd91c5642aa81a3788674c27e1d92aef5c8fb01faa70359985a952d3b7ba88
 EBUILD gnupg-2.0.22.ebuild 4736 SHA256 0dc9e63ae57b6859b62714a593359e9c2fa7097a17c2ad93675d597d5b0aea29 SHA512 2f4ea65dafb1e957c165dd684c3279e287ac9ca94eee87da6390ae6c4ad2a99d3791a82597850e2da0725e2de6a0a7d3e6d1192c250f02fe81fe5f78ad1a59bf WHIRLPOOL 3e6ed2773f428e32af127fa09968a066e41564831487bb06ed403467408fa11e9ca6a10a3d7bd4228b0fb3002909e296551948ec77bc934b3ada37ac90028a7b
 EBUILD gnupg-2.0.23.ebuild 4753 SHA256 7be212cef871ea9bd5c044b97679d123ee5c3b1dd30121851576740a826cb500 SHA512 f1d90cff4d82bbeb07b8f566e368d4be11ef9569f64187711de994ed25290e8b21badceb5291bbb6682f141b91cfaea41a8fb205fb5da0de97535aa1e107c6fd WHIRLPOOL 466e2f787423efdd2333cf64620a61f551c075ef95674cd513b02de6a7c89ca633487de119df0d84ae3a2c55ff2e9c7a424aea61a51d11a24ac1a68e93344e86
-MISC ChangeLog 76250 SHA256 20f5811d81886b0091bbd6651326d99a3969803747ce3d058ba3992b9d0bbce2 SHA512 c94295a482d5eea3aa59e23e77ae695a1f6553bb378b5a3622aa1078c7fcfdbe15d00c5c8504eb28cbb5da9b62304df5521b36b3e207627bfd8e46f809133255 WHIRLPOOL f955b21c2d488fef702e45f32584c77a2d6cadd207c932785a3abf802681e17c0f3df9db920381c4ff996ec372feba5d8809ad8b17fa14ecb7cc13028e51c542
+EBUILD gnupg-2.0.24.ebuild 4750 SHA256 dbf73a4542160bc9acd45f7f204d58ec40107efc41a54f4b1d223f840e2dea2b SHA512 ec96f1a1c317ba1ecf2be3390f2f2d8c899a1e35ec2c2a5fbe156e9e533089bd0080025e52d96b4a1edc12fb8a7bf703d7da11347b616db826da5f83b33911ad WHIRLPOOL 24fa79299c93455f22d658dfe32a508d7dd04ab232efe24920d56e03a1b749ba7235afb1756a23ee161a7feef31007bf038eb83a5d680c373c3d79ae62f64b0e
+MISC ChangeLog 76377 SHA256 8dd2df5e113f0b8eeb5b4300986825911c17d20a0f941a0ada59ab5bf69beb65 SHA512 5d35ac47acef89da54f9d7b3e80e9e1b05fb4bcfc827fb3be577bfc035b7e596b5f3c553ef580b03623a52a986b6eaf757abded1a6de854077f56bb71e3e13c7 WHIRLPOOL 8bb9b698e623e16ac1b83e5f365d721974ed703f10c0cf32ae48784da37902b800e7e9cf34b8080da8587b893f0ecef79d864b42d41f381245e85cd6365e3101
 MISC metadata.xml 1078 SHA256 6d0df2861d7b3fc7777f9c703b06f789a8e4e4d08a98b1f5f5cc661943a5b7e0 SHA512 2998315ea1dad11806385d84827189efb626620d6596bf51a67180567a5ed3cbcb5eea50de907477b93d876ce66fb7e944cce159fe29450a301cda9bdd76db87 WHIRLPOOL fc0761ee1950b067a4434192c22b3d516017b539694e3615f9429ad8b05ace449e8d9abf01086baf91eb93cb9ad4fe2c37467b0313ccaf0411a99be63a7440e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlOoaOoACgkQXYk9GL8g3FFjugEAjCXqDEbQ71iGlcsKRcI8QX1J
-R9fEUkSOa9z+XmUWWmkA/0TjaVxOQyzwjZd27RiwOhLDXAUxs1gCsN0oHyi7cT+p
-=mD61
+iF4EAREIAAYFAlOpjhkACgkQXYk9GL8g3FHTQwD/fgkUokCGc3yg9noPO2TPFy1R
+cLL6KyjsbpiDvBYLsP4BAIvMtIpsPn5vM3KF7TK9FNgnwltny/0EutKbNhariLI/
+=dps6
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/gnupg-2.0.24.ebuild b/app-crypt/gnupg/gnupg-2.0.24.ebuild
new file mode 100644
index 000000000000..8a2155ac7067
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.24.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.24.ebuild,v 1.1 2014/06/24 14:41:22 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 ~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"
+IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/libassuan-2
+	>=dev-libs/libgcrypt-1.4:0=
+	>=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:0=[static-libs]
+		>=dev-libs/libgpg-error-1.11[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
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-agent \
+		"${myconf[@]}" \
+		$(use_with adns) \
+		$(use_enable bzip2) \
+		$(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
+
+	# bug#192151
+	dobin tools/gpgsplit tools/gpg-zip
+
+	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'."
+}