Cleanup

(Portage version: 2.1.2.1-r1)

12 files changed, 0 insertions, 664 deletions

diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.0 b/app-crypt/gnupg/files/digest-gnupg-2.0.0
deleted file mode 100644
index 2ff805dd4b3c..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-2.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13c0d43bd1f4a129de470dda20192284 gnupg-2.0.0.tar.bz2 3904270
-RMD160 739e303f1380ec9cb5c3a248179001700efe6f2e gnupg-2.0.0.tar.bz2 3904270
-SHA256 aae6d4ca81787f05ee98ef6b0c27d54e209b06c62553b1ce10a1b4e84b18897f gnupg-2.0.0.tar.bz2 3904270
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1 b/app-crypt/gnupg/files/digest-gnupg-2.0.1
deleted file mode 100644
index 8adb116e6cf6..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-2.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
-RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
-SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r1 b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r1
deleted file mode 100644
index 8adb116e6cf6..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
-RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
-SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r2 b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r2
deleted file mode 100644
index 8adb116e6cf6..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
-RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
-SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3 b/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3
deleted file mode 100644
index 8adb116e6cf6..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-2.0.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb24e258db73f4cb53a3ce18375efa21 gnupg-2.0.1.tar.bz2 3923924
-RMD160 3b9252b9b8b1ff5c242a3e541adc0a9700e55df1 gnupg-2.0.1.tar.bz2 3923924
-SHA256 49949762a4e080379dcca23948442d50488f0d74e04bcba87fc49e19a899b01d gnupg-2.0.1.tar.bz2 3923924
diff --git a/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch b/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch
deleted file mode 100644
index 8639ae26261a..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.0.1-agent.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urNp gnupg-2.0.1.org/g10/call-agent.c gnupg-2.0.1/g10/call-agent.c
---- gnupg-2.0.1.org/g10/call-agent.c	2006-10-04 16:49:27.000000000 +0200
-+++ gnupg-2.0.1/g10/call-agent.c	2007-01-29 21:46:57.000000000 +0200
-@@ -87,7 +87,10 @@ start_agent (void)
-     return 0; /* fixme: We need a context for each thread or serialize
-                  the access to the agent. */
- 
--  infostr = force_pipe_server? NULL : getenv ("GPG_AGENT_INFO");
-+  if (opt.gpg_agent_info != NULL)
-+    infostr = opt.gpg_agent_info;
-+  else
-+    infostr = force_pipe_server? NULL : getenv ("GPG_AGENT_INFO");
-   if (!infostr || !*infostr)
-     {
-       const char *pgmname;
diff --git a/app-crypt/gnupg/files/gnupg-2.0.1-bsd-make.patch b/app-crypt/gnupg/files/gnupg-2.0.1-bsd-make.patch
deleted file mode 100644
index 2e6395fee0f4..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.0.1-bsd-make.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Date: Fri Jan  5 11:30:30 PST 2007
-
-This patch adds LIBICONV wherever LIBINTL is used. This is needed for compiles
-on Gentoo/OSX and Gentoo/BSD.
-
-There are two cases (t-convert, gpgsplit) where neither LIBINTL nor LIBICONV
-were brought in before, and I added them as well. It might be overkill.
-
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/agent/Makefile.am gnupg-2.0.1/agent/Makefile.am
---- gnupg-2.0.1.orig/agent/Makefile.am	2006-10-20 07:07:09.000000000 -0700
-+++ gnupg-2.0.1/agent/Makefile.am	2007-01-05 11:28:29.000000000 -0800
-@@ -53,7 +53,7 @@
- gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
- gpg_agent_LDADD = $(commonpth_libs) \
-                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
--	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
-+	        $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
- 
- gpg_protect_tool_SOURCES = \
- 	protect-tool.c \
-@@ -62,14 +62,14 @@
- 
- # Needs $(NETLIBS) for libsimple-pwquery.la.
- gpg_protect_tool_LDADD =  $(pwquery_libs) $(common_libs) \
--         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
-+         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
- 
- gpg_preset_passphrase_SOURCES = \
- 	preset-passphrase.c
- 
- # Needs $(NETLIBS) for libsimple-pwquery.la.
- gpg_preset_passphrase_LDADD =  $(pwquery_libs) $(common_libs) \
--	 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
-+	 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
- 
- 
- # Make sure that all libs are build before we use them.  This is
-@@ -83,7 +83,7 @@
- TESTS = t-protect
- 
- t_common_ldadd = $(common_libs) \
--                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
-+                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
- 
- t_protect_SOURCES = t-protect.c protect.c 
- t_protect_LDADD = $(t_common_ldadd)
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/common/Makefile.am gnupg-2.0.1/common/Makefile.am
---- gnupg-2.0.1.orig/common/Makefile.am	2006-11-05 06:32:09.000000000 -0800
-+++ gnupg-2.0.1/common/Makefile.am	2007-01-05 11:29:09.000000000 -0800
-@@ -79,7 +79,7 @@
- module_tests = t-convert
- 
- t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
--                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
-+                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
- 
- t_convert_DEPENDENCIES = convert.c libcommon.a
- t_convert_LDADD = $(t_common_ldadd)
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/g10/Makefile.am gnupg-2.0.1/g10/Makefile.am
---- gnupg-2.0.1.orig/g10/Makefile.am	2006-11-21 06:49:41.000000000 -0800
-+++ gnupg-2.0.1/g10/Makefile.am	2007-01-05 11:27:06.000000000 -0800
-@@ -117,7 +117,7 @@
- 
- LDADD =  $(needed_libs) ../common/libgpgrl.a \
-          $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \
--         $(LIBINTL) $(CAPLIBS) $(NETLIBS)
-+         $(LIBICONV) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
- gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
- gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
- 
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/kbx/Makefile.am gnupg-2.0.1/kbx/Makefile.am
---- gnupg-2.0.1.orig/kbx/Makefile.am	2006-09-20 02:35:52.000000000 -0700
-+++ gnupg-2.0.1/kbx/Makefile.am	2007-01-05 11:24:46.000000000 -0800
-@@ -48,6 +48,6 @@
- kbxutil_SOURCES = kbxutil.c $(common_sources)
- kbxutil_LDADD   = ../jnlib/libjnlib.a ../gl/libgnu.a \
- 	          $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
--                  -lgpg-error $(LIBINTL) ../common/libcommon.a
-+                  -lgpg-error $(LIBICONV) $(LIBINTL) ../common/libcommon.a
- 
- $(PROGRAMS) : ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libcommon.a
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/scd/Makefile.am gnupg-2.0.1/scd/Makefile.am
---- gnupg-2.0.1.orig/scd/Makefile.am	2006-11-21 01:38:26.000000000 -0800
-+++ gnupg-2.0.1/scd/Makefile.am	2007-01-05 11:27:24.000000000 -0800
-@@ -46,7 +46,7 @@
- 
- scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommonpth.a ../gl/libgnu.a \
- 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
--	$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(DL_LIBS) $(NETLIBS)
-+	$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(DL_LIBS) $(NETLIBS)
- 
- # Removed for now: We need to decide whether it makes sense to
- # continue it at all, given that gpg has now all required
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/sm/Makefile.am gnupg-2.0.1/sm/Makefile.am
---- gnupg-2.0.1.orig/sm/Makefile.am	2006-11-05 06:32:08.000000000 -0800
-+++ gnupg-2.0.1/sm/Makefile.am	2007-01-05 11:26:33.000000000 -0800
-@@ -58,7 +58,7 @@
- 
- gpgsm_LDADD = $(common_libs) \
-               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
--              $(GPG_ERROR_LIBS) $(LIBINTL) $(ZLIBS)
-+              $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(ZLIBS)
- 
- # Make sure that all libs are build before we use them.  This is
- # important for things like make -j2.
-diff -Nuar --exclude '*~' gnupg-2.0.1.orig/tools/Makefile.am gnupg-2.0.1/tools/Makefile.am
---- gnupg-2.0.1.orig/tools/Makefile.am	2006-11-23 06:48:46.000000000 -0800
-+++ gnupg-2.0.1/tools/Makefile.am	2007-01-05 11:28:45.000000000 -0800
-@@ -54,34 +54,34 @@
- common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
- pwquery_libs = ../common/libsimple-pwquery.a
- 
--gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(ZLIBS)
-+gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(ZLIBS) $(LIBICONV) $(LIBINTL)
- 
- gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
- 
- # jnlib/common sucks in gpg-error, will they, nil they (some compilers
- # do not eliminate the supposed-to-be-unused-inline-functions).
--gpgconf_LDADD = $(common_libs) $(LIBINTL) $(GPG_ERROR_LIBS)
-+gpgconf_LDADD = $(common_libs) $(LIBICONV) $(LIBINTL) $(GPG_ERROR_LIBS)
- 
- gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
- gpgparsemail_LDADD = 
- 
- symcryptrun_SOURCES = symcryptrun.c
- symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
--                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
-+                    $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
- 
- watchgnupg_SOURCES = watchgnupg.c 
- watchgnupg_LDADD = $(NETLIBS)
- 
- gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
- gpg_connect_agent_LDADD = $(common_libs) $(LIBASSUAN_LIBS) \
--	                  $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
-+	                  $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL) $(NETLIBS)
- 
- gpgkey2ssh_SOURCES = gpgkey2ssh.c
- gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
- # common sucks in jnlib, via use of BUG() in an inline function, which
- # some compilers do not eliminate.
- gpgkey2ssh_LDADD = $(common_libs) \
--                   $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
-+                   $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(LIBINTL)
- 
- 
- # Make sure that all libs are build before we use them.  This is
diff --git a/app-crypt/gnupg/gnupg-2.0.0.ebuild b/app-crypt/gnupg/gnupg-2.0.0.ebuild
deleted file mode 100644
index cf4b94d19d73..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.0.ebuild,v 1.2 2007/01/24 17:05:34 genone Exp $
-
-WANT_AUTOMAKE='latest'
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X gpg2-experimental doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.2.0
-	>=dev-libs/libksba-1.0.0
-	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-0.9.3
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	ldap? ( net-nds/openldap )"
-# Needs sh and arm to be keyworded on pinentry
-#	X? ( app-crypt/pinentry )
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/gpg-agent
-	=app-crypt/gnupg-1.4*
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-		local viewer
-		if has_version 'media-gfx/xloadimage'; then
-			viewer=/usr/bin/xloadimage
-		else
-			viewer=/usr/bin/xli
-		fi
-		myconf="${myconf} --with-photo-viewer=${viewer}"
-	else
-		myconf="${myconf} --disable-photo-viewers"
-	fi
-
-	append-ldflags $(bindnow-flags)
-
-	econf \
-		--enable-agent \
-		--enable-symcryptrun \
-		$(use_enable gpg2-experimental gpg) \
-		--enable-gpgsm \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		--disable-capabilities \
-		${myconf} \
-		|| die
-	emake || die
-	if use doc; then
-		cd doc
-		emake html || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	# neither of these should really be needed, please check
-	use gpg2-experimental && fperms u+s,go-r /usr/bin/gpg2
-	fperms u+s,go-r /usr/bin/gpg-agent
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-	elog
-	elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	elog
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.1-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.1-r1.ebuild
deleted file mode 100644
index e5ead2b00607..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,96 +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-2.0.1-r1.ebuild,v 1.1 2006/12/09 16:57:59 alonbl Exp $
-
-WANT_AUTOMAKE='latest'
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 caps X doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.2.0
-	>=dev-libs/libksba-1.0.0
-	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.0.1
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	ldap? ( net-nds/openldap )"
-# Needs sh and arm to be keyworded on pinentry
-#	X? ( app-crypt/pinentry )
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-		local viewer
-		if has_version 'media-gfx/xloadimage'; then
-			viewer=/usr/bin/xloadimage
-		else
-			viewer=/usr/bin/xli
-		fi
-		myconf="${myconf} --with-photo-viewer=${viewer}"
-	else
-		myconf="${myconf} --disable-photo-viewers"
-	fi
-
-	append-ldflags $(bindnow-flags)
-
-	econf \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_with caps capabilities) \
-		${myconf} \
-		|| die
-	emake || die
-	if use doc; then
-		cd doc
-		emake html || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
diff --git a/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild b/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild
deleted file mode 100644
index da9ed1612450..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1-r2.ebuild,v 1.5 2007/01/12 20:33:19 alonbl Exp $
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 X doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.2.0
-	>=dev-libs/libksba-1.0.0
-	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.0.1
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	ldap? ( net-nds/openldap )
-	app-crypt/pinentry"
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PN}-2.0.1-bsd-make.patch
-	cd "${S}"
-
-	AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-		local viewer
-		if has_version 'media-gfx/xloadimage'; then
-			viewer=/usr/bin/xloadimage
-		else
-			viewer=/usr/bin/xli
-		fi
-		myconf="${myconf} --with-photo-viewer=${viewer}"
-	else
-		myconf="${myconf} --disable-photo-viewers"
-	fi
-
-	append-ldflags $(bindnow-flags)
-
-	econf \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		--disable-capabilities \
-		${myconf} \
-		|| die
-	emake || die
-	if use doc; then
-		cd doc
-		emake html || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
diff --git a/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild b/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild
deleted file mode 100644
index 25ef9100b209..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1-r3.ebuild,v 1.1 2007/01/29 20:01:35 alonbl Exp $
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 X doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.2.0
-	>=dev-libs/libksba-1.0.0
-	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.0.1
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	ldap? ( net-nds/openldap )
-	app-crypt/pinentry"
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-2.0.1-bsd-make.patch"
-	epatch "${FILESDIR}/${P}-agent.patch"
-
-	AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-		local viewer
-		if has_version 'media-gfx/xloadimage'; then
-			viewer=/usr/bin/xloadimage
-		else
-			viewer=/usr/bin/xli
-		fi
-		myconf="${myconf} --with-photo-viewer=${viewer}"
-	else
-		myconf="${myconf} --disable-photo-viewers"
-	fi
-
-	append-ldflags $(bindnow-flags)
-
-	econf \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		--disable-capabilities \
-		${myconf} \
-		|| die
-	emake || die
-	if use doc; then
-		cd doc
-		emake html || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
diff --git a/app-crypt/gnupg/gnupg-2.0.1.ebuild b/app-crypt/gnupg/gnupg-2.0.1.ebuild
deleted file mode 100644
index d81a10bc7639..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.1.ebuild,v 1.2 2007/01/24 17:05:34 genone Exp $
-
-WANT_AUTOMAKE='latest'
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X gpg2-experimental doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.2.0
-	>=dev-libs/libksba-1.0.0
-	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.0.1
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	ldap? ( net-nds/openldap )"
-# Needs sh and arm to be keyworded on pinentry
-#	X? ( app-crypt/pinentry )
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/gpg-agent
-	=app-crypt/gnupg-1.4*
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	AT_M4DIR="m4 gl/m4" eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if use X; then
-		local viewer
-		if has_version 'media-gfx/xloadimage'; then
-			viewer=/usr/bin/xloadimage
-		else
-			viewer=/usr/bin/xli
-		fi
-		myconf="${myconf} --with-photo-viewer=${viewer}"
-	else
-		myconf="${myconf} --disable-photo-viewers"
-	fi
-
-	append-ldflags $(bindnow-flags)
-
-	econf \
-		--enable-agent \
-		--enable-symcryptrun \
-		$(use_enable gpg2-experimental gpg) \
-		--enable-gpgsm \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		--disable-capabilities \
-		${myconf} \
-		|| die
-	emake || die
-	if use doc; then
-		cd doc
-		emake html || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	# neither of these should really be needed, please check
-	use gpg2-experimental && fperms u+s,go-r /usr/bin/gpg2
-	fperms u+s,go-r /usr/bin/gpg-agent
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-	elog
-	elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	elog
-}