Handle multiple ABI python, bug #324173.

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

3 files changed, 36 insertions, 13 deletions

diff --git a/gnome-extra/panflute/ChangeLog b/gnome-extra/panflute/ChangeLog
index 1e1bf6cc4f6f..248468414a2b 100644
--- a/gnome-extra/panflute/ChangeLog
+++ b/gnome-extra/panflute/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/panflute
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/panflute/ChangeLog,v 1.2 2010/12/08 17:44:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/panflute/ChangeLog,v 1.3 2010/12/08 22:44:57 eva Exp $
+
+  08 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> panflute-0.6.2.ebuild:
+  Handle multiple ABI python, bug #324173.
 
   08 Dec 2010; Pacho Ramos <pacho@gentoo.org> panflute-0.6.2.ebuild:
   Let it work when python3 is set as default interpreter.
diff --git a/gnome-extra/panflute/Manifest b/gnome-extra/panflute/Manifest
index 9913e99d3d6f..9aaa20cd9c80 100644
--- a/gnome-extra/panflute/Manifest
+++ b/gnome-extra/panflute/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST panflute-0.6.2.tar.gz 229268 RMD160 6b068d6abe3880d89f5c3471a6fc7aafcd09b453 SHA1 ca550405a5d2450260b764a576d60cf08328b716 SHA256 b38869e27bb22f9c3ea3d41f7c9cb3626fec49eac176410a5aa27bea9745617f
-EBUILD panflute-0.6.2.ebuild 1578 RMD160 7e65cacfc419128fb654b76b006927de7d571df9 SHA1 3960cfb4ffd03602508f34fe11cf32d0a4695016 SHA256 c3ea5adb963e2c1ddaa297549c24d1f1b02bf247887d636982587b2e80d8f6ee
-MISC ChangeLog 527 RMD160 b441536db9e59afa07374851e2547c4782051834 SHA1 1a66323b0bc436e7c38a24603b6c3d38c2c1f067 SHA256 30f4e4e62d92d2424114d1401d970d942d82ce1531ba494ff717d419abf23927
+EBUILD panflute-0.6.2.ebuild 1933 RMD160 3212677a12475486c162339c44e1e5a29aec5626 SHA1 14c9d0aebc457fb07b35ab4c474132f49542f2f9 SHA256 b08425f03008cd0a7056b5107bc0c2dd9c84b76d7f4315e8310782307cae4f5e
+MISC ChangeLog 646 RMD160 7aad591a06c378dc02935fff05162f4c16e96919 SHA1 7c1751d47558567bff38526f5f6f25a696718d57 SHA256 f1ae6a0fd74a8c5f8bf90903c65a9ee236ccba8468216a3823a8110c6d14042b
 MISC metadata.xml 239 RMD160 a0461891923f55c7034f2883109d613460489ef3 SHA1 aeca511f0e6c732886b06a50884c83de3c83df60 SHA256 cb07c9587f4637ec96982b5487883f7a2d3326cc2e55906e2c52ba13e0897980
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkz/xAQACgkQCaWpQKGI+9Qe8QCePe0DA+caf7esdMbiv9yCdXdI
-M6QAnA6MrCEU8o/JYFCg3wwFdwNfUeLB
-=ia8m
+iEYEARECAAYFAk0ACnsACgkQ1fmVwcYIWAab7gCgu1X4jXNRIGDgib91Vyq7+8Ph
+V4IAoO0yMxfjE36P+ZT4v54uuVK3VeZC
+=k9Ed
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/panflute/panflute-0.6.2.ebuild b/gnome-extra/panflute/panflute-0.6.2.ebuild
index 9f17bc821e3a..802bc4f608d1 100644
--- a/gnome-extra/panflute/panflute-0.6.2.ebuild
+++ b/gnome-extra/panflute/panflute-0.6.2.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/panflute/panflute-0.6.2.ebuild,v 1.2 2010/12/08 17:44:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/panflute/panflute-0.6.2.ebuild,v 1.3 2010/12/08 22:44:57 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
-inherit gnome2 python eutils versionator
+inherit eutils gnome2 python versionator
 
 MY_MAJORV="$(get_version_component_range 1-2)"
 
@@ -23,7 +25,7 @@ IUSE="gnome libnotify mpd"
 RDEPEND="
 	>=dev-python/dbus-python-0.80
 	>=dev-libs/dbus-glib-0.71
-	dev-python/pygobject
+	dev-python/pygobject:2
 	gnome? (
 		>=x11-libs/pango-1.6
 		>=gnome-base/libgnomeui-2
@@ -31,7 +33,7 @@ RDEPEND="
 		>=dev-python/gconf-python-2.14
 		>=dev-python/gnome-keyring-python-2.14
 		>=dev-python/gnome-applets-python-2.14
-		>=dev-python/pygtk-2.16 )
+		>=dev-python/pygtk-2.16:2 )
 	libnotify? ( dev-python/notify-python )
 	mpd? ( >=dev-python/python-mpd-0.2.1 )
 	!gnome-extra/music-applet
@@ -43,7 +45,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README THANKS"
-	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -53,7 +55,25 @@ src_prepare() {
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
 
-	python_convert_shebangs -r 2 .
+	python_copy_sources
+}
+
+src_configure() {
+	python_execute_function -s gnome2_src_configure
+}
+
+src_compile() {
+	python_execute_function -s gnome2_src_compile
+}
+
+src_test() {
+	python_execute_function -s -d
+}
+
+src_install() {
+	python_execute_function -s gnome2_src_install
+	python_clean_installation_image
+	python_convert_shebangs -r 2 "${ED}"
 }
 
 pkg_postinst() {