Version bumps, fix bug#510282, fix build issues bug#510418 thanks to Michał Górny

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

4 files changed, 345 insertions, 1 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index b67b0f00d09a..e959c792bcf7 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,15 @@
 # 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.490 2014/05/15 21:43:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.491 2014/05/17 09:46:25 alonbl Exp $
+
+*gnutls-3.3.2 (17 May 2014)
+*gnutls-3.2.14 (17 May 2014)
+
+  17 May 2014; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnutls-3.3.2-build-out-of-tree.patch, +gnutls-3.2.14.ebuild,
+  +gnutls-3.3.2.ebuild:
+  Version bumps, fix bug#510282, fix build issues bug#510418 thanks to Michał
+  Górny
 
   15 May 2014; Michał Górny <mgorny@gentoo.org> gnutls-3.3.1-r1.ebuild:
   Symlink native certtool for reuse in tests, bug #510420.
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
new file mode 100644
index 000000000000..8be98543dcdb
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.3.2-build-out-of-tree.patch
@@ -0,0 +1,59 @@
+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.14.ebuild b/net-libs/gnutls/gnutls-3.2.14.ebuild
new file mode 100644
index 000000000000..d443afae28ae
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.2.14.ebuild
@@ -0,0 +1,122 @@
+# 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.2.ebuild b/net-libs/gnutls/gnutls-3.3.2.ebuild
new file mode 100644
index 000000000000..4d43b824d83d
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.2.ebuild
@@ -0,0 +1,154 @@
+# 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.1 2014/05/17 09:46:25 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 ~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/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
+}