Trim redundant versions.

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

7 files changed, 7 insertions, 536 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 51fa75cb80c6..91e652055f72 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.393 2010/10/19 01:42:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.394 2010/10/19 05:35:30 robbat2 Exp $
+
+  19 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> -gnupg-2.0.11.ebuild,
+  -gnupg-2.0.12.ebuild, -gnupg-2.0.13.ebuild, -gnupg-2.0.14.ebuild,
+  -gnupg-2.0.15.ebuild:
+  Trim redundant versions.
 
 *gnupg-2.0.16-r2 (19 Oct 2010)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 41788d7523cb..60796b6d93fb 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -3,23 +3,13 @@ AUX gnupg-2.0.16-opengpgv2-sha2.patch 1279 RMD160 10477e39c734df91d82e5f9d97039c
 AUX gnupg-realloc-X.509.patch 295 RMD160 2428ed04b6f4ee1d8fc5f5ee9fa58ed820aea9f0 SHA1 aa096528a4ffaf5c50a154a6c793feee901a5e46 SHA256 9c6d7f905662e655a5a7cb04381b4deeaaee714f2d00c736a670b1b2dba3c114
 DIST gnupg-1.4.10.tar.bz2 3410814 RMD160 d54063eaa5b25dc3c3f4ad924411ec69c25c1e62 SHA1 fd1b6a5f3b2dd836b598a1123ac257b8f105615d SHA256 a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38
 DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
-DIST gnupg-2.0.11.tar.bz2 3852869 RMD160 f532a2c41a4fdcf9bd5130f8d382348f6774ba18 SHA1 9f71a342c5be686b0dcef082078af693802a558f SHA256 8c40148ad471f4a7e583bc5f84ebf652c395b303deaf2583b11e51f43fa8b47c
-DIST gnupg-2.0.12.tar.bz2 3924196 RMD160 17edbd6bac5210933ef0cc2ce70820d38ce970ef SHA1 91856f917c13a1a12622ef39995eaf59c46f7502 SHA256 9633e104c519fade1c9fce5843d1f70439b156bcc446aa270ea8192d461d9cce
-DIST gnupg-2.0.13.tar.bz2 3946616 RMD160 a2291f4d5923b50bca980b726e2fe0c31c2589a9 SHA1 2ff42aff14cdddafc291d44ac1968af5f09a9d4d SHA256 d9b3d71f8f2930483d7b7b56276ebe954175b72b34128c6669d0fc00d289aa2e
-DIST gnupg-2.0.14.tar.bz2 3982080 RMD160 3e5ecf0108b65f7d2ecfd6f61b81e04e526ba52f SHA1 cc5e4637f37f5bc82b00c73fc094ddadb7401821 SHA256 feb6050dc00e59d426485550a2af8d416cf975e5e1e0ecf1c5f1bd139baafca5
-DIST gnupg-2.0.15.tar.bz2 3976879 RMD160 16fe31125f2a7e18ffc5618902e2d3370b220e65 SHA1 3596668fb9cc8ec0714463a5009f990fc23434b0 SHA256 5881882f4da120ce1c71da64468392704b391ca7652ddc512bc4f1d8968f0d1c
 DIST gnupg-2.0.16.tar.bz2 4004033 RMD160 3a0ed7a3ebb28fdb875533ff3368f6af3a0bb742 SHA1 e7eb4f60026884bd90803b531472bc518804b95d SHA256 0d5abb977c02ebb0f6ce25a5ba71c8df90835aa666a85acd73a9b7f9df35a80b
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
 EBUILD gnupg-1.4.10-r1.ebuild 5460 RMD160 f3da83b605b8e23da939cae854af4928ccc774b9 SHA1 e9e6b75b8b8581359dd1a5037585bc43c40a9e60 SHA256 67cc2dc3fc50467e28991c2bacac88403b9dda380e90c17cf446042427726d06
 EBUILD gnupg-1.4.10.ebuild 5377 RMD160 33dd305ca1e377a6ae154b27316c868e7c8c8fd4 SHA1 5921bb2138994baf8309f172dc6258067ef46812 SHA256 a53465eba2f18eb70eff2fc1619862878efb86508d0a02182f0f2a7bb44a0347
 EBUILD gnupg-1.4.11.ebuild 5427 RMD160 24d1c5652e4df5ad296e40c8a82a294a4a81a351 SHA1 8a2f0d9fa974224b7ce0c32482316940e82a3797 SHA256 97e0696c00456d02b43f20d8d85b7d11afa419a3c95760d1468fbe809b425e56
-EBUILD gnupg-2.0.11.ebuild 2792 RMD160 269f007092ae559b86f9582dbebe5a15a28773bf SHA1 031e227abf10c8456f9e9003212173fdcb397b4d SHA256 76de1e041a49a01f4a544823b6b1545780efe1f036eab2b7d0994220ae3e25b6
-EBUILD gnupg-2.0.12.ebuild 3215 RMD160 805b1b47ddc9d9c7560e3ff3bd22c5cd7c331e38 SHA1 a874ee8f860f4c7540185a2d54a71adb8c6fbf03 SHA256 a187ec9a33f09802a7401fc140f74de0d775862167622514e2584b49c7afd0a6
-EBUILD gnupg-2.0.13.ebuild 3188 RMD160 9870213d08a85e548d3c51940e98caf243f3ad4c SHA1 d626590a51b631b86ad9768936c2dd71feca7852 SHA256 3879824e38fe7d6910e157c92c8f1f75e1f0d131d119d382b39a7a79e227b27b
-EBUILD gnupg-2.0.14.ebuild 3274 RMD160 cfb59ca50fafe7ab0c2d3d9e2452a23ca3a3b5e1 SHA1 19b663620fa8f20e5bfa11ce55b1d0281a25abe5 SHA256 e13246d0ffbe5d3dec8666f8a4b858172a6935d177dbdd4baefd395ed658b409
-EBUILD gnupg-2.0.15.ebuild 3397 RMD160 f7033731621c64be43443e100f0a2d1d0099d60b SHA1 1c08ff76d9117218e90af8f504aaee27e16e00e5 SHA256 e59f83bee25b6a6f82f5a2f101a6dc9c3072487f0d879fb4f3a1ea93875a63b8
 EBUILD gnupg-2.0.16-r1.ebuild 3495 RMD160 a9ba552f10b1728440e361d2f00e56f95c663c90 SHA1 f4e22310ee4dd607eb220aa74cfcfd22363902a1 SHA256 71ffb3b17afacd1c13aaedb3621f0f9696be680ee8cb118536d0c4f50bacac8c
 EBUILD gnupg-2.0.16-r2.ebuild 4381 RMD160 72252838891d5cd784505415793c5851323528a8 SHA1 ca13301ab7ae8e022768441d07e9d325180d5b49 SHA256 3a02d9dd2f14ddaaa2d28bdd3da8a790929d42fed8c78ce60362a47a5e7fcfd5
 EBUILD gnupg-2.0.16.ebuild 3409 RMD160 aca83b8bfe52da4f6cdb89b77d7480b56540988b SHA1 40ada55022909a978585405bf2361e024ad62576 SHA256 51c27ff74626aef25a572b0afb1a520775db95189419a1cef1ac0a2a11e29c7d
-MISC ChangeLog 59633 RMD160 bd8022776cd35d9a8da579d9ddf2986e4b760748 SHA1 8f9d89329ccc672964b6d515294fef0ec53b3543 SHA256 bdce145827c26912e821a8e717091f50f5e0c411300ae3eff6aeb3ef20b93c0c
+MISC ChangeLog 59828 RMD160 98e05b2d888e4d0c0fb434b0bc7469530293c04d SHA1 ddc5d6a58ad3dc979a7d6c04f8768f03fa795ccf SHA256 d5a03c0fda3e8ed4c4f8f3a2cbc4b7b39b0c5605a836f900abaa34e34252bbe7
 MISC metadata.xml 698 RMD160 8c3577ffbf64da24c47d181ef24f8f7e9e09a224 SHA1 92579ce4870e7bbee4bf596bb466b3f9ce587157 SHA256 8f18f677d1d437d3033b367e8a7514b745a762d518af7a3afdc44e1ddbf2b31e
diff --git a/app-crypt/gnupg/gnupg-2.0.11.ebuild b/app-crypt/gnupg/gnupg-2.0.11.ebuild
deleted file mode 100644
index 41622f379429..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.11.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.11.ebuild,v 1.10 2010/09/30 18:56:21 ssuominen Exp $
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libksba-1.0.2
-	>=dev-libs/libgpg-error-1.4
-	>=net-misc/curl-7.7.2
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	smartcard? ( =virtual/libusb-0* )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
-
-# existence of bins are checked during configure
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	=dev-libs/libassuan-1*
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	virtual/mta
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_compile() {
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_enable static) \
-		$(use_enable caps capabilities) \
-		CC_FOR_BUILD=$(tc-getBUILD_CC)
-	emake || die "emake failed"
-	if use doc; then
-		cd doc
-		emake html || die "emake html failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	mv "${D}/usr/share/gnupg"/help* "${D}/usr/share/doc/${PF}"
-	ecompressdir "/usr/share/doc/${P}"
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	echo ".so man1/gpg2.1" > "${D}/usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${D}/usr/share/man/man1/gpgv.1"
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer"
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.12.ebuild b/app-crypt/gnupg/gnupg-2.0.12.ebuild
deleted file mode 100644
index badde28a1218..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.12.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.12.ebuild,v 1.4 2010/09/30 18:56:21 ssuominen Exp $
-
-EAPI="2"
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libksba-1.0.2
-	>=dev-libs/libgpg-error-1.7
-	>=net-misc/curl-7.10
-	adns? ( >=net-libs/adns-1.4 )
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	smartcard? ( =virtual/libusb-0* )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
-
-# existence of bins are checked during configure
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	=dev-libs/libassuan-1*
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	virtual/mta
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-adns.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_with caps capabilities) \
-		CC_FOR_BUILD=$(tc-getBUILD_CC)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd doc
-		emake html || die "emake html failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	mv "${D}/usr/share/gnupg"/help* "${D}/usr/share/doc/${PF}"
-	ecompressdir "/usr/share/doc/${P}"
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	echo ".so man1/gpg2.1" > "${D}/usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${D}/usr/share/man/man1/gpgv.1"
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer"
-
-	ewarn "Please remember to restart gpg-agent if this if the agent"
-	ewarn "you are currently using. If you are unsure of the gpg "
-	ewarn "agent you are using please run \'killall gpg-agent\',"
-	ewarn "and to start a fresh daemon just run \'gpg-agent --daemon\'."
-
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.13.ebuild b/app-crypt/gnupg/gnupg-2.0.13.ebuild
deleted file mode 100644
index f914a75f0279..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.13.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.13.ebuild,v 1.5 2010/09/30 18:56:21 ssuominen Exp $
-
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libksba-1.0.2
-	>=dev-libs/libgpg-error-1.7
-	>=net-misc/curl-7.10
-	adns? ( >=net-libs/adns-1.4 )
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	smartcard? ( =virtual/libusb-0* )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
-
-# existence of bins are checked during configure
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	=dev-libs/libassuan-1*
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	virtual/mta
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_configure() {
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_with caps capabilities) \
-		CC_FOR_BUILD=$(tc-getBUILD_CC)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd doc
-		emake html || die "emake html failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	mv "${D}/usr/share/gnupg"/help* "${D}/usr/share/doc/${PF}"
-	ecompressdir "/usr/share/doc/${P}"
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	echo ".so man1/gpg2.1" > "${D}/usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${D}/usr/share/man/man1/gpgv.1"
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.14.ebuild b/app-crypt/gnupg/gnupg-2.0.14.ebuild
deleted file mode 100644
index 012a528f502f..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.14.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.14.ebuild,v 1.10 2010/09/30 18:56:21 ssuominen Exp $
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libksba-1.0.2
-	>=dev-libs/libgpg-error-1.7
-	>=net-misc/curl-7.10
-	adns? ( >=net-libs/adns-1.4 )
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	smartcard? ( =virtual/libusb-0* )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
-
-# existence of bins are checked during configure
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	=dev-libs/libassuan-1*
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	virtual/mta
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_configure() {
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_with caps capabilities) \
-		CC_FOR_BUILD=$(tc-getBUILD_CC)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd doc
-		emake html || die "emake html failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	mv "${ED}usr/share/gnupg/help"* "${ED}usr/share/doc/${PF}"
-	ecompressdir "/usr/share/doc/${PF}"
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1"
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.15.ebuild b/app-crypt/gnupg/gnupg-2.0.15.ebuild
deleted file mode 100644
index ce4fd1230274..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.15.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.15.ebuild,v 1.14 2010/09/30 18:56:21 ssuominen Exp $
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libgpg-error-1.7
-	>=dev-libs/libksba-1.0.2
-	>=net-misc/curl-7.10
-	adns? ( >=net-libs/adns-1.4 )
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	smartcard? ( =virtual/libusb-0* )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
-
-# existence of bins are checked during configure
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	static? ( >=dev-libs/libassuan-2[static-libs] )
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	virtual/mta
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_configure() {
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable !elibc_SunOS symcryptrun) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_with caps capabilities) \
-		CC_FOR_BUILD=$(tc-getBUILD_CC)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd doc
-		emake html || die "emake html failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	mv "${ED}usr/share/gnupg/help"* "${ED}usr/share/doc/${PF}"
-	ecompressdir "/usr/share/doc/${PF}"
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1"
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}