Version bump. Fix build with USE=-introspection, bug #383561.

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

4 files changed, 130 insertions, 5 deletions

diff --git a/net-libs/gupnp-igd/ChangeLog b/net-libs/gupnp-igd/ChangeLog
index 1fd6d0ad57fa..ce0d67ad65f9 100644
--- a/net-libs/gupnp-igd/ChangeLog
+++ b/net-libs/gupnp-igd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gupnp-igd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/ChangeLog,v 1.28 2011/09/15 20:44:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/ChangeLog,v 1.29 2011/10/21 22:15:24 eva Exp $
+
+*gupnp-igd-0.1.11 (21 Oct 2011)
+
+  21 Oct 2011; Gilles Dartiguelongue <eva@gentoo.org> +gupnp-igd-0.1.11.ebuild,
+  +files/gupnp-igd-0.1.11-disable_static_modules.patch:
+  Version bump. Fix build with USE=-introspection, bug #383561.
 
 *gupnp-igd-0.1.10 (15 Sep 2011)
 
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 620c4ed3e807..71a28ef412f2 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gupnp-igd-0.1.11-disable_static_modules.patch 246 RMD160 7318d5fd176a5d8ad57733db46a0f9ed0cdbdb49 SHA1 fc98f3a22036aea9280b279378090d711355bc1e SHA256 b3351d87345d858fd3428a84b0ed647e32a6cdbdadf1e2dfebc05b992d6ef497
 AUX gupnp-igd-0.1.7-disable_static_modules.patch 457 RMD160 cc57563be70a8b4d8a2f7e90476ba003652a46fb SHA1 02a1b78d1c457d41e55dca08188c02c74fc7c259 SHA256 184545204d88d6ec9c4901011a7a19524a1b208a359d8980da089e3d6c1d88b5
 AUX gupnp-igd-0.1.7-make-382.patch 253 RMD160 3258498b77547446b470b09c3aab06ae334fc490 SHA1 df5d7280ea3f619241370176c95b5a23c90106ff SHA256 af45a38f78eb01543526733394707e180162edc6a8d1c737080c29d8da7e18fc
 DIST gupnp-igd-0.1.10.tar.gz 375513 RMD160 4b0c55c0dd18b24b2ee31261327daeb77416a5cc SHA1 01d8ae9affb79736adf3d5495956d796fa046e40 SHA256 51e363f167a128af35be2a19b33bb1e7915c6c47861ef8f029614eb2c8f45bdb
+DIST gupnp-igd-0.1.11.tar.gz 376181 RMD160 78ef282126d1e73ec6bd2acdeb05d21a062b8f0e SHA1 d40ffe8a514c27d9ac5f92ed4b831d411ca3b848 SHA256 49aebbd6fd8ad52e6de37dfd555a89831a5a02f169f8f56b1658a46ebdfefba4
 DIST gupnp-igd-0.1.7.tar.gz 362614 RMD160 7176e7bc65b513b41c191366f728c9819a22f8ef SHA1 b37d44af7172af3e4d0c7f331519bba7e31f752b SHA256 c1d80ed20081992fabe70331f02efe9435bbfcc79287676121a855fea6561bf6
 EBUILD gupnp-igd-0.1.10.ebuild 2284 RMD160 221a66187785a4198dc1c07965f9f567f986e6e7 SHA1 8ed570f5f903095a479ecc5c34a72200f27f1ef4 SHA256 e36f3e833e5d45d6faf14b42e7194296eb2aa40e4302cc627334b18c9c935799
+EBUILD gupnp-igd-0.1.11.ebuild 2340 RMD160 b573eced433815fa9c661bccfba16e41853d0f30 SHA1 dd1f73a4b93ae6d62d2cd1c61b8d3f8ac994e3e8 SHA256 e012c97ec4b8546ad7ddfa19b6f925d710227653419d18a7df09684751c30ea5
 EBUILD gupnp-igd-0.1.7.ebuild 2073 RMD160 8485f38ff854ff9f947fcd74fb5c9a9bb80e7292 SHA1 c07a375bbf0514699fa17131aa1d6dc97660079f SHA256 a10499e37004b4b35827475ac7f53df8268fc26a09ed8a85f5ee2ed5f22cc15a
-MISC ChangeLog 3939 RMD160 33564ab056fa5d8d544da9ea81cf5841d9636449 SHA1 815e7dc2d31ce4f9f88b51b00b60293822a692ae SHA256 0d98e008dcd03b9ad951d45954e6e70d57f57b76b336653a5e40fc6476957547
+MISC ChangeLog 4173 RMD160 df0130042aecc4601935ea20abbdba755aa89b8f SHA1 157c317f2ad88fcfd727b913c969e3a14fdfcc50 SHA256 96033aa1fb4bd299084c138b118fa7e3fcf408a4a1a103f7f86abe9fa323a12b
 MISC metadata.xml 279 RMD160 cf038058c4223eacf6329f8abd32bf19b3398d6e SHA1 f1a40803a1daaf878947e05875d52f793e59f283 SHA256 f304c1ad20af47cdf82492cd9770c57e8dc923d588e4bab669ed9f3dcad51b84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5yY6YACgkQ1fmVwcYIWAaCwQCeI/LatHh16e1rvdGut9ce2t9S
-3UkAoOz/gz1pJJEHULSS6Z0R4pX26o6L
-=1nTg
+iEYEARECAAYFAk6h7wIACgkQ1fmVwcYIWAZAfwCfbldH/gzRKT1WP+uKI/yVQsSr
+jpkAoIJx2BlU0tiQd/mvNiSX09kn5d61
+=1M/L
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch b/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch
new file mode 100644
index 000000000000..48534925d21f
--- /dev/null
+++ b/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch
@@ -0,0 +1,10 @@
+--- python/Makefile.am
++++ python/Makefile.am
+@@ -27,7 +28,7 @@
+ 
+ igd_la_LDFLAGS =					\
+-	-module -avoid-version
++	-module -avoid-version -shared
+ 
+ pygupnp-igd.c: $(srcdir)/pygupnp-igd.override $(srcdir)/pygupnp-igd.defs
+ 	$(PYCODEGEN)						\
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.1.11.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.1.11.ebuild
new file mode 100644
index 000000000000..525236dc8256
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.1.11.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 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.1.11.ebuild,v 1.1 2011/10/21 22:15:25 eva Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
+
+inherit autotools eutils python
+
+DESCRIPTION="This is a library to handle UPnP IGD port mapping for GUPnP."
+HOMEPAGE="http://gupnp.org"
+SRC_URI="http://www.gupnp.org/sites/all/files/sources/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection python"
+
+RDEPEND=">=net-libs/gupnp-0.13.2
+	>=dev-libs/glib-2.16:2
+	introspection? ( >=dev-libs/gobject-introspection-0.10 )
+	python? ( >=dev-python/pygobject-2.16 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext
+	dev-util/gtk-doc-am"
+
+# The only existing test is broken
+RESTRICT="test"
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
+
+	# Disable byte-compilation of Python modules.
+	echo "#!/bin/sh" > py-compile
+
+	# Python bindings are built/installed manually.
+	sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-static \
+		--disable-gtk-doc \
+		$(use_enable introspection) \
+		$(use_enable python)
+}
+
+src_compile() {
+	# introspection is built in the same directory and libtool does not handle
+	# well dependency like this
+	MAKEOPTS="${MAKEOPTS} -j1" default
+
+	if use python; then
+		python_copy_sources python
+
+		building() {
+			emake \
+				PYTHON_INCLUDES="-I$(python_get_includedir)" \
+				pyexecdir="$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir python building
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use python; then
+		installation() {
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				install
+		}
+		python_execute_function -s --source-dir python installation
+
+		python_clean_installation_image
+	fi
+
+	dodoc AUTHORS NEWS README TODO || die
+	find "${D}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize gupnp
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup gupnp
+	fi
+}