Security bumps (bug #511840).

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

4 files changed, 295 insertions, 17 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index ec8369770761..62abb33b6d9a 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.492 2014/05/17 14:16:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.493 2014/06/01 07:59:10 radhermit Exp $
+
+*gnutls-3.3.4 (01 Jun 2014)
+*gnutls-3.2.15 (01 Jun 2014)
+
+  01 Jun 2014; Tim Harder <radhermit@gentoo.org> +gnutls-3.2.15.ebuild,
+  +gnutls-3.3.4.ebuild:
+  Security bumps (bug #511840).
 
   17 May 2014; Michał Górny <mgorny@gentoo.org> gnutls-3.3.2.ebuild:
   Symlink remaining tools necessary for tests for non-native ABIs.
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 76a020c71099..46456937e68e 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -19,8 +19,10 @@ DIST gnutls-3.2.12.1.tar.xz 5137552 SHA256 29069907546f6b9e134aafcaa52a030f51783
 DIST gnutls-3.2.12.tar.xz 5136220 SHA256 74c1698a7f6c5ef4938f86285e4fb3929e5f9c6826521b5f2df8ebac22b52505 SHA512 e028ad6b7170571c348523aef30cc16b583198d72d3486f2881bf9b77594e7ecb75568c429159e76cd578efa4e16703d2b845f7c0e8be445072fc33af9d6c3ea WHIRLPOOL b250e8b56f6753a31cbd04cb254d04a4b4d0b410135fc027bd922b7d079b1ca4030d44ae240c75d437745a6b01cbded1fb36e3065afaeaf20513023e5e9b294a
 DIST gnutls-3.2.13.tar.xz 5133400 SHA256 e83676218ba80c4d577d7027b5b087692280347a9b06f90a452403ba70faa604 SHA512 d7b674e109459aac8f96fc9591b18a4d3288e9d8b995f3ffbf52a91270fc2481d555a949b614b73231ec8859fe693bdc7465890ed4422933001cbd7856b8f150 WHIRLPOOL cbe514b2d2e6c43805f0ee9cf7a86f893b172f3c021b3a255b1a4fa21b3e84252f630da4c408ab3931ac709880922b382ec97947f54ff4e4a4f5ecc232279659
 DIST gnutls-3.2.14.tar.xz 5138976 SHA256 f152a9dea1ae08e135194bc6e6664ea99162cd6d3198bcfda4dc3a5f307c56f3 SHA512 2a07a80e71a846e570884279154040273c5a603a079bed3f8b96f0d6d40857b8205a83f302dd04ba8337215a195975e957a69ad3393571dcb38fdb28bb1ee657 WHIRLPOOL b3eaabf789c18cd20715b610b8137dfb2f977a54dc75ab250bdd2d1e48f2191b1b6075a11c65b4c2841753ddba0f4a30e3a958b38a21f198e813dd442c0c6313
+DIST gnutls-3.2.15.tar.xz 5140200 SHA256 30bdc7b34b220258f714602cdf0afa1abf0883bf926f35f400c88b1c72ca77b9 SHA512 efb912e2ebeb43a724f76fdb1b4afeb95706ca791f5b6d3cc1d88257504f591a000e7f69e8b01e0cae2f24960c2fe41a3829409ddef1c25987fb986c3af264a9 WHIRLPOOL 61866eb64cd8b454d7ef58b5fe1a06a4a75977eb45ede6c4fe0d66939b90c23188d505d4a3f718b90530b093922bfc375f2bf6a1559312cfc72cfd4c28bfed27
 DIST gnutls-3.3.1.tar.xz 5313988 SHA256 984b9ebbeae501ed20cde6fc5293c45ebc3c6a197a170a4b3a0300e6f802cfbb SHA512 de871e7ef6be38b2b2b16cdc2345a10fc62e52dd1daa0a0f20595f086cd825915c31ec5435e1c6cacda6bd4dea363ab8d4695ad53defb3ad8f9f5599b74e8bfe WHIRLPOOL 6637da0161eefe53a09d461063ae23a653552cf391341b6c4ab11fe300c533fbc2707ca88793f04f2bafe540393434e2f7c2eaeb9cf84cd372067d45842e4afc
 DIST gnutls-3.3.2.tar.xz 5317220 SHA256 133a630771835718a882ae595eec1ad1e852bddd95c9d561442400fbe25eb776 SHA512 38a2be19a73f152df75caaf19c6baf6a3c4aec28740b98494873d3ab1c272e7d27925d47f089d2c6959ff5ba82bfe8b91d1b9768a71b2c5357ef1c35262cdcbd WHIRLPOOL b93546f949d4f6cec072915930104bd26ff2b2aea353add10b38055d25d6a48a7d8b25e9fbff024a0e8f3a6807a0ad2f1e5572907275445447991d34ee6f32cc
+DIST gnutls-3.3.4.tar.xz 5326368 SHA256 04a53b2bbb936b02cdc62f68144f9706e256cc85cc530b81266a24d80b824357 SHA512 601ce227b5a529d60e19543347f78aaca81fb4051ab73d560a57d5b3f4f20fcbb52bbcecf3da2780f55c303c510b365a027b1758674e5d86fc2b9d2b06fac431 WHIRLPOOL 5dfaecaf6c5e769a8e6ac85d603c98b27b760b9c90dcb4ded0484b060d85e71c54ba31279b0d0fa185cf965e3baff315663ea81922f34b0557e70818d6bcaad1
 EBUILD gnutls-2.12.23-r4.ebuild 3368 SHA256 75eb7867b4de6c6714ee56a28a4e14fe35810b88d738a5b3c6742e283e90ef08 SHA512 8c88242faf9c6a5e6f2ff488717ee9e41451a99d06bfe1982aea2394a7c46de571f56ebc57b8a1228a2635102b0da9bc9931a6ce4557173fe21bc61cd0af873f WHIRLPOOL 26f423e8dd5fae2cb328363a6cf871e9a1feecef15ae33bb33da10c42cdac407b0406e37790f9c30f2f1035fd2cde78b439f390214254bb9b6f9b9259d728242
 EBUILD gnutls-2.12.23-r5.ebuild 3427 SHA256 e0f2f2342fad36c098229b66e2029bf16cdf2e38ab8c83ff48237d7c561c524f SHA512 f803599ea6c01a7afef1becb082865b13ae6662c32b82225b195102f9813df7f5f89edd5cf3571cfd89796bb3237570bb345bed79ecf940d21fd479b313f68d6 WHIRLPOOL fec1ffd875507bdf0d738ae2683e9d495b7e59078255dd9e19bf41fd47a6c813f2cdc2dd41b0b66a744113fd80c87067cb95391ac9efcd6c09e911f99ce8ab1e
 EBUILD gnutls-3.2.11.ebuild 3348 SHA256 19fe0e801fed34dd2933f0ff358c7963e09e97784c47863a360a20752cab94fc SHA512 df5033d5842b60e883ac7fd8fb7d412188d820dffb18d898aa3f5d81e1671760b9af2fdc2241467f172bc1ef1c4d28861d0882cdf012094b4cd7e2eaf09fa291 WHIRLPOOL 19faa81d1134f8f4d965dd4626567c5322fc53cd2d943a63165f0e61a0d0d88283ccb65ffdf91ed8d920eb4b396d7a307c7d260ad1f8c9a0a6c1c54b9d7186cd
@@ -28,27 +30,21 @@ EBUILD gnutls-3.2.12.1.ebuild 3488 SHA256 44031e77b877a5330943bf2cfb4c678d32cd76
 EBUILD gnutls-3.2.12.ebuild 3351 SHA256 8151cb5985a9f11f92d917f319c961119797fd58ce25363af97752f29ceba225 SHA512 4de834f1dc456aa9013e8195293a507f00e35748075bdb518a97ea79a2d7d7ed6f6a71abe913a2b9e26bca60b24112e94c2c4507c208a7c7cbeff3eacf69be83 WHIRLPOOL 22a02bdcb0269dea008a576d8c53fab99458e1a7dda9d627f26fde14e4c1fdfc16a9bb4df5b0a95e9370c05b04b37d7746672086c9fe89dfb433a9784f0f12a2
 EBUILD gnutls-3.2.13.ebuild 3489 SHA256 aec8283c28edd60d9b4ce203b0650c18dd35fa3f22734dbb3752e7d43a4c26c5 SHA512 ac79d1273b0b6dcd79ed57f4687df4e2755c8233b4e5428e43d4bcbbfbdb5d189e8bbd8983f4bd5197338a532caf4ffad49fbd12fe675a6c0223511116db4a96 WHIRLPOOL 0f2c9749a6f91cf91b95af07cb70be05d0ae706fb8b512a526ece4e64e14921a4b27f9b73eddc698fe576e8acf98f953481295ca74ce450936748ebd085f9cdd
 EBUILD gnutls-3.2.14.ebuild 3473 SHA256 2785588887f33d16feb3b77af8872aa92fe534de674ea871195f9fc885307790 SHA512 5ee2cf6e2e7081472711115bb6e33a63aa5df09c3242c9e300e978aef0efef42d22841117016c0d1d0ccbd6827f3734c3670903471e600bafae72ce672b5d75d WHIRLPOOL 3228679829295d567ef8cd59f60c65590de70c7c767c7fbc01979fefe1d2739fd6820e41b8dca1c7a1b63754feec9e94aa426dfee3fc10cac56ea782661dd4de
+EBUILD gnutls-3.2.15.ebuild 3476 SHA256 6a2df9a17f4f3036ff7e87386994f784435201eb1ba46b28d4f11daa246cc1f3 SHA512 25716af0714f85f50a4d0b051303f9ddacb2f6c599c7aa78e5b648ec02637e39ba5cd44a49dd1f097585c01f2134ae983f3fd7486e2f9b7a6755af15baa8e86d WHIRLPOOL 3ca668518a4db0d12e4acb36af9da5885599e93200557f3fa3ebdbb31e4b0b8216e3ca71be03f90b19fb5c24238298e74b24e56d1a618195f4b7aa6128607dea
 EBUILD gnutls-3.3.1-r1.ebuild 4381 SHA256 8d007105af658ea832a638629805b60bee0c390b6eb47e597ab789cf6f5dc502 SHA512 b4f99ef39f03ed903ebb41c13f906c6b525f50e684e2cc387cf6dd4c54f0bbbe05f7dc4f9a00babf0b96f26410c932ca565b01ae657ea7ffc3452b1c184fae44 WHIRLPOOL 686321bd81660666f7bd2d3cb30999154f73493dd0606ccd2e2c90f795998120e081c7f54c4151172b035f15af1737f3a11ba24676d9892df8d22671765082c9
 EBUILD gnutls-3.3.1.ebuild 3258 SHA256 49529f5e126920b950377047ceae4a0dc494a935b195d08530005f9b2b416216 SHA512 1ae66b8c1a0b2e604d5c277fae83cbf4ae6fdb09b6ebc19e608450b9df63e89577461eebfd7e3c854f98a2cedcb8fe8b046f0d2462e5f4954afc13589b3a9be8 WHIRLPOOL b57f7bbc9581fd64890a2f1af4355c98b87b5e349e91c194c0e1a172492d9108a1e2697a69ab9b64c68e342287ee46d9c3bc82bc83660fb6778792c0bfd62d93
 EBUILD gnutls-3.3.2.ebuild 4412 SHA256 95fb517d9852efee9c294d8d6496e8bbd6502b6b3900f34efaa2ebb917e72b2d SHA512 9ddaba1a3c162ae40a47355535a77a7caf57a80e7670b6aadde8c065d9f0236a6c831a4132e4341a58aa865d53f15285afd66f2807f6b632db3053c2c08ef283 WHIRLPOOL f811190a857726e189556a8a88e72fafdf4fc950d36b5d885b9738494c25f521dc5ef1b181dd5bf4b6b3c98e64fb4e011fb43de075419e8d5fb65ff245ce8314
-MISC ChangeLog 73079 SHA256 1a0a7d1b219f59786cc22345391adb8ad9650e98059358a4a4b97489d029038a SHA512 f693d40369819fe2394907de761b7654ef5f1ef61f146d81da1f8c1d7096e45b105a6d96079ac559f479374e5f22adbf22b8dd477ee4634a7cf50690abc60eb3 WHIRLPOOL e88ba731c60dbcfd479fd87f9c40f3b1313f426727b5e3cea7741ba6da9be6221e0446aae5c65a6d9b351c467ebc2cd66bc0bc27f225299f0f80b4ca38a6533b
+EBUILD gnutls-3.3.4.ebuild 4363 SHA256 dad100b9922e53d0b56a1873164b5a731771a0ba90d6cc7ad57449786af23413 SHA512 d493cede7b1df50e75515a1231ac686a6173e5ddeec261a09204923711212766cb0a91a559c6174a4246425ef2984796b60fb8f72c96c9a4aa511fa7df311d78 WHIRLPOOL da7fa3e54f4e40fc7798ff1997b296e448c0caa3332187137d39703942d1e33a0d9f4b1cdc0d7a915f21f75d016749b910077c1cc2154364d9bf2716f8ebcc1a
+MISC ChangeLog 73269 SHA256 09453a88f167d2fa365fdbdbffa7d800a7c86def76d281473f3a3496520714e4 SHA512 7da3e0b392ae4fd2c1e213537c59dbdeb832661c3b9bd47884b235d50b9b5801f2c2a7a8074608e2bd205240de9eccaa0373feece0641250f2c6d7a10994f1d3 WHIRLPOOL 25a0beafd83ec9a5111c0d0a15cdd2c39a329cd2db95e490ae1e69f1a6946892c92faa172a05fa62370c359f65274f33c95e0a659cdd0cf4b96e1cb5e81c8aef
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTd29LXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOwzsP/2e/qSuHWIrmFPp0PvuZEw0S
-oi8Hbt9YTCy2CxtlgKaAyAdN6jzYhDIo8xyo3FIUSJB3he2ZWKa7ksqknulGozD7
-5ZpPuaSzwoRX1zmB4y7j9cFBeUb+j+VwUZ75C9SKTek5JHhfa/t478YwrPOSuMh/
-GlCPboGHYBuhQ231yoKmbXhk51YRgBF4O02ywrZREXEr6yPSJ1d6EQWKWPSLNyv4
-bFBqSPvKJObh339YY8xutFioZ01bDMQsSaEsDVxY6vhfkAtv0HGN3gUWipwiDJHa
-ILFuz9v0YTRx/mf3RSZWZXLgRmsAvrHKuqdE77q2GshA+Plg0qx/zK+PyyoKUalr
-a42CSp8Ffw9LMCVtdkhf2UtGKcHa2jlBrQ3wHP9R0KGG3Kb+r5X9RNzFQJvY2rKU
-lvJ0cztpMmiqW96vJ4P77ZqQ9B5Vy6Xg2EVPTg22IFxRydGfoQgsY4jo38YNJiVj
-Ld+vILiJGngtnmi1YP3Y//78qbsHJruViJH5TKyBr5RobHDSB3XeOHlIXHsVfYwg
-VUK8P6wbO//Pn4N0Kw8uFzRj2Rjjs8F+XdO2APCVDb6np6XG2Tz7aF1DGCuKsr1t
-M8B6sPwx2EjIXmrAUNsSZt00YY56zYAAPeDTp0Bbt5hUrkljWddyj935GKU35Zfi
-UzrTMp+ar7m1HH5GL6cQ
-=EWCA
+iQEcBAEBCAAGBQJTit1YAAoJEEqz6FtPBkyj61cH/0hwNVrOs5krgXDPG/666UnS
+dtkmsdGdnQrNEbYMXSmLTB1dhWK+SROvoB/YmIWhk+mzkN12Jj1nQ7pZSUhCSp2u
+SDCXQXkP4otlM0JYPztnB2bQJYajXNakkFUCZUF4zM+Z0mQhRhXztD3jDWDAK6yu
+Eq06VjsgWoyQIPc7sYD0ZrF0ZjFkE7564JAxda3V5SNw96pgDiRKDFXXtm0mrUYu
+hFh3pljyx1xIsUDjZjB+H6lENg52COPlxM6Fef52H8MCaYiqvw/g8gTCIcxuZtAS
+fZj24HAG5PrTaJ9sf0sdv9joYtUF86nlzcgPcrUjuaYzkReSbufaoSKMJyUyyDk=
+=ee0m
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.2.15.ebuild b/net-libs/gnutls/gnutls-3.2.15.ebuild
new file mode 100644
index 000000000000..c530aa58b9d9
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.2.15.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.15.ebuild,v 1.1 2014/06/01 07:59:10 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="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 ~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 +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.4.ebuild
new file mode 100644
index 000000000000..4f1cb70a72c9
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.4.ebuild
@@ -0,0 +1,153 @@
+# 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.1 2014/06/01 07:59:10 radhermit 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 ~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 +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[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+	dev-libs/gmp[${MULTILIB_USEDEP}]
+	sys-devel/autogen
+	crywrap? ( net-dns/libidn )
+	dane? ( net-dns/unbound[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8[networking] )
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.19.2[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.3.1[${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[${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)
+
+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
+
+	# 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 \
+		--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 \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+}
+
+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
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}