Force python2 fixing bug #312253

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

diff --git a/games-kids/pytraffic/ChangeLog b/games-kids/pytraffic/ChangeLog
index bc87351faabdf34e3c1cb9c93f04c2cd3eeacba8..01fc4b423744db69526b381a5bb49d49def4e94d 100644 (file)
--- a/games-kids/pytraffic/ChangeLog
+++ b/games-kids/pytraffic/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-kids/pytraffic
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/pytraffic/ChangeLog,v 1.10 2009/02/22 15:54:44 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/pytraffic/ChangeLog,v 1.11 2010/04/25 15:38:49 tupone Exp $
+
+  25 Apr 2010; Tupone Alfredo <tupone@gentoo.org> pytraffic-2.5.4.ebuild:
+  Force python2 fixing bug #312253 by arfrever@gentoo.org
 
   22 Feb 2009; Raúl Porcel <armin76@gentoo.org> pytraffic-2.5.4.ebuild:
   x86 stable wrt #257812

diff --git a/games-kids/pytraffic/Manifest b/games-kids/pytraffic/Manifest
index a1f9f8974c1c7ebb1138bee6089f147ebddf5938..8d0f25adfde7cffbc40e67710140c355390440fe 100644 (file)
--- a/games-kids/pytraffic/Manifest
+++ b/games-kids/pytraffic/Manifest
@@ -1,4 +1,4 @@
 DIST pytraffic-2.5.4.tar.gz 2474006 RMD160 3749068efff7f670463a75d1279bbd157ee63658 SHA1 08077ccf3803f6f4dbb5a7892ae23416f5097350 SHA256 7a3254f5a37d71104a1223d960ce8b5d23d40caa4b2b8b8b6236d6a762c00a2a
-EBUILD pytraffic-2.5.4.ebuild 1435 RMD160 42731ea95fda57bb7e96110dcc35ed4be48d2789 SHA1 55c877f9369213efc9e401c99c217dcb2edcee62 SHA256 63052fd4d4a20d13e02f11a8ec58bbf18b2381b2b39795aa9aa3cae9ecb3e3cc
-MISC ChangeLog 1456 RMD160 8e95b2047cc5301c2361d1c40100208018ab5d3b SHA1 dc4943a723c429da2318d60ec7d16add33446b5a SHA256 0fffdc3ff7cd339f704f062c30790a1fb666d97ef277c934f6b96e9a2c5a19b3
+EBUILD pytraffic-2.5.4.ebuild 1525 RMD160 08706293039c01192ee1bf04c3c3bedc8bfc50b3 SHA1 3a9e7b92ac751c60469a1923d6c1c4abfbdd1ad3 SHA256 0628448b16896e9a8c83b43b6855bfe9fb3f5f24adc9e6fb6e4b89c952e49533
+MISC ChangeLog 1588 RMD160 a6c15b3f90acaed90d5ca06629378f94cb5c3bdb SHA1 2fcb33815a3299b064f965dc74e679578976444e SHA256 d72a32d44af73463a759d53567f13e4b4fd89cc75d60e0b2d35327a45040f077
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-kids/pytraffic/pytraffic-2.5.4.ebuild b/games-kids/pytraffic/pytraffic-2.5.4.ebuild
index 624ce7ace8656bdb9e50b7a8c0c7dd37baef84c5..26142bfbe2ef8827f6baffec139f068365f7954b 100644 (file)
--- a/games-kids/pytraffic/pytraffic-2.5.4.ebuild
+++ b/games-kids/pytraffic/pytraffic-2.5.4.ebuild
@@ -1,8 +1,9 @@
-# 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-kids/pytraffic/pytraffic-2.5.4.ebuild,v 1.4 2009/02/22 15:54:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/pytraffic/pytraffic-2.5.4.ebuild,v 1.5 2010/04/25 15:38:49 tupone Exp $
+PYTHON_DEPEND="2"
 
-inherit distutils eutils games
+inherit python distutils eutils games
 
 DESCRIPTION="Python version of the board game Rush Hour"
 HOMEPAGE="http://alpha.uhasselt.be/Research/Algebra/Members/pytraffic/"
@@ -34,7 +35,7 @@ src_install() {
        dosym {"$(games_get_libdir)","${GAMES_DATADIR}"}/${PN}/_sdl_mixer.so \
                || die "dosym _sdl_mixer.so failed"
 
-       games_make_wrapper ${PN} "python ./Main.py" "${GAMES_DATADIR}"/${PN}
+       games_make_wrapper ${PN} "$(PYTHON) ./Main.py" "${GAMES_DATADIR}"/${PN}
        doicon icons/64x64/${PN}.png
        make_desktop_entry ${PN} PyTraffic
 
@@ -44,6 +45,11 @@ src_install() {
        prepgamesdirs
 }
 
+pkg_setup() {
+       python_set_active_version 2
+       games_pkg_setup
+}
+
 pkg_postinst() {
        distutils_pkg_postinst
        games_pkg_postinst