this revision not needed

Package-Manager: portage-2.1_rc2-r2

3 files changed, 13 insertions, 127 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index b3808bfdb83e..3fe990980ee4 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -65,11 +65,11 @@ AUX gnupg-1.9.20-fbsd.patch 901 RMD160 bfc0dc40a8c42130ecac8e8e9b038949720ff115
 MD5 f7c457e0e98e73e3b29bb770c45dd47c files/gnupg-1.9.20-fbsd.patch 901
 RMD160 bfc0dc40a8c42130ecac8e8e9b038949720ff115 files/gnupg-1.9.20-fbsd.patch 901
 SHA256 049c13bf96998298c8ff74e62ab1f112357d8e0efce2da8ae8daa11cf1a81eb3 files/gnupg-1.9.20-fbsd.patch 901
-DIST gnupg-1.4.0-ecc0.1.6.diff.bz2 16703 RMD160 1d98f70f2f13e96eed4482be9c3646342b46cf4d SHA256 9bb0b4b7b2fdc757410c332fbf6e41049169d5ee67a06f1b347dbd21cd583ce5
-DIST gnupg-1.4.2.1.tar.bz2 3030527 RMD160 5e04b3d6a9f683772916b1686edaddadd8afbb98 SHA256 df58e9970727306e28dbe3fcadf6cbff1b00abbee3d9c4ac41e2ed4a0a6353b4
-DIST gnupg-1.4.2.2.tar.bz2 3034652 RMD160 cbbf3ffafa51fdf985c2562ecafccd72bc36ea0d SHA256 174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
-DIST gnupg-1.4.2.tar.bz2 2891177 RMD160 000e67769325a418553845be581de4fa3be0e88e SHA256 2e59787afe23102ebd8b05d32ce6abf165d2035958b200c2e330329c0a98b892
-DIST gnupg-1.4.3-ecc0.1.6.diff.bz2 18138 RMD160 609d0d280d0084c4463bcfaa770d1dab4790bb32 SHA256 35b22cb1ef93042733b8088fee3fb2eff3053c04d506316315295e0b0ea690f0
+DIST gnupg-1.4.0-ecc0.1.6.diff.bz2 16703 RMD160 1d98f70f2f13e96eed4482be9c3646342b46cf4d SHA1 cf868cfc93951b5ee662ef8ce52e66338013a7a8 SHA256 9bb0b4b7b2fdc757410c332fbf6e41049169d5ee67a06f1b347dbd21cd583ce5
+DIST gnupg-1.4.2.1.tar.bz2 3030527 RMD160 5e04b3d6a9f683772916b1686edaddadd8afbb98 SHA1 1c0306ade25154743d6f6f9ac05bee74c55c6eda SHA256 df58e9970727306e28dbe3fcadf6cbff1b00abbee3d9c4ac41e2ed4a0a6353b4
+DIST gnupg-1.4.2.2.tar.bz2 3034652 RMD160 cbbf3ffafa51fdf985c2562ecafccd72bc36ea0d SHA1 f5559ddb004e0638f6bd9efe2bac00134c5065ba SHA256 174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
+DIST gnupg-1.4.2.tar.bz2 2891177 RMD160 000e67769325a418553845be581de4fa3be0e88e SHA1 6eda5b090f9f1ac0da5e8b545e2667220a0e89ca SHA256 2e59787afe23102ebd8b05d32ce6abf165d2035958b200c2e330329c0a98b892
+DIST gnupg-1.4.3-ecc0.1.6.diff.bz2 18138 RMD160 609d0d280d0084c4463bcfaa770d1dab4790bb32 SHA1 08baa8535da8a6317dd24be50f374a616be7ed3e SHA256 35b22cb1ef93042733b8088fee3fb2eff3053c04d506316315295e0b0ea690f0
 DIST gnupg-1.4.3.tar.bz2 3114088 RMD160 f6d328785f41b74f97d25305c6fe95ad45bb70a5 SHA1 9e96b36e4f4d1e8bc5028c99fac674482cbdb370 SHA256 1d8d65e43751d833d4d49fa86df6fe97cebd00162dd0ced743470dca7e520da6
 DIST gnupg-1.9.20.tar.bz2 1810059 RMD160 3501de32f1526f64510a77fe3cc0905dd7fc8854 SHA1 557be26c21c114a3b345ce6b177fcb088883f827 SHA256 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
@@ -89,18 +89,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-r2.ebuild 2694 RMD160 dd2f4c36beba18e3aa2b348f52f2015fe113ef40 SHA1 3c4a210fa17595b6baa11ced3e1616f2dbe880eb SHA256 046afdf557557b80050c13c49c01dfd79bb3cdab570795a7ad508069eb10d9c0
-MD5 42387e5790f967d00e768161a2c7054e gnupg-1.9.20-r2.ebuild 2694
-RMD160 dd2f4c36beba18e3aa2b348f52f2015fe113ef40 gnupg-1.9.20-r2.ebuild 2694
-SHA256 046afdf557557b80050c13c49c01dfd79bb3cdab570795a7ad508069eb10d9c0 gnupg-1.9.20-r2.ebuild 2694
 EBUILD gnupg-1.9.20-r3.ebuild 2757 RMD160 0f833e95996be2ab862d2edb721919429cc1f18a SHA1 f7ea097632f1862253123722b3eb9a1f5e37e692 SHA256 f4d43fe322ab453605ba27f8995551cf3f559d643fd4ff72fcd15a6123559511
 MD5 a1721313cac714318f9b8fda94e21b90 gnupg-1.9.20-r3.ebuild 2757
 RMD160 0f833e95996be2ab862d2edb721919429cc1f18a gnupg-1.9.20-r3.ebuild 2757
 SHA256 f4d43fe322ab453605ba27f8995551cf3f559d643fd4ff72fcd15a6123559511 gnupg-1.9.20-r3.ebuild 2757
-MISC ChangeLog 30772 RMD160 36786e576fea1face07f07197701198ed36b6102 SHA1 645927aacbe0023c65fab08087b752a0468251e5 SHA256 bcf770be7aa0fd1b53ef7622cc9393a8089aae986eed0003a7bf1bacbff81c62
-MD5 d96a467035515f1a4a1bd6e2e13926bc ChangeLog 30772
-RMD160 36786e576fea1face07f07197701198ed36b6102 ChangeLog 30772
-SHA256 bcf770be7aa0fd1b53ef7622cc9393a8089aae986eed0003a7bf1bacbff81c62 ChangeLog 30772
+MISC ChangeLog 30883 RMD160 5dd197584c932c3b24f3d519f5acfa19b2ffd51c SHA1 d294c3db67fa213b38a6085834cec4c893aab32f SHA256 adf6547fefc93a5390df287a7f68c34d6d28c74b298c4046240784157533149c
+MD5 b013584a3e19377a62bc391b00de3928 ChangeLog 30883
+RMD160 5dd197584c932c3b24f3d519f5acfa19b2ffd51c ChangeLog 30883
+SHA256 adf6547fefc93a5390df287a7f68c34d6d28c74b298c4046240784157533149c ChangeLog 30883
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -117,16 +113,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-r2 244
-RMD160 2cee39773952b56927ea28d0eb108c517493c002 files/digest-gnupg-1.9.20-r2 244
-SHA256 a3f14c72acb1d4aa2102ab2ef7d02f12ae0451eef8528fed05a59b07e733d3d0 files/digest-gnupg-1.9.20-r2 244
 MD5 b5311626934af7a07b0760601cc3db45 files/digest-gnupg-1.9.20-r3 244
 RMD160 2cee39773952b56927ea28d0eb108c517493c002 files/digest-gnupg-1.9.20-r3 244
 SHA256 a3f14c72acb1d4aa2102ab2ef7d02f12ae0451eef8528fed05a59b07e733d3d0 files/digest-gnupg-1.9.20-r3 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEdxkYkT4lNIS36YERArnmAJ9cZr6iF+MBL6Tr+XEnw2FhirtaQACdFif7
-OTjxBD1gYHBZs8ldlG4DHV8=
-=WZ5T
+iD8DBQFEd6pFmdTrptrqvGERArtEAKCcfMEn4wkLX27Hvgfre7JcytZYogCfdaHU
+GXkeYg5ga4EvGIAkI144mk8=
+=Ak30
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.20-r2 b/app-crypt/gnupg/files/digest-gnupg-1.9.20-r2
deleted file mode 100644
index ba3b6d7aa814..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.20-r2
+++ /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-r2.ebuild b/app-crypt/gnupg/gnupg-1.9.20-r2.ebuild
deleted file mode 100644
index f4e8a03ad79c..000000000000
--- a/app-crypt/gnupg/gnupg-1.9.20-r2.ebuild
+++ /dev/null
@@ -1,104 +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-r2.ebuild,v 1.3 2006/05/17 12:12:41 flameeyes Exp $
-
-inherit eutils flag-o-matic autotools
-
-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 ~x86-fbsd"
-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"
-
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-	AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-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
-}