Handle multiple ABI python, bug #317003.

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

3 files changed, 37 insertions, 14 deletions

diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog
index aa62e3e6dd8f..9f3b5fbb28ab 100644
--- a/x11-misc/alacarte/ChangeLog
+++ b/x11-misc/alacarte/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/alacarte
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.102 2010/12/08 20:52:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.103 2010/12/08 22:46:20 eva Exp $
+
+  08 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> alacarte-0.13.2.ebuild:
+  Handle multiple ABI python, bug #317003.
 
   08 Dec 2010; Pacho Ramos <pacho@gentoo.org> -alacarte-0.12.1.ebuild,
   alacarte-0.13.2.ebuild:
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index 017547b6bb93..00217361a293 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -5,13 +5,13 @@ AUX alacarte-0.11.5-python-2.6.patch 448 RMD160 db11ef6e261fa0b72af5eeb02a810834
 DIST alacarte-0.12.4.tar.bz2 189318 RMD160 e0bbef89f1603c2de2ed60d6de087c3407f06040 SHA1 a44b3c3bba625c570d3ef7f451f912e537fccedb SHA256 f5bccd47d96b22ee73cf537d86bb90cb7b7e0f70ac68253fe512540e5bf64823
 DIST alacarte-0.13.2.tar.bz2 193746 RMD160 97924d34e9d460267b6118a01488b635551a8aaa SHA1 6eb6a0f308be0da84ead38fbfae0b247743f6038 SHA256 9fa36e5181b1eea947b184cb0f79d796b25cc5a5f122819a1ac2ff01bc7ee4ed
 EBUILD alacarte-0.12.4.ebuild 1128 RMD160 cacfd28fe8d9ca46e47477b59d4fafcb2bed0a42 SHA1 7ddb3a811d99c5ab67cd93dc1c1b4a8badc0c728 SHA256 aab6741a97942d0395a09d178fe3dc56f7d9ea2310900cebdb4e39a07f452a07
-EBUILD alacarte-0.13.2.ebuild 1194 RMD160 9db0e173af4a3aa1335d31c9b837b2e8f34c1696 SHA1 7cf1d64e72dcb5ac30740b2e953c5481e0ab2b6e SHA256 51e79e96c97ba62e1688b28dd20fbac2f44fa623665fba8a380d6cfd5290045c
-MISC ChangeLog 12723 RMD160 9ac7592779b49008dbaf2328d2594100a05c2685 SHA1 31c0db80456d8b8d622d8efc5ae3537b6cc5597c SHA256 6127c04e697135b919886ddeb46532ed8ada06786f3c29fca10b9960accde536
+EBUILD alacarte-0.13.2.ebuild 1551 RMD160 fcd2263eea09e0ee46af7c647a607b837def6f9d SHA1 e5c8346e8dcdca94728a77b04cfa980dd8350257 SHA256 29dc4d1533c221fa8f5480d650e999ac116e84c05265d4d33504595863035d2c
+MISC ChangeLog 12843 RMD160 73e4e3796671ea90218ebae7185e8b645d1ed2bd SHA1 98c311ee504b9e87da0b4ca24f590145c486e147 SHA256 c6e69b726834ea946413c579714ed05688c4e1c09fefefee5c6beb6244c60b9c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkz/8CoACgkQCaWpQKGI+9QIxQCfeDR7iJERE05GsOngSaOwjh9x
-CqYAn3nV/pZn+e1px3kyUMyM81FHwHDT
-=du2C
+iEUEARECAAYFAk0ACscACgkQ1fmVwcYIWAZySQCffowxOpTynL+B3EutW8m69ikU
+uqkAmN2rYMUWWpp7jJWhws9nnluXtJQ=
+=3GFT
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/alacarte/alacarte-0.13.2.ebuild b/x11-misc/alacarte/alacarte-0.13.2.ebuild
index 6184f462b1f1..0f5d4469b1c4 100644
--- a/x11-misc/alacarte/alacarte-0.13.2.ebuild
+++ b/x11-misc/alacarte/alacarte-0.13.2.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.2.ebuild,v 1.2 2010/12/08 20:52:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.2.ebuild,v 1.3 2010/12/08 22:46:20 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.4"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit gnome2 python
 
@@ -12,13 +14,13 @@ DESCRIPTION="Simple GNOME menu editor"
 HOMEPAGE="http://live.gnome.org/"
 
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
-SLOT=0
 
 common_depends="
-	>=dev-python/pygobject-2.15.1
-	>=dev-python/pygtk-2.13
+	>=dev-python/pygobject-2.15.1:2
+	>=dev-python/pygtk-2.13:2
 	>=gnome-base/gnome-menus-2.27.92[python]"
 
 RDEPEND="${common_depends}
@@ -31,7 +33,6 @@ DEPEND="${common_depends}
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
-	python_set_active_version 2
 	python_pkg_setup
 }
 
@@ -41,15 +42,34 @@ src_prepare() {
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
+
+	python_copy_sources
 }
 
 src_configure() {
-	PYTHON="$(PYTHON -a)" gnome2_src_configure
+	configure() {
+		G2CONF="${G2CONF} PYTHON=$(PYTHON -a)"
+		gnome2_src_configure
+	}
+	python_execute_function -s 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() {
 	gnome2_pkg_postinst
-	python_need_rebuild
 	python_mod_optimize Alacarte
 }