Add support for multiple python slots, bug #309045.

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

3 files changed, 49 insertions, 15 deletions

diff --git a/dev-python/pyorbit/ChangeLog b/dev-python/pyorbit/ChangeLog
index 59bf0336a9b0..efdae83df4a8 100644
--- a/dev-python/pyorbit/ChangeLog
+++ b/dev-python/pyorbit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyorbit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/ChangeLog,v 1.71 2010/07/20 15:29:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/ChangeLog,v 1.72 2010/12/21 22:49:06 eva Exp $
+
+  21 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> pyorbit-2.24.0.ebuild:
+  Add support for multiple python slots, bug #309045.
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> pyorbit-2.14.3.ebuild,
   pyorbit-2.24.0.ebuild:
diff --git a/dev-python/pyorbit/Manifest b/dev-python/pyorbit/Manifest
index cedcb17d8743..3bef30e13be4 100644
--- a/dev-python/pyorbit/Manifest
+++ b/dev-python/pyorbit/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pyorbit-2.14.3.tar.bz2 284374 RMD160 a25c396815c17449030d289e8e3d20ec8e1e21bb SHA1 b0863aba35beddaf44722b0d7a3d1f65081e424a SHA256 a3517e0ddaf23508f99e7489a23e3462f86c528ea24bce432e832a78ee4149db
 DIST pyorbit-2.24.0.tar.bz2 293054 RMD160 55aa1c3ac0739d398d8e9bbda93ef36f7c659360 SHA1 f9877ce9672ed3c3d001b86924f1b6514a79efc9 SHA256 8754669b8220aa1f151b920360029d5ea28c42bec55769059676725fe28397b8
 EBUILD pyorbit-2.14.3.ebuild 1141 RMD160 1f09e2390367424d5e16e9e6ba1a3e3618618a65 SHA1 9643305fa1ea1827a5811262b780d1b4a737f3fa SHA256 ce1aabe578ed748ed93a59b9e3fa400dbe20db5a14d82981384245ec11748a6d
-EBUILD pyorbit-2.24.0.ebuild 1218 RMD160 a01be7056a76e35eee61ebd04ce05ecf36892d04 SHA1 0f4ba7871bdd138c695e6189e342d7e574883348 SHA256 dbbf6e3a37962f66c3248fd5c28ef98fbbebc00ac4c4c90173bee3676de0bf91
-MISC ChangeLog 7920 RMD160 0312f32c9d3a1f1ad40783a49293372c9e18996c SHA1 dc16d3bf581c845d6977e355add366c1e28146c0 SHA256 f8570e20ed12fe73a8db178b020473198a0db412d8427d38612de2149e94c782
+EBUILD pyorbit-2.24.0.ebuild 1505 RMD160 756d574df24d3bcf207f4eee2dc51c1ddae1c58b SHA1 b7103d09972231245a5102d8c82606a152495b41 SHA256 93dd0c72d506cb6e0ba0eb7293c60f11092b1f1e7fc9ec8d8dc5656daaaeda3d
+MISC ChangeLog 8052 RMD160 b99e43815802df73ed403e3a7fad6173062b92d8 SHA1 cd6478e5b32d7031b059d5ffc2386dcbdfcc1b64 SHA256 5ac932cf745a90323be5db54e8495ae6b327beeec0d80767e3db64094d523b58
 MISC metadata.xml 178 RMD160 52828e1ca616ad731f2ab1ed2890d6d3a7cc8043 SHA1 a42d68a6c263ea8d8cbb678548e209aa9642a74e SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0RLugACgkQ1fmVwcYIWAaM6gCgnxp6GYKaXpv6ZEnBBbY1+neE
+qvcAn2V/gFBIEtqHTSk9VIWji7GvXbHy
+=o6Jm
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyorbit/pyorbit-2.24.0.ebuild b/dev-python/pyorbit/pyorbit-2.24.0.ebuild
index 0a11efe24f68..9a55c6509f74 100644
--- a/dev-python/pyorbit/pyorbit-2.24.0.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.24.0.ebuild
@@ -1,8 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.24.0.ebuild,v 1.13 2010/07/20 15:29:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.24.0.ebuild,v 1.14 2010/12/21 22:49:06 eva Exp $
 
-inherit python gnome2 multilib
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.4"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit gnome2 multilib python
 
 DESCRIPTION="ORBit2 bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
@@ -12,32 +18,47 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=dev-lang/python-2.4
-	>=gnome-base/orbit-2.12"
+RDEPEND=">=gnome-base/orbit-2.12"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
 DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	# disable pyc compiling
 	mv "${S}"/py-compile "${S}"/py-compile.orig
 	ln -s $(type -P true) "${S}"/py-compile
+
+	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() {
-	[[ -z ${ED} ]] && local ED=${D}
-	gnome2_src_install
+	installation() {
+		gnome2_src_install
 
-	mv "${ED}"$(python_get_sitedir)/{CORBA.py,pyorbit_CORBA.py}
-	mv "${ED}"$(python_get_sitedir)/{PortableServer.py,pyorbit_PortableServer.py}
+		mv "${ED}"$(python_get_sitedir)/{CORBA.py,pyorbit_CORBA.py}
+		mv "${ED}"$(python_get_sitedir)/{PortableServer.py,pyorbit_PortableServer.py}
+	}
+	python_execute_function -s installation
+	python_clean_installation_image
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/{pyorbit_CORBA.py,pyorbit_PortableServer.py}
+	python_mod_optimize pyorbit_CORBA.py pyorbit_PortableServer.py
 }
 
 pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/{pyorbit_CORBA.py,pyorbit_PortableServer.py}
+	python_mod_cleanup pyorbit_CORBA.py pyorbit_PortableServer.py
 }