revision bumped to force smime usage. This fixes bug #131026

(Portage version: 2.1_pre10-r5)
 (Signed Manifest commit)

3 files changed, 14 insertions, 118 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 168ca1a4549f..354eee68c677 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -85,14 +85,14 @@ EBUILD gnupg-1.4.3.ebuild 6384 RMD160 c72bcd2fe78a775b4bf6557ea2b68008e4dba819 S
 MD5 a5ad331b3128b0bff375def48c4f47d1 gnupg-1.4.3.ebuild 6384
 RMD160 c72bcd2fe78a775b4bf6557ea2b68008e4dba819 gnupg-1.4.3.ebuild 6384
 SHA256 d692a1629454419b6c3b118f8f67822b710a2f6fdf435dbe62d2073d2a3a189f gnupg-1.4.3.ebuild 6384
-EBUILD gnupg-1.9.20-r1.ebuild 2605 RMD160 ac862f3cfa9220985eb1a9290bcc90db2347b47a SHA1 33403a131473193f3886fd1a1d146fda3559bb58 SHA256 ea72295ba66033a81d802a8029bc97e2cff478c736d94033e6df3624f16fe370 size 2605
-MD5 2b1bb2ccdd0a60472316d30deaeb3d43 gnupg-1.9.20-r1.ebuild 2605
-RMD160 ac862f3cfa9220985eb1a9290bcc90db2347b47a gnupg-1.9.20-r1.ebuild 2605
-SHA256 ea72295ba66033a81d802a8029bc97e2cff478c736d94033e6df3624f16fe370 gnupg-1.9.20-r1.ebuild 2605
-MISC ChangeLog 29659 RMD160 fb08088a6f32fcbb9c12703389458298c2bbcd1d SHA1 ed5f54856e8d71f3065a67f8087e1cfe2fb4121e SHA256 81d575cf0ab04aca534ee3f1183a6b41d17b531903e8e1ab98ecd981e30b5efa size 29659
-MD5 a2751c628c2491fa6015da2b91e282e1 ChangeLog 29659
-RMD160 fb08088a6f32fcbb9c12703389458298c2bbcd1d ChangeLog 29659
-SHA256 81d575cf0ab04aca534ee3f1183a6b41d17b531903e8e1ab98ecd981e30b5efa ChangeLog 29659
+EBUILD gnupg-1.9.20-r2.ebuild 2605 RMD160 d98bc401643cfe427e2f488adbae8d045e942ba9 SHA1 e60d65f9f78531a31ebdd27064c3ac9dd940d6a0 SHA256 7aecbf3d10b17a6943701bc7e6ddfe61ad6e48da726834fc657dd1d5f4eb9b2d size 2605
+MD5 87edc8f80cd418d52e9115c384216b5a gnupg-1.9.20-r2.ebuild 2605
+RMD160 d98bc401643cfe427e2f488adbae8d045e942ba9 gnupg-1.9.20-r2.ebuild 2605
+SHA256 7aecbf3d10b17a6943701bc7e6ddfe61ad6e48da726834fc657dd1d5f4eb9b2d gnupg-1.9.20-r2.ebuild 2605
+MISC ChangeLog 29885 RMD160 bbe9d538e737a08cd7ba714f51920f6b16e363aa SHA1 15c0eabe8ce73b38ded3274bd58402c79f2c6c0c SHA256 37116e47cec128f20a8677580a8738de8c9009e3229ad881f5d5044008fc08b0 size 29885
+MD5 bb71cdba068925bae3b9095aa0de0b17 ChangeLog 29885
+RMD160 bbe9d538e737a08cd7ba714f51920f6b16e363aa ChangeLog 29885
+SHA256 37116e47cec128f20a8677580a8738de8c9009e3229ad881f5d5044008fc08b0 ChangeLog 29885
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672 size 481
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -109,13 +109,13 @@ SHA256 25fa4aa5eaea9962a865c2e6b0f123972c0111ee0999060b3aca8a17f087328f files/di
 MD5 cc4e04dad418f08cb3eef8edf326b35f files/digest-gnupg-1.4.3 708
 RMD160 9bfc71ad352871b75a329439caaff906a1c5397f files/digest-gnupg-1.4.3 708
 SHA256 8e3cf65fbdae1fd9e4657caa33e005261988c8bea3fa62e518d07d863675b7d3 files/digest-gnupg-1.4.3 708
-MD5 b5311626934af7a07b0760601cc3db45 files/digest-gnupg-1.9.20-r1 244
-RMD160 2cee39773952b56927ea28d0eb108c517493c002 files/digest-gnupg-1.9.20-r1 244
-SHA256 a3f14c72acb1d4aa2102ab2ef7d02f12ae0451eef8528fed05a59b07e733d3d0 files/digest-gnupg-1.9.20-r1 244
+MD5 b5311626934af7a07b0760601cc3db45 files/digest-gnupg-1.9.20-r2 244
+RMD160 2cee39773952b56927ea28d0eb108c517493c002 files/digest-gnupg-1.9.20-r2 244
+SHA256 a3f14c72acb1d4aa2102ab2ef7d02f12ae0451eef8528fed05a59b07e733d3d0 files/digest-gnupg-1.9.20-r2 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEYnFbmdTrptrqvGERAl+hAKCa1/w83t3iXOFwcruZGt6o/jM0dACglZdz
-yfnVilvJnrx2F/9P1JqFRgE=
-=uKFz
+iD8DBQFEYw5KmdTrptrqvGERAiU/AKCJhyyJV8Vwa4Nlp9ZY5GJRySv1YACeLfO0
+grAYCi5sDQd5qjxKjgCTz3Y=
+=8RiS
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.20-r1 b/app-crypt/gnupg/files/digest-gnupg-1.9.20-r1
deleted file mode 100644
index ba3b6d7aa814..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.20-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 93899203fc0530f03e146d49b65c1e28 gnupg-1.9.20.tar.bz2 1810059
-RMD160 3501de32f1526f64510a77fe3cc0905dd7fc8854 gnupg-1.9.20.tar.bz2 1810059
-SHA256 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e gnupg-1.9.20.tar.bz2 1810059
diff --git a/app-crypt/gnupg/gnupg-1.9.20-r1.ebuild b/app-crypt/gnupg/gnupg-1.9.20-r1.ebuild
deleted file mode 100644
index 9473a244e99d..000000000000
--- a/app-crypt/gnupg/gnupg-1.9.20-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.20-r1.ebuild,v 1.5 2006/05/10 22:53:07 dragonheart Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/alpha/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="X caps ldap nls smartcard selinux"
-
-COMMON_DEPEND="
-	dev-lang/perl
-	sys-libs/zlib
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	smartcard? ( >=dev-libs/opensc-0.8.0 )
-	>=dev-libs/libgcrypt-1.1.94
-	>=dev-libs/libksba-0.9.13
-	>=dev-libs/libgpg-error-1.0
-	=dev-libs/libassuan-0.6.10
-	ldap? ( net-nds/openldap )
-	caps? ( sys-libs/libcap )"
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/gpg-agent
-	=app-crypt/gnupg-1.4*
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if use smartcard && ! built_with_use dev-libs/opensc pcsc-lite ; then
-		sed -i -e 's:OPENSC_LIBS="\$OPENSC_LIBS -lpcsclite -lpthread":OPENSC_LIBS="\$OPENSC_LIBS -lopenct -lpthread":' \
-		acinclude.m4 || die "openct patching failed."
-		./autogen.sh
-	fi
-	sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c || die "PIC patching failed"
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-		local viewer
-		if has_version 'media-gfx/xloadimage'; then
-			viewer=/usr/bin/xloadimage
-		else
-			viewer=/usr/bin/xli
-		fi
-		myconf="${myconf} --with-photo-viewer=${viewer}"
-	else
-		myconf="${myconf} --disable-photo-viewers"
-	fi
-
-	use caps || append-ldflags $(bindnow-flags)
-
-	econf \
-		--enable-agent \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_with caps capabilities) \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	if ! use caps; then
-		fperms u+s,go-r /usr/bin/gpg2
-		fperms u+s,go-r /usr/bin/gpg-agent
-	fi
-}
-
-pkg_postinst() {
-	if ! use caps; then
-		einfo "gpg is installed suid root to make use of protected memory space"
-		einfo "This is needed in order to have a secure place to store your"
-		einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
-	fi
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}