Force python2 fixing bug #312273

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

diff --git a/games-rpg/dragonhunt/ChangeLog b/games-rpg/dragonhunt/ChangeLog
index 7504e608afd1214b4bb09ce7743ade5e36befb31..3dbc8ab1fe6b5f9c872a802d70c079baaf2910b9 100644 (file)
--- a/games-rpg/dragonhunt/ChangeLog
+++ b/games-rpg/dragonhunt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-rpg/dragonhunt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/dragonhunt/ChangeLog,v 1.5 2009/12/18 19:39:41 pacho Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/dragonhunt/ChangeLog,v 1.6 2010/05/05 05:07:50 tupone Exp $
+
+  05 May 2010; Tupone Alfredo <tupone@gentoo.org> dragonhunt-3.56.ebuild:
+  Force python2 fixing bug #312273 by arfrevergentoo.org
 
   18 Dec 2009; Pacho Ramos <pacho@gentoo.org> dragonhunt-3.56.ebuild:
   amd64 stable, bug 289164

diff --git a/games-rpg/dragonhunt/Manifest b/games-rpg/dragonhunt/Manifest
index 74bbd6f9b44237eb8880b016db1ff1652dc2ce2d..f16e238a1f8b8c4eea3cd960e9d1e70c552481bc 100644 (file)
--- a/games-rpg/dragonhunt/Manifest
+++ b/games-rpg/dragonhunt/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST Dragon_Hunt-3.56.tar.gz 2170718 RMD160 82199f84e20a3620e223a3488129f34a7f2de01e SHA1 1ed23a5ef8dcad0bf1f66dcb89475224b07a2c52 SHA256 70a22937fd002f2d82d8998623b6ec101fadfbafc4e0d1857aa0686c6bf1eba9
-EBUILD dragonhunt-3.56.ebuild 2314 RMD160 084acb8bf42be3e47ffbfab3b82fa4e69245e070 SHA1 94e584cdcce15f2c7e711dd807bb1d64b2cfaeae SHA256 5b77c37324736cca71fb8bb93ed32f39051664974858dc630e340232b5d0e553
-MISC ChangeLog 766 RMD160 d7e3d0e4e6ec2e5f47cc951844796f57ea2113e3 SHA1 8d33bf238d14064e8bd6d839fa5f841bcfcbc11b SHA256 7527421e20ad46273df125937f65d0c18c8c28bda2fd1e746993dbd25349a233
+EBUILD dragonhunt-3.56.ebuild 2392 RMD160 dc97472ffeedb46df940284382e1e5ec005062f3 SHA1 a344204feeeec353d59ea21a31c2de3e2478f17b SHA256 5fe8b3dfd19a0088f398d1dd0b47818acf51bc07e72b774db7d5274d55a9fb2d
+MISC ChangeLog 899 RMD160 c87e103336cf5d9c9fc62a377d06204b733084c5 SHA1 756e399fed74a4e1c0b116267dc117f9978aecbe SHA256 a2d0d877856f9cb30062ebcc1a299793886638de00b2a40fcec5101d4aa57ca1
 MISC metadata.xml 159 RMD160 5f925ed2fa3718b7d5cdc3f2a12866d3e516bacc SHA1 cd24812821185c81f7c05255d3fa66f5399daaa6 SHA256 c3c3613f26371d08a639f099b4f0d23f1efa7477c4414784a274edfd853eeec7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksr2ocACgkQCaWpQKGI+9THYACdFp02n7z9nK4e73ZPjElWbYLy
-wqIAn1km1uFsu4MM+eb/SvqizOZvekc3
-=XWbU
------END PGP SIGNATURE-----

diff --git a/games-rpg/dragonhunt/dragonhunt-3.56.ebuild b/games-rpg/dragonhunt/dragonhunt-3.56.ebuild
index fd450efaa86d9c5e63847ae1991f6ccb8c4f919f..6721ccdb8b15b2d911189eff676ad6045c6f2c6c 100644 (file)
--- a/games-rpg/dragonhunt/dragonhunt-3.56.ebuild
+++ b/games-rpg/dragonhunt/dragonhunt-3.56.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/dragonhunt/dragonhunt-3.56.ebuild,v 1.4 2009/12/18 19:39:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/dragonhunt/dragonhunt-3.56.ebuild,v 1.5 2010/05/05 05:07:50 tupone Exp $
 
 EAPI=2
-inherit eutils games
+PYTHON_DEPEND="2"
+inherit eutils python games
 
 MY_P="Dragon_Hunt-${PV}"
 DESCRIPTION="A simple graphical RPG"
@@ -15,11 +16,15 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="dev-lang/python
-       dev-python/pygame"
+RDEPEND="dev-python/pygame"
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+       python_set_active_version 2
+       games_pkg_setup
+}
+
 src_prepare() {
        # Where to look for modules to load.
        sed -i "s:\.\./modules/:${GAMES_DATADIR}/${PN}/:" \
@@ -58,8 +63,8 @@ src_install() {
        insinto "$(games_get_libdir)"/${PN}
        doins code/*.py || die "doins code failed"
 
-       games_make_wrapper ${PN} "python ./rpg.py" "$(games_get_libdir)"/${PN}
-       games_make_wrapper ${PN}-mapeditor "python ./map_editor.py" \
+       games_make_wrapper ${PN} "$(PYTHON) ./rpg.py" "$(games_get_libdir)"/${PN}
+       games_make_wrapper ${PN}-mapeditor "$(PYTHON) ./map_editor.py" \
                "$(games_get_libdir)"/${PN}
 
        newicon modules/default/images/buttons/icon.png ${PN}.png