Remove old.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

9 files changed, 15 insertions, 644 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index d45efbabc44f..0c5c6a848463 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.447 2013/09/01 18:51:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.448 2013/09/01 18:59:21 radhermit Exp $
+
+  01 Sep 2013; Tim Harder <radhermit@gentoo.org> -gnutls-2.12.23.ebuild,
+  -gnutls-3.1.10.ebuild, -gnutls-3.1.11.ebuild, -gnutls-3.2.1-r1.ebuild,
+  -files/gnutls-3.2.1-build-gmp-1.patch, -files/gnutls-3.2.1-build-gmp-2.patch,
+  -files/gnutls-3.2.1-build-gmp-3.patch:
+  Remove old.
 
 *gnutls-3.2.4 (01 Sep 2013)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index dd6fa668454b..030b027d02cc 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -7,34 +7,24 @@ AUX gnutls-2.12.20-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cff
 AUX gnutls-2.12.20-libadd.patch 988 SHA256 b1f73ec17feb72817f39f109ec2e4dc69ea8d6b6d62ef243491e85164ff513ac SHA512 a0552276b356fd63e802a886e1243ef6341c6b8d1857814a0b2a686fd605d7c03316965cdfcdb70162547033efe9f2d1c17e442a30925d97ef691c2d573eba68 WHIRLPOOL 4ed528cb20705d91db05f0c533cbfd0356fa3292393eba75b45a22457cb23da80639ef739d889af4f64038a97553f3f990cc08f5e31608b1dc83c74b0e1c46d3
 AUX gnutls-2.12.23-CVE-2013-2116.patch 855 SHA256 473663119e3c0c91677becc2982f6bddcbe44000f9530515ad2051982c8a7e57 SHA512 463add69c9db348e1e7b93ba2e7bff3ce62abc96731485955e36e6855e3e2a1fb53f082238cada537487285e15d94296cf3fd3d408a013c307ff195685896fc5 WHIRLPOOL 10576ef2591f8bf47148a37bc5690abca474691edab802cf46967b8695c838d1e477a5731f677c8951b0652981ba338c42e14479e33e8dfccfa7952ab56f04a9
 AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca615344abf7c9060f73f525a593716f0 SHA512 040507b973788dc2ca4aab19d69f45011e6509354e38ec875ab6fdec3f1c3be40272ea99cd53a5adfc8b52b30e29d86af80891d57b50068a4b3f2cc20246ac70 WHIRLPOOL c4d17452c22e81fdcbd6e14aaaf8294a90a67438ebcadcaab096a6d2f115643c2ce36cc503d186d2d2483366b890add3e9101c26998878817f7baed8589a8514
-AUX gnutls-3.2.1-build-gmp-1.patch 2537 SHA256 997c152757f42beb68e395093ad82751dccc4007d66e78f16ff19150d8815dd3 SHA512 9525128d098f3a03b0a73d1296d0f512315bfba37a48215a0109521dc7aa9990a5dfb794ec2b92436ec8189b93a3997673be4abcbdafd3b015b2fd196d15fa96 WHIRLPOOL f789cd4260c7e052e28a0a86ffe7c1ade2df739acfcea9cd4648ee1b958541f7013d61bf545908e0ba428b163ef48c9e587dd903ed839691ae5f8bfd0ebe2035
-AUX gnutls-3.2.1-build-gmp-2.patch 1038 SHA256 ecc6fa9c76f3da6fe795baf21c0666c3c38aa25d01a3cc15631aef5c229219c2 SHA512 dcd3fb728413852972fc469c8de22c61a15630872b4a4eeba74ee155207dc620af2ac0b0aa8cb01b22e11444fd555587c0666b0e9d4e183e5e238938724ce2f1 WHIRLPOOL cf6a0a2440faf31f60f89a67e75a27cab9164c7aa361124943769069c9289d9ecaeec414c2ddb3dd8604599385bbbc88a5a6ef817d91279e4354dd47228b5a61
-AUX gnutls-3.2.1-build-gmp-3.patch 1143 SHA256 c0db6e13c2f1a2357aa79dfce00b4e2d8ebfdd1f8820b5e0966749e0471597ca SHA512 82b14c9e2fb126f0ad5cf188a1c8863acf925eb74538afedd13524b9a20f41a65bd081a6ecc0a9a39b3aca74d66e1bed53753e319f47b6e4a8eb9f820a72201f WHIRLPOOL 31deca473b5af14a94dc318aa9b535ef25cb1c9820e41a57ed6d2c242ad1c0efaef2b211c707c1e673ce2e6fb48fd3c6bf13095c279cbcf1646a38230af7a7c3
 DIST gnutls-2.12.20.tar.bz2 7231438 SHA256 4884eafcc8383ed23209199bbc72ad04f4eb94955a50a594125ff34c6889c564 SHA512 49fde72d049ca75d3df15744519296a5eb982560d739cf9b41033b758564df59698be857bc86825f1ae2dc71b3479208701482bfc085f22e9ff197a65a00d7d1 WHIRLPOOL 5117604a66e9ef30c96b81f3bc09c87f623a0d9aa8e983595b169f178947499c27eb50767375bb9e9ae6684c7670d5532bdff3c5a71e7a4093648d990cc3c230
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
-DIST gnutls-3.1.10.tar.xz 5084932 SHA256 535373f59c88c171429ed3c4777dc7126681b597e3adca95aa88ecbb69e7c646 SHA512 cfe381825b9d9a6e040a2eccd1adb0927c058c3c512298525ad39e584796e4de5b1972301cd2f024ac071eb328e783a0cbc5e4474154e106227cd197eddc35d2 WHIRLPOOL 44d4a6745179431f63c8b1335f46be6f264553a8d4fc693b2615c01fcc229ece5af01dfce05b2825bc0d456aaedee4e2c1d05eaf55086941c819ed9708023b91
-DIST gnutls-3.1.11.tar.xz 5044120 SHA256 a73ac5bc692450c4c99277125d938367e3d5b8a6945358c98564ea67e2545772 SHA512 6ccb313db3c18a9b838aefd39e07b809821d64bdcb8435c213914661b6eca7ba4f4acedad30b3e33d2ab43a2ce5ef2d2cc587ba6e75bbf2c802c080b1e2f94ee WHIRLPOOL 57f257e98418af6414f698fdf3efd254788d1077a8ba00ba5e174f3bd53c856b7be7cc499f24a897558db47fea5fe640bc5f8937fbf1b03badad45dde65beb42
-DIST gnutls-3.2.1.tar.xz 5127332 SHA256 abfa8165947837ada2363355ada25d913f48e6bb261f0a67f20d2fb6079e22fe SHA512 f2b255e9bb5b7f368cfaa6241975c0ed2dabae489c0621efeb14c4dd61434471610ea2a51589512c5083e44d89205bb073fe9181756b9d5fe88ecae1d7fc4218 WHIRLPOOL c7a0fc7aa9f005894a75e2147007ab578c27e5753cb6dcd36d91af8038fecefd0ae580450226dcee5c2e92679ad9135ee8df8a0bbd7d658610c3fcc5459c57a2
 DIST gnutls-3.2.3.tar.xz 5119264 SHA256 0543ca13ce9ee1dea95a9349d319623b74d93b8a23935543197b1682bb7f2b5b SHA512 c00cc8a73e26c57050e124ed95f98681e41aee5b59a47c545555ba6571b08063152bf81903c3b7c97d3dcefb938ef3fbd5a76e5816a23fce64f799740d61c9bc WHIRLPOOL 5c61309651fa3eafe44b92a72583732756038ea036df530af1759bfe8d7c6b04a06c8ed081ccad1c5955ed8624e1aaf40f15bfc17eb7e7fe134569015a2cf07d
 DIST gnutls-3.2.4.tar.xz 4959876 SHA256 119570af3eb83b411252bf617688b9b9143e4349f48657b7ebaea57d90ff707f SHA512 d0ae82e34421b74cca42f14e9564d52324c1becfeeef0fb3e301fe3919bff4186e13661c93156a3f0515be544be3a34db10887efef59c6a3c74512d2f14351a7 WHIRLPOOL 10124de2f568f05304a989511d6d8139be56de125412d8b66f3827de84c0538b3af00cd49457ca7a039d06dde7cc2bc80d3d03ff9b836c0ed3e27a184301ab6f
 EBUILD gnutls-2.12.20.ebuild 3610 SHA256 785c319b735c8536cb34683fa863a6768cd04900dd83f5d1bfbcd69a11549e55 SHA512 6aa65bd7b955de2d84119c1d78d2c112bae99f90ff568b30ec2fa6c31fd659a2b8df7ec3a37fa11697d32d14bc8a7e12c2177b002863d272ee2c751adc259275 WHIRLPOOL 2f5547bab0891526543100f41e54eab92fbd4244f087e4e4ffa6014a6e0489930ae246583807402f510b1a262f79f00839153cb8a76d95773e7354f8da743528
 EBUILD gnutls-2.12.23-r1.ebuild 3357 SHA256 da49a8d4219dd293e6016b0f9896db1f36a20f44f89766cd502c034a0920b8a1 SHA512 5c4fc5eebdc5480c873e1ea081c6ff87dbc83405d366459186f6ea0ec1ba6e9152403ae50406a934e5dc7a82920cbd0ee964d44217e1ec2f97b3fd546c8d68aa WHIRLPOOL d1adb02419f85d30b7cdc235279bd56b82764f9a314b64353baf408dde99ab9ab9afa050433cfdb9bbaf1951403d24425c76a22b85d59a946c591298c6e054cf
-EBUILD gnutls-2.12.23.ebuild 3399 SHA256 0e8b84dd493bd28b51bd537752c617eab98c594e977d54f90335f9245b9eb12c SHA512 0f04211be9c0c2e300e5fa9f38e929b431f4e2c8bd01fc9084ab663b83df5c0e6ad887486fbed8c58ab1796c9dad4ab11b2cfaa9461130f74b8ac79fda0c03d3 WHIRLPOOL 4a65b2be4be506aeb5e3c70ce58b6261ce2c90192f49bc98dfa15fae0a047ceb63b6df2587c6a1c337c5a072eaf2daadd4aca7a5dd6b0af1ead6512c9538c444
-EBUILD gnutls-3.1.10.ebuild 3143 SHA256 c92de271426a888c6494466bf61560b686fa85a136fc4e928bdb4a8f02438466 SHA512 86b508b2948d06bf4d45ad1ad04ae54a607f86d9143c7249388a3b97b64c6724de4105275ec12cc1df5235969bb4b358a4b8d860e658908a56ca89ae8654fd19 WHIRLPOOL 899242afea605e03f0f577eeeb65693be1496e2be0fe09a8dce8505ea6e4d9b352dc81d66417524e4230a4e856e0933f93e2d120e137983fc9870b5ddd06d28c
-EBUILD gnutls-3.1.11.ebuild 3143 SHA256 d35cff2e64300399eac31fd52c9ee1c331c2eed344a4a45ce19a64894b00c192 SHA512 339444967b8623a7214ece9a70ad7073b77185e6ee0ae409ca1788443e826cb30697d27ef93103835dea0cb32505d6a0f28fbe49eed8b411e0eb58e2222ed5cb WHIRLPOOL 7e925c27affaf1bfe2881b3bb6f4c1af21c32a596faf1df2a206ccaecf412dca93078e9e4a4f86c640a22804fd3ed65b6291ed10e2a896ffcaab6493ca97413d
-EBUILD gnutls-3.2.1-r1.ebuild 3202 SHA256 2c5339e64da4460d7e5cc7bb615496700eb39635238ab4a8d92e9ff3488405b9 SHA512 811e73978b5d625c97ca9122c05e928e59e33ce891daa43824ee9f76ecc88e6bf05a2afa732db583f0e715082b42a02e591c93cd2f1662eb452e82d3d3c688c6 WHIRLPOOL e5ae4abb028ebf18f8362ceaa2e1d6dbf13f17a488c2d69f56ac2f3d683d5f93a8999f23996d71de7902a8028105f87238b649c9e1cffb973583711a5c0835ff
 EBUILD gnutls-3.2.3.ebuild 3156 SHA256 cdbdb936c88d11af46ce617f37733901bc422ffafeaf9609b69b95455712b3db SHA512 cee68c3471ec6d8692d4b0361e841a34aea8078b606a31601f4123b631cf1365a04c778f41344714e1182a3128d2b9771075e9d0d83b44a99ee88c4e674f6bb3 WHIRLPOOL 6f10ed3bace9ea03ac407323c9074d141d617829ff695d02b994a05df1af53c1b640fa7de52741a915471ec7c56d8b9047e70ac015c68658693640c2cfc08d37
 EBUILD gnutls-3.2.4.ebuild 3156 SHA256 48b3f54cb47619fc742e57f5aa79e4f4810afa9c0f674cb874f18fa6a6b4c91e SHA512 314041e8f8561fe3358dbe5a85f95b228a79d12bf218b93c47bfee916deb0e24a45aa7277c8e5af8a5f8e517934ebe317db667b8ca0cbc0ad3bc3346d88d4970 WHIRLPOOL 708e1764f8ff2a73ee0a45718b7b886bf288e5eb9008d1e3d5ef25e8859a6707ff58fb32cc1432b077b9c38143695ea2adf22d22d8df370c3beee6e7d1421f34
-MISC ChangeLog 66487 SHA256 ce9fcb1503fc40a4da64e6867ab2cb2682cb54981b284223950a9efce61ddc94 SHA512 7b91ea11f1fe9774d60c87c39aaa1a5bed93de4213a76db79f974f60cceac515a7bed3cd01726e8a9a7e4fdaba28d22e7df1be5d87927cd1608f1ebd532844c9 WHIRLPOOL 2a282ff5678fb3b1467deae2ef3e600cb02edc3de52bb0a0600e9b8224f80d5bdddb1dfa61a30347f0c3a1f3706fc4c43cca67ccbe33282ae99946829aa680e0
+MISC ChangeLog 66769 SHA256 281aaad24ff543a3bd41262dddb178283dc965bdf0938207458e0422820c4849 SHA512 781abda19f27f4986d8b171046b8189b823bdd911faeb0d233ce81d706f37916561474af432dfeec7879e739dffec8269860d055898f7d6b3b914c73be2d7c4a WHIRLPOOL 7853adeedee3d7e60bb6eb95f5eaf951ae17d9e867131996793cfe3172f84c545c75ccabab767b32d41a40fdbe2f4585947846d2f7bda785f4d50a119fdf2536
 MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSI4y1AAoJEEqz6FtPBkyj4N8IAK6O1AtlR5R+A65nriEL2FfA
-lk5ycT7/CgLXtDbDgDUypAT8zDOVsfUnzQHvxcmxim7lBRV2jgJFanilV372bxG6
-b0nznbHIvWv08girENpnQEq71aYfRt1XFkVvT5bMH2ZoZ2/RFqnfVLcJcYG4YZfM
-Q2E0s4S4f1xa2SHnCXjIuYgjXR7Flvp2MM0zqUSEGvkgEsJXHFoRDbq9/Xlra0Lz
-6TiE8JA5D0ehiB/fEwa5ayOs4qsO1p7rjMqFlr3cc6CmOFtXN9o4QxV2Lu3UddcA
-3r/0AfBnc+QnM/Ook242NPWKkN4cW42xqwgu3rtQgzEfSpGnX7VSWJ15tYIgAV0=
-=/9O0
+iQEcBAEBCAAGBQJSI46KAAoJEEqz6FtPBkyjgJQIAKzYhFD5CzcdbhCs89S/qA9S
+FrM4b1c6SJKx0O6gVlvS6KaaA8QvHpMEdO25lT3ny54uXGRA94FrgJCBAdUU7kpV
+mANO/XtDpHjpFXK+jgw24CGIYxILuSRXkOYoORKp9+qxa/fOF1RMHOxTy2ZFqd2H
+yU8VPZus3w3xhA9453IX2bMXg9MDy7wqYVXZk7IbmRTazZ4BIn6j3j7KrjIAqOJA
+VoIsrkPHApPDR4ZMe3tdNxl/2tvvungZDMtTFDJXC9RjDv1BSi92anssMJFZf2WJ
+ChtunLzH1gsXemjT+p532F9Lvtx5a0fSOYxEvBAg3kccpJFY312/oBdLx542QnU=
+=Eb0A
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-1.patch b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-1.patch
deleted file mode 100644
index cecb957efe66..000000000000
--- a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-1.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 02eb70d6d96f624ed6cc55dfa62734495dffbb44 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Sun, 2 Jun 2013 19:10:52 +0200
-Subject: [PATCH] Directly link to gmp library. Based on original patch by Alon Bar-Lev <alon.barlev@gmail.com>.
-
----
- lib/Makefile.am        |    2 +-
- lib/gnutls.pc.in       |    2 +-
- lib/nettle/Makefile.am |    5 ++++-
- m4/hooks.m4            |   11 +++++++++++
- 4 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index f1e672c..3beb7c7 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -140,7 +140,7 @@ thirdparty_libadd += $(LIBTASN1_LIBS)
- endif
- 
- if ENABLE_NETTLE
--thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS)
-+thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
- libgnutls_la_LIBADD += nettle/libcrypto.la
- endif
- 
-diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
-index 13f2d3b..a25fcdf 100644
---- a/lib/gnutls.pc.in
-+++ b/lib/gnutls.pc.in
-@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
- URL: http://www.gnutls.org/
- Version: @VERSION@
- Libs: -L${libdir} -lgnutls
--Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@
-+Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
- @GNUTLS_REQUIRES_PRIVATE@
- Cflags: -I${includedir}
-diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
-index e2b704e..0987c8e 100644
---- a/lib/nettle/Makefile.am
-+++ b/lib/nettle/Makefile.am
-@@ -25,7 +25,10 @@ AM_CPPFLAGS = \
- 	-I$(srcdir)/../includes		\
- 	-I$(builddir)/../includes	\
- 	-I$(builddir)/../../gl          \
--	-I$(srcdir)/..
-+	-I$(srcdir)/..			\
-+	$(NETTLE_CFLAGS)		\
-+	$(HOGWEED_CFLAGS)		\
-+	$(GMP_CFLAGS)
- 
- if ENABLE_MINITASN1
- AM_CPPFLAGS += -I$(srcdir)/../minitasn1
-diff --git a/m4/hooks.m4 b/m4/hooks.m4
-index 3439edb..cd9ef5c 100644
---- a/m4/hooks.m4
-+++ b/m4/hooks.m4
-@@ -82,6 +82,17 @@ AC_MSG_ERROR([[
- 
-   GNUTLS_REQUIRES_PRIVATE="Requires.private: nettle, hogweed"
- 
-+  AC_ARG_VAR(GMP_CFLAGS, [C compiler flags for gmp])
-+  AC_ARG_VAR(GMP_LIBS, [linker flags for gmp])
-+  if test x$GMP_LIBS = x; then
-+  	AC_CHECK_LIB(gmp, __gmpz_cmp, [GMP_LIBS="-lgmp"], [AC_MSG_ERROR([[
-+***
-+*** gmp was not found.
-+]])])
-+  fi
-+  AC_SUBST(GMP_CFLAGS)
-+  AC_SUBST(GMP_LIBS)
-+
-   AC_ARG_WITH(included-libtasn1,
-     AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]),
-       included_libtasn1=$withval,
--- 
-1.7.1
-
diff --git a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-2.patch b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-2.patch
deleted file mode 100644
index 40aca4ace23e..000000000000
--- a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f3ef68f4f79434fadc3f28c649744e57f3eef99b Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Mon, 3 Jun 2013 21:21:44 +0200
-Subject: [PATCH] Add nettle dependencies to libcrypto.la
-
----
- lib/Makefile.am        |    1 -
- lib/nettle/Makefile.am |    1 +
- 2 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 3beb7c7..006f695 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -140,7 +140,6 @@ thirdparty_libadd += $(LIBTASN1_LIBS)
- endif
- 
- if ENABLE_NETTLE
--thirdparty_libadd += $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
- libgnutls_la_LIBADD += nettle/libcrypto.la
- endif
- 
-diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
-index 3dcb928..7b3f4c0 100644
---- a/lib/nettle/Makefile.am
-+++ b/lib/nettle/Makefile.am
-@@ -37,5 +37,6 @@ endif
- 
- noinst_LTLIBRARIES = libcrypto.la
- 
-+libcrypto_la_LIBADD = $(NETTLE_LIBS) $(HOGWEED_LIBS) $(GMP_LIBS)
- libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h \
- 	gnettle.h 
--- 
-1.7.1
-
diff --git a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-3.patch b/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-3.patch
deleted file mode 100644
index 2ad85039f712..000000000000
--- a/net-libs/gnutls/files/gnutls-3.2.1-build-gmp-3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8b64193ac7b30faa2213d5be6ee477db3a1f70a6 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Mon, 3 Jun 2013 21:17:39 +0200
-Subject: [PATCH] correctly place cflags
-
----
- lib/nettle/Makefile.am |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
-index 0987c8e..3dcb928 100644
---- a/lib/nettle/Makefile.am
-+++ b/lib/nettle/Makefile.am
-@@ -18,17 +18,18 @@
- # You should have received a copy of the GNU Lesser General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>
- 
--AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
-+AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) \
-+	$(NETTLE_CFLAGS)		\
-+	$(HOGWEED_CFLAGS)		\
-+	$(GMP_CFLAGS)
-+
- AM_CPPFLAGS = \
- 	-I$(srcdir)/../../gl		\
- 	-I$(builddir)/../../gl		\
- 	-I$(srcdir)/../includes		\
- 	-I$(builddir)/../includes	\
- 	-I$(builddir)/../../gl          \
--	-I$(srcdir)/..			\
--	$(NETTLE_CFLAGS)		\
--	$(HOGWEED_CFLAGS)		\
--	$(GMP_CFLAGS)
-+	-I$(srcdir)/..
- 
- if ENABLE_MINITASN1
- AM_CPPFLAGS += -I$(srcdir)/../minitasn1
--- 
-1.7.1
-
diff --git a/net-libs/gnutls/gnutls-2.12.23.ebuild b/net-libs/gnutls/gnutls-2.12.23.ebuild
deleted file mode 100644
index e2a7669b84be..000000000000
--- a/net-libs/gnutls/gnutls-2.12.23.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.23.ebuild,v 1.12 2013/03/10 16:19:20 ago Exp $
-
-EAPI=4
-
-inherit autotools libtool eutils versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-
-if [[ "${PV}" == *pre* ]]; then
-	SRC_URI="http://daily.josefsson.org/${P%.*}/${P%.*}-${PV#*pre}.tar.gz"
-else
-	SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-fi
-
-# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library.
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib"
-
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-	<dev-libs/libtasn1-3
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nettle? ( >=dev-libs/nettle-2.1[gmp] )
-	!nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.11 )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )
-	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-pkg_setup() {
-	if use lzo && use bindist; then
-		ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-	fi
-}
-
-src_prepare() {
-	# tests/suite directory is not distributed.
-	sed -i -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' \
-		configure.ac || die
-
-	sed -i -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || die
-
-	local dir
-	for dir in m4 lib/m4 libextra/m4; do
-		rm -f "${dir}/lt"* "${dir}/libtool.m4"
-	done
-	find . -name ltmain.sh -exec rm {} \;
-
-	epatch "${FILESDIR}"/${PN}-2.12.20-AF_UNIX.patch
-	epatch "${FILESDIR}"/${PN}-2.12.20-libadd.patch
-	epatch "${FILESDIR}"/${PN}-2.12.20-guile-parallelmake.patch
-
-	# support user patches
-	epatch_user
-
-	for dir in . lib libextra; do
-		pushd "${dir}" > /dev/null
-		sed -i -e '/^AM_INIT_AUTOMAKE/s/-Werror//' configure.ac || die
-		eautoreconf
-		popd > /dev/null
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	[[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-	econf \
-		--htmldir="${EPREFIX}"/usr/share/doc/${P}/html \
-		--disable-silent-rules \
-		$(use_enable cxx) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-pdf) \
-		$(use_enable guile) \
-		$(use_with !nettle libgcrypt) \
-		$(use_enable nls) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_enable static-libs static) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_test() {
-	if has_version dev-util/valgrind && [[ ${VALGRIND_TESTS} != 1 ]]; then
-		elog
-		elog "You can set VALGRIND_TESTS=\"1\" to enable Valgrind tests."
-		elog
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use doc; then
-		dodoc doc/gnutls.{pdf,ps}
-		dohtml doc/gnutls.html
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.1.10.ebuild b/net-libs/gnutls/gnutls-3.1.10.ebuild
deleted file mode 100644
index 9556160b6ee9..000000000000
--- a/net-libs/gnutls/gnutls-3.1.10.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.10.ebuild,v 1.3 2013/05/30 19:56:09 radhermit Exp $
-
-EAPI=5
-
-inherit autotools libtool eutils versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
-# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
-# heartbeat support is not disabled until re-licensing happens fullyf
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-2.14
-	>=dev-libs/nettle-2.5[gmp]
-	sys-devel/autogen
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.11 )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.11.6
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-src_prepare() {
-	# tests/suite directory is not distributed
-	sed -i \
-		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
-		-e '/^AM_INIT_AUTOMAKE/s/-Werror//' \
-		configure.ac || die
-
-	sed -i \
-		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || die
-
-	rm -f {m4,gl/m4}/{lt*,libtool.m4}
-	find . -name ltmain.sh -delete
-
-	# use system libopts
-	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || die
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-valgrind-tests \
-		--enable-heartbeat-support \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-pdf) \
-		$(use_enable guile) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm
-}
-
-src_test() {
-	# parallel testing often fails
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete
-
-	dodoc doc/certtool.cfg
-
-	if use doc; then
-		dodoc doc/gnutls.pdf
-		dohtml doc/gnutls.html
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.1.11.ebuild b/net-libs/gnutls/gnutls-3.1.11.ebuild
deleted file mode 100644
index dbc6c1d2186d..000000000000
--- a/net-libs/gnutls/gnutls-3.1.11.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.11.ebuild,v 1.3 2013/05/30 19:56:09 radhermit Exp $
-
-EAPI=5
-
-inherit autotools libtool eutils versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
-# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
-# heartbeat support is not disabled until re-licensing happens fullyf
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-2.14
-	>=dev-libs/nettle-2.5[gmp]
-	sys-devel/autogen
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.11 )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.11.6
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-src_prepare() {
-	# tests/suite directory is not distributed
-	sed -i \
-		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
-		-e '/^AM_INIT_AUTOMAKE/s/-Werror//' \
-		configure.ac || die
-
-	sed -i \
-		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || die
-
-	rm -f {m4,gl/m4}/{lt*,libtool.m4}
-	find . -name ltmain.sh -delete
-
-	# use system libopts
-	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || die
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-valgrind-tests \
-		--enable-heartbeat-support \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-pdf) \
-		$(use_enable guile) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm
-}
-
-src_test() {
-	# parallel testing often fails
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete
-
-	dodoc doc/certtool.cfg
-
-	if use doc; then
-		dodoc doc/gnutls.pdf
-		dohtml doc/gnutls.html
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.2.1-r1.ebuild b/net-libs/gnutls/gnutls-3.2.1-r1.ebuild
deleted file mode 100644
index 1f133ce38d93..000000000000
--- a/net-libs/gnutls/gnutls-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.1-r1.ebuild,v 1.1 2013/06/03 20:17:17 alonbl Exp $
-
-EAPI=5
-
-inherit autotools libtool eutils versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
-# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
-# heartbeat support is not disabled until re-licensing happens fullyf
-
-# NOTICE: sys-devel/autogen is required at runtime as we
-# use system libopts
-RDEPEND=">=dev-libs/libtasn1-2.14
-	>=dev-libs/nettle-2.7[gmp]
-	dev-libs/gmp
-	sys-devel/autogen
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.11 )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.11.6
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-build-gmp-"*.patch
-
-	# tests/suite directory is not distributed
-	sed -i \
-		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
-		-e '/^AM_INIT_AUTOMAKE/s/-Werror//' \
-		configure.ac || die
-
-	sed -i \
-		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || die
-
-	rm -f {m4,gl/m4}/{lt*,libtool.m4}
-	find . -name ltmain.sh -delete
-
-	# use system libopts
-	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || die
-
-	# force regeneration of autogen-ed files
-	local file
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-valgrind-tests \
-		--enable-heartbeat-support \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-pdf) \
-		$(use_enable guile) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm
-}
-
-src_test() {
-	# parallel testing often fails
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete
-
-	dodoc doc/certtool.cfg
-
-	if use doc; then
-		dodoc doc/gnutls.pdf
-		dohtml doc/gnutls.html
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}