Delete older ebuilds.

5 files changed, 14 insertions, 306 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 58650e9a7d46..5d03244316fe 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,24 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gnupg-2.0.16-opengpgv2-sha2.patch 1279 RMD160 10477e39c734df91d82e5f9d97039c9b9f8ceab5 SHA1 638d9c7cb3cae325db56f9a51f82d22069cbfe01 SHA256 c8cb42219bdc2e2fee790b48112868f5556e10e54a74d656ff9a05bfc5e07f2f
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1079 RMD160 58fdc7454cd23bd9731866f1350eee1d166487d0 SHA1 3f6710fb83de85c34c8edaf4c7aaddeb1ccc771d SHA256 aec0ea30d898f7f7369abac9a61a0713b6b9b89d231b9beff1ee82041983b7ed
-AUX gnupg-realloc-X.509.patch 295 RMD160 2428ed04b6f4ee1d8fc5f5ee9fa58ed820aea9f0 SHA1 aa096528a4ffaf5c50a154a6c793feee901a5e46 SHA256 9c6d7f905662e655a5a7cb04381b4deeaaee714f2d00c736a670b1b2dba3c114
 DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
-DIST gnupg-2.0.16.tar.bz2 4004033 RMD160 3a0ed7a3ebb28fdb875533ff3368f6af3a0bb742 SHA1 e7eb4f60026884bd90803b531472bc518804b95d SHA256 0d5abb977c02ebb0f6ce25a5ba71c8df90835aa666a85acd73a9b7f9df35a80b
 DIST gnupg-2.0.17.tar.bz2 3997356 RMD160 f919947a1896ac20c455534d91a3e2d3e5b60c1f SHA1 41ef5460417ca0a1131fc730849fe3afd49ad2de SHA256 ea649d5ecb2f97cc8d81c5796c6ad8d7d8581f9554241c39d2b11ab12139eea6
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
 EBUILD gnupg-1.4.11.ebuild 5481 RMD160 f313bd6a39300f48681784d7b7be23917c098688 SHA1 d7cce6fd980f380ca5eca03bc6d8a826a5f257ea SHA256 19a816ee5e19d8c4b1062fb15bfaef1ad3b3d91659ac24915188732745fe71a7
-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.17-r1.ebuild 4540 RMD160 e33b095fa28299cef39d84056adfddc23fc5e8d5 SHA1 3203e2ebdd70ef0ede4062447d98b2d1d2638fb9 SHA256 67ba7510cfa1a85dfc0febae98939a3d83186ddbed96491a4d471fd838ddb245
 EBUILD gnupg-2.0.17.ebuild 4530 RMD160 8e5e06a55c44cee6efe903edda4f0149c38b2044 SHA1 0037dee7d416beeff38cfb4230dad4fb60dd90e1 SHA256 95a2254b67d72ed528b84a7be40d284c4a1bc58d0ae274797eb0a52cf7a6090b
 MISC ChangeLog 62968 RMD160 1eef5d93863c1e26e16670ebaf7431a6373fba05 SHA1 a36893a6a8c63d3c29e3810d5843561e5001261c SHA256 aac833de0a539be3be8b862e4daaf08251ff6996766557c1cfc57624035ead2a
 MISC metadata.xml 1386 RMD160 9cdb52f5bfc316fe64af58338dc70fa4dcdb564e SHA1 3e4113636f8e1381acd8b57ee76c8fe33ac65456 SHA256 a3a9dee1b4732c0632705f66524a12563079fa130c5c17845d62325da49a151a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3O2gAACgkQuQc30/atMkBBHwCeMGug3hbQBo+jgfN0My3W21Lm
-S3AAoI+F2AJF/uVY3jlbyVKXnrVGdZB+
-=0wrn
+iQIcBAEBAgAGBQJNzu6cAAoJEE70JXb4HvNVGS8P/2J4IO+riSWuY4CNnPIo2lky
+65AuPKvykZTS/ukIJrwuNnSvAepS0Zo+w7JVpT05PF0/ccymSEtyfzCmqq6BwRvi
+JGyw5Ojsr3dRdGYn2M1WjOjeEQ78GDnUpn3UsZVy+vN4ZpFALGM+95pP4q2sAUA5
+BoqGn55JeZ8SjYb3n0tWkWZtXu4jB0uuLlA3ffRgrReVBwddgbrXXzPKXNkvosuY
+WmCJztbNsSxPuXTTuyqYTABMsX2ZKS8ZDE/hrn2mgIkgMR1f6a/dF7sQALPFqN/l
+mUdLveW26Ya+WLo8JCZIadhAL48wq2R0evQPCySwQkHmExeDWHcPo6PMz3IDvBFp
+mgXnYzpNA+rPyVGe+ddCurqUKaIk9rjp8IAReH/u0TiJ+HFFhMNB+WCIETvtX9F3
+b+N6F0BHAeFNXaK/BLJKPPVAzNps4o5VaiGrRLdLoS9Ml0MsxpyBKdaC7Pm2dgUN
+F5obdVZ/GFcnzR8Nwfg6+N/3oz5qOnV6q4eIZBlYijx2ZxVxONoNZEaVfGUaqXW7
+PFYc1z+B0LxB+EOqaifFbgEgJUv64rDyMfL2ci2A1awFnP7/lobXPpZnXqs2ULth
+9INROiuZ/5oA4z5dqaYgniNI5W3jxZpKcT6iZFy1g70BxILXEQXPRyNBsS+kwZMi
+b+HRfEdvpTy7o2QdvysC
+=JgIp
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/gnupg-2.0.16-opengpgv2-sha2.patch b/app-crypt/gnupg/files/gnupg-2.0.16-opengpgv2-sha2.patch
deleted file mode 100644
index 36f912ca7d80..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.0.16-opengpgv2-sha2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: g10/call-agent.c
-===================================================================
---- g10/call-agent.c	(revisione 5423)
-+++ g10/call-agent.c	(revisione 5424)
-@@ -892,6 +892,25 @@
-   return 0;
- }
-   
-+
-+/* Helper returning a command option to describe the used hash
-+   algorithm.  See scd/command.c:cmd_pksign.  */
-+static const char *
-+hash_algo_option (int algo)
-+{
-+  switch (algo)
-+    {
-+    case GCRY_MD_RMD160: return "--hash=rmd160 ";
-+    case GCRY_MD_SHA1  : return "--hash=sha1 ";
-+    case GCRY_MD_SHA224: return "--hash=sha224 ";
-+    case GCRY_MD_SHA256: return "--hash=sha256 ";
-+    case GCRY_MD_SHA384: return "--hash=sha384 ";
-+    case GCRY_MD_SHA512: return "--hash=sha512 ";
-+    case GCRY_MD_MD5   : return "--hash=md5 ";
-+    default:             return "";
-+    }
-+}
-+
- /* Send a sign command to the scdaemon via gpg-agent's pass thru
-    mechanism. */
- int
-@@ -938,8 +957,7 @@
-   else
- #endif
-     snprintf (line, DIM(line)-1, "SCD PKSIGN %s%s",
--              hashalgo == GCRY_MD_RMD160? "--hash=rmd160 " : "",
--              serialno);
-+              hash_algo_option (hashalgo), serialno);
-   line[DIM(line)-1] = 0;
-   rc = assuan_transact (agent_ctx, line, membuf_data_cb, &data,
-                         default_inq_cb, NULL, NULL, NULL);
diff --git a/app-crypt/gnupg/files/gnupg-realloc-X.509.patch b/app-crypt/gnupg/files/gnupg-realloc-X.509.patch
deleted file mode 100644
index 123e4cd3202b..000000000000
--- a/app-crypt/gnupg/files/gnupg-realloc-X.509.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kbx/keybox-blob.c   (revision 5367)
-+++ kbx/keybox-blob.c   (working copy)
-@@ -898,6 +898,7 @@
-              rc = gpg_error_from_syserror ();
-              goto leave;
-            }
-+          names = tmp;
-        }
-      names[blob->nuids++] = p;
-      if (!i && (p=x509_email_kludge (p)))
diff --git a/app-crypt/gnupg/gnupg-2.0.16-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.16-r1.ebuild
deleted file mode 100644
index d43d1f637bfc..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.16-r1.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.16-r1.ebuild,v 1.11 2010/09/30 18:56:21 ssuominen Exp $
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-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/libassuan-2
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libgpg-error-1.7
-	>=dev-libs/libksba-1.0.2
-	>=dev-libs/pth-1.3.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}
-	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_prepare() {
-	EPATCH_OPTS="-l" epatch "${FILESDIR}"/gnupg-realloc-X.509.patch
-}
-
-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'."
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.16-r2.ebuild b/app-crypt/gnupg/gnupg-2.0.16-r2.ebuild
deleted file mode 100644
index cb8193a2881d..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.16-r2.ebuild
+++ /dev/null
@@ -1,136 +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.16-r2.ebuild,v 1.2 2010/10/19 03:43:08 mr_bones_ Exp $
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-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/libassuan-2
-	>=dev-libs/libgcrypt-1.4
-	>=dev-libs/libgpg-error-1.7
-	>=dev-libs/libksba-1.0.2
-	>=dev-libs/pth-1.3.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}
-	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 )"
-
-pkg_setup() {
-	if ( use openct || use pcsc-lite ) && ! use smartcard; then
-		ewarn "You have openct or pcsc-lite enabled but do not"
-		ewarn "have smartcard support enabled. This will not affect"
-		ewarn "the building of this package, but it may affect others."
-	fi
-}
-
-src_prepare() {
-	EPATCH_OPTS="-l" epatch "${FILESDIR}"/gnupg-realloc-X.509.patch
-	epatch "${FILESDIR}"/gnupg-2.0.16-opengpgv2-sha2.patch
-	#epatch "${FILESDIR}"/gnupg-2.0.14-encode-s2k.patch
-}
-
-src_configure() {
-	local want_scdaemon=0
-	if use openct || use pcsc-lite || use smartcard ; then
-		want_scdaemon=1
-	fi
-
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	if use static ; then
-		append-ldflags -static
-		# but ..., now see bug #219423
-		if [[ $want_scdaemon -eq 1 ]] ; then
-			die "Upstream explicitly disallows static builds when combining with smartcard support: http://www.mail-archive.com/gnupg-users@gnupg.org/msg10851.html"
-		fi
-	fi
-
-	[[ $want_scdaemon -eq 1 ]] && myconf="--enable-scdaemon" || myconf="--disable-scdaemon"
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		${myconf} \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(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
-
-	echo 'CONFIG_PROTECT=/usr/share/gnupg/qualified.txt' >>"${ED}"/etc/env.d/30gnupg
-}
-
-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'."
-}