net-misc/gnutls: multilib-utize (rough around the edges)

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

2 files changed, 29 insertions, 22 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 251cb4a..b95351f 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -7,6 +7,6 @@ AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca61534
 AUX gnutls-3.2.5-build.patch 358 SHA256 a5719aefb78d8b6fbdd1176e604db7498cc930bb86a09105b0f32ad6a2d9d513 SHA512 6ec4b617829b6d0bf24b739d9965790cbbd0faa27aeb4ed1e00749117f1f2dc28ecbcff0aa0d32cb1b174d0d03e235ae36928104434a42937b8c2382661bc97a WHIRLPOOL 2c680688926200406ec65b276e31e00225bb594b2e72e78e007a587c4786a84c9ec2ae94c2d0a9ecd3bc73a4d496f67a6a360942aab5b5ab30bbf86a82021bfe
 AUX gnutls-3.2.8-build.patch 3292 SHA256 84b2ea16f4510c63b6ab3eab48d001e35f75e98a2fc0e3f17bf97df95025c066 SHA512 4adf1589830b350633de6b0868e8ed5d54c4c1a2462df901bacc661be6daca9c8c9b07413daad5fea84fb3b6aaa0f7019ba0b5649285eb81d98a1e56d4005246 WHIRLPOOL dcbf2ee7e07ddebadfc6716ec2afc733762d367f5ce519a8f4cfe7e0311a081229190236b38e636d4259dc9d19bb83894ea21da23f2e1506b6d83817eb220d27
 DIST gnutls-3.2.8.tar.xz 5135984 SHA256 144156f4140400df2bd9303dab69f44099113a3b46780737734affe93782d94d SHA512 a5bb23a13a55ab4238099bbca4c7eaea66b2ac3b4382f5710654f8714fb33ca81449dbcecb2ac604ee435c4c219f2bdd14371cd4440ae2afb26999585dcef0cf WHIRLPOOL eb10da7b22a125587c42312dd8b586eff726a922db222bab0a5838cbfcab2afaf40a42a3e4cad0a05e350af4575b43343264f731459e163ba4961a0fb9678754
-EBUILD gnutls-3.2.8-r1.ebuild 3255 SHA256 627fb782f16d234bf69974b7edac95ad0257baf7cc45008cdfbd910e0942516d SHA512 33b9251dfde75d7b6f6a5bf32a088717d95affc6f5dd59368ff51835b27b393cad03eea0eaf8212aebdf8a3d74948baeaf67910bd2f07d5665919ea8f4a747f9 WHIRLPOOL f42d45aabe50e9c3bdc53698bda3a447f273c7824487cca6e74d6a446ecf27553e64ffdc6d0b6be4a2a99fe6c743b6eb22e56ec07643caaa236460aed777f260
+EBUILD gnutls-3.2.8-r1.ebuild 3648 SHA256 450cd16a5904ec47484c97b93af51ddab0b47811c32c70c6ca7a0c2ac75add01 SHA512 4b472aedcbaa09a5dc975ec10dbfb74cf42b10264c61faa8515e3fd26209b25e4879ec9ba1b8a4fae714d7da751051c043992505e5333111d4328bbcd8d77db1 WHIRLPOOL d6f5d5bd37af8be01eb9c05efa75699e96b3929f148a2307767bcad640f1c3ed5e3b885486bd2fa0e0f9ac1c5a3c7ed6bc5f00f92e55c8265b0fad849035d30e
 MISC ChangeLog 68165 SHA256 e9dfb3be674f32cdd3de03fb6680da52ac782ac2eebfa2d1d5622edc6b6a2714 SHA512 6b3e965991ec7b75393d47d985a66c543cb918e7de722214978089457a10cd06bcc3f3219ac1c0789e85f2410d6929e0c7d8c75daf86ea76e41ac27b79e11649 WHIRLPOOL 78fecaf77e68b7a70cc3a69a99268f30a48bf3f97844fceabab9071044130b7510878af51d2f131d5bbc8cbaef41ed0369bb607db180c1a8da7371fdd85114b6
 MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
diff --git a/net-libs/gnutls/gnutls-3.2.8-r1.ebuild b/net-libs/gnutls/gnutls-3.2.8-r1.ebuild
index d45f356..14e4230 100644
--- a/net-libs/gnutls/gnutls-3.2.8-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.8-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit autotools libtool eutils versionator
+inherit gtk-doc autotools-multilib libtool eutils versionator
 
 DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
@@ -14,30 +14,37 @@ SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/
 # 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"
+KEYWORDS="~amd64"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
 IUSE="+cxx 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
+RDEPEND=">=dev-libs/libtasn1-2.14[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+	dev-libs/gmp[${MULTILIB_USEDEP}]
 	sys-devel/autogen
-	dane? ( net-dns/unbound )
+	dane? ( net-dns/unbound[${MULTILIB_USEDEP}] )
 	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.11 )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.11[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.3.1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=sys-devel/automake-1.11.6
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	test? ( app-misc/datefudge )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+MULTILIB_PARALLEL_PHASES="src_configure src_compile"
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 
 src_prepare() {
 	# tests/suite directory is not distributed
@@ -61,13 +68,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${P}-build.patch"
 
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
+	autotools-multilib_src_prepare
 }
 
 src_configure() {
@@ -77,7 +78,7 @@ src_configure() {
 	# 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 \
+	autotools-multilib_src_configure \
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--disable-valgrind-tests \
 		--enable-heartbeat-support \
@@ -94,13 +95,19 @@ src_configure() {
 		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
 }
 
+ehook autotools-multilib-per-abi-post_src_configure perabi_post_configure
+perabi_post_configure() {
+	einfo "copying .def files"
+	cp -av "${S}"/src/*.def src/ || die copy def files fail
+}
+
 src_test() {
 	# parallel testing often fails
-	emake -j1 check
+	autotools-multilib_src_test -j1
 }
 
 src_install() {
-	default
+	autotools-multilib_src_install
 
 	find "${ED}" -name '*.la' -delete