remove cruft and make SRC_URI friendlier

Package-Manager: portage-2.0.51.22-r2

19 files changed, 31 insertions, 897 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index b853bce014c2..8908a7f62c1e 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.121 2005/08/03 00:54:55 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.122 2005/08/03 11:48:09 seemant Exp $
+
+  03 Aug 2005; Seemant Kulleen <seemant@gentoo.org> -gnupg-1.2.4.ebuild,
+  gnupg-1.2.6.ebuild, -gnupg-1.4.0-r1.ebuild, -gnupg-1.4.0-r2.ebuild,
+  gnupg-1.4.1.ebuild, gnupg-1.4.1-r1.ebuild, gnupg-1.4.2.ebuild,
+  -gnupg-1.9.14.ebuild, -gnupg-1.9.15.ebuild, gnupg-1.9.15-r1.ebuild,
+  -gnupg-1.9.16.ebuild:
+  change SRC_URI to reflect mirror://gnupg instead. Also removed a whole bunch
+  of cruft ebuilds.
 
 *gnupg-1.4.2 (03 Aug 2005)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 22479ffebdbc..ca6bf189334f 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,29 +1,17 @@
-MD5 37387694805f83024b7823b35433d1fc gnupg-1.9.15.ebuild 3220
-MD5 6ecc58b77da07fe7882bebe540596707 gnupg-1.2.4.ebuild 4249
-MD5 f5eb46b8fb2d9048a46c8597356b0d96 gnupg-1.2.6.ebuild 3816
-MD5 f3947ad96c747f25725d177cd71c47c8 gnupg-1.4.2.ebuild 6377
-MD5 369faea312e22cbe53340e12b2789f94 gnupg-1.9.14.ebuild 3072
-MD5 5225958353df3f24d3c34c7ef01bdf87 gnupg-1.9.15-r1.ebuild 3063
-MD5 f3b11df31820dc64d62400fcadcf3ce6 gnupg-1.4.0-r2.ebuild 5183
-MD5 39c87153344e78b53e63711e9a014754 gnupg-1.9.16.ebuild 3404
-MD5 05db7952d51f17c10f1f0d3117c76fa4 gnupg-1.4.1-r1.ebuild 6381
-MD5 52a48b27031c926706fb495dcd70969b gnupg-1.4.1.ebuild 6308
-MD5 f0e5192e98cda0e4bbab2f09d6ab913f ChangeLog 19561
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
-MD5 f1562716f6a8af1435234fe95bcfdbaf gnupg-1.4.0-r1.ebuild 4604
-MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 921f00a83ce6b1d77190396b4456f05f gnupg-1.2.6.ebuild 3800
+MD5 cfe5a67b1204af18a6b03edbdbaa5363 gnupg-1.4.1.ebuild 6292
+MD5 25cc01bef564eb349af85dbb81aa06dc gnupg-1.4.1-r1.ebuild 6365
+MD5 d6aec47f51e77081e719189d9e51766d gnupg-1.4.2.ebuild 6362
+MD5 65762289b0895c03fa47da7283a216a6 gnupg-1.9.15-r1.ebuild 3050
+MD5 c80acfbf10e69d2ecd1627a64763c79f ChangeLog 19960
 MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
-MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
-MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2 190
-MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0-r1 117
-MD5 9e4bb59ff6cbb14c85cf044408669ccd files/digest-gnupg-1.4.0-r2 190
-MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
+MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
+MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
+MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
 MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15-r1 66
-MD5 a614d4d6eb27b31d9b4651c349b31c3e files/digest-gnupg-1.9.14 65
-MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15 66
-MD5 8c4a537dc8228a95208b0e227c93ed7d files/digest-gnupg-1.9.16 66
-MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
-MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
+MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
 MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selftest.patch 1180
-MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
+MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2 190
+MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.2.4 b/app-crypt/gnupg/files/digest-gnupg-1.2.4
deleted file mode 100644
index d07dcdb15a4a..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.2.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 16d0b575812060328f8e677b7f0047cc gnupg-1.2.4.tar.bz2 2377277
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.0-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.0-r1
deleted file mode 100644
index d3a4894bee62..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8c303606aaf73b7756b9fe6f3d8b58c2 gnupg-1.4.0.tar.bz2 2722669
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.0-r2 b/app-crypt/gnupg/files/digest-gnupg-1.4.0-r2
deleted file mode 100644
index 7fc98bd1a9bb..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8c303606aaf73b7756b9fe6f3d8b58c2 gnupg-1.4.0.tar.bz2 2722669
-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.9.14 b/app-crypt/gnupg/files/digest-gnupg-1.9.14
deleted file mode 100644
index 63c90efe8d60..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72b56586392c7be6668df4ef8ea7c879 gnupg-1.9.14.tar.gz 1925582
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.15 b/app-crypt/gnupg/files/digest-gnupg-1.9.15
deleted file mode 100644
index bc188f89d378..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b1d0562b66b1853b77d511feb786629 gnupg-1.9.15.tar.bz2 1636927
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.16 b/app-crypt/gnupg/files/digest-gnupg-1.9.16
deleted file mode 100644
index f4bdad3e3554..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1282755dce9cf4a84e904ca0191017a3 gnupg-1.9.16.tar.bz2 1707356
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
deleted file mode 100644
index 8bb0bec8e9e7..000000000000
--- a/app-crypt/gnupg/gnupg-1.2.4.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.30 2005/07/29 22:41:54 dragonheart Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/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 ppc64 sparc x86"
-IUSE="X ldap nls static caps idea selinux"
-
-RDEPEND="!static? ( ldap? ( net-nds/openldap )
-		caps? ( sys-libs/libcap )
-		app-arch/bzip2
-		sys-libs/zlib )
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	nls? ( sys-devel/gettext )
-	virtual/libc
-	dev-lang/perl
-	selinux? ( sec-policy/selinux-gnupg )"
-
-DEPEND="caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	nls? ( sys-devel/gettext )
-	!static? ( sys-libs/zlib )
-	app-arch/bzip2
-	virtual/libc
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-
-	if use hppa
-	then
-		cd ${S}
-		epatch ${FILESDIR}/gnupg-1.2.4-hppa_unaligned_constant.patch
-	fi
-
-	# 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
-
-	use ppc64 && epatch ${FILESDIR}/gnupg-1.2.4.ppc64.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
-
-	# 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"
-		export LDFLAGS="${LDFLAGS} -static"
-	else
-		myconf="${myconf} --without-included-zlib"
-	fi
-
-	if use caps; then
-		myconf="${myconf} --with-capabilities"
-	fi
-
-	# Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	if ! use sparc; then
-		myconf="${myconf} --enable-m-guard"
-	fi
-
-	append-ldflags -Wl,-z,now
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR=${D} libexecdir="/usr/lib/gnupg" install || die "install failed"
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL 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
-
-	if ! use caps; then
-		chmod u+s "${D}/usr/bin/gpg"
-	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 "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		einfo "is distributed under the GPL in countries where it is permitted to do so"
-		einfo "by law."
-		einfo
-		einfo "Please read http://www.gnupg.org/why-not-idea.html for more information."
-		einfo
-		einfo "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		einfo "to use it at no cost for 'non revenue generating data transfer between private"
-		einfo "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/"
-	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.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index 56367eb39ec2..b7b35bdebbb8 100644
--- a/app-crypt/gnupg/gnupg-1.2.6.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 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.24 2005/07/29 22:41:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.25 2005/08/03 11:48:09 seemant Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
 	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )"
 
 LICENSE="GPL-2 idea? ( IDEA )"
diff --git a/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
deleted file mode 100644
index 3ba26960b1c0..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild,v 1.8 2005/07/29 22:41:54 dragonheart Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
-	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ppc ~ppc-macos ~s390 -sparc ~x86 ~ia64 ~mips ~ppc64"
-IUSE="X bzip2 caps idea ldap nls readline selinux smartcard zlib"
-
-RDEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	nls? ( sys-devel/gettext )
-	virtual/libc
-	readline? ( sys-libs/readline )
-	selinux? ( sec-policy/selinux-gnupg )"
-# Disabling X and usb until dependancies has sufficient keywords
-#	X? ( media-gfx/xloadimage media-gfx/xli )
-#	smartcard? ( dev-libs/libusb )
-
-# static not working yet
-#	!static? (
-#			ldap? ( net-nds/openldap )
-#			bzip2? ( app-arch/bzip2 )
-#			zlib? ( sys-libs/zlib )
-#		)
-
-# 	dev-lang/perl
-#	virtual/mta
-
-
-DEPEND="ldap? ( net-nds/openldap )
-	nls? ( sys-devel/gettext )
-	zlib? ( sys-libs/zlib )
-	bzip2? ( app-arch/bzip2 )
-	dev-lang/perl
-	virtual/libc"
-
-#	smartcard? ( dev-libs/libusb )
-
-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}
-	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"
-
-	if ! use zlib; then
-		myconf="${myconf} --with-included-zlib"
-	else
-		myconf="${myconf} --without-included-zlib"
-	fi
-
-	use ppc-macos || append-ldflags -Wl,-z,now
-
-	if use ppc-macos && use caps; then
-		eerror "Capabilities support is only available for Linux."
-	fi
-
-	econf \
-		`use_enable X photo-viewers` \
-		`use_enable ldap` \
-		--enable-mailto \
-		--enable-hkp \
-		--enable-finger \
-		`use_enable nls` \
-		`use_enable bzip2` \
-		`use_enable smartcard card-support` \
-		`use_enable selinux selinux-support` \
-		`use_enable x86 asm` \
-		`use_with caps capabilities` \
-		`use_with readline` \
-		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
-		--enable-sha512 \
-		${myconf} || die
-	emake || die
-
-	# NOTE libexecdir dir is deliberately different from that in the install
-}
-
-src_install() {
-	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 INSTALL NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-}
-
-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 "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		einfo "is distributed under the GPL in countries where it is permitted to do so"
-		einfo "by law."
-		einfo
-		einfo "Please read http://www.gnupg.org/why-not-idea.html for more information."
-		einfo
-		einfo "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		einfo "to use it at no cost for 'non revenue generating data transfer between private"
-		einfo "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/"
-	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.0-r2.ebuild b/app-crypt/gnupg/gnupg-1.4.0-r2.ebuild
deleted file mode 100644
index 2f449fa27d33..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.0-r2.ebuild,v 1.6 2005/07/29 22:41:54 dragonheart Exp $
-
-inherit eutils flag-o-matic
-
-ECCVER=0.1.6
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
-	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
-	ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${P}-ecc${ECCVER}.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc-macos ~s390 ~sparc ~x86 ~ia64 ~mips ~ppc64"
-IUSE="ecc ldap nls readline caps zlib idea bzip2 selinux smartcard"
-#
-# Disabling X until media-gfx/xli has sufficient keywords
-# missing ~alpha ~ia64 ~mips = bug #76234
-
-#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? ( sys-devel/gettext )
-	virtual/libc
-	readline? ( sys-libs/readline )
-	smartcard? ( dev-libs/libusb )
-	selinux? ( sec-policy/selinux-gnupg )"
-
-
-#	X? ( media-gfx/xloadimage media-gfx/xli )
-
-# 	dev-lang/perl
-#	virtual/mta
-
-
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-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}
-	if use ecc; then
-		epatch ${WORKDIR}/${P}-ecc${ECCVER}.diff
-	fi
-	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"
-
-	if ! use zlib; then
-		myconf="${myconf} --with-included-zlib"
-	else
-		myconf="${myconf} --without-included-zlib"
-	fi
-
-	use ppc-macos || append-ldflags -Wl,-z,now
-
-	if use ppc-macos && use caps; then
-		eerror "Capabilities support is only available for Linux."
-	fi
-
-	# configure doesn't trean --disable-asm correctly
-	use x86 && myconf="${myconf} --enable-asm"
-
-	# 		`use_enable X photo-viewers` \
-	#
-	econf \
-		`use_enable ldap` \
-		--enable-mailto \
-		--enable-hkp \
-		--enable-finger \
-		`use_enable nls` \
-		`use_enable bzip2` \
-		`use_enable smartcard card-support` \
-		`use_enable selinux selinux-support` \
-		`use_with caps capabilities` \
-		`use_with readline` \
-		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
-		--enable-sha512 \
-		${myconf} || die
-	emake || die
-
-	# NOTE libexecdir dir is deliberately different from that in the install
-}
-
-src_install() {
-	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 INSTALL NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-}
-
-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 "Capabilites 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-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
index e2c464274003..f851bdebb2be 100644
--- a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4 2005/07/29 22:41:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild,v 1.5 2005/08/03 11:48:09 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,7 +9,7 @@ ECCVER_GNUPG=1.4.0
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
+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 )"
 
diff --git a/app-crypt/gnupg/gnupg-1.4.1.ebuild b/app-crypt/gnupg/gnupg-1.4.1.ebuild
index c8324f61e97c..f8d40cbcb718 100644
--- a/app-crypt/gnupg/gnupg-1.4.1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.16 2005/07/29 22:41:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1.ebuild,v 1.17 2005/08/03 11:48:09 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,7 +9,7 @@ ECCVER_GNUPG=1.4.0
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
+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 )"
 
diff --git a/app-crypt/gnupg/gnupg-1.4.2.ebuild b/app-crypt/gnupg/gnupg-1.4.2.ebuild
index dfa3865bbf20..da8f4466b5d9 100644
--- a/app-crypt/gnupg/gnupg-1.4.2.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.1 2005/08/03 00:54:55 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2.ebuild,v 1.2 2005/08/03 11:48:09 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,7 +9,7 @@ ECCVER_GNUPG=1.4.0
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
+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 )"
 
diff --git a/app-crypt/gnupg/gnupg-1.9.14.ebuild b/app-crypt/gnupg/gnupg-1.9.14.ebuild
deleted file mode 100644
index ed629aa41360..000000000000
--- a/app-crypt/gnupg/gnupg-1.9.14.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.14.ebuild,v 1.8 2005/07/09 19:33:16 swegener Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="X caps ldap nls smartcard static selinux"
-
-RDEPEND="
-	!static? (
-		ldap? ( net-nds/openldap )
-		caps? ( sys-libs/libcap )
-		sys-libs/zlib
-	)
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	nls? ( sys-devel/gettext )
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libksba-0.9.7
-	smartcard? ( dev-libs/opensc )
-	virtual/libc
-	dev-lang/perl
-	dev-libs/pth
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )"
-
-DEPEND="caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	nls? ( sys-devel/gettext )
-	>=dev-libs/libgcrypt-1.1.94
-	>=dev-libs/libksba-0.9.7
-	>=dev-libs/libassuan-0.6.9
-	smartcard? ( dev-libs/opensc )
-	sys-libs/zlib
-	virtual/libc
-	dev-lang/perl
-	dev-libs/pth"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e 's/PIC/__PIC__/g' ${S}/intl/relocatable.c
-}
-
-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
-
-	append-ldflags -Wl,-z,now
-
-	econf \
-		--disable-agent \
-		`use_enable smartcard scdaemon` \
-		`use_enable nls` \
-		`use_enable ldap` \
-		`use_with caps capabilities` \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dosym gpg2 /usr/bin/gpg
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc ChangeLog INSTALL NEWS README THANKS TODO VERSION
-
-	if ! use caps ; then
-		fperms u+s,go-r /usr/bin/gpg2
-	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
-	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
-	ewarn "	THIS IS _ALPHA_ CODE, IT MAY NOT WORK CORRECTLY OR AT ALL. THERE"
-	ewarn "	MAY BE UNDISCOVERED SECURITY OR DATA-LOSS ISSUES, DO NOT USE"
-	ewarn "	IN A PRODUCTION ENVIRONMENT."
-	ewarn
-	ewarn "	This ebuild is provided for those who wish to experiment with this"
-	ewarn "	new branch of gnupg and beta-testers, not for general purpose use"
-	ewarn "	by non-developers"
-	ewarn
-	ewarn "	Please see #37109"
-	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
-
-	einfo
-	einfo "gpg-agent is now provided in app-crypt/gpg-agent"
-	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.15-r1.ebuild b/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild
index 2ae3671fd6c1..f624b3a1b5c3 100644
--- a/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild,v 1.3 2005/07/09 19:33:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild,v 1.4 2005/08/03 11:48:09 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -8,7 +8,7 @@ ECCVER=0.1.6
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.bz2"
+SRC_URI="mirror://gnupg/alpha/gnupg/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-crypt/gnupg/gnupg-1.9.15.ebuild b/app-crypt/gnupg/gnupg-1.9.15.ebuild
deleted file mode 100644
index 22e833a1fae8..000000000000
--- a/app-crypt/gnupg/gnupg-1.9.15.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.15.ebuild,v 1.4 2005/07/09 19:33:16 swegener Exp $
-
-inherit eutils flag-o-matic
-
-ECCVER=0.1.6
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="X caps ldap nls smartcard static threads selinux"
-
-RDEPEND="
-	!static? (
-		ldap? ( net-nds/openldap )
-		caps? ( sys-libs/libcap )
-		sys-libs/zlib
-	)
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	nls? ( sys-devel/gettext )
-	>=dev-libs/libgcrypt-1.1.94
-	>=dev-libs/libksba-0.9.7
-	=dev-libs/libassuan-0.6.9
-	smartcard? ( >=dev-libs/opensc-0.8.0 )
-	sys-libs/zlib
-	virtual/libc
-	dev-lang/perl
-	threads? ( >=dev-libs/pth-1.3.7 )
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )"
-
-DEPEND="caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	nls? ( sys-devel/gettext )
-	>=dev-libs/libgcrypt-1.1.94
-	>=dev-libs/libksba-0.9.7
-	>=dev-libs/libassuan-0.6.9
-	smartcard? ( >=dev-libs/opensc-0.8.0 )
-	sys-libs/zlib
-	virtual/libc
-	dev-lang/perl
-	threads? ( >=dev-libs/pth-1.3.7 )"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e 's/PIC/__PIC__/g' ${S}/intl/relocatable.c
-}
-
-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
-
-	append-ldflags -Wl,-z,now
-
-	econf \
-		--disable-agent \
-		`use_enable smartcard scdaemon` \
-		`use_enable nls` \
-		`use_enable ldap` \
-		`use_with caps capabilities` \
-		`use_enable threads` \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dosym gpg2 /usr/bin/gpg
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc ChangeLog INSTALL NEWS README THANKS TODO VERSION
-
-	if ! use caps ; then
-		fperms u+s,go-r /usr/bin/gpg2
-	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
-	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
-	ewarn "	THIS IS _ALPHA_ CODE, IT MAY NOT WORK CORRECTLY OR AT ALL. THERE"
-	ewarn "	MAY BE UNDISCOVERED SECURITY OR DATA-LOSS ISSUES, DO NOT USE"
-	ewarn "	IN A PRODUCTION ENVIRONMENT."
-	ewarn
-	ewarn "	This ebuild is provided for those who wish to experiment with this"
-	ewarn "	new branch of gnupg and beta-testers, not for general purpose use"
-	ewarn "	by non-developers"
-	ewarn
-	ewarn "	Please see #37109"
-	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
-
-	einfo
-	einfo "gpg-agent is now provided in app-crypt/gpg-agent"
-
-	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.16.ebuild b/app-crypt/gnupg/gnupg-1.9.16.ebuild
deleted file mode 100644
index c7a416aef81f..000000000000
--- a/app-crypt/gnupg/gnupg-1.9.16.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.16.ebuild,v 1.4 2005/07/09 19:33:16 swegener Exp $
-
-inherit eutils flag-o-matic
-
-ECCVER=0.1.6
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-*"
-IUSE="X caps ldap nls smartcard static threads selinux"
-
-DEPEND_COMMON="
-	nls? ( sys-devel/gettext )
-	dev-lang/perl
-	sys-libs/zlib
-	virtual/libc
-	threads? ( >=dev-libs/pth-1.3.7 )
-	smartcard? ( >=dev-libs/opensc-0.8.0 )
-	>=dev-libs/libgcrypt-1.1.94
-	>=dev-libs/libksba-0.9.7
-	>=dev-libs/libgpg-error-1.0
-	=dev-libs/libassuan-0.6.9"
-
-RDEPEND="
-	${DEPEND_COMMON}
-	!static? (
-		ldap? ( net-nds/openldap )
-		caps? ( sys-libs/libcap )
-	)
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )"
-
-DEPEND="
-	${DEPEND_COMMON}
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )"
-
-src_unpack() {
-	ewarn "Danger BETA software"
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c
-	use caps && return 0
-	sed -i \
-		-e '/^gpg2_LDADD/s:=:=-Wl,-z,now:' \
-		g10/Makefile.in || die "sed -z now"
-}
-
-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
-
-	econf \
-		--disable-agent \
-		--enable-gpg \
-		--enable-hkp \
-		--enable-mailto \
-		--enable-keyserver-helpers \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_with caps capabilities) \
-		$(use_enable threads) \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-
-src_test() {
-	make check
-	einfo "The below test may have failed (two faults reported) - told you this was beta"
-	einfo "asschk: cmd_expect_ok: expected OK but got ERR 50331649 General error <GpgSM>"
-
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dosym gpg2 /usr/bin/gpg
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc ChangeLog INSTALL NEWS README THANKS TODO VERSION
-
-	if ! use caps ; then
-		fperms u+s,go-r /usr/bin/gpg2
-	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
-	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
-	ewarn "	THIS IS _ALPHA_ CODE, IT MAY NOT WORK CORRECTLY OR AT ALL. THERE"
-	ewarn "	MAY BE UNDISCOVERED SECURITY OR DATA-LOSS ISSUES, DO NOT USE"
-	ewarn "	IN A PRODUCTION ENVIRONMENT."
-	ewarn
-	ewarn "	This ebuild is provided for those who wish to experiment with this"
-	ewarn "	new branch of gnupg and beta-testers, not for general purpose use"
-	ewarn "	by non-developers"
-	ewarn
-	ewarn "	Please see #37109"
-	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
-
-	einfo
-	einfo "gpg-agent is now provided in app-crypt/gpg-agent"
-
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}