net-libs/gupnp-igd: Add fix for underlinking, fix obsolete macros in automake-1.13, #467888, fix python handling, #450392

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 130 insertions, 12 deletions

diff --git a/net-libs/gupnp-igd/ChangeLog b/net-libs/gupnp-igd/ChangeLog
index fa108731124e..bdfa2736ed4b 100644
--- a/net-libs/gupnp-igd/ChangeLog
+++ b/net-libs/gupnp-igd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/gupnp-igd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/ChangeLog,v 1.43 2012/12/01 17:59:08 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/ChangeLog,v 1.44 2013/05/04 11:50:56 jlec Exp $
+
+*gupnp-igd-0.2.2-r1 (04 May 2013)
+
+  04 May 2013; Justin Lecher <jlec@gentoo.org> +gupnp-igd-0.2.2-r1.ebuild,
+  +files/gupnp-igd-0.2.2-underlinking.patch, metadata.xml:
+  Add fix for underlinking, fix obsolete macros in automake-1.13, #467888, fix
+  python handling, #450392
 
   01 Dec 2012; Raúl Porcel <armin76@gentoo.org> gupnp-igd-0.2.1.ebuild:
   alpha/ia64/sparc stable wrt #434300
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index bb93e720cbb4..d8fddf22bc4a 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gupnp-igd-0.1.11-disable_static_modules.patch 246 SHA256 b3351d87345d858fd3428a84b0ed647e32a6cdbdadf1e2dfebc05b992d6ef497 SHA512 091d59561b9d870cfa3282a862d78bb2f7a6e64fb754811fb01a953bc54718c7d0129cb0d8ca19751bd03c8558216ff4077a23c91a0aba431154a08f98f14d56 WHIRLPOOL f53c6ce599af96cbe921527182910a42a9c9cf149548e22a26b95b6bc30b49b6b3901937977a2716aaf263501cf8eb034359d1e07607dddeed677554e5a05ef6
 AUX gupnp-igd-0.1.7-disable_static_modules.patch 457 SHA256 184545204d88d6ec9c4901011a7a19524a1b208a359d8980da089e3d6c1d88b5 SHA512 0e55ea41990c22abc66824e1d4d1e1c8c2e00445060094764550bfc1b1b9efda760bacd8432319566ef48502968611f688ca94429c6a12b55cfe4a37342ad158 WHIRLPOOL 92db78d474ae42405096d82ff0ca11e9080c0cd958f1b9ed4e3c3065681c85334806e8a644687cdec57a39b2de6264d3bc460c8e73dfaa0e0df37b1e08dc45ec
 AUX gupnp-igd-0.1.7-make-382.patch 253 SHA256 af45a38f78eb01543526733394707e180162edc6a8d1c737080c29d8da7e18fc SHA512 c31f07369295e6bf87f90adda30c45fad13edc5bef8b7e7e9c32e4291b3968206200ac42958df0bbcb3badb9a6276118f7b3d416421c0ff35341c7c0f3b5a19d WHIRLPOOL 26c5d983122e00dd0b0e03d79e733b69bb66fcbb4246e9a4ecc1b93cf1dec0cd645f474dce09c178d6a7f7773fcb15f4320ac0cb6c763c6563dccb4ff8411a2d
+AUX gupnp-igd-0.2.2-underlinking.patch 502 SHA256 4effb10a35e213758303d47d2490d4879332cfa06e5230243e212f0b70fae740 SHA512 89db92780320e6d2144b358d553c8aac1d68afa2b5a254c701079e8efe7b73be84e5f3214ce96292bab8febfc9a792d9586a445f0a3b20d7a77d3482790264d8 WHIRLPOOL c23ce2cb2557a61e0e5854656041e766eaea60f08d9727df4279da4e8c5633ecce6afd6428508fc8a89e974efead5840e5aca337eaefd162775e50d60b2de99b
 DIST gupnp-igd-0.1.11.tar.gz 376181 SHA256 49aebbd6fd8ad52e6de37dfd555a89831a5a02f169f8f56b1658a46ebdfefba4
 DIST gupnp-igd-0.1.7.tar.gz 362614 SHA256 c1d80ed20081992fabe70331f02efe9435bbfcc79287676121a855fea6561bf6 SHA512 550095b3434a89d9c481c9205ad95a5092abad3368180e7d614c0ad3291021cb00c0fc133a068c1822746be3a4fbdb6de7dd1ede503923e6ef476f472eeefef3 WHIRLPOOL 6244edad6eb45c25d625f7004d7a42ac1891564be0cb9f7a52ca6519ced5542223516f8b327f68569aa33f4d20fa63d59f0ba271d262f781209b4965a7ababe8
 DIST gupnp-igd-0.2.1.tar.gz 378358 SHA256 023ae08200ff14ebfee7d3113c25047dd585087252bc65dbf8d42f4804452aa2 SHA512 878cf254b8bcb729c78708bbdd192eeef7883dbf6e8c7c6915d3c02add62d0a25846c055a6f382ccbca7cc610e126c8ce8a3e0cdfb248b5038abeda20f5117d1 WHIRLPOOL fc4b832b0225578ec80d1dc50734c859bbd8726d073c685fdde3126e8ce9b992b97a23431d8d4a3067c930610919461fc44a9c0a30ce6e59657ee5be19d4bc8f
@@ -11,13 +12,14 @@ DIST gupnp-igd-0.2.2.tar.xz 262216 SHA256 73b6a98a0f13b29b34c3bfc07f99f78b131921
 EBUILD gupnp-igd-0.1.11.ebuild 2368 SHA256 a4c0d6090b74dbd760e2dc1d8365dcb926be05bfc6e7d79991d07d195a24e8e6 SHA512 ee27cac694f2cd960c70c2b92318c893ed9e0ca5416327aa20a48b39601454f4618e2cd376ecce68fe0b4aa1ea615ca9e797f9ce766f359c45ea6400a5b8d9d9 WHIRLPOOL 763e521200f9be52b2be01c21101af26f49f7538da70bbaae2e4f66f9ee6a43597de649658ac07e6c3b3fe59a4a77b1a78fe80e0ecdd7951272f9278fbdadf55
 EBUILD gupnp-igd-0.1.7.ebuild 2096 SHA256 728ad4af0d1677d4dc8a07059c61b5b81b07662e34ff6860fae79885b5356aa3 SHA512 82b954f9dafc1daa29888e8816b6a2b50d4d93a9f0b22faeaa80f9d5c8e0cdea7a68b763eb305f83bdd44e833bb7d86252d863bc346cccafa5be93c6e9b59705 WHIRLPOOL 255319f006a7d0a4fb82f78415480acda49f5abd5186681dff496fa4b352e596db62dee6280ce5f52f7979afab18598c38c413d6a1c2b565f20d9e133f86dd16
 EBUILD gupnp-igd-0.2.1.ebuild 2334 SHA256 6bd18b832cc9d1c16290cb5f7172752d3ee01cf3ee07fb3d5c3d35b41d9078ed SHA512 0a034d7d226bd73d770a7a8e15db4bfc2196eb5296de4b2da20248d03bd287fbcecaa0f891392ac42984e752847c6e21fc34138a8a8ac75734355eeb728ba8be WHIRLPOOL bc0da6ec1e005d60347633e2ed389c774c834f4da22bd64533ba73351bf4a11c57d34f508666a0e69cea937a8283bc0ca6c306d0a1f4a6aa04bdc000a51b53a7
+EBUILD gupnp-igd-0.2.2-r1.ebuild 2033 SHA256 3f3e89fc8a38c9b202bb0020ffef939ef8d866a4283e9016142a70bca2c253ac SHA512 a8867c5906fdc650e75814548d2ab0c0a4aa31cf7702b3a5736c0992f5a68421fc15eb8813eb89f14e9d84ec5ec6489e8c0253c2e1d57611193515a0df209e7f WHIRLPOOL 1aef021cd3b8db82158bbd0008f7fc84a456bfd216da06b65f063a4171acd5e2d8895bd562c491e7049370a831e4dabb72f9319900c3a956dae827b7a98cd47b
 EBUILD gupnp-igd-0.2.2.ebuild 2073 SHA256 f76d49641f36fea80a3708c71ddf45cf659edd5bfb5b24eda8bc9ce0b41997cd SHA512 8015712769668fc98ee6fb0a50c466b23c46ba81a11cdf63d99eb522572f499c319a2cb242638c6749743b8de982e8ed01be7be097dc21cc552dfac0fd6c6ddc WHIRLPOOL c6ae5684304099154b61a695da8f04301372749d2a108f4abe5f001c43990c8d10a59155bdd00427fe2ac02b017a74e764f43278d97907b1903e5c5b761ccbae
-MISC ChangeLog 6136 SHA256 1e8ee9ba99600d1b5ff05160a640502c38e25c41f8aff445dc52cfc6bad25db3 SHA512 a1ee4b5683ac3e8e2b0ddff4262387cdd7fde4816501574b02eefb33775c75f481951fb167eaff546447fa67edbaca68e4a49531cedc269c820086a85eeb038d WHIRLPOOL c0102f4f0ff7a51f6ab0fc4d44b148c18dd600c0da0661e7518e223abd903384e7e7ee807d45665069d2221687762cbdb6e3b84f001e2898854070c4fe11570c
-MISC metadata.xml 279 SHA256 f304c1ad20af47cdf82492cd9770c57e8dc923d588e4bab669ed9f3dcad51b84 SHA512 bd8fe14babc68de671b982fad0de63d4772a4269acf3c828d684a234d6631d422a9f3cbd2baabbb0181f101e64eb44e43f2d0fa36222468d0a3ff012b479d2ff WHIRLPOOL 706e48ff2dd2b67941ba7ef50c28b4143e47af4fc0267b196f0550c0d006271055e5bfee25358197bf84c995dcf6319f5183b3f6a6d5e29a549222f4c828e653
+MISC ChangeLog 6409 SHA256 7f418e476d88d708fe3845bfa1503d21d13bfa00c0979fc4909f22519aaac0e5 SHA512 d0987880df1c5ee726afd9c4e0568c2e9c6cf7ebb863a91294b75cb0717d58176b74a3fcb645d79b3722f5fbac97691678cc5f88d0a8a4bf707bd68222144483 WHIRLPOOL 699223770228591725fd949568f2e2baf2d22de4653b1515afb41ff9f13a0d11efc3b16b07d0bced18a62efaf3297eadfffdaf92809934ee3950c6562af65fc9
+MISC metadata.xml 284 SHA256 315b82f83a6768fe17f9f0871531046bc1371f27113c8c40fc802f472e090071 SHA512 e42bf958116d1808405d3d137818a5f39d1e7dd2c73ea041755575b2a8a4632099a1822d7e3dd71c5bea0d3edee104173c59e440b6183b627ff94a639412c5be WHIRLPOOL 3c5a75b63501033c1ed1fb21fdd328558d5f98a352da66bd5884c1accc53e33058b90e2f86a045f99528303e01c38d81e3ba0d1c09d8d5343aad3f6208606d68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC6RW8ACgkQuQc30/atMkBBSQCgrrRNIq2kteYS6Gxakwcegqgy
-nM4AnRvI5jGWw+/mP/u/hJvtxhDRSoMF
-=4CIz
+iEYEAREKAAYFAlGE9iYACgkQgAnW8HDreRYH9QCdHou1KZwP/ra3ZaeRxTGCq2XY
+9dMAoNI7ElrGlogLhRpQn2zGgwU6skuP
+=VvFj
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
new file mode 100644
index 000000000000..0e1dfb48a388
--- /dev/null
+++ b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
@@ -0,0 +1,16 @@
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c4f7d47..f13b398 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+ 
+-PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0 gssdp-1.0)
+ 
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..40654be4f2ed
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 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.2-r1.ebuild,v 1.1 2013/05/04 11:50:56 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils gnome.org 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="
+	net-libs/gssdp
+	>=net-libs/gupnp-0.18
+	>=dev-libs/glib-2.16:2
+	introspection? ( >=dev-libs/gobject-introspection-0.10 )
+	python? (
+		>=dev-libs/gobject-introspection-0.10[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
+		)"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# The only existing test is broken
+RESTRICT="test"
+
+PATCHES=(
+		"${FILESDIR}"/${P}-underlinking.patch
+		"${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
+	)
+
+src_prepare() {
+	rm missing || die
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	# Python bindings are built/installed manually.
+	if use python; then
+		sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am Makefile.in || die
+	fi
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--disable-gtk-doc
+		$(use_enable introspection)
+		$(use_enable python)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use python; then
+		python_copy_sources
+
+		building() {
+			cd "${BUILD_DIR}"/python || die
+			emake \
+				PYTHON_INCLUDES="-I$(python_get_includedir)" \
+				pyexecdir="$(python_get_sitedir)"
+		}
+		python_foreach_impl building
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use python; then
+		installation() {
+			cd "${BUILD_DIR}"/python || die
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl installation
+	fi
+}
diff --git a/net-libs/gupnp-igd/metadata.xml b/net-libs/gupnp-igd/metadata.xml
index bcf095d10035..9198b0537de5 100644
--- a/net-libs/gupnp-igd/metadata.xml
+++ b/net-libs/gupnp-igd/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
+  <herd>net-p2p</herd>
+  <use>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
 			introspection</flag>
-	</use>
+  </use>
 </pkgmetadata>