Force python2 fixing bug #312233

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

diff --git a/games-arcade/watermelons/ChangeLog b/games-arcade/watermelons/ChangeLog
index 44853bb905b026e3fff9bbef48307e65da1f98d7..18edf369cc5770576b4262f1f2f468ddaf3a3aa1 100644 (file)
--- a/games-arcade/watermelons/ChangeLog
+++ b/games-arcade/watermelons/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/watermelons
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/watermelons/ChangeLog,v 1.3 2007/04/24 15:20:33 drizzt Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/watermelons/ChangeLog,v 1.4 2010/05/04 04:47:24 tupone Exp $
+
+  04 May 2010; Tupone Alfredo <tupone@gentoo.org> watermelons-1.1.1.ebuild:
+  Force python2 fixing bug #312233 by arfrever@gentoo.org
 
   24 Apr 2007; Timothy Redaelli <drizzt@gentoo.org>
   watermelons-1.1.1.ebuild:

diff --git a/games-arcade/watermelons/Manifest b/games-arcade/watermelons/Manifest
index 061685a0766795c292548e79e247c7b0fd818bb3..4f4f1b1e9723e525e950f89ff56a597e135693a0 100644 (file)
--- a/games-arcade/watermelons/Manifest
+++ b/games-arcade/watermelons/Manifest
@@ -1,4 +1,4 @@
 DIST melons-1.1.1.tgz 318692 RMD160 76320b68b8f5ebaf3e20721b4df734568c57a020 SHA1 35cb45de715dbb1fac4c6271ed56328e17037dfe SHA256 7433004460bf97a055d7c4c28fc274eeda920f30d5441e76020a7b8db223a336
-EBUILD watermelons-1.1.1.ebuild 1347 RMD160 12f672bc34563ff259caa7967372eca58f5b5f18 SHA1 8d4c3b4f3e78d6660d0d3e2b8377abc41daea439 SHA256 c0433c98e1e45ba6bae6de03cc68d64486b5ff8098fc1533b6100e847deb2c7e
-MISC ChangeLog 712 RMD160 049413ef50911671d539f21e7fd981cfeac4889b SHA1 5f3b2dbbf1b40952632dcffa64d3502e3a3a380a SHA256 66c619c3b8098acf05850a34dbed0997e746be0d6bb397162750a414c43247c1
+EBUILD watermelons-1.1.1.ebuild 1399 RMD160 330e7d95679cb203464265ecc7ba707bb2265290 SHA1 70fff2c678e264feaf1289a704dcbb71601e4a14 SHA256 3e3d5de63c665f4c3f90a9279611de529d33175378da3cb4c28ed280d7afae29
+MISC ChangeLog 847 RMD160 246176ec7a3b63eb86980935d363bcf538afcbea SHA1 c6ae42f2e9e666720f16ad8c5eef535f0077ceb7 SHA256 e2cd27d3d13af1bbe2c4cf55d2ed6e6188452663e16b7270dd4ce758e6c4a5f0
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-arcade/watermelons/watermelons-1.1.1.ebuild b/games-arcade/watermelons/watermelons-1.1.1.ebuild
index 0343a7c5fc1dd24b6c9056844f8ef2ee087f5038..b9a4c2620070a93b56b598030967f5fca171286c 100644 (file)
--- a/games-arcade/watermelons/watermelons-1.1.1.ebuild
+++ b/games-arcade/watermelons/watermelons-1.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 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/watermelons/watermelons-1.1.1.ebuild,v 1.4 2007/04/24 15:20:33 drizzt Exp $
-
-inherit eutils games
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/watermelons/watermelons-1.1.1.ebuild,v 1.5 2010/05/04 04:47:24 tupone Exp $
+EAPI="2"
+PYTHON_DEPEND="2"
+inherit eutils python games
 
 MY_PN="melons"
 DESCRIPTION="A thrilling watermelon bouncing game."
@@ -16,15 +17,16 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-lang/python-2.4
-       dev-python/pygame"
+RDEPEND="dev-python/pygame"
 
 S=${WORKDIR}/${MY_PN}
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+pkg_setup() {
+       python_set_active_version 2
+       games_pkg_setup
+}
 
+src_prepare() {
        sed -i \
                -e "s:melons.hs:${GAMES_STATEDIR}/${PN}/&:" \
                main.py \
@@ -33,7 +35,7 @@ src_unpack() {
        cat <<-EOF > "${PN}"
        #!/bin/bash
        cd "${GAMES_DATADIR}/${PN}"
-       exec python main.py
+       exec $(PYTHON) main.py
 EOF
 }