Version bump.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

4 files changed, 170 insertions, 17 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index a001a331ee8e..67855f6c2817 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.329 2012/02/19 15:13:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.330 2012/02/20 08:47:15 radhermit Exp $
+
+*gnutls-3.0.13 (20 Feb 2012)
+
+  20 Feb 2012; Tim Harder <radhermit@gentoo.org> +gnutls-3.0.13.ebuild,
+  +files/gnutls-3.0.13-test-kill.patch:
+  Version bump.
 
   19 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> gnutls-2.10.5.ebuild,
   gnutls-2.12.16.ebuild, gnutls-3.0.11.ebuild:
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 455ebeeddafa..441672b507a5 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,28 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX gnutls-3.0.13-test-kill.patch 648 RMD160 398def9aae2e0b7ebb6870e3e3c1383aebfc841c SHA1 547a126db16e5c80bede40319c3f2fd3a6445be6 SHA256 53082bec577959cf1673eee352411bb9b406996b4f2e1a848b925c95c0e8325b
 DIST gnutls-2.10.5.tar.bz2 7287913 RMD160 4bc886ced90742a488e00c1884e6124b37047382 SHA1 4530657082a0e754356de89a5529d1ad7a18e777 SHA256 c086d5426ef04427038db6af1a4dc62ff32694e91e759ebf9bb3380243ebd9c9
 DIST gnutls-2.12.16.tar.bz2 7167795 RMD160 447212115b6b39a6d52cc6b441dc3bf15e69789a SHA1 2d0857f7896597185b19d2861a2eb378e5d310fb SHA256 d04328857d9e420eca53f7f7fd615bc76d2f5d74984a9b90c0f2c5f7b5bf5b4a
 DIST gnutls-3.0.11.tar.xz 4384992 RMD160 e25ff325b8069e838b2c5d6637902edaecfb1047 SHA1 62a5c4c3777e5ed707de740667306a583cb0a118 SHA256 39c10ca177a72a182a54860a815b9f4340f92c3d4de241e80f091d5da14913d1
+DIST gnutls-3.0.13.tar.xz 4846584 RMD160 8d9c3917084d6e9e37ae55cf04d5c64dcbe00040 SHA1 8271de0f76ee4a35c238309ed4fb8a94bd1ac53b SHA256 2e0adbc50059496ec13177034708eef163344c2b8898da7ce6a91312b70d6e7c
 EBUILD gnutls-2.10.5.ebuild 2890 RMD160 70e4cb44d8aba26bdb0dbe5810751664a5672b55 SHA1 603c86d11d8336d5e7889ecd15cf1652af1a5fc1 SHA256 bd67bbb0f13aec113e285782b1266162b346a418aaf9411116ee50fddc75f99b
 EBUILD gnutls-2.12.16.ebuild 3124 RMD160 841ac55d79b16171cbedff77f4c9ea09b906faaa SHA1 52567d16786e93f40592995eb7c032476e280dce SHA256 6f49670d25c52547dbdc12bb054d0c629906b81f3942b62ddf7f64cbb4470383
 EBUILD gnutls-3.0.11.ebuild 2745 RMD160 1ea92abcc52bb1429583e6d5411314e8433f8ab1 SHA1 f8d29c1255d63030d52482a696ef7d76b74d3a02 SHA256 4ab68ae1a56fe2122d9da74411475381900c285c47e55be964bb11a6a6e703f0
-MISC ChangeLog 49561 RMD160 f5d1cdd230211ef497815a43e773c11ceaea33f7 SHA1 15049e9b57165e341741d2fd34edc10172397f71 SHA256 a1e3ca67d657426d2ae93448a4b3805bd2ac20ecd8338e66305cac99709930e6
+EBUILD gnutls-3.0.13.ebuild 3029 RMD160 b862575067ecc44eb3a1f3d8e4335e1d6444ebb1 SHA1 fa9de33fc3660f99707f42fe5709bf7bd4836df0 SHA256 e212d9e8f8a4413d6203d0a0eafe66ac7a37ce90b566c3171ec2a9fdb622d25a
+MISC ChangeLog 49720 RMD160 f5ac50f520f2cf6bf46fb223c3156a359d65b548 SHA1 fd2637ab124ba1a96d1f16b31f157779efdb2b96 SHA256 20a655798d2b52b8b6cd403242e27410c5c149aae142e1e32e059e279e93490e
 MISC metadata.xml 340 RMD160 e973767590edb923f2828ef545293617b4b19554 SHA1 e42964b82af04a3d6de8307186a33d18a12af326 SHA256 a2bf9aefe44513df9e611a974c08d7f26b987c0c48c134a0d6f5177ca6a8676d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPQRG5AAoJEOSiRoyO7jvo6BUP/33cbwRWWd1YhPkInOY4ZwrK
-joJq+lofnoltyCXFPdeKWIdjFlUQYDJ4UyoKYhjS+itIAYwop2JsEFT58A7QgzAU
-CWU4GgJEzMVY4KQP24GWLyrbkrby0vJjGPoSO0ywZITkaBY9zYp6/8KdcMTtzZ/j
-NMmc0zILhK0cK18SR/vMxYGt3sJAb8CQQ2GoXchSV5hmcMC8NMeWLkpXo+mG+a9K
-06LhNi/RbVf3JfN3qRj4T7kyPbnRNbsn0ssFTAxz2yTom+izbt4wtPsG8JHe6d63
-8desd8SbAsVEkmlG/0+4WDw23yss626xgAz8BuvrG+pyRiXTZQ/5posEQPLe4e8S
-iYNBMZ5jOAAqB59JZzylQ2AUQKY0DOwnUtQpgnVHZqMfFZfjqVKGwoxNTJtscoU2
-ncS1r1V9F5Id1wsM5LBvhi6ZjoCYt2b6UumJYusp1ZjC/+4VVMPPS/5FX3o2vLoo
-4DyRVeLXH5gJeYww2r7X0WD+6416xi+3KUNXC6VSx6on+sJL6GqjTUcdtF0uDba/
-ZNRvdo0ZETQYLjJvtt0jFizYaYMAqajvAOA4lP/CJPJn/qbxwoVwGaIOxbwvOaL6
-//7kFS4bASmtndp0RjDaE9Zo/P2l8SgM3OhYJx7wt5AwU9cNJ9d51I6LrUAUKqN6
-zcfxuO6DxVPYtuSs1209
-=2M5T
+iQEcBAEBCgAGBQJPQgidAAoJEEqz6FtPBkyjvIkIALnZkkSaUTvIxsOjWx24BhtV
+i6oxBEamm+QEsRPkopUA06l4r8H4Z52rV0ca4PDcXr96w4vyoXdZ476tB1xhy559
+HPO8yoWl5DJORbo7P3fXdk4RRmLX4++/BEhbt/iK97Ko8qKsS8DfUvzPen2idBN5
+LHQSSSwJeIKqWtNti1v/LYUUIY/QOoXUiIn+OgTq/R+zGP0pki/W/zRAwmcBfY6T
+l3R3ZzNuzvyaWIc/n2JuNvG1y2BBxTZkMdk+dXRB1y0jY5jqgEd2Y3kQoLoMlnTU
+e+UbqNXNlLen/eiIfINN4lMDpsFj4xxb8oyh73L1btUbvujJrQ87y5X+8ZTpFJY=
+=zP9k
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-3.0.13-test-kill.patch b/net-libs/gnutls/files/gnutls-3.0.13-test-kill.patch
new file mode 100644
index 000000000000..7c871bb78ac9
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.0.13-test-kill.patch
@@ -0,0 +1,24 @@
+From 642e6b5ca996325dc0ca6401a3b87039408b2585 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Sun, 19 Feb 2012 19:51:06 +0100
+Subject: [PATCH] force kill of child process.
+
+---
+ tests/mini-loss-time.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/tests/mini-loss-time.c b/tests/mini-loss-time.c
+index 17f6d3f..cc01dcd 100644
+--- a/tests/mini-loss-time.c
++++ b/tests/mini-loss-time.c
+@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
+     {
+       /* parent */
+       server (fd[0], server_packet);
++      kill(child, SIGTERM);
+     }
+   else 
+     {
+-- 
+1.7.2.5
+
diff --git a/net-libs/gnutls/gnutls-3.0.13.ebuild b/net-libs/gnutls/gnutls-3.0.13.ebuild
new file mode 100644
index 000000000000..e8dff612f3e8
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.0.13.ebuild
@@ -0,0 +1,126 @@
+# 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.0.13.ebuild,v 1.1 2012/02/20 08:47:15 radhermit 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
+	MINOR_VERSION="${PV#*.}"
+	MINOR_VERSION="${MINOR_VERSION%%.*}"
+	if [[ $((MINOR_VERSION % 2)) == 0 ]]; then
+		#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	else
+		SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+	fi
+	unset MINOR_VERSION
+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 ~sparc-fbsd ~x86-fbsd"
+IUSE="+cxx doc examples guile nls pkcs11 static-libs test zlib"
+
+RDEPEND=">=dev-libs/libtasn1-0.3.4
+	>=dev-libs/nettle-2.4[gmp]
+	sys-devel/autogen
+	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/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
+
+	# tests/suite directory is not distributed.
+	sed -i \
+		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
+		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 {} \;
+
+	# force regeneration of autogen-ed files
+	for i in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${i} .c).{c,h} || die
+	done
+
+	# fix hanging test
+	epatch "${FILESDIR}"/${P}-test-kill.patch
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+	[[ ${VALGRIND_TESTS} != 1 ]] && myconf+=" --disable-valgrind-tests"
+
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--disable-local-libopts \
+		--disable-libopts-install \
+		$(use_enable cxx) \
+		$(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}
+}
+
+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
+}