Enable multilib support.

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

3 files changed, 136 insertions, 6 deletions

diff --git a/net-libs/gupnp-igd/ChangeLog b/net-libs/gupnp-igd/ChangeLog
index fd6fe07c79fe..8bbc377f51fc 100644
--- a/net-libs/gupnp-igd/ChangeLog
+++ b/net-libs/gupnp-igd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gupnp-igd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/ChangeLog,v 1.56 2014/04/26 06:35:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/ChangeLog,v 1.57 2014/06/10 18:02:51 mgorny Exp $
+
+*gupnp-igd-0.2.3-r1 (10 Jun 2014)
+
+  10 Jun 2014; Michał Górny <mgorny@gentoo.org> +gupnp-igd-0.2.3-r1.ebuild:
+  Enable multilib support.
 
   26 Apr 2014; Pacho Ramos <pacho@gentoo.org> gupnp-igd-0.2.2-r1.ebuild:
   Move to testing in some arches due other gupnp dependencies
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index c8b529e017ef..ed8a1c8e57a5 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -6,13 +6,26 @@ AUX gupnp-igd-0.2.2-underlinking.patch 502 SHA256 4effb10a35e213758303d47d2490d4
 DIST gupnp-igd-0.2.2.tar.xz 262216 SHA256 73b6a98a0f13b29b34c3bfc07f99f78b1319211cb95a8585752873af2b9067d3 SHA512 5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583 WHIRLPOOL 71d33882f94fdab4b517df1abcf5e8bb1944a7dcde150cd69954fd32ca2b208a95d2324f9d4215be7fd1016d72eb376c3332f2e84216afe0d8d25a18be4d7fbc
 DIST gupnp-igd-0.2.3.tar.xz 269920 SHA256 ccaf49f9d4f38ac646f1b00341d4db767291e56592286da0e0eb0835811f462d SHA512 74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac WHIRLPOOL badd5a9a5f6e73a6b9db41e5604fa7e3bd911026bd317b61e782750422a7ea1065bd0287c9925fdbf5f74ee1483efdaf66a30b7977f5a480f264419494177eb0
 EBUILD gupnp-igd-0.2.2-r1.ebuild 2014 SHA256 b572b8e7f73f9c71ac5fe9a7c1e0827f86f2bab6bc82ab2a36f435159c83ecb7 SHA512 8f72c753a9ead4e5ef5d5ba225abc32e60c43447c70e4f24a87f67971743c6a290e2ddce06d9c188f2081e13acbd03fd92d755eec3deefda8a76df3f917b52aa WHIRLPOOL 92791eade87c276e7b7cf86c151a25ab92e8fb47a2ee8d06e3f65daf5369f06d42fb86936ab7138ce43045ead734ccdbd97a33a082b8d64fe0e29c7f50a7671c
+EBUILD gupnp-igd-0.2.3-r1.ebuild 2501 SHA256 af42ce703d0fb25fbe20f3e6e0b0ab9ea81d4c80bad40d84fa408f68f51c4dd0 SHA512 b908cd21fbd0c340eaf85df92ddaf085116eaa36682dac4e7769c82d2f30f2e727d4405fde34b72ac33c23b4f514c9c73268ee5a1634d08dca07a736324952bb WHIRLPOOL d429f568c03dc03092682bca3faf158db094a47fd964e5fd4bc853f713c135303744ceaf0fc6b3f3806243944a8a425de8ed7d22ce493238bcc6fb22f39fad25
 EBUILD gupnp-igd-0.2.3.ebuild 1879 SHA256 a878a2fe16d83afa2f1ce2bd2eb2e41bb23344e583563baa788e5940b0f6fff8 SHA512 b169b4fc93e157d836390bd8488ee6978bd30b576d34b91be76522660b913505998ce7018d9a2b70a40d8149314653237afea243e0331950e8af117a0e4590eb WHIRLPOOL 17d32f9079e49269bcd6a05e796770fb1472a47bb46f6f19543b55da7e75ceeefe271eb5dbdf772e91c825f5d5b66e670b20d2ca7d0ab98a2d0885bec17aab8e
-MISC ChangeLog 8103 SHA256 413d4ccf6d929ca1e80bde5319d190f2f691ade581be22ba76e7ec0fabbf4ef8 SHA512 a86011d3c18de8508b93a1d6dfd437ad5404922ac868e43a756cfbee3e0a7da7c5a62d4c53c6ca6a79a4340cb3e926031847f4bc4f48f687aa98e16f9260403a WHIRLPOOL 4191bcf6f66a6bed4a2496933df7e2b370ddbe83b5d5ed4c490778e006409bdbbbe79045eca7e8f6a9a19187d202bb68986ca2b6c77375f132c77a7aabee9d98
+MISC ChangeLog 8245 SHA256 af79618f3bcd7446dfc120411016f67f052dd7a366b3039c48ea61b3b08b2d12 SHA512 08da579ef6827e43f0142e426f47143aabf2c9ef3be00a9beaf40e1bd2949a1c52ba27fb63fd67d493b059c7fae37b1a101392197e6ee77983750a877b87df94 WHIRLPOOL 6a065d3b3cb803fb3732d9c714cd582f3e450b7020c1c4781e5ed3972b1760765578d9599368fb2f69b3cc400eae767c4c9cd517a873bcd0b73ce232d9ac8b03
 MISC metadata.xml 284 SHA256 315b82f83a6768fe17f9f0871531046bc1371f27113c8c40fc802f472e090071 SHA512 e42bf958116d1808405d3d137818a5f39d1e7dd2c73ea041755575b2a8a4632099a1822d7e3dd71c5bea0d3edee104173c59e440b6183b627ff94a639412c5be WHIRLPOOL 3c5a75b63501033c1ed1fb21fdd328558d5f98a352da66bd5884c1accc53e33058b90e2f86a045f99528303e01c38d81e3ba0d1c09d8d5343aad3f6208606d68
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNbU7YACgkQCaWpQKGI+9THcgCfReLR5eeYHVDsODmlUeA1DH8n
-3zgAniEg0jJZhBy0EzaXbHzYusXP8TRT
-=gV07
+iQJ8BAEBCABmBQJTl0hMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJjAQAIhVXvccvWzJTDK+5jwozHwW
+dIfoDbYhBuN95b/uavQWCbBNbTTKoudjeCIq6UzQTE8wpC/vJ4vAsX2ypTWb5jnd
+mmte9bTERXLHJz3rI5Qt8MJSEhaQbOmyjaeJRHl4F6noIueBYfNL8/I9Uoi9vfzT
+rNdOCDX1gBAHFi7ufIG5Osua5x26LB9ijFEGOpj2IMzXOHTpzDgNwI9U4GxOArtd
+FUvT2v23KSNbxarEuxYLcC3CNlwkaISZFU4ohHyzyDfSvYB0CYOU7oqtONPdwDX+
+V9mG2MtlAR4b4fhQXOvaMbCptRLu3Lm9iYODjhsx+4Jk2UTh37oTKYumALyBbdIy
+mBZJtD3ni0feZCjwZMjj8FxBSoVQzQKl7ww5jFsZxS4YJZjZCg9FRUvvkuHJloY1
+ef2DQA59kDiNfguWY0ELKU6rLmOSu1jpek+mXg94wXvLBDLSNL7l0sU8HVzRiFbI
+mD6pnAfialKqvKpFzzI2Aw6xHJDcFyg9SumFRlS465oX6yfqAx5IXq4Wgkb6vBCz
+mCeNnXdIbop8pU3JJN5wL3vGTTlx77KbgL0xA7gFKkPf48WOMeaHDsZkFUrUis+S
+7E6E51veSDjhcc4CovtT8251XZls9sJ02cinR1XV6v9sjRbYrq7kVb5c77X3az2Y
+7Fc402Z0DvzHZUJkYUWv
+=dHaV
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..f9a6c3f236f4
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild,v 1.1 2014/06/10 18:02:51 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=true
+
+inherit eutils gnome.org multilib-minimal python-r1
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection python"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	net-libs/gssdp[${MULTILIB_USEDEP}]
+	>=net-libs/gupnp-0.18[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10 )
+	python? (
+		>=dev-libs/gobject-introspection-0.10
+		>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+# The only existing test is broken
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
+)
+
+src_prepare() {
+	# Python bindings are built/installed manually.
+	if use python; then
+		sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am Makefile.in || die
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-gtk-doc
+		$(multilib_native_use_enable introspection)
+		# python is built separately
+		--disable-python
+	)
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+
+		python_configure() {
+			mkdir -p "${BUILD_DIR}" || die
+			cd "${BUILD_DIR}" || die
+
+			ECONF_SOURCE=${S} \
+			econf "${myconf[@]}" \
+				--enable-python
+		}
+
+		python_parallel_foreach_impl python_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python; then
+		local native_builddir=${BUILD_DIR}
+
+		python_compile() {
+			emake -C "${BUILD_DIR}"/python \
+				VPATH="${S}/python:${native_builddir}/python" \
+				igd_la_LIBADD="\$(PYGUPNP_IGD_LIBS) ${native_builddir}/libgupnp-igd/libgupnp-igd-1.0.la"
+		}
+
+		python_foreach_impl python_compile
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use python; then
+		local native_builddir=${BUILD_DIR}
+
+		python_install() {
+			emake -C "${BUILD_DIR}"/python \
+				VPATH="${S}/python:${native_builddir}/python" \
+				DESTDIR="${D}" install
+		}
+
+		python_foreach_impl python_install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}