Version bump, bug#518762

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 140 insertions, 7 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 960fcc4b0a30..afe5078f4cfb 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.509 2014/07/06 21:15:48 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.510 2014/08/08 08:40:50 alonbl Exp $
+
+*gnutls-3.2.16 (08 Aug 2014)
+*gnutls-3.3.6 (08 Aug 2014)
+
+  08 Aug 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.2.16.ebuild,
+  +gnutls-3.3.6.ebuild, -gnutls-3.3.4.ebuild:
+  Version bump, bug#518762
 
 *gnutls-3.3.4-r1 (06 Jul 2014)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 048e590c1f4e..62c879dd39c9 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -16,17 +16,20 @@ AUX gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch 1146 SHA256 064
 AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca615344abf7c9060f73f525a593716f0 SHA512 040507b973788dc2ca4aab19d69f45011e6509354e38ec875ab6fdec3f1c3be40272ea99cd53a5adfc8b52b30e29d86af80891d57b50068a4b3f2cc20246ac70 WHIRLPOOL c4d17452c22e81fdcbd6e14aaaf8294a90a67438ebcadcaab096a6d2f115643c2ce36cc503d186d2d2483366b890add3e9101c26998878817f7baed8589a8514
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
 DIST gnutls-3.2.15.tar.xz 5140200 SHA256 30bdc7b34b220258f714602cdf0afa1abf0883bf926f35f400c88b1c72ca77b9 SHA512 efb912e2ebeb43a724f76fdb1b4afeb95706ca791f5b6d3cc1d88257504f591a000e7f69e8b01e0cae2f24960c2fe41a3829409ddef1c25987fb986c3af264a9 WHIRLPOOL 61866eb64cd8b454d7ef58b5fe1a06a4a75977eb45ede6c4fe0d66939b90c23188d505d4a3f718b90530b093922bfc375f2bf6a1559312cfc72cfd4c28bfed27
+DIST gnutls-3.2.16.tar.xz 5337140 SHA256 781836a04a8bbb42e6590d6524d53c870850d26fc55146a7e0e5d7e1d183bcae SHA512 839f826fed0c2907e89bbaa71ef23f9dd8ddaf8b5aa92fad07a5281c3c7b0b66231569997fe906e92f7a8b8753253230f7e41e82b289d171da3e99ab8ae377bf WHIRLPOOL 047351a95cf61545d327d1fe3bd58e1755383c09167a35f4917a2cf441cd96936ae62aca45c5d9911a1ad7d77283814d7e77fe7618434f4cf866ca08e52c752a
 DIST gnutls-3.3.4.tar.xz 5326368 SHA256 04a53b2bbb936b02cdc62f68144f9706e256cc85cc530b81266a24d80b824357 SHA512 601ce227b5a529d60e19543347f78aaca81fb4051ab73d560a57d5b3f4f20fcbb52bbcecf3da2780f55c303c510b365a027b1758674e5d86fc2b9d2b06fac431 WHIRLPOOL 5dfaecaf6c5e769a8e6ac85d603c98b27b760b9c90dcb4ded0484b060d85e71c54ba31279b0d0fa185cf965e3baff315663ea81922f34b0557e70818d6bcaad1
+DIST gnutls-3.3.6.tar.xz 6076320 SHA256 edc9df4c1faab96002ddcab041322bee386c2cdd22c958f7d1f3bad914af5a9e SHA512 d43c488f8ceba8b308290c3d9d7a220274f2687aaabda349dcd01296e96128b5df088d9a7b68729fcfe5210d851c38955aebed1d46e3d22b4fe01ae5f86fbc37 WHIRLPOOL 0231d1fd50cd54eef5d274c1ddb2a4c1f365f344f43577d5b75214aace65784a145793c53df3a483ebbd43ca2d2216ce128e9fe59eaf3c2c96999d0d10dd50d0
 EBUILD gnutls-2.12.23-r6.ebuild 3552 SHA256 b4a141ff1d0788c8dbf1be66fdca6e7b9fb1fffeb54d44a3c3852133cf9d754d SHA512 cdffb4af5421fac4a72116868b18da98b1c1ca16356c9210ea3127b3c16e171777a013021b1575208bfa873b7bed7d5a3107689d0f2f3dce0c5fd1cd31d2ed17 WHIRLPOOL 8237f17fa94fea35393d6bfdbab319caa43e598744402f43c3b3a483bb580e6c85ee1e4cdfa996688f1cd5e23888a8558eff91bd158cd047f65cbc3d754776d8
 EBUILD gnutls-3.2.15.ebuild 3486 SHA256 0a5488f83afe14accb38455e96bc4812f0ea735c191333c22e7316c4324e4bbc SHA512 fb4018f0311a913df557825379cfc4bd96b74671b51c8373320fd85cad642b254b00b60305e6a4d90d0ed4c2f60596226cad4e159d457f4168b126c1163048ae WHIRLPOOL d31d6460722a4ab4714cec75af36c79b1dbdd1ac9a47781a0fa9ce4183d1c1d5b0494e9819382755cccc557e1f3376db13ecd9c5cdd61c9eb91adc40bbc19f63
+EBUILD gnutls-3.2.16.ebuild 3486 SHA256 0e1a1bef7d8490a549bd13d68664ce27d99baf45aa38643d467d4b8a59980e4e SHA512 02d7d6007974869f5eb936b15ee72a78f63cd3426eee7ca57a36ba5b74f8c25f0d0ac38fc8ea003f1038e83639cf36f03aad746f59681d7661e3394f08d1abcb WHIRLPOOL 42ea5d2500f41c8e9fc63d0947798989b0160233be0e15492f132d954fe888bb0ad6c4e0677545051d66418795e52e5601d069f58076db6ecb696dd670f3b50f
 EBUILD gnutls-3.3.4-r1.ebuild 4472 SHA256 40cb082dd53d3c84018e53740c10607632ce64f967b2d58c98523edf31624754 SHA512 c7cd2043d72a4e769572be25b7db1dac85d09ead07e91ff6b3f8a99e9300139c66e529023e9754de30c08c815c02f1b375dd458c6307c7b10aa7467f6bfdcd5f WHIRLPOOL 89dac29f8d876483fbf07e356d9348dd40f14226b9d48f25bb1fbc0fc5f5a9bcc82df8af2edc9843372cbb0af8932d64ff2188c63c6018279d1a95525c42efa1
-EBUILD gnutls-3.3.4.ebuild 4407 SHA256 d73edc0f1c99a5775bd867241e71614a35461142d33d9583b53b32d515c3d82b SHA512 eb55615a3c9b07eb3f97904c95ee29e27936fd200647e96a39d79392cfd42a81bc2115d39e4a99caf518d1de1e55b94924112e76487111f34787b2c067b85aa3 WHIRLPOOL 41b9855b958246bc4c0667cd83046a962fe8a372f2a634984ce90c05631abaeaa3e17eb78f7f365b8c504fbc8642fb6a4727dbd090c6925af636cc976ca5bc10
-MISC ChangeLog 75883 SHA256 7a736910c677fbfd71c8b4bfd33040752ac40e3bc69942ed0df6cd05f7cccc55 SHA512 36140405622197c89f24a2772cf4dd9a1fd8e354c97d7ba375e0cffc2046782b7a2d11d5b8d287ee22714feed11171529813a5a4545f7abf26e060b816a58501 WHIRLPOOL 4f3df2d97f979b9758382edfb93b05fdd63df58797156ea70f4a19ab400300b0afb904857a5aeffb1b93154e954d1c1b187e621cff84a7811a95884caf6ffde7
+EBUILD gnutls-3.3.6.ebuild 4469 SHA256 80d4e18ffa831dae7757a527c46990651dbb3021f358454154020afa0f630624 SHA512 5d3fe6c9c23f4b9a9d158ceca8328bb74364254406cb0b536ed96ef7bdc0c32b6b13093cde4305be7d3af36bd70b827a10fa287e3c68b3b1c371009c104dc863 WHIRLPOOL 2297448413bb9ff78a37dcd9e2cc4006d46acc31623b518c2f124fbf118afbd2da7e1aca034e9369b2c7b940a9904c9982d62904b07465b97b8305f537cccaf9
+MISC ChangeLog 76086 SHA256 a36b8f116bfb06602592d4369cca8b4f3226d3dc574597dafddae640133faeba SHA512 9070a4684fac00e971aac2e976aec35924aa6b796577d0bf7aa0767e146cea4c300e01669bc8e3c5af00aee92e9c5b5c426e801dced780e985eb80666928a350 WHIRLPOOL ee28ecf6365b2ff083a7112de765d443ee4bff12408f6f9d16cba7f359179fe61e8b7512beee53fa9b5ea1000769cbd04b14c36b10140de5823e79dd52d9d46d
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlO5vJAACgkQXYk9GL8g3FFHIgD/Xp3TCSwz0destrn9TgtXFJA2
-4Ryvx71bBlP2tgFgD6AA/0Sb7pIUKHrHk0vsqlLWEpXJSgCHonymSOTgNfZz2ovf
-=hFOu
+iF4EAREIAAYFAlPkjRgACgkQXYk9GL8g3FGcRQD+NrTZ5TN1cXSJZdCRiB7kpHY5
+gmkfA9gS5tKDwQ3Mo+UA/2INP2uSBaDnL9vVv7rWQFAMbP6Ia0dg9TBHR651OCkf
+=bL0J
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.2.16.ebuild b/net-libs/gnutls/gnutls-3.2.16.ebuild
new file mode 100644
index 000000000000..0332d168b690
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.2.16.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.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.3.4.ebuild b/net-libs/gnutls/gnutls-3.3.6.ebuild
index 184ee0b85ef0..f2516344cc39 100644
--- a/net-libs/gnutls/gnutls-3.3.4.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.6.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.4.ebuild,v 1.4 2014/06/18 20:35:42 mgorny Exp $
+# $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
 
@@ -92,6 +92,7 @@ multilib_src_configure() {
 		$(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)
 }