New revision: Merge with gpg-agent, allow tests, introduce self-depend on version 1.4* in order to unmask it, bug 117717, also remove old versions

Package-Manager: portage-2.1_pre4-r1

17 files changed, 56 insertions, 1076 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 40aa4ad4bf8f..a3596ed8eaa9 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.165 2006/02/26 20:03:46 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.166 2006/03/05 14:10:23 genstef Exp $
+
+*gnupg-1.9.20-r1 (05 Mar 2006)
+
+  05 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
+  -files/gnupg-1.2.6-ppc64.patch, -files/gnupg-1.4.1-selftest.patch,
+  -gnupg-1.2.6.ebuild, -gnupg-1.4.1.ebuild, -gnupg-1.4.1-r1.ebuild,
+  -gnupg-1.4.2-r1.ebuild, -gnupg-1.4.2-r2.ebuild, -gnupg-1.9.20.ebuild,
+  +gnupg-1.9.20-r1.ebuild:
+  New revision: Merge with gpg-agent, allow tests, introduce self-depend on
+  version 1.4* in order to unmask it, bug 117717, also remove old versions
 
   26 Feb 2006; Joshua Kinard <kumba@gentoo.org> gnupg-1.4.2.1.ebuild:
   Marked stable on mips.
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 679b4975b4a8..766578e51c3d 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,27 +1,45 @@
-MD5 9429c63ddcc54d8b1ed8af7b35560267 ChangeLog 26645
-MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
-MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
-MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
-MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r1 190
-MD5 f972c88baf3f90f8ef0953df6f328e28 files/digest-gnupg-1.4.2-r2 190
+MD5 cdeb140a4525feaf7b742ccadad5eeea ChangeLog 27120
+RMD160 a647a6988e36354e09defc0706c412f8519ee07a ChangeLog 27120
+SHA256 179c29e2f3375bc4f67fcc1aec8ffecc80bc73764d752284d53f4e87dcc775a7 ChangeLog 27120
 MD5 f972c88baf3f90f8ef0953df6f328e28 files/digest-gnupg-1.4.2-r3 190
+RMD160 410230fb169484809a308599ecce378edbf4d6e3 files/digest-gnupg-1.4.2-r3 190
+SHA256 f5da031277620b47d9fd79f68d62c250549988ce4b8a43056125eb60136cade3 files/digest-gnupg-1.4.2-r3 190
 MD5 bc6b26af83d8258c025e691ff0c1a711 files/digest-gnupg-1.4.2.1 192
-MD5 15f59d2129cdfb1c8e6121d45a1e61ca files/digest-gnupg-1.9.20 66
-MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
-MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selftest.patch 1180
+RMD160 b8c8d5bfb1a47653bb7f3bece9dabe89eb400674 files/digest-gnupg-1.4.2.1 192
+SHA256 f7f0e622b0560788a2a39017139b25272be3d156563dfcb93b637bad8cb077d1 files/digest-gnupg-1.4.2.1 192
+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 e893ac3e7a6b11ab9806e16d3a8582fd files/gnupg-1.4.2-badruman.patch 463
+RMD160 d45ba287a2254380b379191afaec315bd278af57 files/gnupg-1.4.2-badruman.patch 463
+SHA256 d2e5f0d993ada9683991553eca4c40935d399572226cc59a2fd0a2cf0972be7e files/gnupg-1.4.2-badruman.patch 463
 MD5 c23d51ccf048f10b5e8b10b45570c13a files/gnupg-1.4.2-jari.patch 370
+RMD160 93e4099381de6cefadacf28ffd170b3cd5585c9f files/gnupg-1.4.2-jari.patch 370
+SHA256 d244d5d6f9f9e01f0cad2577d23c506f11e073210efbd48702ab62847cc60e73 files/gnupg-1.4.2-jari.patch 370
 MD5 ee3a4487eadfb9858f32adde3554394c files/gnupg-1.4.2-keyserver.patch 389
+RMD160 ce11305302e2c9777913a7697c44195844fce1d2 files/gnupg-1.4.2-keyserver.patch 389
+SHA256 7f2a020d9fb5a8f7d4dd94f6e70168a348713afb66ad2088123a76e5e439030b files/gnupg-1.4.2-keyserver.patch 389
 MD5 fb96d149b5fc7dacc041dda2a57b2315 files/gnupg-1.4.2-mpicoder.patch 991
+RMD160 72d876fdec86f491b729ccaf95be9d0d1053a8f6 files/gnupg-1.4.2-mpicoder.patch 991
+SHA256 af1c3a0420546226eaa420728a06e9d8eb74e73f17cf4c350aeaebdfdc2bed0b files/gnupg-1.4.2-mpicoder.patch 991
 MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
+RMD160 7eeca9456366fbc9717de8becb3f42e9230d4b66 files/gnupg-1.4.2-selftest.patch 1358
+SHA256 ee99cdee58e519311b4b372595ce99e5da1e38ace8d5a60bf1394937f3e53495 files/gnupg-1.4.2-selftest.patch 1358
 MD5 af68eb5d9d81d48514f170f580d9e83d files/gnupg-1.4.2.1-badruman.patch 558
+RMD160 a96b834dd0bfeeb7b6086248f8bef65ba8830aa2 files/gnupg-1.4.2.1-badruman.patch 558
+SHA256 0b924dce1e5f92f54d52c8f228b8763d674f8f8055d6a81e221774c9ab79bab6 files/gnupg-1.4.2.1-badruman.patch 558
 MD5 e6487554fb0e281b61ae10aa5105dad9 files/gnupg-1.4.2.1-selftest.patch 1374
-MD5 c33d4c0d2018fb8ce862e3651f8dc56c gnupg-1.2.6.ebuild 3824
-MD5 f3c9b66ae60d9489af728fb51f43b67d gnupg-1.4.1-r1.ebuild 6298
-MD5 5ef59105c5a53b2bab60c88b06f6a185 gnupg-1.4.1.ebuild 6210
-MD5 962233a8d9a735a8b2fcbafb990fcfdc gnupg-1.4.2-r1.ebuild 6267
-MD5 f444d77227438c1455e4134fbc92742f gnupg-1.4.2-r2.ebuild 6820
+RMD160 87809c8f21da31868ad92721396e5a4ba96b4612 files/gnupg-1.4.2.1-selftest.patch 1374
+SHA256 c6991fefaef0efee0fe6291a50e928f57024d93636955aa1754b8bcc10b633da files/gnupg-1.4.2.1-selftest.patch 1374
 MD5 7704ccabfdf30bc1a86ad81b8449abec gnupg-1.4.2-r3.ebuild 6872
+RMD160 07ee3dc77ad9a0465b1beea4409be8139fec0205 gnupg-1.4.2-r3.ebuild 6872
+SHA256 0f6a7801b4dc89e52646ffb7039530a0776e9929e65ac0a4c49bd820c69f0800 gnupg-1.4.2-r3.ebuild 6872
 MD5 8dcabb00eac251f533b741a88fca98d8 gnupg-1.4.2.1.ebuild 6839
-MD5 c0303b6186b4642581741079adba89f9 gnupg-1.9.20.ebuild 3262
+RMD160 af2774aa8b2b899b0c9bf8f5704be6fc57b2110c gnupg-1.4.2.1.ebuild 6839
+SHA256 19cbaaab359632cd37321038e1f54391035a7a00c4275a7450fc45cf962db971 gnupg-1.4.2.1.ebuild 6839
+MD5 657a743dbb9b75102f7ef9ec68dd26ef gnupg-1.9.20-r1.ebuild 3239
+RMD160 08bea59e88ebf23f4c028dccac5d249c6d4abd4f gnupg-1.9.20-r1.ebuild 3239
+SHA256 91f69ba5ec8137dec5889a3445b1e87bbead096488471c6c91090761059c7dcb gnupg-1.9.20-r1.ebuild 3239
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
+RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
+SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672 metadata.xml 481
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.2.6 b/app-crypt/gnupg/files/digest-gnupg-1.2.6
deleted file mode 100644
index 80141be29fe1..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.2.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b1890f5dfacd2ba7ab15448c5ff08a4e gnupg-1.2.6.tar.bz2 2550665
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.1 b/app-crypt/gnupg/files/digest-gnupg-1.4.1
deleted file mode 100644
index fa28828dd944..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fdfc5553d0904cd65011e47a42a9532c gnupg-1.4.1.tar.bz2 2822791
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.1-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.1-r1
deleted file mode 100644
index fa28828dd944..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fdfc5553d0904cd65011e47a42a9532c gnupg-1.4.1.tar.bz2 2822791
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.2-r1
deleted file mode 100644
index e9f46e0a9867..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7afd50c7d01fcfada229326b3958404 gnupg-1.4.2.tar.bz2 2891177
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r2 b/app-crypt/gnupg/files/digest-gnupg-1.4.2-r2
deleted file mode 100644
index 181255e43f2e..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
-MD5 c7afd50c7d01fcfada229326b3958404 gnupg-1.4.2.tar.bz2 2891177
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.20 b/app-crypt/gnupg/files/digest-gnupg-1.9.20
deleted file mode 100644
index f4a47876888d..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93899203fc0530f03e146d49b65c1e28 gnupg-1.9.20.tar.bz2 1810059
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.20-r1 b/app-crypt/gnupg/files/digest-gnupg-1.9.20-r1
new file mode 100644
index 000000000000..ba3b6d7aa814
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.9.20-r1
@@ -0,0 +1,3 @@
+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/files/gnupg-1.2.6-ppc64.patch b/app-crypt/gnupg/files/gnupg-1.2.6-ppc64.patch
deleted file mode 100644
index 7f268a9ab796..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.2.6-ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mpi/config.links.orig	2004-12-31 08:35:14.690939440 +0000
-+++ mpi/config.links	2004-12-31 08:36:32.005901592 +0000
-@@ -215,7 +215,11 @@
- 	path="m68k/mc68020 m68k"
- 	;;
- 
--    powerpc*-*-linux*)
-+	powerpc64*-*-linux*)
-+	path="powerpc64"
-+	;;
-+
-+	powerpc*-*-linux*)
- 	echo '/* configured for powerpc/ELF */' >>./mpi/asm-syntax.h
- 	echo '#define ELF_SYNTAX'               >>./mpi/asm-syntax.h
- 	cat   $srcdir/mpi/powerpc32/syntax.h	>>./mpi/asm-syntax.h
diff --git a/app-crypt/gnupg/files/gnupg-1.4.1-selftest.patch b/app-crypt/gnupg/files/gnupg-1.4.1-selftest.patch
deleted file mode 100644
index 4ae2d70b8d44..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.4.1-selftest.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- gnupg-1.4.1/g10/openfile.c.orig	2004-10-14 17:11:56.000000000 +1000
-+++ gnupg-1.4.1/g10/openfile.c	2005-06-28 22:27:52.611861217 +1000
-@@ -392,8 +392,10 @@
-      * To cope with HOME, we do compare only the suffix if we see that
-      * the default homedir does start with a tilde.
-      */
-+#ifndef ENABLE_SELINUX_HACKS
-     if( opt.dry_run || opt.no_homedir_creation )
- 	return;
-+#endif
- 
-     if ( ( *defhome == '~'
-            && ( strlen(fname) >= strlen (defhome+1)
---- gnupg-1.4.1/checks/Makefile.in.orig	2005-03-16 01:52:20.000000000 +1000
-+++ gnupg-1.4.1/checks/Makefile.in	2005-06-29 00:04:24.613682330 +1000
-@@ -516,9 +516,11 @@
- 
- ./gpg_dearmor:
- 	echo '#!/bin/sh' >./gpg_dearmor
--	echo "../g10/gpg --no-options --no-greeting \
-+	echo "../g10/gpg --no-options --no-greeting --homedir . \
-              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
- 	chmod 755 ./gpg_dearmor
-+	if test ! -f ./pubring.gpg; then touch -t 197001020000 ./pubring.gpg; fi
-+	if test ! -f ./secring.gpg; then touch -t 197001020000 ./secring.gpg; fi
- 
- ./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor
- 	./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc
diff --git a/app-crypt/gnupg/gnupg-1.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
deleted file mode 100644
index 296b44a7c732..000000000000
--- a/app-crypt/gnupg/gnupg-1.2.6.ebuild
+++ /dev/null
@@ -1,133 +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.2.6.ebuild,v 1.28 2006/02/17 01:08:01 vanquirius Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
-	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )"
-
-LICENSE="GPL-2 idea? ( IDEA )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc-macos ppc64 s390 sh sparc x86"
-IUSE="X ldap nls static idea selinux"
-
-RDEPEND="!static? ( ldap? ( net-nds/openldap )
-			app-arch/bzip2
-			sys-libs/zlib )
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	nls? ( virtual/libintl )
-	dev-lang/perl
-	virtual/libc
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )"
-
-DEPEND="ldap? ( net-nds/openldap )
-	nls? ( sys-devel/gettext )
-	!static? ( sys-libs/zlib )
-	app-arch/bzip2
-	dev-lang/perl
-	virtual/libc
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Please read http://www.gnupg.org/why-not-idea.html
-	if use idea; then
-		mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-	fi
-
-	cd ${S}
-	epatch ${FILESDIR}/gnupg-1.2.6-ppc64.patch
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
-}
-
-src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# support for external HKP keyservers requested in #16457.
-	local myconf="--enable-external-hkp --enable-static-rnd=linux --libexecdir=/usr/lib --enable-sha512"
-
-	if ! use nls; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	if use ldap; then
-		myconf="${myconf} --enable-ldap"
-	else
-		myconf="${myconf} --disable-ldap"
-	fi
-
-	if use X; then
-		myconf="${myconf} --enable-photo-viewers"
-	else
-		myconf="${myconf} --disable-photo-viewers"
-	fi
-
-	# `USE=static` support was requested in #29299
-	if use static; then
-		myconf="${myconf} --with-included-zlib"
-		append-ldflags -static
-	fi
-
-	# Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	if ! use sparc; then
-		myconf="${myconf} --enable-m-guard"
-	fi
-
-	use ppc-macos || append-ldflags -Wl,-z,now
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR=${D} libexecdir="/usr/lib/gnupg" install || die
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	use idea && dodoc ${S}/cipher/idea.c
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-
-	chmod u+s "${D}/usr/bin/gpg"
-}
-
-pkg_postinst() {
-	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."
-	echo
-	if use idea; then
-		einfo "Please read http://www.gnupg.org/why-not-idea.html for more"
-		einfo "information on IDEA support."
-		einfo
-		einfo "If you are in a country where the IDEA algorithm is patented,"
-		einfo "you are permitted to use it at no cost for 'non revenue"
-		einfo "generating data transfer between private individuals'."
-		einfo
-		einfo "Countries where the patent applies are listed here"
-		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
-	fi
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}
diff --git a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
deleted file mode 100644
index 87013dcaab2c..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,210 +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.4.1-r1.ebuild,v 1.8 2006/02/17 01:08:01 vanquirius Exp $
-
-inherit eutils flag-o-matic
-
-ECCVER=0.1.6
-ECCVER_GNUPG=1.4.0
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
-	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
-	ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard usb zlib X"
-
-#static not working yet
-#!static? (
-#			ldap? ( net-nds/openldap )
-#			bzip2? ( app-arch/bzip2 )
-#			zlib? ( sys-libs/zlib )
-#		)
-
-RDEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	nls? ( virtual/libintl )
-	curl? ( net-misc/curl )
-	virtual/libc
-	virtual/mta
-	readline? ( sys-libs/readline )
-	smartcard? ( dev-libs/libusb )
-	selinux? ( sec-policy/selinux-gnupg )
-	usb? ( dev-libs/libusb )"
-
-RDEPEND="${RDEPEND}
-	X? ( || (  media-gfx/xloadimage media-gfx/xli ) )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	# Please read http://www.gnupg.org/why-not-idea.html
-	if use idea; then
-		mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-	fi
-
-	if use ecc; then
-		# this trickery is because the only reject in the 1.4.0 patch is the
-		# version number!
-		local eccpatch=${WORKDIR}/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
-		if [ "${ECCVER_GNUPG}" != "${PV}" ]; then
-			einfo "Tweaking PV in ECC patch"
-			sed -i "s/ VERSION='${ECCVER_GNUPG}/ VERSION='${PV}/g" $eccpatch
-		fi
-		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch
-	fi
-
-	# maketest fix
-	epatch ${FILESDIR}/${P}-selftest.patch
-
-	# Fix PIC definitions
-	cd ${S}
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
-}
-
-src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# `USE=static` support was requested in #29299
-	# use static && append-ldflags -static
-
-	# Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	use sparc || myconf="${myconf} --enable-m-guard"
-
-	use ppc-macos || append-ldflags -Wl,-z,now
-
-	# configure doesn't trean --disable-asm correctly
-	use x86 && myconf="${myconf} --enable-asm"
-
-
-	# fix compile problem on ppc64
-	use ppc64 && myconf="${myconf} --disable-asm"
-
-	econf \
-		$(use_enable ldap) \
-		--enable-mailto \
-		--enable-hkp \
-		--enable-finger \
-		$(use_with !zlib included-zlib) \
-		$(use_with curl libcurl /usr) \
-		$(use_enable nls) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard card-support) \
-		$(use_enable selinux selinux-support) \
-		$(use_with caps capabilities) \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		$(use_enable X photo-viewers) \
-		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
-		--enable-sha512 \
-		${myconf} || die
-	# this is because it will run some tests directly
-	gnupg_fixcheckperms
-	emake || die
-
-	# NOTE libexecdir dir is deliberately different from that in the install
-}
-
-src_install() {
-	gnupg_fixcheckperms
-	emake DESTDIR=${D} libexecdir="/usr/libexec/gnupg" install || die
-
-	# caps support makes life easier
-	use caps || fperms u+s,go-r /usr/bin/gpg
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-
-	# Remove collissions
-	if use ppc-macos; then
-		rm ${D}/usr/lib/charset.alias ${D}/usr/share/locale/locale.alias
-	fi
-}
-
-gnupg_fixcheckperms() {
-	# GnuPG does weird things for testing that it build correctly
-	# as we as for the additional tests. It WILL fail with perms 770 :-(.
-	# See bug #80044
-	if has userpriv ${FEATURES}; then
-		einfo "Fixing permissions in check directory"
-		chown -R portage:portage ${S}/checks
-		chmod -R ugo+rw ${S}/checks
-		chmod ugo+rw ${S}/checks
-	fi
-}
-
-src_test() {
-	gnupg_fixcheckperms
-	einfo "Running tests"
-	emake check
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		die "Some tests failed! Please report to the Gentoo Bugzilla"
-	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
-	echo
-	if use idea; then
-		einfo "-----------------------------------------------------------------------------------"
-		einfo "IDEA"
-		ewarn "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		ewarn "is distributed under the GPL in countries where it is permitted to do so"
-		ewarn "by law."
-		einfo
-		einfo "Please read http://www.gnupg.org/why-not-idea.html for more information."
-		einfo
-		ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		ewarn "to use it at no cost for 'non revenue generating data transfer between private"
-		ewarn "individuals'."
-		einfo
-		einfo "Countries where the patent applies are listed here"
-		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
-		einfo
-		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
-		einfo "-----------------------------------------------------------------------------------"
-	fi
-	if use ecc; then
-		einfo
-		ewarn "The elliptical curves patch is experimental"
-		einfo "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-	fi
-	if use caps; then
-		einfo
-		ewarn "Capabilities code is experimental"
-	fi
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}
diff --git a/app-crypt/gnupg/gnupg-1.4.1.ebuild b/app-crypt/gnupg/gnupg-1.4.1.ebuild
deleted file mode 100644
index b77c8f6e0e35..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.1.ebuild
+++ /dev/null
@@ -1,206 +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.4.1.ebuild,v 1.20 2006/02/17 01:08:01 vanquirius Exp $
-
-inherit eutils flag-o-matic
-
-ECCVER=0.1.6
-ECCVER_GNUPG=1.4.0
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
-	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
-	ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 mips ppc ppc-macos ppc64 ~s390 sparc x86"
-IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard zlib X"
-
-#static not working yet
-#!static? (
-#			ldap? ( net-nds/openldap )
-#			bzip2? ( app-arch/bzip2 )
-#			zlib? ( sys-libs/zlib )
-#		)
-
-RDEPEND="ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	nls? ( virtual/libintl )
-	curl? ( net-misc/curl )
-	virtual/libc
-	virtual/mta
-	readline? ( sys-libs/readline )
-	smartcard? ( dev-libs/libusb )
-	selinux? ( sec-policy/selinux-gnupg )"
-
-RDEPEND="${RDEPEND}
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	# Please read http://www.gnupg.org/why-not-idea.html
-	if use idea; then
-		mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-	fi
-
-	if use ecc; then
-		# this trickery is because the only reject in the 1.4.0 patch is the
-		# version number!
-		local eccpatch=${WORKDIR}/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
-		if [ "${ECCVER_GNUPG}" != "${PV}" ]; then
-			einfo "Tweaking PV in ECC patch"
-			sed -i "s/ VERSION='${ECCVER_GNUPG}/ VERSION='${PV}/g" $eccpatch
-		fi
-		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch
-	fi
-
-	# maketest fix
-	epatch ${FILESDIR}/${P}-selftest.patch
-
-	# Fix PIC definitions
-	cd ${S}
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
-}
-
-src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# `USE=static` support was requested in #29299
-	# use static && append-ldflags -static
-
-	# Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	use sparc || myconf="${myconf} --enable-m-guard"
-
-	use ppc-macos || append-ldflags -Wl,-z,now
-
-	# configure doesn't trean --disable-asm correctly
-	use x86 && myconf="${myconf} --enable-asm"
-
-	# fix compile problem on ppc64
-	use ppc64 && myconf="${myconf} --disable-asm"
-
-	econf \
-		`use_enable ldap` \
-		--enable-mailto \
-		--enable-hkp \
-		--enable-finger \
-		`use_with !zlib included-zlib` \
-		`use_with curl libcurl /usr` \
-		`use_enable nls` \
-		`use_enable bzip2` \
-		`use_enable smartcard card-support` \
-		`use_enable selinux selinux-support` \
-		`use_with caps capabilities` \
-		`use_with readline` \
-		`use_enable X photo-viewers` \
-		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
-		--enable-sha512 \
-		${myconf} || die
-	# this is because it will run some tests directly
-	gnupg_fixcheckperms
-	emake || die
-
-	# NOTE libexecdir dir is deliberately different from that in the install
-}
-
-src_install() {
-	gnupg_fixcheckperms
-	emake DESTDIR=${D} libexecdir="/usr/libexec/gnupg" install || die
-
-	# caps support makes life easier
-	use caps || fperms u+s,go-r /usr/bin/gpg
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-
-	# Remove collissions
-	if use ppc-macos; then
-		rm ${D}/usr/lib/charset.alias ${D}/usr/share/locale/locale.alias
-	fi
-}
-
-gnupg_fixcheckperms() {
-	# GnuPG does weird things for testing that it build correctly
-	# as we as for the additional tests. It WILL fail with perms 770 :-(.
-	# See bug #80044
-	if has userpriv ${FEATURES}; then
-		einfo "Fixing permissions in check directory"
-		chown -R portage:portage ${S}/checks
-		chmod -R ugo+rw ${S}/checks
-		chmod ugo+rw ${S}/checks
-	fi
-}
-
-src_test() {
-	gnupg_fixcheckperms
-	einfo "Running tests"
-	emake check
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		die "Some tests failed! Please report to the Gentoo Bugzilla"
-	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
-	echo
-	if use idea; then
-		einfo "-----------------------------------------------------------------------------------"
-		einfo "IDEA"
-		ewarn "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		ewarn "is distributed under the GPL in countries where it is permitted to do so"
-		ewarn "by law."
-		einfo
-		einfo "Please read http://www.gnupg.org/why-not-idea.html for more information."
-		einfo
-		ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		ewarn "to use it at no cost for 'non revenue generating data transfer between private"
-		ewarn "individuals'."
-		einfo
-		einfo "Countries where the patent applies are listed here"
-		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
-		einfo
-		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
-		einfo "-----------------------------------------------------------------------------------"
-	fi
-	if use ecc; then
-		einfo
-		ewarn "The elliptical curves patch is experimental"
-		einfo "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-	fi
-	if use caps; then
-		einfo
-		ewarn "Capabilities code is experimental"
-	fi
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}
diff --git a/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild
deleted file mode 100644
index 49ccee2b0178..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,210 +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.4.2-r1.ebuild,v 1.6 2006/02/17 01:08:01 vanquirius Exp $
-
-inherit eutils flag-o-matic
-
-ECCVER=0.1.6
-ECCVER_GNUPG=1.4.0
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
-	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
-	ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard usb zlib X"
-
-#static not working yet
-#!static? (
-#			ldap? ( net-nds/openldap )
-#			bzip2? ( app-arch/bzip2 )
-#			zlib? ( sys-libs/zlib )
-#		)
-
-COMMON_DEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	virtual/libc
-	virtual/mta
-	readline? ( sys-libs/readline )
-	smartcard? ( dev-libs/libusb )
-	usb? ( dev-libs/libusb )"
-
-RDEPEND="${COMMON_DEPEND}
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	# Please read http://www.gnupg.org/why-not-idea.html
-	if use idea; then
-		mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-	fi
-
-	if use ecc; then
-		# this trickery is because the only reject in the 1.4.0 patch is the
-		# version number!
-		local eccpatch=${WORKDIR}/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
-		if [ "${ECCVER_GNUPG}" != "${PV}" ]; then
-			einfo "Tweaking PV in ECC patch"
-			sed -i "s/ VERSION='${ECCVER_GNUPG}/ VERSION='${PV}/g" $eccpatch
-		fi
-		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch
-	fi
-
-	# maketest fix
-	epatch ${FILESDIR}/${P}-selftest.patch
-
-	# Fix PIC definitions
-	cd ${S}
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
-
-	# Fix ldap helper
-	epatch ${FILESDIR}/${P}-keyserver.patch
-}
-
-src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# 'USE=static' support was requested in #29299
-	# use static && append-ldflags -static
-
-	# Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	use sparc || myconf="${myconf} --enable-m-guard"
-
-	use ppc-macos || append-ldflags -Wl,-z,now
-
-	# configure doesn't trean --disable-asm correctly
-	use x86 && myconf="${myconf} --enable-asm"
-
-	# fix compile problem on ppc64
-	use ppc64 && myconf="${myconf} --disable-asm"
-
-	econf \
-		$(use_enable ldap) \
-		--enable-mailto \
-		--enable-hkp \
-		--enable-finger \
-		$(use_with !zlib included-zlib) \
-		$(use_with curl libcurl /usr) \
-		$(use_enable nls) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard card-support) \
-		$(use_enable selinux selinux-support) \
-		$(use_with caps capabilities) \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		$(use_enable X photo-viewers) \
-		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
-		--enable-sha512 \
-		${myconf} || die
-	# this is because it will run some tests directly
-	gnupg_fixcheckperms
-	emake || die
-}
-
-src_install() {
-	gnupg_fixcheckperms
-	make DESTDIR=${D} install || die
-
-	# caps support makes life easier
-	use caps || fperms u+s,go-r /usr/bin/gpg
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-
-	# Remove collissions
-	if use ppc-macos; then
-		rm ${D}/usr/lib/charset.alias ${D}/usr/share/locale/locale.alias
-	fi
-}
-
-gnupg_fixcheckperms() {
-	# GnuPG does weird things for testing that it build correctly
-	# as we as for the additional tests. It WILL fail with perms 770 :-(.
-	# See bug #80044
-	if has userpriv ${FEATURES}; then
-		einfo "Fixing permissions in check directory"
-		chown -R portage:portage ${S}/checks
-		chmod -R ugo+rw ${S}/checks
-		chmod ugo+rw ${S}/checks
-	fi
-}
-
-src_test() {
-	gnupg_fixcheckperms
-	einfo "Running tests"
-	emake check
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		die "Some tests failed! Please report to the Gentoo Bugzilla"
-	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
-	echo
-	if use idea; then
-		einfo "-----------------------------------------------------------------------------------"
-		einfo "IDEA"
-		ewarn "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		ewarn "is distributed under the GPL in countries where it is permitted to do so"
-		ewarn "by law."
-		einfo
-		einfo "Please read http://www.gnupg.org/why-not-idea.html for more information."
-		einfo
-		ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		ewarn "to use it at no cost for 'non revenue generating data transfer between private"
-		ewarn "individuals'."
-		einfo
-		einfo "Countries where the patent applies are listed here"
-		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
-		einfo
-		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
-		einfo "-----------------------------------------------------------------------------------"
-	fi
-	if use ecc; then
-		einfo
-		ewarn "The elliptical curves patch is experimental"
-		einfo "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-	fi
-	if use caps; then
-		einfo
-		ewarn "Capabilities code is experimental"
-	fi
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}
diff --git a/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild
deleted file mode 100644
index 1a0996970ce4..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,234 +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.4.2-r2.ebuild,v 1.13 2006/02/17 01:08:01 vanquirius Exp $
-
-inherit eutils flag-o-matic linux-info
-
-ECCVER=0.1.6
-ECCVER_GNUPG=1.4.0
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
-	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
-	ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc-macos ppc64 ~s390 sparc x86"
-IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard static usb zlib X"
-
-COMMON_DEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	virtual/libc
-	virtual/mta
-	readline? ( sys-libs/readline )
-	smartcard? ( dev-libs/libusb )
-	usb? ( dev-libs/libusb )"
-
-RDEPEND="!static? (
-		${COMMON_DEPEND}
-		X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	)
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# fix bug #113474 - no compiled kernel needed now
-	get_running_version
-
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Jari's patch to boost iterated key setup by factor of 128
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-jari.patch
-
-	if use idea; then
-		ewarn "Please read http://www.gnupg.org/why-not-idea.html"
-		mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-	fi
-
-	if use ecc; then
-		# this trickery is because the only reject in the 1.4.0 patch is the
-		# version number!
-		local eccpatch=${WORKDIR}/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
-		if [ "${ECCVER_GNUPG}" != "${PV}" ]; then
-			einfo "Tweaking PV in ECC patch"
-			sed -i "s/ VERSION='${ECCVER_GNUPG}/ VERSION='${PV}/g" $eccpatch
-		fi
-		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch
-	fi
-
-	# maketest fix
-	epatch ${FILESDIR}/${P}-selftest.patch
-
-	# install RU man page in right location
-	epatch ${FILESDIR}/${P}-badruman.patch
-
-	cd ${S}
-	# keyserver fix
-	epatch ${FILESDIR}/${P}-keyserver.patch
-
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
-}
-
-src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# 'USE=static' support was requested in #29299
-	use static &&append-ldflags -static
-
-	# Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	use sparc || myconf="${myconf} --enable-m-guard"
-
-	use ppc-macos || append-ldflags -Wl,-z,now
-
-	# configure doesn't trean --disable-asm correctly
-	use x86 && myconf="${myconf} --enable-asm"
-
-	# fix compile problem on ppc64
-	use ppc64 && myconf="${myconf} --disable-asm"
-
-	econf \
-		$(use_enable ldap) \
-		--enable-mailto \
-		--enable-hkp \
-		--enable-finger \
-		$(use_with !zlib included-zlib) \
-		$(use_with curl libcurl /usr) \
-		$(use_enable nls) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard card-support) \
-		$(use_enable selinux selinux-support) \
-		$(use_with caps capabilities) \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		$(use_enable static) \
-		$(use_enable X photo-viewers) \
-		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
-		--enable-sha512 \
-		${myconf} || die
-	# this is because it will run some tests directly
-	gnupg_fixcheckperms
-	emake || die
-}
-
-src_install() {
-	gnupg_fixcheckperms
-	make DESTDIR=${D} install || die
-
-	# caps support makes life easier
-	if ! use caps && kernel_is lt 2 6 9
-	then
-		ewarn "installing gpg suid for memory space protection"
-		fperms u+s,go-r /usr/bin/gpg
-	fi
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-
-	# install RU documentation in right location
-	if use linguas_ru
-	then
-		cp doc/gpg.ru.1 ${T}/gpg.1
-		doman -i18n=ru ${T}/gpg.1
-	fi
-
-	# Remove collissions
-	if use ppc-macos; then
-		rm ${D}/usr/lib/charset.alias ${D}/usr/share/locale/locale.alias
-	fi
-}
-
-gnupg_fixcheckperms() {
-	# GnuPG does weird things for testing that it build correctly
-	# as we as for the additional tests. It WILL fail with perms 770 :-(.
-	# See bug #80044
-	if has userpriv ${FEATURES}; then
-		einfo "Fixing permissions in check directory"
-		chown -R portage:portage ${S}/checks
-		chmod -R ugo+rw ${S}/checks
-		chmod ugo+rw ${S}/checks
-	fi
-}
-
-src_test() {
-	gnupg_fixcheckperms
-	einfo "Running tests"
-	emake check
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		die "Some tests failed! Please report to the Gentoo Bugzilla"
-	fi
-}
-
-pkg_postinst() {
-	if ! use caps && kernel_is lt 2 6 9
-	then
-		chmod u+s,go-r ${ROOT}/usr/bin/gpg
-		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."
-	else
-		chmod u-s,go-r ${ROOT}/usr/bin/gpg
-	fi
-	echo
-	if use idea; then
-		einfo "-----------------------------------------------------------------------------------"
-		einfo "IDEA"
-		ewarn "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		ewarn "is distributed under the GPL in countries where it is permitted to do so"
-		ewarn "by law."
-		einfo
-		einfo "Please read http://www.gnupg.org/why-not-idea.html for more information."
-		einfo
-		ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		ewarn "to use it at no cost for 'non revenue generating data transfer between private"
-		ewarn "individuals'."
-		einfo
-		einfo "Countries where the patent applies are listed here"
-		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
-		einfo
-		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
-		einfo "-----------------------------------------------------------------------------------"
-	fi
-	if use ecc; then
-		einfo
-		ewarn "The elliptical curves patch is experimental"
-		einfo "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-	fi
-	if use caps; then
-		einfo
-		ewarn "Capabilities code is experimental"
-	fi
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}
diff --git a/app-crypt/gnupg/gnupg-1.9.20.ebuild b/app-crypt/gnupg/gnupg-1.9.20-r1.ebuild
index 10c4b8157ab4..5158c2278326 100644
--- a/app-crypt/gnupg/gnupg-1.9.20.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.20-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.3 2006/02/17 01:08:01 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.20-r1.ebuild,v 1.1 2006/03/05 14:10:23 genstef Exp $
 
 inherit eutils flag-o-matic
 
@@ -20,7 +20,7 @@ COMMON_DEPEND="
 	>=dev-libs/pth-1.3.7
 	smartcard? ( >=dev-libs/opensc-0.8.0 )
 	>=dev-libs/libgcrypt-1.1.94
-	>=dev-libs/libksba-0.9.12
+	>=dev-libs/libksba-0.9.13
 	>=dev-libs/libgpg-error-1.0
 	=dev-libs/libassuan-0.6.10
 	ldap? ( net-nds/openldap )
@@ -30,15 +30,13 @@ 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 )"
 
-RESTRICT="test"
-# self tests can't work since it depends on gpg-agent
-# Gentoo has put this in its own package (app-crypt/gpg-agent)
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -65,10 +63,11 @@ src_compile() {
 		myconf="${myconf} --disable-photo-viewers"
 	fi
 
-	append-ldflags $(bindnow-flags)
+	use caps || append-ldflags $(bindnow-flags)
 
 	econf \
-		--disable-agent \
+		--enable-agent \
+		--enable-gpgsm \
 		--enable-symcryptrun \
 		--enable-gpg \
 		$(use_enable smartcard scdaemon) \
@@ -84,8 +83,9 @@ src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc ChangeLog NEWS README THANKS TODO VERSION
 
-	if ! use caps ; then
+	if ! use caps; then
 		fperms u+s,go-r /usr/bin/gpg2
+		fperms u+s,go-r /usr/bin/gpg-agent
 	fi
 }