Set SUPPORT_PYTHON_ABIS, don't install .a, .la, .pyc and .pyo files in Python site-packages directories, call python_mod_optimize() and python_mod_cleanup() (bug #356611).

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

4 files changed, 81 insertions, 6 deletions

diff --git a/net-libs/gupnp-igd/ChangeLog b/net-libs/gupnp-igd/ChangeLog
index 2d893455e35e..7182a879ec55 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.26 2011/02/26 19:31:10 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/ChangeLog,v 1.27 2011/02/26 20:02:53 arfrever Exp $
+
+  26 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  gupnp-igd-0.1.7.ebuild, +files/gupnp-igd-0.1.7-disable_static_modules.patch:
+  Set SUPPORT_PYTHON_ABIS, don't install .a, .la, .pyc and .pyo files in Python
+  site-packages directories, call python_mod_optimize() and
+  python_mod_cleanup() (bug #356611).
 
   26 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gupnp-igd-0.1.7.ebuild:
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index daa238775d6c..e00855ca0b49 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,5 +1,6 @@
+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.7.tar.gz 362614 RMD160 7176e7bc65b513b41c191366f728c9819a22f8ef SHA1 b37d44af7172af3e4d0c7f331519bba7e31f752b SHA256 c1d80ed20081992fabe70331f02efe9435bbfcc79287676121a855fea6561bf6
-EBUILD gupnp-igd-0.1.7.ebuild 1157 RMD160 854809642f3f75259754a0340ee0146a56515150 SHA1 d443cd879692ec0ebd1836b4d0e8ccb30db0996a SHA256 5a5db6c9a52ec1cd87d093d9a3fd6316d1a58ff32a4f17f006e6fc191636e40d
-MISC ChangeLog 3440 RMD160 ff4d9d222092cfa1e0edf042a1d20662e8eef52a SHA1 e0e66e0557ce342cf72a5930958e7533afeea390 SHA256 8920621137b393da46ed38fb8c76fdfa9271eb7268adecfaa6654ca72d7f9740
+EBUILD gupnp-igd-0.1.7.ebuild 2073 RMD160 8485f38ff854ff9f947fcd74fb5c9a9bb80e7292 SHA1 c07a375bbf0514699fa17131aa1d6dc97660079f SHA256 a10499e37004b4b35827475ac7f53df8268fc26a09ed8a85f5ee2ed5f22cc15a
+MISC ChangeLog 3771 RMD160 1e8be3c98e52b843fb084431c2640a37b5516702 SHA1 6ca8a929a58709316f7bffefe58fd16102efdc2d SHA256 ce541fb92d0b5785629ed6a3cd4cdae10430962cf327e383f3ce88b28487ec18
 MISC metadata.xml 161 RMD160 419e26d02ec2be8f627f0b1b25aeb1698a713ee9 SHA1 dd595b6a10af8706aa3470451dcae25df3c21522 SHA256 7319e52af87b7cdfc644d720749750d9b182db438b40d6dd0ebc60c4e6c51eba
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.1.7-disable_static_modules.patch b/net-libs/gupnp-igd/files/gupnp-igd-0.1.7-disable_static_modules.patch
new file mode 100644
index 000000000000..9eae01f19a6a
--- /dev/null
+++ b/net-libs/gupnp-igd/files/gupnp-igd-0.1.7-disable_static_modules.patch
@@ -0,0 +1,19 @@
+--- python/Makefile.am
++++ python/Makefile.am
+@@ -1,6 +1,7 @@
+ PYDEFS=`pkg-config --variable=defsdir pygobject-2.0`
+ 
+ AM_CPPFLAGS =						\
++	-shared						\
+ 	-I.						\
+ 	-I$(top_srcdir)					\
+ 	-DDATADIR=\""$(datadir)"\"			\
+@@ -27,7 +28,7 @@
+ 
+ igd_la_LDFLAGS =					\
+ 	`python-config --libs`				\
+-	-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.7.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.1.7.ebuild
index c230056ff444..0c750174a0a1 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.1.7.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.1.7.ebuild
@@ -1,9 +1,11 @@
 # 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.7.ebuild,v 1.10 2011/02/26 19:31:10 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-igd/gupnp-igd-0.1.7.ebuild,v 1.11 2011/02/26 20:02:53 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
 
 inherit autotools eutils python
 
@@ -26,13 +28,20 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if use python; then
-		python_set_active_version 2
 		python_pkg_setup
 	fi
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-make-382.patch
+	epatch "${FILESDIR}"/${P}-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
 }
 
@@ -44,7 +53,47 @@ src_configure() {
 		--with-html-dir=/usr/share/doc/${PF}/html
 }
 
+src_compile() {
+	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
-	dodoc AUTHORS NEWS README TODO
+
+	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
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize gupnp
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup gupnp
+	fi
 }