Enable multilib support.

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

12 files changed, 392 insertions, 25 deletions

diff --git a/net-libs/gssdp/ChangeLog b/net-libs/gssdp/ChangeLog
index 6050a9175721..6849ec87a926 100644
--- a/net-libs/gssdp/ChangeLog
+++ b/net-libs/gssdp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gssdp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/ChangeLog,v 1.71 2014/05/31 09:46:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/ChangeLog,v 1.72 2014/06/10 18:00:13 mgorny Exp $
+
+*gssdp-0.14.8-r1 (10 Jun 2014)
+
+  10 Jun 2014; Michał Górny <mgorny@gentoo.org> +gssdp-0.14.8-r1.ebuild:
+  Enable multilib support.
 
 *gssdp-0.14.8 (31 May 2014)
 
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index 5651823fbc35..b4810e8264f2 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -4,13 +4,26 @@ Hash: SHA256
 DIST gssdp-0.14.7.tar.xz 283112 SHA256 02db81cb90a86c08579fc06f55584aea6b30dc6dcc7a5b5a4864a0ecb2f3d8b5 SHA512 94e1c35eb14ba176c2134f93dfc0598898e8308dd5f70c5f7d9e1afdf83c272974769b7b9fa7ac47a92bc851b5b0c1dfff52005c5ac5096b34ee3aa0401e8ffa WHIRLPOOL b96cbc9fcf47db5be29440292c6b5214432ffe698bc5f38ae059b539fe70075e38449391293f929d7230a8bb793ce9f772c414826c28fea19498b9ab9fb18706
 DIST gssdp-0.14.8.tar.xz 290756 SHA256 4c3ffa01435e84dc31c954e669e1ca0749b962f76a333e74f5c2cb0de5803a13 SHA512 9c1cb1474d9c80e053492cb6e2a46d1d0710d96a34024d997807a09d9f915a5791ca5a871f08365f5df8ede67e18b3942205fb86d10f98c8ed36f2b3b4740851 WHIRLPOOL 7212f68da959ac13c4d2dabbae588a6e2cf7b9e8c97003904db2a7def17604371ad07f679a9ad247abe8a47d588508352cacb4d4bf63e08ac15ad3501bd8128a
 EBUILD gssdp-0.14.7.ebuild 1272 SHA256 db36bd2514cbd3eb630a4d618e39d4be42b832c7bafc482c0fd1e070f8a7c83f SHA512 98d60c17e32ea20a874fe5415b4dc5d58ae22e1164a48adfacdf3325f9e4c41e0d6e68e429621e32cfccb509e8931ba7745b62cf0b0b1404db661b85eacb345d WHIRLPOOL 1c501ec0afa46835b24aae6a46abaca3019d966d2e9708f2ff12186a0956b632b0aa979f5da002444c05e96cf1a772c822387f9d16506642c098009399a1b372
+EBUILD gssdp-0.14.8-r1.ebuild 1581 SHA256 50132de380aaa1ebe82669e7f24ab0bd8ad97abd1ef085d4cb4e6045b77a787a SHA512 328968daf40fcf94d748836828993cfc7de95f2bb8ec7392f19eed85dc8a0586cff701b3a93e13a08d09420b920783d6eda771240305dad3d396c388f976f68d WHIRLPOOL d84ff81fe26909d08a00249f811b44538fdb21468044a383f7a24442972f91c83343ea7d3b3f22b388d5c53a69f6bdd37ced73333e81b9fa8fd6731e752890d0
 EBUILD gssdp-0.14.8.ebuild 1297 SHA256 3f9f750f0304f9dbd221a6f39d1841783f5c11fbcd356baff0b9af16eacb045e SHA512 cbc2e6885d4cc7a697ed1906832cc52d3c60235a5ab9816fdf1aa815fc0de8ee5a4a7c42dd6955ac1edf5232843df5a19e3eb9d61244057ce3c767068ac89c07 WHIRLPOOL 3ed64a747b273b4c2c9b7d26b8eb24e74f5eafabcf6311cc9f0c3261c1880531e840d45a5cd49bbfd7f4f45cd89a425596ef681a0b6a5f6ca4dc2622ded19b2f
-MISC ChangeLog 8647 SHA256 282bbbc0474de572e9302519fc6b237d6b0f747bbbde8bdbd398ac911e9d5cf7 SHA512 ebca40f55b13dc58588b84ff264b933b4c3e4c7326a3c55c833acc12fdd5fb60facc5e004208cd13031d267b639d938fe4e29a7aa641da3ac9b1818665022bf6 WHIRLPOOL 824f916f0816144ecf3a70634fd1a30b64e4c16507e6f16f55698b01d219b9c5161124744b5e27e6ff24f4887dc5c9ac2f9cde44e02406687faeeb9d81eee372
+MISC ChangeLog 8783 SHA256 adbb7bcbae6f72aa58196970038c674e42d18bba589884c3bd0998dad318b2c9 SHA512 b74edc84f6c9729afcf2458d37077371b1fc80daac7f3f72f07f79eaa83e7024b94f062800aab240cb8e44bc6b1ee3d6a58de9fb1840febd3d97ca5851b91498 WHIRLPOOL 05c3c67597d674bd42ca677db98ab8f05e3f3d171a38176b5365c0748b30a8e0bac89262e0397d14d86a21eb8ecb88b43ed65422356f663afd2ec58b411e9c84
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOJpPIACgkQCaWpQKGI+9T0dACffZWXdPudHPXYA0PReMH5fe2+
-3BcAoIMgEq/B9JXGvYR9Ku6mmCiVVckC
-=Qkx9
+iQJ8BAEBCABmBQJTl0euXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO3rkP/jPhvWjUpg8f2Mlr9pc85ZX6
+baLOPNBxd9fQjUeIkhWWxCwmguqhKZ6szwU6gczC1Bc6vPIg/8cTGz77ALqoNHSR
+ahuOLtb0aT0RLGGJhfkklYGZLKUeHxR3Jme0/wkwpRJB0RV8uEsQ5vwXH8FtRPjT
+P9QqHxPJJ1tZL+o2qjNwd6HowOgn4TXHJndAwpfuIjrqBjaaEAoE04MzP6gDEWKV
+LOH7VyUDZco09JxbcCgjG7Qe6eKgq4MqyfVJqYLeMOyJAYjzrYSvBcSkm4hQMxUR
+yGeujhwQ5nLjN2gkJ7e1UFH4USq4aNXEaHy7lSEk21CaFTZmsAf0E8vHE20SRcoF
+pOvoyWUNOo54Kcs1THvHO6wVr7V0c83ifpMIHY2bTysbpZL5KM1oPzEu/wbm7lMC
++/cM5UlIFQAaMpldhII0RBT4xgUN+RpMw8zgx5i6mDrVERrZ+Glfvh13mKcIzF7L
+TCvxJx5kYfhkYmJ6cIqTmImIXLe8n9L/yd/zIGfMbFsSCjmFFrMEH/HEcIQdo5aj
+VMQJ5WSS/CVUwLUoncUvMm8SwItgGfglxn6nMA6kNe8gw7KUbYrs4mrkMGAJy2nE
+Ut10kfpxfY5jcYs/1GJAxZwrIUusb+5T/BuBpI2KW/vzQt8PYootMVQsXcpb0gYw
+V+bt7p8wWFnbyyCGY7fu
+=1Bvh
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gssdp/gssdp-0.14.8-r1.ebuild b/net-libs/gssdp/gssdp-0.14.8-r1.ebuild
new file mode 100644
index 000000000000..f4b8b8b1f34c
--- /dev/null
+++ b/net-libs/gssdp/gssdp-0.14.8-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gssdp/gssdp-0.14.8-r1.ebuild,v 1.1 2014/06/10 18:00:13 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 multilib-minimal vala
+
+DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+introspection +gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.26.1:2.4[${MULTILIB_USEDEP},introspection?]
+	gtk? ( >=x11-libs/gtk+-3.0:3 )
+	introspection? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-0.6.7 )
+	!<net-libs/gupnp-vala-0.10.3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.10
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	# Disable functional test as it requires port that might be used by rygel to
+	# be free of use
+	sed 's/\(check_PROGRAMS.*\)test-functional$(EXEEXT)/\1/' \
+		-i "${S}"/tests/gtest/Makefile.in || die
+
+	use introspection && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_with gtk) \
+		--disable-static
+
+	if multilib_is_native_abi; then
+		# fix gtk-doc
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
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
+}
diff --git a/net-libs/gupnp/ChangeLog b/net-libs/gupnp/ChangeLog
index 6383f417478e..cea1cb3d299b 100644
--- a/net-libs/gupnp/ChangeLog
+++ b/net-libs/gupnp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gupnp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/ChangeLog,v 1.84 2014/05/31 15:38:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/ChangeLog,v 1.85 2014/06/10 18:01:44 mgorny Exp $
+
+*gupnp-0.20.12-r1 (10 Jun 2014)
+
+  10 Jun 2014; Michał Górny <mgorny@gentoo.org> +gupnp-0.20.12-r1.ebuild:
+  Enable multilib support.
 
 *gupnp-0.20.12 (31 May 2014)
 
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 78f44ab46e92..f1c75e184e30 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -4,13 +4,26 @@ Hash: SHA256
 DIST gupnp-0.20.10.tar.xz 382264 SHA256 5c7f9278b50ed252606552e2f148be4e1b1616bc93ebc8b09b22fcf5d8aa08e4 SHA512 3c9a4e1335507fbddd898baee6783765b6a4c012fc1f97e5a997c6a90b8ce9807f62b127d8a22f3b0fc3e806d22f73dbee4690dbfe62ab02572993a3f34bb864 WHIRLPOOL faca7982f484d13544265557d642e9d530e9e17aeddf7073ef6611f7b10b3b71e73ce4ca82984be92d0d55e9ab93b33004f1ef78be1de1c8b0b1a3a0b5070d70
 DIST gupnp-0.20.12.tar.xz 394316 SHA256 205d47b950a1b7190df1115f454cb38a44d71aacfec75d4287299e400e139b69 SHA512 87b74f550e5b1f18a984fce2d955bc43a8931aae4ca6d4bfe19842fd5f6028590e4cb2b6e0fc245dfda7099b7913b5855cbe6a324b5b4cba780cc35b73e6cc33 WHIRLPOOL 1b60c28ba8346b90270e4363e25755bcd81045755adb913516ab7824a0b7e8d71021d106408f8dadee731692e56e0c3a87519470394521593c5a70a02fcd8053
 EBUILD gupnp-0.20.10.ebuild 1743 SHA256 f0e44f549b1d8148ed8082907217ed41a12001b7e117b9db72d64a89bf4c485a SHA512 fe5f25f01126f1acbf0ddf62f30fc06b75348f0f441ad72385c1433255d1c00bc317a6b18192fa5f31f3c2a9f9ed4525cea858674ba9d106ab7410dbe5b526f6 WHIRLPOOL 8eefaaad1ef2aca81daeff2e12af251331e400fd20f259f6001d2e94df9b9fd7f962f25ff91880d607b1de1545d58e3fcd69687db5c2bec14161db70b110c6c4
+EBUILD gupnp-0.20.12-r1.ebuild 2409 SHA256 a8c25e7225aff7a061664f701a751f7187b32efc2c0242d5a6cdfa2485cee01b SHA512 7c74b3827819f096454ecdb92c7af1309fe1b4a7d16b4e771fdf3f0de07da951c234441e4e9bba64e3b19edf5c180cafdc204201806e9ae20e97baf7c23a4818 WHIRLPOOL 513e5af2f216bb5c4b91715793338a7409284bd991cb03f8cf8d62e225faeb31fe902f329c5fee8b99fa25c878e456a3e9529f3218193deef1a02a4d641dbb00
 EBUILD gupnp-0.20.12.ebuild 1770 SHA256 76d31fa3578b216dce9b895ce9256d2e9d6b59203a62a85b703dae6fc17aec0a SHA512 4e2f5e0bb4a585493448d6e36112bed070f6cd00aadff5f3a1c9d8296883cc34f77fbdeea6db7bd06e02b6cba9079bce54d3741457cfeb2ed2c4e9d44cbf1836 WHIRLPOOL b9e1f9951e7c6bf27c64ab2e35acfb55b04fdf86c0982f9d3afaa30b3ca41a133ae1ad4715ffb6a3ec6dc7b35f1de035de3d0ff595336ff29c9e38da763ae134
-MISC ChangeLog 10448 SHA256 b9eb4ebcc1f966531c232be8f7697c18b3a209c410f81ee80ffc016b2927ed57 SHA512 f2b997a1274173a3901d34eaad5201e80558d064ea24e6b4c2aec9dbb00017d942e50561ccf3bc6483737db38e0f4568497aafdbed472e10e99caf727adde8c2 WHIRLPOOL 4b81545c32aba73eb038c249d47f47c8aa9bb3c33b6501eb6c81260866187c378c3943a5f70a574d9ae0a37441a0edb57402395a540cf3a05f1e5a93be949289
+MISC ChangeLog 10586 SHA256 351c2dda0d82f93a060378988541c1a405b4fab4525711b500abcd53cc8cdecc SHA512 ab9c2110e077fd2e48ba98c8297a57a67d75aa7405477ae346ce537f4f96dfbb8a4361358cc2b2b117bf8b0171b2b2fc066e16739abe5b1cfb8c9711e86daf14 WHIRLPOOL c7341d1f0c717f526c083001b44930cb808606f6d3fccfe69b07b3fca17b6591bb58500b5abb2c42b3fb22e2e62d3407eb08d96a014e5b7018bb5e18f8b2cf1e
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOJ92AACgkQCaWpQKGI+9S3eACfUOdTeGcCFiuySKh1gi8QeIT2
-gaQAoIbphL+kQA6oYIHto9qdOHlOFLJJ
-=qwJo
+iQJ8BAEBCABmBQJTl0gKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOwgcQAL/CAKHmxDc9sOE7uQtbkgH+
+gFzkltf870/2iOlt/Q2fIeSD/yD3r+1WI49mZc2F4D51Ylpc6VLMkZ9UKmJO/Tzm
+0fotft0HQUbGwsmH5JqAhh2Gc/8SCEt2OiKqMBjsC4idLDGpmQsqUiVqxWvjdKRM
+tj13wKterrCMVHrR/Dd+1GbPsMa+N7lUS1yIHqWxzjoVkMQLseM3kYg2NdhGQfJM
+SsCsMXiJb4KJrw6Xdqb0Sp5Qdgr4PgvEEyOGt9emOCmDW9wRhp+Ipnja7z1cHpsg
+YDQ5f3MOOIja06xMbXR+lsegG1/hHBc3rj73R1uDJv3XpJKaO0YE8Zch2G1S64D1
+dSArNiu38SDE/b1j3D3bvRBW+24ox2I8U1DYGURa1K2pGxMqXaJl0phov/0tp3FW
+mWBy2nfL1V1UJXzrCHmqcKQ/2kbYUdevunylR8QRKWyqRw1wsMN3waio7rOO7Ato
+1kdHfnf3rgkNZNbramydc+qcx3h54jn5jieQR20/PRqVHSeZ1Ur8NIH2GFpU/jRq
+TO8LdnayDv5lvN8jcRT/NjybWPYFCOfWqCNeHvMau9/Sg35Dt/An21wKGxqk2AVq
+HsW0CpwXvQFNpw+qx+yTFac1E2PDn29DzS8yU82SglE0Q9J5mIP656WaEdH91mVu
+Grd4GydmHQODRLqNQine
+=gfYw
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gupnp/gupnp-0.20.12-r1.ebuild b/net-libs/gupnp/gupnp-0.20.12-r1.ebuild
new file mode 100644
index 000000000000..97d3ede4b81c
--- /dev/null
+++ b/net-libs/gupnp/gupnp-0.20.12-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/gupnp-0.20.12-r1.ebuild,v 1.1 2014/06/10 18:01:44 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+# FIXME: Claims to works with python3 but appears to be wishful thinking
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 multilib-minimal python-r1 vala
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="connman +introspection kernel_linux networkmanager"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=net-libs/gssdp-0.13.0:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.28.2:2.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+	|| (
+		>=sys-apps/util-linux-2.16[${MULTILIB_USEDEP}]
+		<sys-libs/e2fsprogs-libs-1.41.8[${MULTILIB_USEDEP}] )
+	introspection? (
+			>=dev-libs/gobject-introspection-0.6.4
+			$(vala_depend) )
+	connman? ( >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] )
+	networkmanager? ( >=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}] )
+	!net-libs/gupnp-vala
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+# either of the two backends will be used
+REQUIRED_USE="^^ ( connman networkmanager )"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local backend=unix
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	# fake connman.pc to avoid pulling it in unnecessarily (only dbus
+	# interface is used) and fix multilib.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731457
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		CONNMAN_CFLAGS=' ' CONNMAN_LIBS=' ' \
+		$(multilib_native_use_enable introspection) \
+		--disable-static \
+		--with-context-manager=${backend}
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	python_parallel_foreach_impl python_doscript tools/gupnp-binding-tool
+}
diff --git a/net-libs/libnice/ChangeLog b/net-libs/libnice/ChangeLog
index e9adeb4f1080..ddcd5aee6672 100644
--- a/net-libs/libnice/ChangeLog
+++ b/net-libs/libnice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libnice
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/ChangeLog,v 1.64 2013/10/27 09:40:58 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/ChangeLog,v 1.65 2014/06/10 18:03:55 mgorny Exp $
+
+*libnice-0.1.4-r1 (10 Jun 2014)
+
+  10 Jun 2014; Michał Górny <mgorny@gentoo.org> +libnice-0.1.4-r1.ebuild:
+  Enable multilib support.
 
   27 Oct 2013; Pacho Ramos <pacho@gentoo.org> -libnice-0.1.3-r1.ebuild,
   metadata.xml:
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index f6ac39de58e2..c3e059474fcd 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -2,13 +2,26 @@
 Hash: SHA256
 
 DIST libnice-0.1.4.tar.gz 712256 SHA256 44e517de9c01203158f2a3d59f058706299a4ae41dfe1a7eeb72c290fcc8bf57 SHA512 ee0029e641c3dc15e5d7f878985f7d87b06e6f033fd14827094171299165120b3b1ffedc6bd036c998768cc9059d7e5dce2322799aa843b0f38487b7243bd40f WHIRLPOOL 1856bdcfe961d391a98d357c56bbbb22a8a110cfcf69deb9af2269a8a133c6657202231844b9ebd86a59e36ad0d68f5f6bffde9ab8bfb965a8a349935b40cc67
+EBUILD libnice-0.1.4-r1.ebuild 1217 SHA256 9b3de2f43219c1ac17b8e9a089056c8d16ee9f960322889a9be9ebfc5c0b99d9 SHA512 fbd8201e1f203b1e16fff1943a4a6acae75e635c4e71f55e089cd85207396fe4387f75814a9869e88711235fdfdeb038851e0ce2faaeb01156b4821bf169c28c WHIRLPOOL 0f75971fcc9def9888b3f38cc58296b05a82b74d8667152c67c61ced345f4242afaf956ca285097d802fba47df2c67063d0ec3be57e9aa98c504616f1f747fdb
 EBUILD libnice-0.1.4.ebuild 987 SHA256 0002d4197dc867b17c22431ad7607d6457ccea8c1654a4d5681c68521e677f75 SHA512 50d1d1c795fd9e4fba47a31216a438e622b3df32d82b7e51fb7295870e31f61c73ff33574d72cc61c7b98371b278e61bab8a7f6ee75e768a8b429f8472e1b578 WHIRLPOOL de2f93431da465a6b5e9f9fb39d982f349f1a5ca9e013a893345fddf9393a7cfb5668aa8a62ee1c91a0b5f9b422e215f232cb8840b8a9d56a6ac8213f34a5d50
-MISC ChangeLog 8095 SHA256 e3c651e5d47de3f832ff4376bf33eb8c04a79354f9fca8f325eefdafb169bc12 SHA512 d2814cbafac098639b931d82e0abb4b3ad888cd09d90d6431ab564eaeb207d11940a074c11f3532830f0ce86babd38dc6fd1d30268079392c15ddcd231016cb5 WHIRLPOOL 2ba445fb3a00648609076535d6e97d1983a03f9d1e34a43a4edeff209215a939f0bb126b98d71aeac36e82dcf098b210bf04f8fb6198695f1dd5704f9f75f752
+MISC ChangeLog 8233 SHA256 6a22164a58f8df37be9ff9049e55470ee7350922830ec8f041fc56c19f5b2c62 SHA512 bbabe586521304ad65868ec6463e24ad69a104d33083812a2237c5ceae5ea7dd11cc5fab8bdf8e605ed19eb1a84e12372374d301e1ee72ddcc83e9cb89f2af1c WHIRLPOOL a5dbbfbd0320ca88e696af2a0e843cb27a6bd442af0a7ed8f0a287475259ffaf5492863bd110055402923c8df1c1db2f5425ea2857815de856cae02678813e22
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlJs36sACgkQCaWpQKGI+9R1fQCdF/fRfg6BKZowRgsfPJkB1Xot
-4hoAn0xIrwptcCv3bGSZP0qCddKMJqmU
-=lB/1
+iQJ8BAEBCABmBQJTl0iMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOL/MP/3fYkrb1Y6pAimcykAjYCWIH
+11BXOxD5uMYrdiGDyJmyWEMHVNQ30jAeD4Jk6YwsdpM7sGSBjFTWqhzQ8f3mZVTp
+VqVfwIOLMfiNRIuDmwluf2p1FS9nGY6LZ8O8t3LrgmayUko3I3b8Q+QPgjmAy9+x
+oWExVqGzGHZy8Q8QTqsPk6wtW0SehDkhKpWyO8uvNc69NUlT4q7xPbHPqujUgD9A
+y56YzMsi/AM2s2s9PJJqCz6MbNWyMxxWn4sBrvDKq2foSq5rG6GtUYq9D8g8flVc
+hlRVh1SZF/cJclXUv/Ty6msx4ubaX21zGfS/WESAyk/pyPwpXxNblJCWGlDaQCKd
+CxeLrPqTN6loda6CPhjfGsyb6XBq4fvS1ciG7XG+gFlsLXeFHwJOsrdXrFh989tm
+l8D06Gu11Rf7RgTbqH64NlLIJgUUpWZiChX+bJz5qqtlJdNQ+Rghgm6AFSTxUBaX
+a8qO/y8CasZt1kQhmdNmWCawl1nZZFyptEAhVz2rn9Uj7o9Rz+Ai4NJxQObEP7Z1
+3pprEdBWMxPcow6wJfnuDAFNBeiyK4trtGCCs8flOIEc5c1KmD/k1VWLVLf1UAEj
+8s4tdmXEgtaVu+e3lOE7zS0S2PWnADKsS6+ytu5WMTRtOrLRyRt2blmFjDtjyIUT
+lqM4l3TnUQHJyhYyW43X
+=DbJT
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnice/libnice-0.1.4-r1.ebuild b/net-libs/libnice/libnice-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..12554bd60cbe
--- /dev/null
+++ b/net-libs/libnice/libnice-0.1.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnice/libnice-0.1.4-r1.ebuild,v 1.1 2014/06/10 18:03:55 mgorny Exp $
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
+HOMEPAGE="http://nice.freedesktop.org/wiki/"
+SRC_URI="http://nice.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+upnp"
+
+RDEPEND=">=dev-libs/glib-2.13:2[${MULTILIB_USEDEP}]
+	upnp? ( >=net-libs/gupnp-igd-0.1.3:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+multilib_src_configure() {
+	# gstreamer plugin split off into media-plugins/gst-plugins-libnice
+	ECONF_SOURCE=${S} \
+	econf --disable-static \
+		--without-gstreamer \
+		--without-gstreamer-0.10 \
+		$(use_enable upnp gupnp)
+
+	if multilib_is_native_abi; then
+		ln -s {"${S}"/,}docs/reference/libnice/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}