Version bump, bug#545208

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

3 files changed, 185 insertions, 15 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 238fa5dd4070..14748feecb9f 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.528 2015/03/10 21:24:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.529 2015/04/01 22:33:39 alonbl Exp $
+
+*gnutls-3.3.14 (01 Apr 2015)
+
+  01 Apr 2015; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.3.14.ebuild:
+  Version bump, bug#545208
 
   10 Mar 2015; Mike Frysinger <vapier@gentoo.org> gnutls-3.3.10-r2.ebuild:
   Mark arm64/ia64/m68k/s390/sh stable #492522.
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 4459ce0e3a40..b9fcef8a1850 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -17,25 +17,17 @@ AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca61534
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
 DIST gnutls-3.3.10.tar.xz 6173572 SHA256 e27553981d48d9211a7e5e94f6e78c575205202a181c2345a1c8466ebf1d2219 SHA512 3f73af238c48322d1df59b8c27c2bcc5e03f25e632792279a1e25a3712d71108f83b6e135bf1766917e84ec9499f4419c266c2a43a8e2ccd8dd9efd6f15d85ec WHIRLPOOL 1ef664b763acaff9292f96db86f5ad441a4c49141d1d3529ea970cba67fc5714b509be1350250bb01bfd7a863e466b7f4d5590caa5236dddc680b6ca709ec93e
 DIST gnutls-3.3.12.tar.xz 6185624 SHA256 67ab3e92c5d48f3323b897d7c1aa0bb2af6f3a84f5bd9931cda163a7ff32299b SHA512 71c5ed7dee6c14581f675137b587173065c896040cb023b2910a3503a0f644abedc1f43c4e90c7a47ad4482215426788e272ba4b0b81c0475c2adcd62c4301a7 WHIRLPOOL 2e405e7edd52a828d16ae858d791809905ea02f27ee518847e43c3e56c5e92876d58e210513176c9424703dd65c8834a7516826db55e0eec5039a3d63b25b26e
+DIST gnutls-3.3.14.tar.xz 6286196 SHA256 0dfa0030faad8909c1e904105198232d6bc0123cae8cf4933b2bac85ee7cec52 SHA512 68f144baaf52c156a9b597701ac1afe04de8a6a646bcd48bb28be4ef33d259d1ade55bec6984d40c0ed5944ca3f8c9ce6243a617961e1de0a94b538e38230fed WHIRLPOOL f140d47d2b7eb2678245394efbb57e47eab58acceddb710b688b407792299d3e139afbd5946bfd5e10ceebae3892516d15753ca4bef17485c46aea07c1185584
 EBUILD gnutls-2.12.23-r6.ebuild 3552 SHA256 b4a141ff1d0788c8dbf1be66fdca6e7b9fb1fffeb54d44a3c3852133cf9d754d SHA512 cdffb4af5421fac4a72116868b18da98b1c1ca16356c9210ea3127b3c16e171777a013021b1575208bfa873b7bed7d5a3107689d0f2f3dce0c5fd1cd31d2ed17 WHIRLPOOL 8237f17fa94fea35393d6bfdbab319caa43e598744402f43c3b3a483bb580e6c85ee1e4cdfa996688f1cd5e23888a8558eff91bd158cd047f65cbc3d754776d8
 EBUILD gnutls-3.3.10-r2.ebuild 4908 SHA256 fed591ca76f6059e1adc3ef6411fedb809b613cadbb131800adcc7248c796ac0 SHA512 6a8436c2f0ee3d72e7aab17b4fca79f071c540df4b9003fc9c24f2e29ba3bdab34eaa9dcce808d20e6c8949bd59718c261fba52c9854b78df896950d0dcb5ca3 WHIRLPOOL 6e83ec02107182b27f14f75f53521e0be9aa006f28282c4d3ee06998e5fb69b7681705728c581a938f2c671cc472c184fd335a58bd59146eefbd9a64caea0c06
 EBUILD gnutls-3.3.12.ebuild 4917 SHA256 0d666cafbdbb810f7ee81e7fd1572dab25977de926d30fb060967dde596edf01 SHA512 dc3bd26a1c317fee28a39b7617de1d9e83d3486a3af578c88b5186584ee3ee31d3807ca755dfa6f698a9edd29949a866c5951b44a68343cc8e87864ce0c542fb WHIRLPOOL e4c9e57a5062d4d5dad4aa391d3fa86d53ccb0d59a95d337ea4d5c62250e55e68eacc084bcd7cdc9ac2bc2275651b5b5df6f36979593e575962510fd30baba5e
-MISC ChangeLog 78981 SHA256 4286fe41da2e766144fbf5bfcd6556e7668c2380313a9de911f9a9b648f51f85 SHA512 066a327a619732b1335ca429497968b27c6428b7a0add3c8fd78d7e06e2dcba692d9bde4a6fd02ea8e4daacb02dfe31f5a1862d1c512a540f851db62ef2d1972 WHIRLPOOL b0228f92e621e4b5b4c308a94d5ed8fdf211bf99bbf99d23cb9551efa44391bcba51cc8d5e07f10958f7f4ff5f9c76437d567a12183488e47383d746861ec4e4
+EBUILD gnutls-3.3.14.ebuild 4917 SHA256 23534e5c5ce53b155c15db696c59b6822f2ccdd06c0f37fa7f540b77f955141f SHA512 b545531f7094947892459844f4cbcac4118ec468f26015e0e550b7016f0e4f9f6c97da385fe8a6eed6a13d225e97120cce4520b5cecaccc28319c49c3c18c740 WHIRLPOOL 11b89eabe074e5ad22f284a22e05d34365c9cb29be4533e48598857927825f13ac163447b309c71523db9a4c9eb1dd53114184ef2b6ebf8dbda80539ff4e0592
+MISC ChangeLog 79110 SHA256 02afceb768893111b532bae1bb23e3da522b737eaa94db07724d8d65d2b46659 SHA512 5e1e32a95d7013b187448f89cfe50eacb45d1a72284a4500f8867f087e433857b9c8e57729f8f32c9e19bbe1aba894aa7217d784767a7ed948ae56f6cc124976 WHIRLPOOL 6c38432be5d4d92c7df3550bfa39809dc5536202ec97c402410bd7e82e3e00dbdcf485ea4690717267ec883a02f83808bb83351e9afa5089f81797b6bfda2655
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU/2EJAAoJEPGu1DbS6WIASckP/0Uj3cJ3+OcuQ4wVZ5mH1UFa
-wkjlIg7NpEVHYE5ZMq2xOqhifjcq7ICQj4XshCkDBNVNuMpBau2edsZTRPGu85rs
-K0sDRK0mTA/LTE0tFPfyR1Cv+wlC97XW2FYvFa8NdB9YPe6Ksy9QRfPgQXrU0FWm
-B+wqKRG/+71T2pb62Z3V+BFzaBkWKmKumQKs2B69//yKJRYTVept8iMqAfmxkwbs
-FMPDKKS9/D1RLcP33VBySDmhnzFItLt2lqNEIpgW8bVrFKTv8KvONFB7rYa8icG3
-ghUe9/hxk0FgGsDT0M6r9/fdpnQgebFdohEgKbJhzPobkEeMXUBFaFgWw8EeBkF5
-273p5T5bsU6VfdR9BTkCl4SkQR9mVBpB+yPL8SjSX4AddVvo6Jinutf621N7zD+K
-wzItyfDR58S0+kHIN0oJER5/GhC2Vko/H6OCTyMDDpjalIyo0zYbECHp8VEQAcTu
-9WtahsIco1JUH9fMFScP7fKOlnGy2E+GHLs8ftcZ6p+4MhfQjG2MGeRA5Z4nZjee
-BwXlJl2lrgbSw+VwCmdGGcgDa7mcDfGvFpIVeSeHnMAr35ioGYv26n9y7lnZneT9
-DGcdm59QnZgiyg0oAHcO53U58z6LbHZd0VLC1aizbvhnigZ1f6N19jdUgur+srNs
-FWRw2o8nMVgkzCmTK64h
-=0F7v
+iF4EAREIAAYFAlUccksACgkQXYk9GL8g3FHdUAD+Oje0OL6AghTuHxzGwmJVxqN9
+F+oRXliFDojvQ501oOQA/3zQUX9gkN6mV9ana3jeP35PbJIzHnq7E1izxpsam8tY
+=c1pT
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.3.14.ebuild b/net-libs/gnutls/gnutls-3.3.14.ebuild
new file mode 100644
index 000000000000..5b2c30363849
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.14.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.14.ebuild,v 1.1 2015/04/01 22:33:39 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 ~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-3.9[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+	sys-devel/autogen
+	crywrap? ( net-dns/libidn )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${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-0-r1[${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)"
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+}
+
+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
+
+	# force regeneration of makeinfo files
+	# have no idea why on some system these files are not
+	# accepted as-is, see bug#520818
+	for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+		rm "${file}" || die
+	done
+
+	# 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 \
+		--without-included-libtasn1 \
+		--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 \
+		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/reference/html doc/reference/html || die
+	fi
+}
+
+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 "${T}"/native-tools || 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 tools
+		ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
+			"${BUILD_DIR}"/src/ || 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
+	else
+		rm -fr "${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}