Version bump, bug#523190, thanks to polynomial-c

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

4 files changed, 302 insertions, 5 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 825ba0009168..99a22dee4314 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.512 2014/08/29 20:51:04 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.513 2014/09/19 08:45:55 alonbl Exp $
+
+*gnutls-3.3.8 (19 Sep 2014)
+*gnutls-3.2.18 (19 Sep 2014)
+
+  19 Sep 2014; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.2.18.ebuild,
+  +gnutls-3.3.8.ebuild:
+  Version bump, bug#523190, thanks to polynomial-c
 
 *gnutls-3.3.7-r1 (29 Aug 2014)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 6f3c23ab709c..3f56596fbc01 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -18,20 +18,24 @@ AUX gnutls-3.3.7-build.patch 2564 SHA256 5432642ad118536bf77169e93bd8d4619f536b9
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
 DIST gnutls-3.2.16.tar.xz 5337140 SHA256 781836a04a8bbb42e6590d6524d53c870850d26fc55146a7e0e5d7e1d183bcae SHA512 839f826fed0c2907e89bbaa71ef23f9dd8ddaf8b5aa92fad07a5281c3c7b0b66231569997fe906e92f7a8b8753253230f7e41e82b289d171da3e99ab8ae377bf WHIRLPOOL 047351a95cf61545d327d1fe3bd58e1755383c09167a35f4917a2cf441cd96936ae62aca45c5d9911a1ad7d77283814d7e77fe7618434f4cf866ca08e52c752a
 DIST gnutls-3.2.17.tar.xz 5151932 SHA256 8c9c1c38d7e458004749b1de47ecd794c2b16ddebb90dea073e57ac721e5e731 SHA512 275a13bb705539ae402269c9b67aa7f78bf57892f8b24727a2529de6024454fcbc4fd1ed9922120b33c30dad964a1f473f5222243b35eda7010538e7e3b61bef WHIRLPOOL 091af21360ba97615e324b16d1731b6730220600b2e529d981a83a50239fe4fb74164fa4628228a9d98d32684ebc48273849994c82ec4090e020dfe4336089f3
+DIST gnutls-3.2.18.tar.xz 5154476 SHA256 4762afab5e1b9e829c5f53d2b00cd5e41d43fa6d035efcf239e3fe0459134d45 SHA512 fc364be7997d31e1a1855d871b4a9564ee5a3e9c2900839f9c32fcc656e67c916ef634508bc0363b8b3f0cba131c97596509f838c1e9b3ac2b56b224eee43908 WHIRLPOOL 6da2bcfca5755a7fd3ce922b3bbeb21a44c2fc5446b342361577a4eb216ae01867cbf49d01fe44a75ca850dbf960c481e5f122f37669ea404e5213fc8b0e5491
 DIST gnutls-3.3.6.tar.xz 6076320 SHA256 edc9df4c1faab96002ddcab041322bee386c2cdd22c958f7d1f3bad914af5a9e SHA512 d43c488f8ceba8b308290c3d9d7a220274f2687aaabda349dcd01296e96128b5df088d9a7b68729fcfe5210d851c38955aebed1d46e3d22b4fe01ae5f86fbc37 WHIRLPOOL 0231d1fd50cd54eef5d274c1ddb2a4c1f365f344f43577d5b75214aace65784a145793c53df3a483ebbd43ca2d2216ce128e9fe59eaf3c2c96999d0d10dd50d0
 DIST gnutls-3.3.7.tar.xz 6049632 SHA256 52d86c1bf2ff142c5499037db812d06d42e29bcfefe1fdd2035aaab38677c79f SHA512 7173f30c7160118a5204bd108eeaba47d507df6b3dcb78f1086b5640519f820b6268d2edfe0f5f0165cab110cde3d6996e2f9563cb39209b574dedacfd9e3715 WHIRLPOOL be140c5f037a28db7bed3d8aae2c5de9ccc4510b35e29f782176cd64eef27f3ea18e1e0eb419a1015da65eae3e1aa8f567886eb1aede80d990740e511a75c018
+DIST gnutls-3.3.8.tar.xz 6153180 SHA256 bd4642f180e19632f4ed3a1e62d60c824c7b695f5cddf41a8fba1b272eaef046 SHA512 6b778df551a4eea1e920be0596137ca1e5995392f7a2e489beb79124cadac132111f0f763beb2857b6d305b3c4b8378c48e2106daf9e10a7dee3a2dbd9b833fd WHIRLPOOL cd1c3f9f59831eef10fcf8278bfe35f19d6c52aa2a7020ac7fcad4c3609a998ee375bf0ebeab8db7fe1ec0d0257859662690bfdd611aba9b351a44348e266d9e
 EBUILD gnutls-2.12.23-r6.ebuild 3552 SHA256 b4a141ff1d0788c8dbf1be66fdca6e7b9fb1fffeb54d44a3c3852133cf9d754d SHA512 cdffb4af5421fac4a72116868b18da98b1c1ca16356c9210ea3127b3c16e171777a013021b1575208bfa873b7bed7d5a3107689d0f2f3dce0c5fd1cd31d2ed17 WHIRLPOOL 8237f17fa94fea35393d6bfdbab319caa43e598744402f43c3b3a483bb580e6c85ee1e4cdfa996688f1cd5e23888a8558eff91bd158cd047f65cbc3d754776d8
 EBUILD gnutls-3.2.16.ebuild 3486 SHA256 0e1a1bef7d8490a549bd13d68664ce27d99baf45aa38643d467d4b8a59980e4e SHA512 02d7d6007974869f5eb936b15ee72a78f63cd3426eee7ca57a36ba5b74f8c25f0d0ac38fc8ea003f1038e83639cf36f03aad746f59681d7661e3394f08d1abcb WHIRLPOOL 42ea5d2500f41c8e9fc63d0947798989b0160233be0e15492f132d954fe888bb0ad6c4e0677545051d66418795e52e5601d069f58076db6ecb696dd670f3b50f
 EBUILD gnutls-3.2.17.ebuild 3486 SHA256 7482f23277b9ccc657070c0bc362899271fba8aca5b2f0d6c50f9cfe9af440d8 SHA512 548176fc66cfcab0422cfcce9a1a92cef89cf54bbb32025cad1ed5bd725eb1876413e132e9a78582ba26f70b94aa8028b4259c00fb5e080082222aa6d5331440 WHIRLPOOL 1fdff59dc8e3aa8fbf776de26f3349f2531e1e41a63876850680df3c9207edd300ddf485fbcdb4d1983a0f03c87b2d4f42714ea81963bee3424702e81a35528a
+EBUILD gnutls-3.2.18.ebuild 3486 SHA256 ca2dd4018e16bb135f6e9ebfff76de7c8090c14d78c2190c1e4de2fbea42abd2 SHA512 8cd08ad3018fdaa18a38d87fb3b68a42167eed9b226a117ddf43bde35a5b0506001114c1ae4b83510f628ab143b59b01220a3e7db07ec263df8d5f09e9ca9293 WHIRLPOOL 33b36c21546849af576c66157c884614a3b136dc2e23e167de43625ce4d6bed68e80120c01879ffe3712c3c4bddd3c914897d430ce464df92ca5d6447c27a631
 EBUILD gnutls-3.3.6.ebuild 4469 SHA256 80d4e18ffa831dae7757a527c46990651dbb3021f358454154020afa0f630624 SHA512 5d3fe6c9c23f4b9a9d158ceca8328bb74364254406cb0b536ed96ef7bdc0c32b6b13093cde4305be7d3af36bd70b827a10fa287e3c68b3b1c371009c104dc863 WHIRLPOOL 2297448413bb9ff78a37dcd9e2cc4006d46acc31623b518c2f124fbf118afbd2da7e1aca034e9369b2c7b940a9904c9982d62904b07465b97b8305f537cccaf9
 EBUILD gnutls-3.3.7-r1.ebuild 4807 SHA256 a4e2da6fcff480f66a01bd6be06c3abf8858268de7415d4b2de71aec3ac22618 SHA512 35f6ddb5c7152cff0c010bb16cb1e1a9976f1fa082af887a8e2e03b264b4a7f3f03e0ce18382a311fd728533af8abaf9adc7dfa6ac16b8b56e96e39715f64aab WHIRLPOOL 5ca3d536172ad14395bf144ce1a2cae32434031980ba22f8621e012555e42dd69618fd3c8ba6bb6ecde53a667e6e08a2fb8a66c7499735b1b8a47374e08aeda0
 EBUILD gnutls-3.3.7.ebuild 4509 SHA256 22c65ef83726107f3ede1426d3665a0f1abd8622274cfc67fa1da32cbcbc0df0 SHA512 a3032feb7952799adac7ab5f7bd5983d55107a8925869fd9564b7f66f82205aefe2ba9db92871f49e94d92f96b6cae2c88526cd723c0cc5c6749fd9692c56c30 WHIRLPOOL 98a8e01e1f1ee2978e83a60c03325d5f6de672a690902fa30454bcd57fa45ce32a27022e748bac0a09d83f0c8361c77f27fcb4f9fa7e66a6645e91542c0cd168
-MISC ChangeLog 76557 SHA256 4f21ee97f5a4bc3abfbef33d95bde0d63ef637c69cf150bf73af7a9e595224df SHA512 2508f08e5634d39a41e93641a37d5cab6a9762ea1a6911d197b08fe348e1a959a9b471dfedb4cd7d59a628d93116d24a549cb1698d0d1ab74644cd965ffbdc8a WHIRLPOOL bf17a936ea641d08081c59a203876c9002bec820e9fa7593b99c5313c253a40f5c46cc972bb50423d9ca502628a692eca25fd76911fd4ef52c8e8fa77e87f4e4
+EBUILD gnutls-3.3.8.ebuild 4764 SHA256 f2723007ef2b327bd54dcdb568ffc4ae07a5ed377b1a28c0b82d9c1e80f78211 SHA512 d6bf6dc5615d8cbe9438c4d958b10ff267b648eef5871bfd4af40fc4bfa6abade74fc68b4ebb17479f2a47e2cf467c6da71490db41a667016843ffe9e4aa8946 WHIRLPOOL b8c45760988da1be0025f1b837e8a1d85b437d838113c31e3de724111d27ca134176f532a7c46b3675e60db745c6229f25ccd314df5b45d8242d9a86f2c0a566
+MISC ChangeLog 76762 SHA256 a6d319e1cc2e7faab6a8c8b98ffa3f0294271cacef364804cecfab42f4b0d12f SHA512 52a562ff63f605be4d295293907008c69278d7a79cba4d78c2fc8bfbb66eebb413d4f66c7e0f39af75165a397510227d3904bfa45d919574fc258a4b03c51d6c WHIRLPOOL ae082e9def93480f2f629d21960c033d02a79dee4f43fecb37ada80152c2e8cf8b49e0f9884c274c0135c2f675a7c3804c84282f317b479fd2ff5b15b4eb7733
 MISC metadata.xml 875 SHA256 a0a8b100321cd3bfc4458cdd37570fafbe7270bce36b15ec8f17ece2232a5906 SHA512 1cd6b55fc3fe2460a6fad153190a95bb97a3baf7c2ae153a4548be9922f4775518acb9dd858f98191f3972dced8e8ccc1da9309871ffbf4ccdc7bc394d343bd2 WHIRLPOOL 4fd8f09f0f43c80ee037785de47b67bb9ae8a6e7928008290beec977a64ca8744c7d15b96eec0dbcc142e1dc753eab850b72f4182330ae25c6f29001ccb06637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQA57wACgkQXYk9GL8g3FHswAD9F7zAMnfV9bXnuhViN6udyzpp
-N00Z3nHJkk3Imoh54VMBAKLFXbHW4+E2WptMLJv0LuBaPrsgzCF4HajyDO9NETba
-=6zE9
+iF4EAREIAAYFAlQb7UgACgkQXYk9GL8g3FFmmgD+LWY2RwVu59hIRCmzVykK7oCK
+EEyHigDypkaexq+VHKgA+wSu2kkJjZes8h0iz++EPugJ4rdWfXiNWdCUSCG63kVh
+=Rttt
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.2.18.ebuild b/net-libs/gnutls/gnutls-3.2.18.ebuild
new file mode 100644
index 000000000000..6cb353dad52a
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.2.18.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.18.ebuild,v 1.1 2014/09/19 08:45:55 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.8.ebuild b/net-libs/gnutls/gnutls-3.3.8.ebuild
new file mode 100644
index 000000000000..0e0f8925a967
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.8.ebuild
@@ -0,0 +1,164 @@
+# 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.8.ebuild,v 1.1 2014/09/19 08:45:55 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.4[${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.19.3[${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}]
+	>=sys-apps/texinfo-5.2
+	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
+
+	# 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 \
+		--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)
+}
+
+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
+}