Version bump.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 131 insertions, 5 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 30c83c2b4886..75590e760644 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.453 2013/10/28 12:04:09 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.454 2013/11/09 21:28:46 radhermit Exp $
+
+*gnutls-3.2.6 (09 Nov 2013)
+
+  09 Nov 2013; Tim Harder <radhermit@gentoo.org> +gnutls-3.2.6.ebuild:
+  Version bump.
 
   28 Oct 2013; Alon Bar-Lev <alonbl@gentoo.org> -gnutls-3.2.3.ebuild:
   Remove old ebuild, bug#489262
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index dd158b49623e..56c1b9129389 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -10,14 +10,20 @@ AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca61534
 AUX gnutls-3.2.5-build.patch 358 SHA256 a5719aefb78d8b6fbdd1176e604db7498cc930bb86a09105b0f32ad6a2d9d513 SHA512 6ec4b617829b6d0bf24b739d9965790cbbd0faa27aeb4ed1e00749117f1f2dc28ecbcff0aa0d32cb1b174d0d03e235ae36928104434a42937b8c2382661bc97a WHIRLPOOL 2c680688926200406ec65b276e31e00225bb594b2e72e78e007a587c4786a84c9ec2ae94c2d0a9ecd3bc73a4d496f67a6a360942aab5b5ab30bbf86a82021bfe
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
 DIST gnutls-3.2.5.tar.xz 4987156 SHA256 c6fbcdcd32b2f38cca3bbfa10759556d66f4795ac6e6e50503f2ee5c08c081b7 SHA512 87dc3ba29d2423769e6532d2f6175ddec4665d30b22f45907c30bee3b48468032790eb4dc49e7a1c0a13f523b44dd98be2c5ea062444885652b122cbcc26d69d WHIRLPOOL 8714e2c174978ec85edf54f8b2e50a94c8d2be2213cafade9d85c43d23cb20abf588328dbf436fea90ec0befc86a8518f8d29e7d1e7e09c8db6d0cc2f777b2c3
+DIST gnutls-3.2.6.tar.xz 4992204 SHA256 0a45dfa50edc8091ca1c25f7bae9d9c780b8a09c58ceb3e256264d2dc49338f4 SHA512 1246c03780d9fffc0c89e9eb00a24fe85dcc5370d9c8329174331e49c6b4221a22c216c778733a1646c9d66d099921ebce59c7463366bfb5a9deb86d90080931 WHIRLPOOL 6e4a93700083fccbbf52ff3ffea2e9722db7c2f12e56c48687c3b73ceae3b62bf992b32b7230e607b768bb13b774354b08e41301b2f88e863073f77b39898b8e
 EBUILD gnutls-2.12.23-r1.ebuild 3357 SHA256 da49a8d4219dd293e6016b0f9896db1f36a20f44f89766cd502c034a0920b8a1 SHA512 5c4fc5eebdc5480c873e1ea081c6ff87dbc83405d366459186f6ea0ec1ba6e9152403ae50406a934e5dc7a82920cbd0ee964d44217e1ec2f97b3fd546c8d68aa WHIRLPOOL d1adb02419f85d30b7cdc235279bd56b82764f9a314b64353baf408dde99ab9ab9afa050433cfdb9bbaf1951403d24425c76a22b85d59a946c591298c6e054cf
 EBUILD gnutls-3.2.5.ebuild 3193 SHA256 78c5a17447bcec4dd2b9a20c28af11c225a516be7debda3822b74071963f3a2e SHA512 ea31aee54c0c1dd15477c05feb0f707b8de53cd89511f64cf15ae955b10739252a9d408edd50358cc0ac3e16b8a7e188539cbaee986e350082183750ba04c18f WHIRLPOOL 629cf98921ef5778f0ca6d0dcd0928ecd3edc37c8f1150633a2a94ecfaeda8d0df9dc6e322e236d91631d7aff24f27eddd978ea04c40cb998efc79de21ea2b16
-MISC ChangeLog 67390 SHA256 a96e96d54a4ad0331732fc9b737a8545004fb7a2e79285a8b940a3d047a5bfca SHA512 78611694b7a09b5a838b81ae6e5f87933c1824eae0354f3349e418029c253c960be6d600558ad17e83bcd6728c5389d8420cdc5297b471afed881abe4f628682 WHIRLPOOL 2ad8b97f19c63b6bd48069df390b1833c287209ff5561b7584e8906aa0d16126bdef8049497336b3852a2f61bc9485408f3783825b33a23b2edeeeeb90d5c162
+EBUILD gnutls-3.2.6.ebuild 3156 SHA256 8e1b1994bb743c5ba45827e9abf80b084418b477ccb0a25eca2bb2cda4a6ca59 SHA512 59f282a4e2d54dad069b7a4aa1150f17deab93cfef493139a76cdcad8dc764039494913220dc0d93c7a9ec656a31faa8bd0ef3d136f4fd2f9678927863133964 WHIRLPOOL d60c25c0e8d631ee65cd8dcbac7d3b015ee44561d94861a7b8e35dbcefe80d3915c241a95e5052936838ce800266f3290826e0181235760e7c4402c489f62bd7
+MISC ChangeLog 67510 SHA256 24623c982c898405a03425214b5d0da084b3b1076a08308484875d9c3bff8115 SHA512 9f14986366ec0cf202f4ced804544276745059864bfaa2037d2195388dfcef86b7fa22c5c45d51cd3ef4a31d4634ccd390f7d538711bc0da0df1dbfd858e804e WHIRLPOOL a597eb38b86cc0f51ae3dbfb4ddb17b5e15dc5311b2eed7cf9a55b4de41a53102bace0e98eda6775733a2d413637c8fa90f0f0db82560d0db3f2c65a74637cad
 MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJuUr4ACgkQXYk9GL8g3FHZnQD8Cq2ua64FAzrjedS3x25R0dtS
-7UWk9JT0/+kwkofnpPIA/Au2/xsXdKDrvAi/l7aEFAZafWdH9q+OSK4JAAv9t8s7
-=TtXO
+iQEcBAEBCAAGBQJSfqkSAAoJEEqz6FtPBkyjmPwH/R0OqbbL53rKazJKIsUiUL6L
+/fatAqH23aNAjOcHPgDWNQoRSG0Hh2SFlNkcmhVP/wqZTJJCzyc833NUodLbFPTD
+gQVblq/nV/Z5Z5ZQoXtpKDIfF+jXUAuQY5aBPzkTfgP2pc2OsI35hUUA9rKvgtI+
+iq2biuht7lX5rIkfFB7pjlJwMQdbo06PGiD5jxiHJSFW1IAAvRZ4QpSjNNZVb+LG
+q7DvsC5pUku1wPjFCkHQgqBD/EL8yZxm/RqYKiD8dl8fuvelAZnhpzX8mwaEBzJw
+1ogbjZ2tikHMO6m4Z+jTdSMLv/3OPQHijhomc+aC0M6nfro1S9sWOgfChGfUQfA=
+=KTgz
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.2.6.ebuild b/net-libs/gnutls/gnutls-3.2.6.ebuild
new file mode 100644
index 000000000000..15c217f960c8
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.2.6.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.6.ebuild,v 1.1 2013/11/09 21:28:46 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 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
+	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}
+	>=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
+
+	rm -f {m4,gl/m4}/{lt*,libtool.m4}
+	find . -name ltmain.sh -delete
+
+	# use system libopts
+	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || 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
+}
+
+src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	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 nls) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm
+}
+
+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
+}