net-dns/libidn: multilib-utize

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

2 files changed, 23 insertions, 13 deletions

diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 8ad4e7f..c0c345b 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,5 +1,5 @@
 AUX 50libidn-gentoo.el 455 SHA256 b8b5a7df3ef312b47ef44d7b5c9180e06e9d8b9cbe43fa67b8511296381ff937 SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501 WHIRLPOOL e2925be57973d4f2d9adebaa63bc9a2d63daa0c4ac571790fd564fe4b7a4d5d8db62a0e342a5043b28e2c506bb62f86e9f967e5a680dd50261fa1dfb4214b260
 DIST libidn-1.28.tar.gz 3476317 SHA256 dd357a968449abc97c7e5fa088a4a384de57cb36564f9d4e0d898ecc6373abfb SHA512 ae40fb99349867a9d8e715669f20db2fa683e6aa4d4fcdb32b097aa37ee16acb727f553eb27210f290880a2cc051c5c0f8f28349aeea71045bf76dbcf472e003 WHIRLPOOL a9e245be163b0bfdf7b6670178023274dcb7717c554bfd75e713b87bfad49698e670c57f88ba512c81f1e39f743d44171f6c123ada52d82c8e7f5d20bc08879d
-EBUILD libidn-1.28-r1.ebuild 2275 SHA256 78f1067a17eff723d27812adaf653e8e116e3089e3b2b52a1a0a91662d2fa6c8 SHA512 7bf7b03e5ebb6bba194dc46b2a80754ba6ecbb294525c97975435ff87bd3d14d65cc8db85374c208115fccabf88dc52df6f991a8476e9e83a3a1c38aec417605 WHIRLPOOL 0828421356de008721fa4d4d2e4d8a202af225d284d87c67c9ddf263d1d3ea224ec0a64c7f695b9916e3a2751397b23ed7ede74aca160b3ed602abd765ce8af6
+EBUILD libidn-1.28-r1.ebuild 2619 SHA256 981038005f77309fac21c3c546beb60f81532a60805cb594637c45e20aad7feb SHA512 87ffaba97631acda57cdff603d3d8e1514ed805f146b9ea6712a24908cbb2a4ea584c5833e05d03a8f946562ab8ae2260f8520536c7533967943eee2091e32d9 WHIRLPOOL fc40be49e1ea9d2d803f2f2b36a14a53f7b8ea8a5a56a2564bf717722eeb626c05782976dcd2025da8911a1ac80b8c58bd2142176afaf663be3a71701850404a
 MISC ChangeLog 23827 SHA256 4808d9e739e7a4e00595900d7c036b2a9247ec35060f2c16b6f5f6ad50defc64 SHA512 777bbd3e8075a869e6e918647b93f94eba6f29ef987cf03f3798dc9b3b88f2bb43d1e89a3bf9126ed08a5b728e66f03fcded3a9617905f24fa39f79458a8e590 WHIRLPOOL 52781afc1fb9258a789c2f7c2f4abc3d4e60a2eab80b1ad9a2135569e704ecdf51792e8c62226099cdddf1a74ce101bcfb8a3f3ffb60f1d5c9a6eabb684e7ba2
 MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
diff --git a/net-dns/libidn/libidn-1.28-r1.ebuild b/net-dns/libidn/libidn-1.28-r1.ebuild
index 9c4d6ce..6adfd96 100644
--- a/net-dns/libidn/libidn-1.28-r1.ebuild
+++ b/net-dns/libidn/libidn-1.28-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal
+inherit eutils-multilib elisp-common java-pkg-opt-2 mono-env multilib-minimal
 
 DESCRIPTION="Internationalized Domain Names (IDN) implementation"
 HOMEPAGE="http://www.gnu.org/software/libidn/"
@@ -18,19 +18,25 @@ IUSE="doc emacs java mono nls static-libs"
 COMMON_DEPEND="
 	emacs? ( virtual/emacs )
 	mono? ( >=dev-lang/mono-0.95 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
 "
 DEPEND="${COMMON_DEPEND}
-	nls? ( >=sys-devel/gettext-0.17 )
+	nls? ( >=sys-devel/gettext-0.17[${MULTILIB_USEDEP}] )
 	java? (
 		>=virtual/jdk-1.5
 		doc? ( dev-java/gjdoc )
 	)
 "
 RDEPEND="${COMMON_DEPEND}
-	nls? ( virtual/libintl )
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jre-1.5 )
 "
 
+MULTILIB_PARALLEL_PHASES="src_configure src_compile"
+
 pkg_setup() {
 	mono-env_pkg_setup
 	java-pkg-opt-2_pkg_setup
@@ -43,7 +49,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable java) \
+		$(use_enable_best_abi java) \
 		$(use_enable mono csharp mono) \
 		$(use_enable nls) \
 		$(use_enable static-libs static) \
@@ -55,9 +61,8 @@ multilib_src_configure() {
 		--with-packager="Gentoo"
 }
 
-multilib_src_compile() {
-	default
-
+src_compile() {
+	multilib-minimal_src_compile
 	if use emacs; then
 		elisp-compile src/*.el || die
 	fi
@@ -76,20 +81,25 @@ multilib_src_install_all() {
 
 	if use doc ; then
 		dohtml -r doc/reference/html/*
+		if use java; then
+			java-pkg_dojavadoc doc/java
+		fi
 	fi
 
 	if use java ; then
-		java-pkg_newjar java/${P}.jar ${PN}.jar || die
 		rm -r "${ED}"/usr/share/java || die
-
-		if use doc ; then
-			java-pkg_dojavadoc doc/java
-		fi
 	fi
 
 	prune_libtool_files
 }
 
+multilib_src_install() {
+	default
+	if multilib_is_best_abi && use java ; then
+		java-pkg_newjar java/${P}.jar ${PN}.jar || die
+	fi
+}
+
 pkg_postinst() {
 	use emacs && elisp-site-regen
 }