Remove old.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

8 files changed, 7 insertions, 626 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/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
-}