Add large-secmem by default

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

4 files changed, 180 insertions, 9 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index ee03948df29a..a2e85a36c5b3 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.598 2015/04/17 16:39:24 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.599 2015/04/19 21:06:27 alonbl Exp $
+
+*gnupg-2.0.27-r1 (19 Apr 2015)
+*gnupg-2.1.3-r3 (19 Apr 2015)
+
+  19 Apr 2015; Alon Bar-Lev <alonbl@gentoo.org> +gnupg-2.0.27-r1.ebuild,
+  +gnupg-2.1.3-r3.ebuild, -gnupg-2.1.3-r2.ebuild:
+  Add large-secmem by default
 
   17 Apr 2015; Mikle Kolyada <zlogene@gentoo.org> gnupg-2.1.3-r2.ebuild:
   Add ~x86 keyword wrt bug #546478
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 533d7ad20aca..bc763c26878d 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -16,16 +16,15 @@ DIST gnupg-2.1.3.tar.bz2 4875813 SHA256 213e7fb0d74bb4e53a2d3153f309ddc077528f2c
 EBUILD gnupg-1.4.18.ebuild 3763 SHA256 37cedb3946b555e83111f5096b3dd73f9506175976be10d648f8eb76b0b5fd3a SHA512 3dd165eb15a4946a9e2157549f0da6864e84c054a6369d7053730a899b50c5f05a703c1ce8e208b9de21b135bc8888f0f13835fce50f0e9eec467140e7e63355 WHIRLPOOL 9c64d59b7c444dde1fb601a6ab8d1085525153174b5995009ff7758866e56b88028056b42154fa0e28b3328978e15df515e4c65e65cb667fc17b75fb340e8e15
 EBUILD gnupg-1.4.19.ebuild 3472 SHA256 e2d789f8ddd23866340e7e2cd450e7d7c51ea135e403571ec00873e85e04a4a1 SHA512 e4b5eb1b1d03762528464596316e433ec2b01330cd76ce5a7d7006ba77f8b7dda2d15e66f8574803a229fb5f543c587fe01b82ad981bb7a26c7ad7c2d86d7f7e WHIRLPOOL 9452157d05e9fc515af5b1d71bc14c820ac09337d6b3ac5ff66bca45a7de1ea50958f42bfdc6aee3f27e2596997efe36a473e7053bd904e144c73c3fbbc3a17e
 EBUILD gnupg-2.0.26-r3.ebuild 4889 SHA256 d68393d52300de25451d6e732c7c10484f31283b560988e4992e9ac8fed0874a SHA512 5cc4f633741c32f244aa43eb4606a339e9de7b0d7ceb6cc38bdc985293efc605abcaafe438d0d60250d30f1cf7923a92a093d854f2abb28b302a8ff385b4cfc9 WHIRLPOOL 3d5df13d06a20c6cb53ca9259a416e7f0fc6490331d19ba4b98508d1dd18ddbcfe19913ce0a8fb61071c5a4ed38e8d9dca68b79f22ceb97890ce8236dd2e739c
+EBUILD gnupg-2.0.27-r1.ebuild 4814 SHA256 e886319d458473e57a6f88e1f0c15d791e3375e66aca80eceebd3bad539c52ff SHA512 656c96421556ac1b6b1022d28b452db23de5100c0cf8ed0c51e73053f4526d7c38c6682dea596ab7d36489b20978da6a1375a56f5ca24b43b78394c859de363b WHIRLPOOL b3fe2d812c0defcff16030f6fdb07a9b430781fa0027c45dcda3c921785413271ec492f789a7a1a4f5c393794ab539f0bb7e263fd1eb1784972a752d3fd3b9a5
 EBUILD gnupg-2.0.27.ebuild 4782 SHA256 5453bd69096075d8866a4877b6dbc3efa03a85ae8cbee63ff72269741749545e SHA512 6fa97736a7995c4f6a0095453bfdc0a627c9915da1e7442a65933532aa2ec7d21fdc69ae1cc1b32147731927eaa3cd1716715fdc8dcd969956201649a9da23ce WHIRLPOOL f9f7fe16b87194311f24f9699c561248faec2600fb632a9bd14a205e5ba8092826c7167e895968ea516d6b260f5bc618faf412cd5e5df0198d04891f7ad2c4f1
-EBUILD gnupg-2.1.3-r2.ebuild 5153 SHA256 a10bf563e28012a8ad75137acb6b56fa1d0e482298d5a2b670c4b1babbb1e9be SHA512 c624fe848d3e86f05495bab406c92dfca0245d068c22fd477866afc7b4455068f0bdec8ef722ef82bd0839b350b59ccc8e0e2940b45d7cbce54a929f51e170c3 WHIRLPOOL 326feecdb9b4a8a74e43f16629682eb0037531f0f0cfda24dbfcd19e3f7a99fa3449cd086e8fe36440b1f8417695b58f828c5572377a863a4605ffc95d61aec1
-MISC ChangeLog 87436 SHA256 424c80115d9e93e55aab13cef8eba5ce0f03b00b0ab27c8e5eae58ec88f5fba7 SHA512 8e8c9762f3e6883fe61af789e8ef5f26e6973a6009eed6b8da2bb413591fea178a282e3e50cfd44e14db958604852e073769f0415ae0f009a95059455d030e69 WHIRLPOOL cef62d4d2dc1cb04573d7f7986f7248bc374a113833840e763a4e95fd01ef67cc6acde50adfb56eb15087d884fcb65b448bf0389b2ae1793fab03bff8dd9c769
+EBUILD gnupg-2.1.3-r3.ebuild 5178 SHA256 54138b47d302311b4fe829bf68f31b3e339752be4b97032b087c183a057e0ddf SHA512 fabc2b9cc79ccdb9d8894a065c01172c1369b093fe4d097e2ae0be2772c1cd04619066ae0654c2d5d574b585ec354920ad887a6b7df126dc666f18c7a38ddee1 WHIRLPOOL f21abd5888ded109a24c79b2ba2bf818d1a3075a5d2ac7a2df1c7e06d92c0d3e7d5a562dafd4a83a1ec3f6546c02630babbff464fdd88bcf1e968a681c3c1f91
+MISC ChangeLog 87651 SHA256 8aa749df9fd2ff82193aa9c621c5c1f6283099b0b7ef9d6493421e5020c1adf4 SHA512 ed929e876b8eb5b7f190ea040081aad29b74bbfcdb9d0cc740f77ba1c136193db3ed6c39ebcdbc9eb574da1deb50787d09548fab22c2143ed4b3cc159eb26e63 WHIRLPOOL 3d09e225b2f51ab7d0da24f2c1c5e73a8411d48e797fd8bc524ff5dffe890960aeaf5ee8f9448e57348bf3b95c4be278b24e30a2427b80778a8b79ddf9e453e9
 MISC metadata.xml 1032 SHA256 cbef1621eb1364c8d12ac18e71cf4aabfced9ecd3c990a3f3cdf066902dc97bb SHA512 5e2ef4380effe027a0b0b8a11a29ed1996b3b5256ee333909d4a7cfcb18ea1e9dead9b8303c7dffc1ad10014dea79e827b1d84caa92294f4d3dfc29ff23a6af5 WHIRLPOOL a24c7f71ed140f34dd59b10314869d0c5482063be20faefa1591595feb856c79bc57a6b344dd467875cf3389d8cd14e2d41f2312f51d3b77dcbe27af97b7f129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlUxNswACgkQG9wOWsQutdZLCgP+LIhjWpaHwLeDdcV2uwrNcZTj
-Qgnn0cxKUSY4bft5oA4Dp/2/n1A7BrKtYD9h/vLp+yB2Lr/bDjrrtNn8KfVqjYNG
-BkTrsLyTYezkV7r0oQLwfxu1MrQT2iWT4PnWe6pL902V99lGmNfzaqpZT9DPhxNO
-P2Sey1gBs2iaosSo6lU=
-=aSy8
+iF4EAREIAAYFAlU0GNcACgkQXYk9GL8g3FFWnQD/crBsqV+vP+a6QO7GLG17Id8/
+b3L/popMZWgsRCmESmYA/3axvbryl5yJT20UlWCLPSfeKw5SXr/nEMw//qpHL1rH
+=rWm6
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild
new file mode 100644
index 000000000000..446d6914e7fd
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild,v 1.1 2015/04/19 21:06:27 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 ~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"
+IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools 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
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	ldap? ( net-nds/openldap )"
+COMMON_DEPEND_BINS="app-crypt/pinentry"
+
+# 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 \
+		--enable-large-secmem \
+		--without-adns \
+		"${myconf[@]}" \
+		$(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
+
+	use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+	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'."
+}
diff --git a/app-crypt/gnupg/gnupg-2.1.3-r2.ebuild b/app-crypt/gnupg/gnupg-2.1.3-r3.ebuild
index 9902d8bb93a8..d71f0bd84356 100644
--- a/app-crypt/gnupg/gnupg-2.1.3-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.3-r2.ebuild,v 1.3 2015/04/17 16:39:24 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.1.3-r3.ebuild,v 1.1 2015/04/19 21:06:27 alonbl Exp $
 
 EAPI="5"
 
@@ -94,6 +94,7 @@ src_configure() {
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-gpg \
 		--enable-gpgsm \
+		--enable-large-secmem \
 		--without-adns \
 		"${myconf[@]}" \
 		$(use_enable bzip2) \