Version bump

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

5 files changed, 192 insertions, 37 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 665d8daabc58..ba8b57dd676e 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,13 @@
 # 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.534 2015/04/27 12:32:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.535 2015/05/03 19:08:41 alonbl Exp $
+
+*gnutls-3.4.1 (03 May 2015)
+*gnutls-3.3.15 (03 May 2015)
+
+  03 May 2015; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.3.15.ebuild,
+  +gnutls-3.4.1.ebuild, -files/gnutls-3.4.0-build.patch, -gnutls-3.4.0.ebuild:
+  Version bump
 
   27 Apr 2015; Agostino Sarubbo <ago@gentoo.org> gnutls-3.3.10-r2.ebuild:
   Stable for sparc, wrt bug #492522
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 0ac55432f0aa..16e6283c3c70 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -14,33 +14,24 @@ AUX gnutls-2.12.23-CVE-2014-3469.patch 3461 SHA256 cc055dafc2bdfd1e0d0a6026fc0bf
 AUX gnutls-2.12.23-gdoc-perl-5.18.patch 4878 SHA256 a55a56b8faead4e7c369945d356190b59f16e57429fa20221f201b88e92dbef6 SHA512 2480cb3e9625eb6518958c8f4caa208957fc5a9e7c3ef84fa6345640ca7e65cba2f8043f8b6a05aceb80750748502e66dd6f5c55ebcbc750c54955baaad4d31b WHIRLPOOL 5ff3a01efb80fc8dee9ed77436afa70aa39e33fcecb8a9742fa431047e66055cffc4a07657a28485d3e2c75a5ea9bd7ebd1f72b9bed1ad7caaa468997c600d54
 AUX gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch 1146 SHA256 0644a00f75987f8a8906ec536b4b29967c24ae22ece8dfee074af3f85be566b5 SHA512 ea3062f90ace33a6229fe10f9a1fb492e84905dce0231309d2c105386c45a151d99c140c66158435ebe4781defc5a536775f4d68b3552208885636e5ed4b7223 WHIRLPOOL ee131aa7709e717cf5e893d5073dbc7eeec569e2a6e48094534dcf8f0d3d17b8a4f75da0a2c91ed2d70e37ef4429d7759dffce4948fd508dcbc0e081a8d98aa0
 AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca615344abf7c9060f73f525a593716f0 SHA512 040507b973788dc2ca4aab19d69f45011e6509354e38ec875ab6fdec3f1c3be40272ea99cd53a5adfc8b52b30e29d86af80891d57b50068a4b3f2cc20246ac70 WHIRLPOOL c4d17452c22e81fdcbd6e14aaaf8294a90a67438ebcadcaab096a6d2f115643c2ce36cc503d186d2d2483366b890add3e9101c26998878817f7baed8589a8514
-AUX gnutls-3.4.0-build.patch 760 SHA256 7a394b50077d01eb967c77f764460ad4cd2a7cb487b925b44ac04cde543b20bd SHA512 9410eda16dc102246ce5754d69b2de0ee80f63ac1a1efd0bbaa065ffb34464cca0d80a368fb6e32447ddd346d7be8c90dbad3d4c888d7512ac8af5df4b56b7cc WHIRLPOOL 68d6a3acf56108c4be11638422525460823e3f2d0ebddf99bc6e5580d23027e2912e8c8ac3ce67f9bbd54bdd3826c3c5ebd886be4d72bcd0520791f4c7360ea6
 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
-DIST gnutls-3.4.0.tar.xz 6453932 SHA256 b422544431bfb5c4e24a605b6c793ee34792cc791c1060562ab46eaf77f3472e SHA512 ab11bb46e69a689f275cc158d8bc031bb09287a2193a2d9ccb36c04a8e106d9204754bd148c67417e6d63ed0c75750bbe7b602424bb7dcd9af2e25d9275ef02d WHIRLPOOL 5871564934d1d13ad777bc47dc6ab2f04a916470030e8b844d9f376c049072277fbf351fad4bfb42b8680a6e01ffc79ebb9459887342e92a0af11569c105c47d
+DIST gnutls-3.3.15.tar.xz 6286288 SHA256 8961227852911a1974e15bc017ddbcd4779876c867226d199f06648d8b27ba4b SHA512 0d112f20fd1a010c278ecc5c0e9e22a040c5a765073ea722329e9d5d7b4c661c6bd2fc6749903ea562fe44caf9a1643c6d95e2e193bb8c444e2e6418f73d5445 WHIRLPOOL 4a7b28952bcbe837d4f9e9b62b9254a43510363634daa1c9dc61bf07c7734699011bf5963d4556d3f53c45f63cdf6d2447f7b101e026d0d21c94d827bff9c6dc
+DIST gnutls-3.4.1.tar.xz 6469756 SHA256 e9b5f58becf34756464216056cd5abbf04315eda80a374d02699dee83f80b12e SHA512 8fd386b66c9bc42f2beaec93b503f83dad9736ba25673aac34a2cc7adc1b5467ae21b859406743df9d698fcf06237bb61404a1f33a8d8ec0da536cc088bf98e0 WHIRLPOOL ae39c0a3397519b78c2c7f07a22cb912e79871c97b3b1729ef17c0bb4fad12a001644bfed9528cfc1bc98bae267bd0aa62c6c9c25e55104061281ba574e76a9f
 EBUILD gnutls-2.12.23-r6.ebuild 3675 SHA256 fde1f48cfe231601626db9cfc21d148d9e4b5e843febdd44c23b1b163ae5be26 SHA512 7bdee9dc92f35159f03cda67f2143cb1ec0802ea18c6ba57b02fc8a4ad92f915725e3a11aa4a300a8b5eb7c4be4e8d769f8abf34855b2da67d34557dcfb79d1c WHIRLPOOL 280d35f2b1b96097e5dea680a588bedc063c6cbfe3ffab239a183b73ed94bcc5f86917ca52ec78c7969c388096167fe02b58ee28b3201eea8a331bcb78bd6f59
 EBUILD gnutls-3.3.10-r2.ebuild 4949 SHA256 be952f52f9e3eb120470204795decc82e39a6817baa78830cd4ac3400d245c4d SHA512 f5d2868ba167048ea66c15828d3bc666f9ecb574f835c7496fc9d186ba75d43cd95138caa11ee07cf3fe372ce6092243bd28698e3e83ef6727b9afa62a8700c6 WHIRLPOOL c2f9ccc038f320551c1ca289f899cc62605c13bc7fca317b2b128ef1701cc517bc75f1075866f335634005805f1e0854682152b3f7dd809c7bab9fcf9b90dbc0
 EBUILD gnutls-3.3.12.ebuild 4962 SHA256 a9e68cd7141cfe5d30112915150b17ecb2825b08fa1ed505964faf18b9ef97d9 SHA512 23279a2b4c2e204edee51d8cf5c9eb5550e622f3987aa874adb757bf3c1b08b21b7bd0025bc67f9b7c4ff619c509b5aed7a7ee0790fbbd8c271c49cee24942d6 WHIRLPOOL c82d0c93a0855bafc8ad0cd795d163d28588f86ff7b95c494a6d101007884ddd4a8e4c3ae495e0d986c0fbedff6ff4d1bb98c09bb8cffe4b19e236d7c2dffff4
 EBUILD gnutls-3.3.14.ebuild 5018 SHA256 5be0a6594c786f5dacfd05071163767039f2df2fb82b5dcd0681717c4ec4e7fb SHA512 20dcd24ad9faa34d5cb419dd201857f411ccb925874037d25e3a5673407b14131b3443d921a577b222603b347577be35af3df052095e32782405ac8e3febb7c6 WHIRLPOOL 9b63d5f566a61961a78d5f83bf915ebbd8a3d10c0ba213616e679c2d168e8ab1ed1305be33b76289b46ac35964a8f12b88d30f5b5003dbae912f6ba78409eb74
-EBUILD gnutls-3.4.0.ebuild 4244 SHA256 f136c3090ceae08675d4b1727dadc140aeaf9bd4b020f263127c6d51d02090f3 SHA512 31ffa9060a2ea49763dc91d859acf748af3e5ec5dbead98994fb186163199d3b76aa88fd3f23d687c931266d4529e047bcc2b9a78fe7e7a5e29b663a3fddd8e9 WHIRLPOOL e20e12227d514e9509d3d8cdeb794b617d71ebcf59ef92177cf3e16b211cf562152a2081ddbcaa4382e05f03c3a899798e28887f56d22dd49e09935710fd1d9a
-MISC ChangeLog 80160 SHA256 abe5cbdd1c55c1b06dd386604867e30d9c4facc89c873a7f6aab7bfc7e80ce6b SHA512 a683ad5678d4ca78605f71fa20f02d87a6df211064b18bb5d58edc3287f23b41ff6d4bc91055eac883e444d0bb3476b4bdbcdd20b07ab2afc7a6f924a0815f0b WHIRLPOOL 2363bd08d13bb5baf4d267fbebb65ce14eaee7aeb5df02825a48f51318833fe9f7872e8af5661751ac12c518ed22d5179741c5a1fabe4f5b8bc1266657a98461
+EBUILD gnutls-3.3.15.ebuild 5020 SHA256 1c9254c15b1f94c8b6f209707c6604d1502c64b880f7f733c1d72e53d556d1b7 SHA512 a1d96779a691e0a524792299ef6de6b82e6c9fa13a1d14d0a627c453aa6d882113400511324b0f4fede2bd4045efa78f6ad065234cc640517242c95001ffa456 WHIRLPOOL d81b4a641ea25ca9ca7d487dc2eb936d110f6ebeb4318146c05ddcbb57c773eb78866afbe3c9777182cace71b7366462988776a6980e7dda53ab6e4b3edf481f
+EBUILD gnutls-3.4.1.ebuild 4204 SHA256 5a49f3814e0176a15ad3da7c60d5b2fb61e0b0b8ff84edd733b363ac9b6e0a60 SHA512 15cdb71cc56af4ccaa67ff842408b3095bb0f8e8f7b8a7b32171b9b6c4dc3161ecf5068f25d91536b72309821b5f6cb53a6aafcd00241c67353316cec741cca2 WHIRLPOOL d2380a6e59d15b87814adda7c09a5cb97d510d7ee6fda395ae1f2e740bc541b3a37b2aa164dfb20b30ee6657dfa1c9edfba9f141b8fe55e4d68c7a6faf644f63
+MISC ChangeLog 80387 SHA256 988a9e957fc3e5081d29371976303a0469098d192e0fdf2b16e70618357ab46e SHA512 9c2431a390fa697fcc602e0c4b7920ee979b1a033560ca60ea01874e5ba9182950f9afee8d48c4353af274d691a5ebde6aa6dc57ba985178344c9395f23ce4f4 WHIRLPOOL 8447f0a450671a38aee257b3befc94c6a0647c34fdff9c5f68ed22d47b303b9aad6d71233df02e0f68e9b84963f279333c1556ea504d87b3426893e80d41e58b
 MISC metadata.xml 1023 SHA256 05138b1a8676ab5301d1d7b5eaad829faf485f954a2af4232219f9585a950187 SHA512 c462e545a288b4d7397f64ea9db2691ae554fce793a7f8f79554618499f88817374ad37aa3f11a7df21847d985d4549946a25faa5ab7a68ac40ab21231977ccf WHIRLPOOL 18581d9887f7324a2febd30e3e293ac616c5854927257cf2c3f65494979b450de109b014aaf31d3bab43efe39cf99221ac21852cbac11a04b28478d264a25ab6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVPixVAAoJELp701BxlEWfpi0P/iHSstE8AP6ieY9RgVrFGzxd
-iQiVpWf3sV5OKrWKh6wrj8MqKx3L7nzl5Zz2oq61VwupJY9I1ecCODjg/ALNLqTs
-b3ckKCcZ0Qa/IcFqNVuB4BmRbBK7bKceymBzFHFOm1rFiaXMR8Z50hkZA5CbzD3o
-qeEc8G7ku8p8sAWRgY/fdTFdVIqFeqGN0Ev0dhy9KRd08QCVqjECT5GZBlQy567X
-heQo00EhRt50FiPt7KVFsAp/8xWw1hc6LokYHj6/OjB7mAXBrj4CL+5lrn5h8g5c
-YBbUi/sg0LfirOcXeZSWwtz6QVWf8XylNQfeVI4XjoZDwMaz1AtQLEzuCWFahuuO
-X6M867o+eKqzDUKExIMDHzVV0ZuVMKyT1EpQbAZ8bPCmBsiiw2bi7g8dvuSdefyd
-j8y23qJfE/WwMWBkPDFZMiNORjKey2wmts5L7XZ3pCzzeAsz5PvZ1X/jZdNITHh7
-Gn4RE+3oy8+CszSqFDdCIj5K6GhANKKdZ5PBWw0i/wbMM49Gp/uwpBPsFaI3I9u8
-yPHY2ESRpctt0kkLAzqDV6ffu2Ete4vYDM6WdxfIdQw80pfXYoHVwedvtljyQerV
-TsTCsXcPF05N6Vemf3P7VwkELBzVTm9ULIMaNW6AnXHtBt85SMmEepCx7aDC7l9F
-qp/qR8RBqTlC7mqPVUh+
-=vJ6p
+iF4EAREIAAYFAlVGcj0ACgkQXYk9GL8g3FGeRAEAn80cDSXz3dKdQf49XSo9E6SD
+Ug6kew5rdXqu4s6++bgA/3+0zgIUPuL0uqaAVAoB7ZiOCN8cAjmPXtcVaZmmppYP
+=hXL4
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-3.4.0-build.patch b/net-libs/gnutls/files/gnutls-3.4.0-build.patch
deleted file mode 100644
index 1962cc3f2432..000000000000
--- a/net-libs/gnutls/files/gnutls-3.4.0-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
-index 8e793d3..1bce3f5 100644
---- a/doc/manpages/Makefile.am
-+++ b/doc/manpages/Makefile.am
-@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
- APIMANS += gnutls_certificate_get_peers_subkey_id.3
- APIMANS += gnutls_certificate_get_trust_list.3
- APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_key.3
--APIMANS += gnutls_certificate_get_x509_key.3
- APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
- APIMANS += gnutls_certificate_server_set_request.3
- APIMANS += gnutls_certificate_set_dh_params.3
diff --git a/net-libs/gnutls/gnutls-3.3.15.ebuild b/net-libs/gnutls/gnutls-3.3.15.ebuild
new file mode 100644
index 000000000000..b865e19dac42
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.15.ebuild
@@ -0,0 +1,175 @@
+# 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.15.ebuild,v 1.1 2015/05/03 19:08:41 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 +openssl 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/nettle-3[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 openssl openssl-compatibility) \
+		$(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
+}
diff --git a/net-libs/gnutls/gnutls-3.4.0.ebuild b/net-libs/gnutls/gnutls-3.4.1.ebuild
index 097c44981f2a..8738e2642de5 100644
--- a/net-libs/gnutls/gnutls-3.4.0.ebuild
+++ b/net-libs/gnutls/gnutls-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.0.ebuild,v 1.2 2015/04/10 08:30:28 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.1.ebuild,v 1.1 2015/05/03 19:08:41 alonbl Exp $
 
 EAPI=5
 
@@ -69,8 +69,6 @@ src_prepare() {
 		rm "${file}" || die
 	done
 
-	epatch "${FILESDIR}/${P}-build.patch"
-
 	# support user patches
 	epatch_user