purge security vulnerable versions. Version bumps too

(Portage version: 2.1.2_rc2-r5)
 (Signed Manifest commit)

11 files changed, 34 insertions, 448 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index a4f71dfa87bf..8a93f341b27d 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,59 +1,46 @@
-AUX gnutls-1.2.10-as-needed.patch 1418 RMD160 0c2b7c1984c886e44956d5b31672ae10ad23421b SHA1 6920685847e67cfb0e6859ecc12876effe4960ea SHA256 a573a7cc02c67b86bef3ada98d62a9b4e3d21767e31844c5dd837fc2c67fca3c
-MD5 aeb37fd93438092e982743c59ca5feea files/gnutls-1.2.10-as-needed.patch 1418
-RMD160 0c2b7c1984c886e44956d5b31672ae10ad23421b files/gnutls-1.2.10-as-needed.patch 1418
-SHA256 a573a7cc02c67b86bef3ada98d62a9b4e3d21767e31844c5dd837fc2c67fca3c files/gnutls-1.2.10-as-needed.patch 1418
-AUX gnutls-1.4.1-as-needed.patch 3045 RMD160 95366b846c5674769ac279a4bc69a4d8da4f410f SHA1 88818671babf38862a97f4ecaa917e775d63cdc5 SHA256 978f7f3e23b4f1e1fb53a49407e9adfa7b9c4d30e363631ae43731da9918c153
-MD5 763571a9ba2b91db8e48617ab813bc46 files/gnutls-1.4.1-as-needed.patch 3045
-RMD160 95366b846c5674769ac279a4bc69a4d8da4f410f files/gnutls-1.4.1-as-needed.patch 3045
-SHA256 978f7f3e23b4f1e1fb53a49407e9adfa7b9c4d30e363631ae43731da9918c153 files/gnutls-1.4.1-as-needed.patch 3045
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnutls-1.4.4-selflink.patch 756 RMD160 830b6fc3a9e277698742928f9037f674381b9ada SHA1 9149910647e17fa9c43ab0697f67ee55f3fc8721 SHA256 726cb2ab00774d9aece875ae3ea76458583d1b27c61821db87c5623dae127b31
 MD5 1ce7c84a86097d0fca1c76e20ffd9699 files/gnutls-1.4.4-selflink.patch 756
 RMD160 830b6fc3a9e277698742928f9037f674381b9ada files/gnutls-1.4.4-selflink.patch 756
 SHA256 726cb2ab00774d9aece875ae3ea76458583d1b27c61821db87c5623dae127b31 files/gnutls-1.4.4-selflink.patch 756
-DIST gnutls-1.2.10.tar.bz2 2737849 RMD160 33b0d4e5955b06611141ac2d1e8889b42675cc98 SHA1 18140bebae006e019deb77962836bcd775256aab SHA256 1b16eecc4a8bf2f4941eb7a2ebf0632f908b9c2733457e0076b13a79798dce23
-DIST gnutls-1.2.11.tar.bz2 2756620 RMD160 07b3f4b9fb875c55e981f95aa4edb6c639176331 SHA1 4d5167091c72f994ed97e1406ae886f3c2757d49 SHA256 400c118150b31f475a5d562d60ab6912ed7a52b12ef31b2ad9b30a6960ea446d
-DIST gnutls-1.4.1.tar.bz2 4046780 RMD160 1bb959a118ce8d776693f602034342c31a8737aa SHA1 25d183fef21abbcaab0afe6b5809893aa70b577d SHA256 834e0009a6bfc67c427ba652ae2139f6cce50b4a1ac38214de6249611de73def
 DIST gnutls-1.4.4.tar.bz2 4048916 RMD160 a31dfe33934ddf2500ae0e6c67aa265cd5b9ede4 SHA1 8f6ee112c8d93dd726e8e3d0e3fbf234f085a2cd SHA256 dfcdcd622b80b00d28ee40881ee56fec771213110b7fc07048bce07df7cec035
-EBUILD gnutls-1.2.10-r1.ebuild 1674 RMD160 3188d68a61d8a8f84ed282026a767172b65d1a48 SHA1 d29f4409459a7225cba3c033945cb30579d89d4b SHA256 13f81ece77dc2a3e6968f0b3775ce9a090f05d1971900fbe6338840a76a3e8b2
-MD5 f3482f1e82f666a1c3365664b4d99337 gnutls-1.2.10-r1.ebuild 1674
-RMD160 3188d68a61d8a8f84ed282026a767172b65d1a48 gnutls-1.2.10-r1.ebuild 1674
-SHA256 13f81ece77dc2a3e6968f0b3775ce9a090f05d1971900fbe6338840a76a3e8b2 gnutls-1.2.10-r1.ebuild 1674
-EBUILD gnutls-1.2.10.ebuild 1684 RMD160 d959ef86ba792995fb58b717b2f75bab74cfb37f SHA1 fd9547f24895b9bb9fe6dd168091d4381f9e4b15 SHA256 fbafc026d1b0aebd00dfaa7f17f6209d18ab01dbc0db98010fccbebb0978cea2
-MD5 aeac4c1d9e3627f8f0e0ecf5e89f28d8 gnutls-1.2.10.ebuild 1684
-RMD160 d959ef86ba792995fb58b717b2f75bab74cfb37f gnutls-1.2.10.ebuild 1684
-SHA256 fbafc026d1b0aebd00dfaa7f17f6209d18ab01dbc0db98010fccbebb0978cea2 gnutls-1.2.10.ebuild 1684
-EBUILD gnutls-1.2.11.ebuild 1648 RMD160 db180cdd53c9ea12330f6ca1fdbb0c7ba7e9e630 SHA1 759c62fda2f1b92b00f94cc78ea6ca5e6e8ec9e8 SHA256 af230a42c62a3cff119f90bb1d75dead86b083415ce0caaa2e005c4d382357d7
-MD5 75379f7307e7b7972097e7c4793186d8 gnutls-1.2.11.ebuild 1648
-RMD160 db180cdd53c9ea12330f6ca1fdbb0c7ba7e9e630 gnutls-1.2.11.ebuild 1648
-SHA256 af230a42c62a3cff119f90bb1d75dead86b083415ce0caaa2e005c4d382357d7 gnutls-1.2.11.ebuild 1648
-EBUILD gnutls-1.4.1.ebuild 1468 RMD160 47af0e82fa9b128d6255f80043c95e6ce3c58474 SHA1 e2a6189d4f7d90a8a6f3f2be85eea19810155ec5 SHA256 89b0c973352da16292da172d31f5347ed3dcde7de2746859d6680b92a5d89e7e
-MD5 e1bd943b030b2733afdb1de20a8213e7 gnutls-1.4.1.ebuild 1468
-RMD160 47af0e82fa9b128d6255f80043c95e6ce3c58474 gnutls-1.4.1.ebuild 1468
-SHA256 89b0c973352da16292da172d31f5347ed3dcde7de2746859d6680b92a5d89e7e gnutls-1.4.1.ebuild 1468
-EBUILD gnutls-1.4.4-r1.ebuild 1837 RMD160 8d6c66b2452e37f4f28ce03690be1154ef72238c SHA1 9c4f83471ee6c9ac56a0a3e6832f1fd5889d2e3d SHA256 da2c3c03c45a041a01b06834b3bc45ee7b2e9f16440193a3fcebc579502550fe
-MD5 f5eb6d76be2b16cee70f6262c57ca6d7 gnutls-1.4.4-r1.ebuild 1837
-RMD160 8d6c66b2452e37f4f28ce03690be1154ef72238c gnutls-1.4.4-r1.ebuild 1837
-SHA256 da2c3c03c45a041a01b06834b3bc45ee7b2e9f16440193a3fcebc579502550fe gnutls-1.4.4-r1.ebuild 1837
-MISC ChangeLog 16875 RMD160 6bf039b3dcfdf753e19aee7b9c8385ccdbcb29ac SHA1 34b7e54add13c8073c903b8d3a4190aedf58c49d SHA256 167e7df6df7b9c5540df9ce58a1000fba6d6d446b109067a82550cd29618ff7d
-MD5 506d6e3f9c794fa3cd9cf31c17e3b0b1 ChangeLog 16875
-RMD160 6bf039b3dcfdf753e19aee7b9c8385ccdbcb29ac ChangeLog 16875
-SHA256 167e7df6df7b9c5540df9ce58a1000fba6d6d446b109067a82550cd29618ff7d ChangeLog 16875
+DIST gnutls-1.4.5.tar.bz2 4045874 RMD160 74bb6f9fc4286b92f04edffa513ea0524f574099 SHA1 49a468de975ee6d10778ac43884ea4febb03d9dc SHA256 88580ab55ddcb2c6f3585ef22e3a349f453d15ce546549f9dae34d333b6d7341
+DIST gnutls-1.6.0.tar.bz2 4225613 RMD160 3348928c56845c6a6b49876509271b2c77394f5c SHA1 b0600815aeae57cfa21cad19c1da8708c5b25d73 SHA256 c2a5d97cf96cfcdb3f6f108430d4b4a90d1b6a00b0f06dac54c5abc99d329d57
+EBUILD gnutls-1.4.4-r1.ebuild 1853 RMD160 5f714db7e1f62884744e8fa94f374de5c4c849be SHA1 dde3442d52b73d9a8ecefdae21e741972a7dc57b SHA256 7f615c3d594931f81db3b97f4f2a882bb86cc941cbc2c398ddf6f7ad8677b348
+MD5 f661e67c2e6cdbd74fc1ead8a7aea840 gnutls-1.4.4-r1.ebuild 1853
+RMD160 5f714db7e1f62884744e8fa94f374de5c4c849be gnutls-1.4.4-r1.ebuild 1853
+SHA256 7f615c3d594931f81db3b97f4f2a882bb86cc941cbc2c398ddf6f7ad8677b348 gnutls-1.4.4-r1.ebuild 1853
+EBUILD gnutls-1.4.5.ebuild 1467 RMD160 ba4a190c21d298758efbe7f3feb5b8ff4da8d34b SHA1 4d97d4d0219f84fbd46230529bce990d7decb9bf SHA256 15df36fd291a924c70f235a067d0c04e4beefb6244c54b41ce520ec42a2f3128
+MD5 cbb36d19bb222b9df0bf78257a7a0343 gnutls-1.4.5.ebuild 1467
+RMD160 ba4a190c21d298758efbe7f3feb5b8ff4da8d34b gnutls-1.4.5.ebuild 1467
+SHA256 15df36fd291a924c70f235a067d0c04e4beefb6244c54b41ce520ec42a2f3128 gnutls-1.4.5.ebuild 1467
+EBUILD gnutls-1.6.0.ebuild 1467 RMD160 e99b536d823c2bd6a244ba96ca49f6170fcc553c SHA1 a276ef8a2dc008124e7934ab98f2a1057a1b3f3f SHA256 6f76e65b15a28d5db311a503fba5e85eafbeb253d5d0a3209c8951e14d82635a
+MD5 cdf0f678139af1d13b1a9e16055998dc gnutls-1.6.0.ebuild 1467
+RMD160 e99b536d823c2bd6a244ba96ca49f6170fcc553c gnutls-1.6.0.ebuild 1467
+SHA256 6f76e65b15a28d5db311a503fba5e85eafbeb253d5d0a3209c8951e14d82635a gnutls-1.6.0.ebuild 1467
+MISC ChangeLog 17293 RMD160 e91031b2c4960b1e626757f8541d12348587ef9b SHA1 69b05f5e7ff96c09dd2ff124d3383753ab40aabc SHA256 5728899104fe437f5e66b8a92cf8c9e60bfe1e2903f944184af30f0981c91520
+MD5 0ed30ff9d289ca6f270eb94e1cec5287 ChangeLog 17293
+RMD160 e91031b2c4960b1e626757f8541d12348587ef9b ChangeLog 17293
+SHA256 5728899104fe437f5e66b8a92cf8c9e60bfe1e2903f944184af30f0981c91520 ChangeLog 17293
 MISC metadata.xml 276 RMD160 99eb13264f3656e33d5cbc95ed9319ba50a1e58c SHA1 1f70a3ead5de1eb0d62a59c084b3a06147256e2f SHA256 abd952a77edadf769a821e7210a01f38850cada9a7677a1561f6aa0ce954f480
 MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 RMD160 99eb13264f3656e33d5cbc95ed9319ba50a1e58c metadata.xml 276
 SHA256 abd952a77edadf769a821e7210a01f38850cada9a7677a1561f6aa0ce954f480 metadata.xml 276
-MD5 09aebfe015690e5cd9d39c4534f2882b files/digest-gnutls-1.2.10 247
-RMD160 c464b3eff56634132e72a0132e372bc349ee80bf files/digest-gnutls-1.2.10 247
-SHA256 047f28a7c85970bb1a9933721a1d02b78016dc53281ed67c674fc5882b5ac329 files/digest-gnutls-1.2.10 247
-MD5 09aebfe015690e5cd9d39c4534f2882b files/digest-gnutls-1.2.10-r1 247
-RMD160 c464b3eff56634132e72a0132e372bc349ee80bf files/digest-gnutls-1.2.10-r1 247
-SHA256 047f28a7c85970bb1a9933721a1d02b78016dc53281ed67c674fc5882b5ac329 files/digest-gnutls-1.2.10-r1 247
-MD5 707557d2508565f704cd4974bba0c4ff files/digest-gnutls-1.2.11 247
-RMD160 8ea4873cb2db6c205ec810a82b1b12ca8434e736 files/digest-gnutls-1.2.11 247
-SHA256 8d3459d1267af0e4b428e0cc7754900fd0683d7ffc1343efbc734299f88b26ca files/digest-gnutls-1.2.11 247
-MD5 dc7a3d08731b4d700adadcb93d1a3e4b files/digest-gnutls-1.4.1 244
-RMD160 44feeb4561921ea716793d0cf06ef98dc3fb3eac files/digest-gnutls-1.4.1 244
-SHA256 9b90f6154d6e62a7ca293a0952da6a9981722382f5f90b8af55fa46db7846dc0 files/digest-gnutls-1.4.1 244
 MD5 be730be5feb0bac389fb036a33c1c42b files/digest-gnutls-1.4.4-r1 244
 RMD160 3ac7f1b8772d3ed3329629f22c09773ecded01b1 files/digest-gnutls-1.4.4-r1 244
 SHA256 314e2cbd832d1f021e946afb2adbbf21fdd1946d5724eb8a623934aa0c8cd999 files/digest-gnutls-1.4.4-r1 244
+MD5 e0b4ec89235e57b161729242437397ea files/digest-gnutls-1.4.5 244
+RMD160 e33387030a318aef4b0d3b924bf7c6c9259cc223 files/digest-gnutls-1.4.5 244
+SHA256 8f7d530b3b2e4d50d326bad0a0f0a448c4273d37f557d7ba4bd6b96a0b8e9de1 files/digest-gnutls-1.4.5 244
+MD5 a6f158f60903809156bf23272d657b3f files/digest-gnutls-1.6.0 244
+RMD160 4fa7eaf9a98eccbc88fc4d213d9d40b48bed3d33 files/digest-gnutls-1.6.0 244
+SHA256 ccbef2b2b4f1c602dd8ec86ceac72effa0988d86f703e826f11391405a32e6a9 files/digest-gnutls-1.6.0 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFejOdmdTrptrqvGERAiEnAJ9iFsZXafPRFNioKhR7i5OVH9qKRQCdG9UG
+PdHHST23zuxra6WLK68NF6g=
+=oFin
+-----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.10 b/net-libs/gnutls/files/digest-gnutls-1.2.10
deleted file mode 100644
index a760744a115c..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.2.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 523273961e3cca45c92e50b2676b3c83 gnutls-1.2.10.tar.bz2 2737849
-RMD160 33b0d4e5955b06611141ac2d1e8889b42675cc98 gnutls-1.2.10.tar.bz2 2737849
-SHA256 1b16eecc4a8bf2f4941eb7a2ebf0632f908b9c2733457e0076b13a79798dce23 gnutls-1.2.10.tar.bz2 2737849
diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.10-r1 b/net-libs/gnutls/files/digest-gnutls-1.2.10-r1
deleted file mode 100644
index a760744a115c..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.2.10-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 523273961e3cca45c92e50b2676b3c83 gnutls-1.2.10.tar.bz2 2737849
-RMD160 33b0d4e5955b06611141ac2d1e8889b42675cc98 gnutls-1.2.10.tar.bz2 2737849
-SHA256 1b16eecc4a8bf2f4941eb7a2ebf0632f908b9c2733457e0076b13a79798dce23 gnutls-1.2.10.tar.bz2 2737849
diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.11 b/net-libs/gnutls/files/digest-gnutls-1.2.11
deleted file mode 100644
index af7b6cb4b1c5..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.2.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e471ec76791929aa65311c57e0768a6f gnutls-1.2.11.tar.bz2 2756620
-RMD160 07b3f4b9fb875c55e981f95aa4edb6c639176331 gnutls-1.2.11.tar.bz2 2756620
-SHA256 400c118150b31f475a5d562d60ab6912ed7a52b12ef31b2ad9b30a6960ea446d gnutls-1.2.11.tar.bz2 2756620
diff --git a/net-libs/gnutls/files/digest-gnutls-1.4.1 b/net-libs/gnutls/files/digest-gnutls-1.4.1
deleted file mode 100644
index 7f04a038be5c..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1948be128e8f684da034b32988867a13 gnutls-1.4.1.tar.bz2 4046780
-RMD160 1bb959a118ce8d776693f602034342c31a8737aa gnutls-1.4.1.tar.bz2 4046780
-SHA256 834e0009a6bfc67c427ba652ae2139f6cce50b4a1ac38214de6249611de73def gnutls-1.4.1.tar.bz2 4046780
diff --git a/net-libs/gnutls/files/gnutls-1.2.10-as-needed.patch b/net-libs/gnutls/files/gnutls-1.2.10-as-needed.patch
deleted file mode 100644
index 78c961a20572..000000000000
--- a/net-libs/gnutls/files/gnutls-1.2.10-as-needed.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- gnutls-1.2.10/tests/Makefile.am.orig	2006-08-01 11:00:11.000000000 +1000
-+++ gnutls-1.2.10/tests/Makefile.am	2006-08-01 11:00:54.000000000 +1000
-@@ -29,6 +29,7 @@
- EXTRA_DIST = client.p12 noclient.p12 unclient.p12
- 
- openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
-+gc_LDADD = $(LDADD) $(LIBGCRYPT_LIBS)
- 
- ctests = simple anonself openssl gc
- TESTS = pkcs12_neon $(ctests)
---- gnutls-1.2.10/tests/Makefile.in.orig	2006-08-01 11:01:54.000000000 +1000
-+++ gnutls-1.2.10/tests/Makefile.in	2006-08-01 11:02:52.000000000 +1000
-@@ -122,11 +122,11 @@
- 	libutils.la
- gc_SOURCES = gc.c
- gc_OBJECTS = gc.$(OBJEXT)
--gc_LDADD = $(LDADD)
--gc_DEPENDENCIES = ../lib/libgnutls.la ../gl/libgnu.la libutils.la
-+am__DEPENDENCIES_1 = ../lib/libgnutls.la ../gl/libgnu.la libutils.la
-+am__DEPENDENCIES_2 =
-+gc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
- openssl_SOURCES = openssl.c
- openssl_OBJECTS = openssl.$(OBJEXT)
--am__DEPENDENCIES_1 = ../lib/libgnutls.la ../gl/libgnu.la libutils.la
- openssl_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	../libextra/libgnutls-openssl.la
- simple_SOURCES = simple.c
-@@ -321,6 +321,7 @@
- libutils_la_SOURCES = utils.h utils.c
- EXTRA_DIST = client.p12 noclient.p12 unclient.p12
- openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
-+gc_LDADD = $(LDADD) $(LIBGCRYPT_LIBS)
- ctests = simple anonself openssl gc
- TESTS = pkcs12_neon $(ctests)
- dist_check_SCRIPTS = pkcs12_neon
diff --git a/net-libs/gnutls/files/gnutls-1.4.1-as-needed.patch b/net-libs/gnutls/files/gnutls-1.4.1-as-needed.patch
deleted file mode 100644
index 839464de6fa9..000000000000
--- a/net-libs/gnutls/files/gnutls-1.4.1-as-needed.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- gnutls-1.4.1/tests/Makefile.am.orig	2006-08-01 11:49:16.000000000 +1000
-+++ gnutls-1.4.1/tests/Makefile.am	2006-08-01 11:50:12.000000000 +1000
-@@ -35,6 +35,7 @@
- openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
- tlsia_LDADD = $(LDADD) ../libextra/libgnutls-extra.la \
- 	../gl/libgnu.la @LTLIBREADLINE@
-+gc_LDADD = $(LDADD) $(LIBGCRYPT_LIBS)
- 
- ctests = simple anonself pskself openssl gc dhepskself set_pkcs12_cred	\
- 	tlsia resume certder
---- gnutls-1.4.1/tests/Makefile.in.orig	2006-08-01 11:49:21.000000000 +1000
-+++ gnutls-1.4.1/tests/Makefile.in	2006-08-01 11:50:46.000000000 +1000
-@@ -138,13 +138,12 @@
- 	../lib/libgnutls.la libutils.la
- gc_SOURCES = gc.c
- gc_OBJECTS = gc.$(OBJEXT)
--gc_LDADD = $(LDADD)
--gc_DEPENDENCIES = ../lib/libgnutls.la ../gl/libgnu.la \
-+am__DEPENDENCIES_1 = ../lib/libgnutls.la ../gl/libgnu.la \
- 	../lib/libgnutls.la libutils.la
-+am__DEPENDENCIES_2 =
-+gc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
- openssl_SOURCES = openssl.c
- openssl_OBJECTS = openssl.$(OBJEXT)
--am__DEPENDENCIES_1 = ../lib/libgnutls.la ../gl/libgnu.la \
--	../lib/libgnutls.la libutils.la
- openssl_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	../libextra/libgnutls-openssl.la
- pskself_SOURCES = pskself.c
-@@ -250,7 +249,6 @@
- GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
- GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
- GMSGFMT = @GMSGFMT@
--GREP = @GREP@
- GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
- GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
- HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
-@@ -347,9 +345,15 @@
- WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
- WINT_T_SUFFIX = @WINT_T_SUFFIX@
- XGETTEXT = @XGETTEXT@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_AS = @ac_ct_AS@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
- ac_ct_F77 = @ac_ct_F77@
-+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -366,30 +370,23 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--datarootdir = @datarootdir@
--docdir = @docdir@
--dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
--htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
--localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
--pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
--psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -413,6 +410,7 @@
- tlsia_LDADD = $(LDADD) ../libextra/libgnutls-extra.la \
- 	../gl/libgnu.la @LTLIBREADLINE@
- 
-+gc_LDADD = $(LDADD) $(LIBGCRYPT_LIBS)
- ctests = simple anonself pskself openssl gc dhepskself set_pkcs12_cred	\
- 	tlsia resume certder
- 
diff --git a/net-libs/gnutls/gnutls-1.2.10-r1.ebuild b/net-libs/gnutls/gnutls-1.2.10-r1.ebuild
deleted file mode 100644
index 4b8ee46e1f2b..000000000000
--- a/net-libs/gnutls/gnutls-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.10-r1.ebuild,v 1.5 2006/09/04 10:29:57 vapier Exp $
-
-inherit eutils gnuconfig libtool
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
-
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="zlib doc crypt"
-
-RDEPEND=">=dev-libs/libgcrypt-1.2.2
-	>=app-crypt/opencdk-0.5.5
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	>=dev-libs/lzo-2
-	>=dev-libs/libtasn1-0.2.11
-	dev-libs/libgpg-error"
-#	crypt? ( >=app-crypt/opencdk-0.5.5 )
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/gcc
-	sys-devel/libtool"
-
-# gnutls has its own version of these. should maybe avoid using.
-#	libtasn1
-#	opencdk
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	cd "${S}"
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf=""
-	# use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--without-included-minilzo \
-		--without-included-libtasn1 \
-		--without-included-opencdk \
-		`use_enable doc gtk-doc` \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS \
-		README THANKS doc/TODO
-
-	if use doc ; then
-		dodoc doc/README.autoconf doc/tex/gnutls.ps
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-1.2.10.ebuild b/net-libs/gnutls/gnutls-1.2.10.ebuild
deleted file mode 100644
index 9c7a3c12ad49..000000000000
--- a/net-libs/gnutls/gnutls-1.2.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.10.ebuild,v 1.12 2006/09/04 10:29:57 vapier Exp $
-
-inherit eutils gnuconfig libtool
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
-
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="zlib doc crypt"
-
-RDEPEND=">=dev-libs/libgcrypt-1.2.2
-	>=app-crypt/opencdk-0.5.5
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	=dev-libs/lzo-1*
-	>=dev-libs/libtasn1-0.2.11
-	dev-libs/libgpg-error"
-#	crypt? ( >=app-crypt/opencdk-0.5.5 )
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/gcc
-	sys-devel/libtool"
-
-# gnutls has its own version of these. should maybe avoid using.
-#	libtasn1
-#	opencdk
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	elibtoolize
-}
-
-src_compile() {
-	# Needed for mips and probably others
-	gnuconfig_update
-
-	local myconf=""
-	# use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--without-included-minilzo \
-		--without-included-libtasn1 \
-		--without-included-opencdk \
-		`use_enable doc gtk-doc` \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS \
-		README THANKS doc/TODO
-
-	if use doc ; then
-		dodoc doc/README.autoconf doc/tex/gnutls.ps
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-1.2.11.ebuild b/net-libs/gnutls/gnutls-1.2.11.ebuild
deleted file mode 100644
index 4a0d02761498..000000000000
--- a/net-libs/gnutls/gnutls-1.2.11.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.2.11.ebuild,v 1.3 2006/09/10 17:18:49 the_paya Exp $
-
-inherit eutils gnuconfig libtool
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
-
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="zlib doc crypt"
-
-RDEPEND=">=dev-libs/libgcrypt-1.2.2
-	>=app-crypt/opencdk-0.5.5
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	>=dev-libs/lzo-2
-	dev-libs/libgpg-error"
-#	>=dev-libs/libtasn1-0.3.4
-#	crypt? ( >=app-crypt/opencdk-0.5.5 )
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-# gnutls has its own version of these. should maybe avoid using.
-#	libtasn1
-#	opencdk
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.2.10-as-needed.patch
-	elibtoolize
-}
-
-src_compile() {
-	local myconf=""
-	# use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		$(use_with zlib) \
-		--without-included-minilzo \
-		--without-included-libtasn1 \
-		--without-included-opencdk \
-		$(use_enable doc gtk-doc) \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS \
-		README THANKS doc/TODO
-
-	if use doc ; then
-		dodoc doc/README.autoconf doc/tex/gnutls.ps
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-1.4.1.ebuild b/net-libs/gnutls/gnutls-1.4.1.ebuild
deleted file mode 100644
index 14a1dcf77fea..000000000000
--- a/net-libs/gnutls/gnutls-1.4.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.4.1.ebuild,v 1.3 2006/09/04 10:29:57 vapier Exp $
-
-inherit eutils gnuconfig libtool
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
-
-# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="zlib doc crypt"
-
-RDEPEND=">=dev-libs/libgcrypt-1.2.2
-	>=app-crypt/opencdk-0.5.5
-	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc
-	>=dev-libs/lzo-2
-	dev-libs/libgpg-error
-	>=dev-libs/libtasn1-0.3.4"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	cd "${S}"
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf=""
-	# use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
-
-	econf  \
-		$(use_with zlib) \
-		--without-included-minilzo \
-		--without-included-opencdk \
-		$(use_enable doc gtk-doc) \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS \
-		README THANKS doc/TODO
-
-	if use doc ; then
-		dodoc doc/README.autoconf doc/tex/gnutls.ps
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}