Version bump; a patch is needed for a test failure with USE=-dane.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

3 files changed, 142 insertions, 1 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index eaa1d41d4ed3..b3983ed09fb4 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.389 2012/11/04 05:22:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.390 2012/11/10 01:41:02 flameeyes Exp $
+
+*gnutls-3.1.4 (10 Nov 2012)
+
+  10 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/gnutls-3.1.4-nodane.patch, +gnutls-3.1.4.ebuild:
+  Version bump; a patch is needed for a test failure with USE=-dane.
 
   04 Nov 2012; Tim Harder <radhermit@gentoo.org> gnutls-3.1.3.ebuild:
   Don't try to install the postscript doc since it's not built by default
diff --git a/net-libs/gnutls/files/gnutls-3.1.4-nodane.patch b/net-libs/gnutls/files/gnutls-3.1.4-nodane.patch
new file mode 100644
index 000000000000..048f1ae9ca09
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.1.4-nodane.patch
@@ -0,0 +1,16 @@
+Index: gnutls-3.1.4/tests/cert-tests/Makefile.am
+===================================================================
+--- gnutls-3.1.4.orig/tests/cert-tests/Makefile.am
++++ gnutls-3.1.4/tests/cert-tests/Makefile.am
+@@ -25,6 +25,10 @@ EXTRA_DIST = ca-no-pathlen.pem no-ca-or-
+ 
+ dist_check_SCRIPTS = pathlen aki template-test pem-decoding dane
+ 
+-TESTS = pathlen aki template-test pem-decoding dane
++TESTS = pathlen aki template-test pem-decoding
++
++if ENABLE_DANE
++TESTS += dane
++endif
+ 
+ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
diff --git a/net-libs/gnutls/gnutls-3.1.4.ebuild b/net-libs/gnutls/gnutls-3.1.4.ebuild
new file mode 100644
index 000000000000..57a3ab3e7cce
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.1.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.4.ebuild,v 1.1 2012/11/10 01:41:02 flameeyes Exp $
+
+EAPI=4
+
+inherit autotools libtool eutils
+
+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="mirror://gnu/${PN}/${P}.tar.xz"
+fi
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib"
+
+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}
+	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 )
+
+src_prepare() {
+	local dir file
+
+	# 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
+
+	for dir in m4 gl/m4; do
+		rm -f "${dir}/lt"* "${dir}/libtool.m4"
+	done
+	find . -name ltmain.sh -exec rm {} \;
+
+	# use system libopts
+	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || die
+
+	# force regeneration of autogen-ed files
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	epatch "${FILESDIR}"/${PN}-3.1.3-guile-parallelmake.patch
+	epatch "${FILESDIR}"/${P}-nodane.patch
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	# TPM needs to be tested before being enabled
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--disable-silent-rules \
+		--disable-valgrind-tests \
+		$(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) \
+		${myconf} \
+		--without-tpm
+}
+
+src_test() {
+	# let it build in parallel
+	emake check
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	if use doc; then
+		dodoc doc/gnutls.pdf
+		dohtml doc/gnutls.html
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}