Force python2 fixing bug #312231

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/games-arcade/bub-n-bros/ChangeLog b/games-arcade/bub-n-bros/ChangeLog
index fb8b3f3c3991960d46409c1282eff55b08c813c8..6c1e577dbe01110632201e8227c83453874d2dbb 100644 (file)
--- a/games-arcade/bub-n-bros/ChangeLog
+++ b/games-arcade/bub-n-bros/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/bub-n-bros
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v 1.19 2008/06/29 11:03:16 klausman Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v 1.20 2010/05/04 05:10:24 tupone Exp $
+
+  04 May 2010; Tupone Alfredo <tupone@gentoo.org> bub-n-bros-1.6.ebuild:
+  Force python2 fixing bug #312231 by arfrever@gentoo.org
 
   28 Jun 2008; Tobias Klausmann <klausman@gentoo.org> bub-n-bros-1.6.ebuild:
   Stable on alpha, bug #227651

diff --git a/games-arcade/bub-n-bros/Manifest b/games-arcade/bub-n-bros/Manifest
index 4a25a78969517c09bbc9bba80004aa98256d06f7..8dd27ec58408bf2a972b6edea77dd79f55343fd5 100644 (file)
--- a/games-arcade/bub-n-bros/Manifest
+++ b/games-arcade/bub-n-bros/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bub-n-bros-1.6-home.patch 2035 RMD160 6ba15ad4bbd1f2463abfe7962e75690646808c53 SHA1 f790c118adb5d1396c3e880b5dca83253619f7c5 SHA256 13bfced9b7b4bbb543ba32fa209bcf7d313a2f6c0dda979d71dba83dd717ff95
 AUX bub-n-bros-1.6-python25.patch 1066 RMD160 98c6363fc76009fb19e2a5459ab06540cbf3f7db SHA1 fc81e2c34cd0f3be921559a7f99abd350f9ffc12 SHA256 57534f2e7b94fe48d4c6da20dd16257136832171adae6f959492d3c3363821d4
 DIST bubbros-1.6.tar.bz2 9052959 RMD160 f4da90058650f07f4c50d33dd9b42be336c660df SHA1 17cd2811e11effde3ee41289725ea8fae86b70cd SHA256 dd197e60a23e09800010f3a5906feb77847e6eeaa7cfd47d803a85daa0bcf255
-EBUILD bub-n-bros-1.6.ebuild 1496 RMD160 027c3cb098635e6603bccd19ac3bea0bb52fce30 SHA1 9139c38b1fb930a9c650ab7caaaa8aed7db4dc92 SHA256 8d14ccd183b3558452aef9fc85c982e3ab9f300d558f780985f8f4e825493360
-MISC ChangeLog 2298 RMD160 8ca2b64e21cbd88ae3c6866b83ae2924304b2de6 SHA1 784eadc0f8e61357c2d600ea168d3e458f1eaadd SHA256 d41ca84e32d8f113e33110c4126497b7dd12cf473e958998ea2925e0b71ef125
+EBUILD bub-n-bros-1.6.ebuild 1547 RMD160 1b6f0f8053d46d439c35a47f393ea1adf2719e0a SHA1 7ea1749308af2c6a73cb23f8938b5e7490778873 SHA256 110c6296f9c527ebc4a74575653a74a7fb533435e4bbcd5d2e0cee28280e6dac
+MISC ChangeLog 2428 RMD160 985de41b8ae5b9a58229566cd02283916dd0ff04 SHA1 e005fa275e73329c94017726d16f61daa13a7395 SHA256 7e3c1e3fcb3b24a1725c45787d4cbe82c10e77ee23153b302e97e50baa930b50
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkomfzMACgkQdz7hIScOURHu1QCg4woMp0zT8GODlvAjs5GlIDeV
-sh4AnRXRjlI+PA8zY9JuyrnSWUYpiaT8
-=skWH
------END PGP SIGNATURE-----

diff --git a/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild b/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild
index 27f7b6a93fd49e6e0b8e013f9775016de5524d3d..341370dbe2f7ac5a45a13afd4c3baf45d9302ae3 100644 (file)
--- a/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild
+++ b/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild,v 1.5 2008/06/29 11:03:16 klausman Exp $
-
-inherit eutils games
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild,v 1.6 2010/05/04 05:10:24 tupone Exp $
+EAPI="2"
+PYTHON_DEPEND="2"
+inherit eutils python games
 
 MY_P=${P/-n-}
 DESCRIPTION="A multiplayer clone of the famous Bubble Bobble game"
@@ -14,31 +15,35 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="dev-lang/python"
 RDEPEND="dev-python/pygame"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+pkg_setup() {
+       python_set_active_version 2
+       games_pkg_setup
+}
+
+src_prepare() {
+       ecvs_clean
        epatch \
                "${FILESDIR}"/${P}-home.patch \
                "${FILESDIR}"/${P}-python25.patch
+       python_convert_shebangs -r 2 .
 }
 
 src_compile() {
        # Compile the "statesaver" extension module to enable the Clock bonus
        cd "${S}"/bubbob
-       python setup.py build_ext -i || die
+       $(PYTHON) setup.py build_ext -i || die
 
        # Compile the extension module required for the X Window client
        cd "${S}"/display
-       python setup.py build_ext -i || die
+       $(PYTHON) setup.py build_ext -i || die
 
        # Build images
        cd "${S}"/bubbob/images
-       python buildcolors.py || die
+       $(PYTHON) buildcolors.py || die
 }
 
 src_install() {
@@ -56,6 +61,5 @@ src_install() {
        newicon http2/data/bob.png ${PN}.png
        make_desktop_entry bubnbros Bub-n-Bros
 
-       rm -rf $(find "${D}/${dir}" -name CVS -type d)
        prepgamesdirs
 }