Version bump, cleanup

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

7 files changed, 10 insertions, 642 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index f5420448ed21..a978edd5d154 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,13 @@
 # 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.514 2014/09/23 06:39:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.515 2014/10/13 13:03:42 alonbl Exp $
+
+*gnutls-3.3.9 (13 Oct 2014)
+
+  13 Oct 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.3.9.ebuild,
+  -files/gnutls-3.3.7-build.patch, -gnutls-3.2.16.ebuild, -gnutls-3.2.17.ebuild,
+  -gnutls-3.3.6.ebuild, -gnutls-3.3.7-r1.ebuild, -gnutls-3.3.7.ebuild:
+  Version bump, cleanup
 
   23 Sep 2014; Alon Bar-Lev <alonbl@gentoo.org> gnutls-3.3.8.ebuild:
   Bump p11-kit dependency, bug#523472, thanks to Marcin Mirosław
diff --git a/net-libs/gnutls/files/gnutls-3.3.7-build.patch b/net-libs/gnutls/files/gnutls-3.3.7-build.patch
deleted file mode 100644
index cd9673d7fbe4..000000000000
--- a/net-libs/gnutls/files/gnutls-3.3.7-build.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 580c82cbe8629b0848b30a4a4ed659c558dc42c7 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sun, 24 Aug 2014 21:19:26 +0300
-Subject: [PATCH] build: condition pkcs11 block
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- lib/gnutls_privkey.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
-index 24ed6f2..647777e 100644
---- a/lib/gnutls_privkey.c
-+++ b/lib/gnutls_privkey.c
-@@ -198,6 +198,7 @@ _gnutls_privkey_get_mpis(gnutls_privkey_t key, gnutls_pk_params_st * params)
- 	case GNUTLS_PRIVKEY_X509:
- 		ret = _gnutls_pk_params_copy(params, &key->key.x509->params);
- 		break;
-+#ifdef ENABLE_PKCS11
- 	case GNUTLS_PRIVKEY_PKCS11: {
- 		gnutls_pubkey_t pubkey;
- 
-@@ -210,6 +211,7 @@ _gnutls_privkey_get_mpis(gnutls_privkey_t key, gnutls_pk_params_st * params)
- 
- 		break;
- 		}
-+#endif
- 	default:
- 		gnutls_assert();
- 		return GNUTLS_E_INVALID_REQUEST;
--- 
-1.8.5.5
-
-From 95cf32756f65d945dff17458a89a0bdf7fc81f41 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sun, 24 Aug 2014 21:49:55 +0300
-Subject: [PATCH] build: tests: x509cert-tl: support separate builddir
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- tests/Makefile.am   | 1 +
- tests/x509cert-tl.c | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 6638fce..3ad6c67 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -128,6 +128,7 @@ TESTS_ENVIRONMENT =						\
- 	PKCS12FILE_2=$(srcdir)/pkcs12-decode/pkcs12_2certs.p12	\
- 	PKCS12PASSWORD_2=""					\
- 	PKCS12PATH=$(srcdir)/pkcs12-decode/			\
-+	X509CERTDIR=$(srcdir)/x509cert-dir/			\
- 	EXEEXT=$(EXEEXT)					\
- 	top_builddir="$(top_builddir)"				\
- 	srcdir="$(srcdir)"
-diff --git a/tests/x509cert-tl.c b/tests/x509cert-tl.c
-index dad7860..5ecc03e 100644
---- a/tests/x509cert-tl.c
-+++ b/tests/x509cert-tl.c
-@@ -189,6 +189,7 @@ static time_t mytime(time_t * t)
- void doit(void)
- {
- 	int ret;
-+	const char *path;
- 	gnutls_datum_t data;
- 	gnutls_x509_crt_t server_crt, ca_crt2;
- 	gnutls_x509_trust_list_t tl;
-@@ -209,7 +210,10 @@ void doit(void)
- 	gnutls_x509_crt_init(&server_crt);
- 	gnutls_x509_crt_init(&ca_crt2);
- 
--	ret = gnutls_x509_trust_list_add_trust_dir(tl, "./x509cert-dir", NULL, GNUTLS_X509_FMT_PEM, 0, 0);
-+	path = getenv("X509CERTDIR");
-+	if (!path)
-+		path = "./x509cert-dir";
-+	ret = gnutls_x509_trust_list_add_trust_dir(tl, path, NULL, GNUTLS_X509_FMT_PEM, 0, 0);
- 	if (ret != 1)
- 		fail("gnutls_x509_trust_list_add_trust_dir: %d\n", ret);
- 
--- 
-1.8.5.5
-
diff --git a/net-libs/gnutls/gnutls-3.2.16.ebuild b/net-libs/gnutls/gnutls-3.2.16.ebuild
deleted file mode 100644
index 0332d168b690..000000000000
--- a/net-libs/gnutls/gnutls-3.2.16.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.16.ebuild,v 1.1 2014/08/08 08:40:50 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 ~arm64 ~hppa ~ia64 ~m68k ~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.17.ebuild b/net-libs/gnutls/gnutls-3.2.17.ebuild
deleted file mode 100644
index d67d3f322a22..000000000000
--- a/net-libs/gnutls/gnutls-3.2.17.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.17.ebuild,v 1.1 2014/08/24 19:09:45 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 ~arm64 ~hppa ~ia64 ~m68k ~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.6.ebuild b/net-libs/gnutls/gnutls-3.3.6.ebuild
deleted file mode 100644
index f2516344cc39..000000000000
--- a/net-libs/gnutls/gnutls-3.3.6.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.6.ebuild,v 1.1 2014/08/08 08:40:50 alonbl 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 ~arm64 ~hppa ~ia64 ~m68k ~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-3.4[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
-	sys-devel/autogen
-	crywrap? ( net-dns/libidn )
-	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.3[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${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-0-r1[${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
-
-	# 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 \
-		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
-		$([[ ${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
-}
diff --git a/net-libs/gnutls/gnutls-3.3.7.ebuild b/net-libs/gnutls/gnutls-3.3.7.ebuild
deleted file mode 100644
index 206fcb74640b..000000000000
--- a/net-libs/gnutls/gnutls-3.3.7.ebuild
+++ /dev/null
@@ -1,156 +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.7.ebuild,v 1.1 2014/08/24 19:09:45 alonbl 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 ~arm64 ~hppa ~ia64 ~m68k ~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-3.4[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
-	sys-devel/autogen
-	crywrap? ( net-dns/libidn )
-	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.3[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${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-0-r1[${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.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 \
-		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
-		$([[ ${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
-}
diff --git a/net-libs/gnutls/gnutls-3.3.7-r1.ebuild b/net-libs/gnutls/gnutls-3.3.9.ebuild
index 4066e37f98a5..bca1beb89e19 100644
--- a/net-libs/gnutls/gnutls-3.3.7-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.9.ebuild
@@ -1,6 +1,6 @@
 # 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.7-r1.ebuild,v 1.1 2014/08/29 20:51:04 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.9.ebuild,v 1.1 2014/10/13 13:03:42 alonbl Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ RDEPEND=">=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}]
 	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
 	guile? ( >=dev-scheme/guile-1.8[networking] )
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.19.3[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20140508
@@ -65,8 +65,6 @@ src_prepare() {
 		rm "${file}" || die
 	done
 
-	epatch "${FILESDIR}/${P}-build.patch"
-
 	# support user patches
 	epatch_user