Enable multilib support.

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

3 files changed, 131 insertions, 15 deletions

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 0cc2921add52..5da5e56ef39e 100644
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/libidn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.203 2014/04/06 15:11:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.204 2014/05/25 11:08:28 mgorny Exp $
+
+*libidn-1.28-r1 (25 May 2014)
+
+  25 May 2014; Michał Górny <mgorny@gentoo.org> +libidn-1.28-r1.ebuild:
+  Enable multilib support.
 
   06 Apr 2014; Mike Frysinger <vapier@gentoo.org> libidn-1.28.ebuild:
   Mark arm64/m68k/s390/sh stable.
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index f9041e91a30a..e67ac4c69dcb 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -3,23 +3,26 @@ Hash: SHA256
 
 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 2710 SHA256 e635a6020f35f29345d3197690c18d3bae009931422959673c7cc6e3e44f02f2 SHA512 27a140f0ea08519641d91e18e76e012f5df9e3f3e7aeeb4a94590e7c67f1016e8e5de1590612734c4e6839d74d5a7e96216d3a667093897ea837aea258e6592c WHIRLPOOL 2a627a57606f54fceceb4052356f9041750280167b72371291480d0d2e09a60eda35b5751d6946438cebce26c7e50a85818f079bb225d99b51e2f9615bc39f97
 EBUILD libidn-1.28.ebuild 2317 SHA256 bb1b09b0766fbc20748f44c35a3b5bd8cff3d5509eee8f0fa8c0b8d30469d78c SHA512 b7a34f9e77167c74f799eab540ebde2493bfd0d8b05c61c05a30eadd5464a2780a83a06c877223df73cc225d61aaf34667bc1be3bf901f25095e9257ca2d69be WHIRLPOOL 475fcd1928bf4754d7188facf4bfc310b6a8d314d53379b8acc5fbf44fc76f67102dc32d21cb600c7e0767e47f6abd94762894ec4c9e3353d759595a60c8fb29
-MISC ChangeLog 23935 SHA256 bb478fa202647c49487f80410ea87074d2f675a17c270e8151caff025df82ebb SHA512 f26922d1d15a4bd0a7f1e6bb13f908d55c757bf2aa5e1b268a87f6aa688b581f5dc557f6880fff30bce70a93ce0ed142b81d1ff177e9568947530efe25ab6848 WHIRLPOOL 5563c2808f25608d33e92be25d4cd2324866cf22857ec3c302a6aa6eff2d689151db6a10b7d6951d57cae2ce1d746a9d42eb15e9a48e8672186fa61fc5848ccd
+MISC ChangeLog 24068 SHA256 1ff2163f7cb5813d5a702f2004708b71560862eed73a23e1fa1928370da00465 SHA512 e7593b142d792d9a56ec8c39077d7f689c27f547ecca37dfe30cee2027580eeee059eb6760ff3dd236dbdd766ae39f4933ab58a243826ebff98be415f5858b2b WHIRLPOOL efe87bda66ffd6d286b84fd9c9ac53a7fbc8ed5475b389010375bee32b86eb630d5d4ab2be1394709d09f5b7b198307af273bfc38b78d3a666e9937693745a2b
 MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTQW6pAAoJEPGu1DbS6WIAlpUP/1rE2jKmAuMASOSikR+fQg5B
-xhuxhy8qqMX6V1hW1kPLulP+HhP4T8OjQPUq0fLkXR3xbnQwXKfwEgr92u/bUMHS
-H2y7Rwu/+3gFgAq5H1h6fQj64eebKAXhzhKlImGqOsdk7ZFQvwyFQpukSpBIDT5C
-S2aZS2v758bQ3ObopINHnBWgQeg4HlRUCQu9+9cGmj1GreeehV5uqLNZU9XrCehS
-Dy2aIM/Ymv+n0/lL1KbFzJ+SjCl3e+DDf3oyYBT4BtDnP3f2r9QqYRlR8DZU65CS
-IP+WRT7jzBpoxqPHCJAhVwbqjznNcneuCCFRuM2UeXWRnZfnWeYSlREY0HBL32ZA
-JPKXSuoLKTDmgB7ZcKbOb4juZF1LWAXyTbPk7Xpurt0Zn9gEPZcqaIsAgJOVxCdd
-TX+wF7wlYkK/MVlPaxgWkx8iQY1OzuFVaDh0U3EFt6IDcrL4mo6wKhHUPBm7AcyV
-UUd0G/Qpcv89JIA/3y75asZwDiVxhXw+sPzIJJPl88OnCqNXtcOEv3BO9IxkgNj9
-XjUO4sQ598NKRFVeZDnqGcO7+M2Sp0c4gMUiBGVBp++s+E1L2IBaS+Ic4vGzsqz3
-uS6isJdaXX/Yt6nVdiDZyn15lE2NjjYDJDM7PM/ZW/i2F/sgmKI3rI2qDoTK19tq
-NdNypSOLnYd0fF5vC8fj
-=ZUl4
+iQJ8BAEBCABmBQJTgc8uXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkRkQANiWj2mtFELrrumcIpus68La
+4wqSfbZqosFz8zkok6ACpNhokZJe/kmBOwb4wyCVLOgtzpxZ4YtFHFkcXO2TN1+g
+ZotmrQpoMWyXNZs2DzlG2F/YFotVtUnyrLQfIoXUBqz4Snn9tufuQxidraDqXTjD
+7OODmxjkAVypCUeuasMHdCnbftw1uz+VNIe4WkfDhaziBjHCmYguJI6UAZiiNM3w
+XVlCscuE+UIIChBbeccAbT2C4/3/H7yWPTYgx6MY2DhYNJut49vINkYmsbB0Jasl
+vQhR9nU+06Nb1FB58Fesu5cBdU/NuTicjRJ0XV5XskU1KSX34sN4QBDI8PlwG4Hm
+0AOxVnT7g+wycNwmhq4XaAIjtJ9ngUZn+h5UIn6sbVYJENo4pBPdGtSek+BGfciV
+VgVOF4qvmH64cHrkmgvh3MenkDG6oJyWpxMfiBNTUUmE8gbjHjlI8kR1IITgJkMr
+FhvbSAVxaCkdIqPMvrzIB2Llt+0ssbFFW4FaBtgaS6U+QiL/9G//3ezyy8Gwm5aj
+2zFi/DeNMcn1D9303woECpjXOay6RS78TUN5ouVX/WcFpvn1JUG2uUHhklHGY/8p
+xSIj/9Lohf/85h5Hu7W+QOc6JmwSgSHIWnFeUlZ/LKgJqSOZfFvnqbkk7aCCyWf3
+WPzbNAxEV6+UaBKc3Hty
+=jKFp
 -----END PGP SIGNATURE-----
diff --git a/net-dns/libidn/libidn-1.28-r1.ebuild b/net-dns/libidn/libidn-1.28-r1.ebuild
new file mode 100644
index 000000000000..11f27dacf563
--- /dev/null
+++ b/net-dns/libidn/libidn-1.28-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.28-r1.ebuild,v 1.1 2014/05/25 11:08:28 mgorny Exp $
+
+EAPI=5
+
+inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="http://www.gnu.org/software/libidn/"
+SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs java mono nls static-libs"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
+COMMON_DEPEND="
+	emacs? ( virtual/emacs )
+	mono? ( >=dev-lang/mono-0.95 )
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( >=sys-devel/gettext-0.17 )
+	java? (
+		>=virtual/jdk-1.5
+		doc? ( dev-java/gjdoc )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.5 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	# bundled, with wrong bytecode
+	rm "${S}/java/${P}.jar" || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(multilib_native_use_enable java) \
+		$(multilib_native_use_enable mono csharp mono) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--disable-silent-rules \
+		--disable-valgrind-tests \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packager-bug-reports="https://bugs.gentoo.org" \
+		--with-packager-version="r${PR}" \
+		--with-packager="Gentoo"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use emacs; then
+		elisp-compile "${S}"/src/*.el || die
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && 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
+}
+
+multilib_src_install_all() {
+	if use emacs; then
+		# *.el are installed by the build system
+		elisp-install ${PN} "${S}"/src/*.elc
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	else
+		rm -r "${ED}/usr/share/emacs" || die
+	fi
+
+	einstalldocs
+	if use doc ; then
+		dohtml -r doc/reference/html/.
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}