Cleanup old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

12 files changed, 9 insertions, 1143 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 62abb33b6d9a..82bcc2316c62 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.493 2014/06/01 07:59:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.494 2014/06/07 17:48:35 alonbl Exp $
+
+  07 Jun 2014; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/gnutls-2.12.20-glibc-2.16.patch, -files/gnutls-3.3.1-guile.patch,
+  -files/gnutls-3.3.2-build-out-of-tree.patch, -gnutls-3.2.11.ebuild,
+  -gnutls-3.2.12.1.ebuild, -gnutls-3.2.12.ebuild, -gnutls-3.2.13.ebuild,
+  -gnutls-3.2.14.ebuild, -gnutls-3.3.1-r1.ebuild, -gnutls-3.3.1.ebuild,
+  -gnutls-3.3.2.ebuild:
+  Cleanup old
 
 *gnutls-3.3.4 (01 Jun 2014)
 *gnutls-3.2.15 (01 Jun 2014)
diff --git a/net-libs/gnutls/files/gnutls-2.12.20-glibc-2.16.patch b/net-libs/gnutls/files/gnutls-2.12.20-glibc-2.16.patch
deleted file mode 100644
index 6b7f5453490c..000000000000
--- a/net-libs/gnutls/files/gnutls-2.12.20-glibc-2.16.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gnutls-2.12.20/gl/stdio.in.h
-+++ gnutls-2.12.20/gl/stdio.in.h
-@@ -714,8 +714,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#ifdef HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
---- gnutls-2.12.20/lib/gl/stdio.in.h
-+++ gnutls-2.12.20/lib/gl/stdio.in.h
-@@ -714,8 +714,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#ifdef HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/net-libs/gnutls/files/gnutls-3.3.1-guile.patch b/net-libs/gnutls/files/gnutls-3.3.1-guile.patch
deleted file mode 100644
index e0cf96af54c4..000000000000
--- a/net-libs/gnutls/files/gnutls-3.3.1-guile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 872409857351f28b1e3c21526bfa6606c918b176 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Sat, 19 Apr 2014 15:04:54 +0200
-Subject: [PATCH] do not override gnutls' allocation functions
-
-That was not being done using the API, and overriding them
-is no longer possible in 3.3.x.
----
- guile/src/core.c |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git a/guile/src/core.c b/guile/src/core.c
-index 6940eae..b40e93e 100644
---- a/guile/src/core.c
-+++ b/guile/src/core.c
-@@ -3364,11 +3364,6 @@ scm_init_gnutls (void)
- #include "core.x"
- 
-   /* Use Guile's allocation routines, which will run the GC if need be.  */
--  gnutls_malloc = scm_malloc;
--  gnutls_realloc = scm_realloc;
--  gnutls_secure_malloc = scm_malloc;
--  gnutls_free = free;
--
-   (void) gnutls_global_init ();
- 
-   scm_gnutls_define_enums ();
--- 
-1.7.1
-
diff --git a/net-libs/gnutls/files/gnutls-3.3.2-build-out-of-tree.patch b/net-libs/gnutls/files/gnutls-3.3.2-build-out-of-tree.patch
deleted file mode 100644
index 8be98543dcdb..000000000000
--- a/net-libs/gnutls/files/gnutls-3.3.2-build-out-of-tree.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 3c306b63f8377440c1ebdbf30264b342ff2d02d6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 15 May 2014 23:46:03 +0200
-Subject: [PATCH] tests: pass PKCS12PATH to fix tests in out-of-source builds.
-
-The set_pkcs12_cred used to default to looking for input files in a
-subdirectory of the current working directory. When an out-of-source
-build is performed, the files reside in a subdirectory of source
-directory instead. Set PKCS12PATH to that directory in order to fix the
-build.
-
-Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
----
- tests/Makefile.am |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index f155dfa..3fec620 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -114,6 +114,7 @@ TESTS_ENVIRONMENT =						\
- 	PKCS12PASSWORD=foobar					\
- 	PKCS12FILE_2=$(srcdir)/pkcs12-decode/pkcs12_2certs.p12	\
- 	PKCS12PASSWORD_2=""					\
-+	PKCS12PATH=$(srcdir)/pkcs12-decode/			\
- 	EXEEXT=$(EXEEXT)					\
- 	top_builddir="$(top_builddir)"				\
- 	srcdir="$(srcdir)"
--- 
-1.7.1
-
-From b7f7b483a2c1e8da424bb3519e9365c489f1b248 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 15 May 2014 23:53:17 +0200
-Subject: [PATCH] tests/slow: add -I flags necessary for out-of-source builds.
-
-Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
----
- tests/slow/Makefile.am |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/tests/slow/Makefile.am b/tests/slow/Makefile.am
-index 0e4b382..d65b9d5 100644
---- a/tests/slow/Makefile.am
-+++ b/tests/slow/Makefile.am
-@@ -20,7 +20,9 @@
- AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
- AM_CPPFLAGS = -I$(top_srcdir)/lib/includes		\
- 	-I$(top_builddir)/lib/includes \
--	-I$(top_srcdir)/tests/
-+	-I$(top_srcdir)/tests/ \
-+	-I$(top_srcdir)/lib \
-+	-I$(top_srcdir)/gl
- 
- AM_LDFLAGS = -no-install
- LDADD = ../libutils.la \
--- 
-1.7.1
-
diff --git a/net-libs/gnutls/gnutls-3.2.11.ebuild b/net-libs/gnutls/gnutls-3.2.11.ebuild
deleted file mode 100644
index a64a12c0431b..000000000000
--- a/net-libs/gnutls/gnutls-3.2.11.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.11.ebuild,v 1.4 2014/02/17 09:35:44 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 +crywrap 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
-	crywrap? ( net-dns/libidn )
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.2 )
-	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
-
-	# 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
-
-	# bug 497472
-	use cxx || epunt_cxx
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	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 crywrap) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-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.12.1.ebuild b/net-libs/gnutls/gnutls-3.2.12.1.ebuild
deleted file mode 100644
index 7cb9d5038a33..000000000000
--- a/net-libs/gnutls/gnutls-3.2.12.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.12.1.ebuild,v 1.2 2014/03/08 20:21:37 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 +crywrap 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
-	crywrap? ( net-dns/libidn )
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.2 )
-	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 )
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-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
-
-	# 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
-
-	epatch "${FILESDIR}/${PN}-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch"
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-
-	# bug 497472
-	use cxx || epunt_cxx
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	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 crywrap) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-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.12.ebuild b/net-libs/gnutls/gnutls-3.2.12.ebuild
deleted file mode 100644
index 866ffe2f85ac..000000000000
--- a/net-libs/gnutls/gnutls-3.2.12.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.12.ebuild,v 1.1 2014/03/03 20:09:58 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 +crywrap 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
-	crywrap? ( net-dns/libidn )
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.2 )
-	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
-
-	# 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
-
-	# bug 497472
-	use cxx || epunt_cxx
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	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 crywrap) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-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.13.ebuild b/net-libs/gnutls/gnutls-3.2.13.ebuild
deleted file mode 100644
index 396a6257e3f8..000000000000
--- a/net-libs/gnutls/gnutls-3.2.13.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.13.ebuild,v 1.1 2014/04/11 02:09:50 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 +crywrap 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
-	crywrap? ( net-dns/libidn )
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.2 )
-	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 )
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-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
-
-	# 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
-
-	epatch "${FILESDIR}/${PN}-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch"
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-
-	# bug 497472
-	use cxx || epunt_cxx
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	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 crywrap) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-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.14.ebuild b/net-libs/gnutls/gnutls-3.2.14.ebuild
deleted file mode 100644
index d443afae28ae..000000000000
--- a/net-libs/gnutls/gnutls-3.2.14.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.14.ebuild,v 1.1 2014/05/17 09:46:25 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="mirror://gnupg/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 +crywrap 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
-	crywrap? ( net-dns/libidn )
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.2 )
-	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 )
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-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
-
-	# 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
-
-	epatch "${FILESDIR}/${PN}-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch"
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-
-	# bug 497472
-	use cxx || epunt_cxx
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	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 crywrap) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-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.3.1-r1.ebuild b/net-libs/gnutls/gnutls-3.3.1-r1.ebuild
deleted file mode 100644
index 438956c1688d..000000000000
--- a/net-libs/gnutls/gnutls-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.1-r1.ebuild,v 1.2 2014/05/15 21:43:48 mgorny Exp $
-
-EAPI=5
-
-inherit autotools libtool eutils multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/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 +crywrap 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[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
-	dev-libs/gmp[${MULTILIB_USEDEP}]
-	sys-devel/autogen
-	crywrap? ( net-dns/libidn )
-	dane? ( net-dns/unbound[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.2[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.3.1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.11.6
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-src_prepare() {
-	sed -i \
-		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || 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
-
-	epatch "${FILESDIR}/${P}-guile.patch"
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-
-	# bug 497472
-	use cxx || epunt_cxx
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	ECONF_SOURCE=${S} \
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-valgrind-tests \
-		--enable-heartbeat-support \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc gtk-doc-pdf) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable crywrap) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-
-		# symlink certtool for use in other ABIs
-		if use test; then
-			ln -s "${BUILD_DIR}"/src/certtool "${T}"/certtool || die
-		fi
-	else
-		emake -C gl
-		emake -C lib
-		emake -C extra
-		use dane && emake -C libdane
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		# parallel testing often fails
-		emake -j1 check
-	else
-		# use native ABI certtool
-		ln -s "${T}"/certtool "${BUILD_DIR}"/src/certtool || die
-
-		emake -C gl -j1 check
-		emake -C tests -j1 check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C lib DESTDIR="${D}" install
-		emake -C extra DESTDIR="${D}" install
-		use dane && emake -C libdane DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	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.3.1.ebuild b/net-libs/gnutls/gnutls-3.3.1.ebuild
deleted file mode 100644
index e132665598cc..000000000000
--- a/net-libs/gnutls/gnutls-3.3.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.1.ebuild,v 1.2 2014/04/25 19:05:35 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="mirror://gnupg/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 +crywrap 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
-	crywrap? ( net-dns/libidn )
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.2 )
-	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 )
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-src_prepare() {
-	sed -i \
-		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || 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
-
-	epatch "${FILESDIR}/${P}-guile.patch"
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-
-	# bug 497472
-	use cxx || epunt_cxx
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	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 crywrap) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-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.3.2.ebuild b/net-libs/gnutls/gnutls-3.3.2.ebuild
deleted file mode 100644
index fdbd72376b3f..000000000000
--- a/net-libs/gnutls/gnutls-3.3.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.2.ebuild,v 1.2 2014/05/17 14:16:42 mgorny Exp $
-
-EAPI=5
-
-inherit autotools libtool eutils multilib-minimal versionator
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="mirror://gnupg/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 +crywrap 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[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
-	dev-libs/gmp[${MULTILIB_USEDEP}]
-	sys-devel/autogen
-	crywrap? ( net-dns/libidn )
-	dane? ( net-dns/unbound[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.2[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.3.1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.11.6
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-src_prepare() {
-	sed -i \
-		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || 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
-
-	epatch "${FILESDIR}/${P}-build-out-of-tree.patch"
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-
-	# bug 497472
-	use cxx || epunt_cxx
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	# hardware-accell is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	ECONF_SOURCE=${S} \
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-valgrind-tests \
-		--enable-heartbeat-support \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc gtk-doc-pdf) \
-		$(multilib_native_use_enable guile) \
-		$(multilib_native_use_enable crywrap) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm \
-		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-
-		# symlink certtool for use in other ABIs
-		if use test; then
-			ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
-		fi
-	else
-		emake -C gl
-		emake -C lib
-		emake -C extra
-		use dane && emake -C libdane
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		# parallel testing often fails
-		emake -j1 check
-	else
-		# use native ABI tools
-		ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
-			"${BUILD_DIR}"/src/ || die
-
-		emake -C gl -j1 check
-		emake -C tests -j1 check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C lib DESTDIR="${D}" install
-		emake -C extra DESTDIR="${D}" install
-		use dane && emake -C libdane DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	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
-}