Force python2 fixing bug #312251

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

4 files changed, 52 insertions, 18 deletions

diff --git a/games-kids/childsplay/ChangeLog b/games-kids/childsplay/ChangeLog
index 54ef4bc5b51d..19b0b68c74b0 100644
--- a/games-kids/childsplay/ChangeLog
+++ b/games-kids/childsplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/childsplay
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/childsplay/ChangeLog,v 1.16 2009/11/26 21:07:05 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/childsplay/ChangeLog,v 1.17 2010/04/26 10:27:00 tupone Exp $
+
+  26 Apr 2010; Tupone Alfredo <tupone@gentoo.org> childsplay-0.90.2.ebuild,
+  +files/childsplay-0.90.2-gentoo.patch:
+  Force python2 fixing bug #312251 by arfrever@gentoo.org
 
   26 Nov 2009; Markus Meier <maekke@gentoo.org> childsplay-0.90.2.ebuild:
   x86 stable, bug #294562
diff --git a/games-kids/childsplay/Manifest b/games-kids/childsplay/Manifest
index 46e5de4ee996..b375f1b7dd79 100644
--- a/games-kids/childsplay/Manifest
+++ b/games-kids/childsplay/Manifest
@@ -1,7 +1,8 @@
 AUX childsplay 99 RMD160 d7ce724efdc413a1fce862aa4f0d3643430b6e4f SHA1 2d3b7a7cdb45488550376bff34dd6aadb03affac SHA256 d33e50603bba2e2c5808d30df79d3172ec28fb26b7a97da38d5719f5d356c990
+AUX childsplay-0.90.2-gentoo.patch 895 RMD160 b85bb3093edf4e6dcaeb70e0198d44b7a6fd86e8 SHA1 57d11610215a303f455d89a98a21b0b6faf51755 SHA256 05f0510340285f04bafc2fc2fe1121643dae988ed375122616055581c29b5aa3
 DIST childsplay-0.90.2.tgz 2330022 RMD160 ccbd7f6ccca3320088054deab5b4bc1991fbb741 SHA1 8bd21a03126f2117a6ba62055973e891d0f208d2 SHA256 baa7c2c6168d581d546bcea3612a513268cf2e8273f2cf748df9e1559c62e054
 DIST childsplay_plugins-0.90.tgz 4528735 RMD160 d639777fd814595980e2bf8c22663d06263a2e11 SHA1 4cfadf71d83f272201e72dcc33b4e0be1dd1843e SHA256 3eff00eb1fb20f59b503071e61ca21eaf869969bb7cdc5f644ece5f6e48664c3
 DIST childsplay_plugins_lfc-0.90.tgz 6159653 RMD160 b78786a81b65a396eeb94660e22ad342c2e4d769 SHA1 29c49598695ad24d0535183bd5ab701f0aa7c276 SHA256 629a84beb94191c786508de4476c8b7ac98b5007aa7e0d9f7d0fa4d3e43b11b2
-EBUILD childsplay-0.90.2.ebuild 3742 RMD160 b2c455e9ba58bf06b9fd8d2cfb173bcce7f1ee61 SHA1 f2b88295e3f033fe87794e8fe24f320e4eac0b0f SHA256 a3a11edcc36705910ce2b4519c1c28f2dd7b6973c1ad58a2670c4d604ff63f18
-MISC ChangeLog 2230 RMD160 f42f9fd4c3f67b29d6a806b7c7a35d9e860cbb03 SHA1 1359d6d1de28e05b1a386ec811dbf6882cc8d15c SHA256 09fb7972caaa8194a9ec69dff96df3e5ecbac02faf073680ca5c86ae200ae485
+EBUILD childsplay-0.90.2.ebuild 3925 RMD160 dffbe61dc6ee47aa241a553794a3308c94a3f298 SHA1 b1bd04c68d10d0555a6c5dbccedf0a8082107f23 SHA256 20b4adb434e61c8faafdffe888d0dc1eedcf3f3fa09d20ccbafb297b8f0a84aa
+MISC ChangeLog 2406 RMD160 c5cf758c1ab4198da9a3f655f23f14a846794408 SHA1 89e6b2d1da4b91f0bff59f8957a20927f7b071c6 SHA256 7ab4d2e20cc640159dd00ccd247297440ce5105f945e341208b3bfc81bdf9c52
 MISC metadata.xml 340 RMD160 df5c4251e24c5f3951e50ed7a713b6028f8f12ec SHA1 71f3ff94bcdaf386a08944d59c0c883474a3a0b8 SHA256 a27158ca00e167722e2fbe151d58b63588863d71b2e152d491b1392d1e4704a9
diff --git a/games-kids/childsplay/childsplay-0.90.2.ebuild b/games-kids/childsplay/childsplay-0.90.2.ebuild
index 09ed2bd65941..70010da556fd 100644
--- a/games-kids/childsplay/childsplay-0.90.2.ebuild
+++ b/games-kids/childsplay/childsplay-0.90.2.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/childsplay/childsplay-0.90.2.ebuild,v 1.2 2009/11/26 21:07:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/childsplay/childsplay-0.90.2.ebuild,v 1.3 2010/04/26 10:27:00 tupone Exp $
 
 EAPI=2
+PYTHON_DEPEND="2"
 inherit eutils python games
 
 DESCRIPTION="A suite of educational games for young children"
@@ -18,27 +19,33 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.1
-	>=dev-python/pygame-1.7.1
+DEPEND=">=dev-python/pygame-1.7.1
 	>=media-libs/sdl-image-1.2[gif,jpeg,png]
 	>=media-libs/sdl-ttf-2.0
 	>=media-libs/sdl-mixer-1.2[vorbis]
 	media-libs/libogg"
 
-src_unpack() {
+pkg_setup() {
+	python_set_active_version 2
+	games_pkg_setup
+}
+
+src_prepare() {
 	local DIR
 
 	# Copy the plugins into the main package.
-	unpack ${A}
+	mv ../${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds Data || die
+	mv ../${PN}_plugins-${PLUGINS_VERSION}/add-score.py . || die
 	for DIR in ${PN}_plugins-${PLUGINS_VERSION} ${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}; do
-		cp -r ${DIR}/Data/*.icon.png ${P}/Data/icons || die
-		cp -r ${DIR}/lib/* ${P}/lib || die
-		cp -r ${DIR}/assetml/* ${P}/assetml || die
+		mv ../${DIR}/Data/*.icon.png Data/icons || die
+		cp -r ../${DIR}/lib/* lib || die
+		mv ../${DIR}/assetml/${PN}/* assetml/${PN} || die
+		rm -rf ../${DIR}
 	done
-	cp -r ${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds ${P}/Data || die
-	cp ${PN}_plugins-${PLUGINS_VERSION}/add-score.py ${P} || die
-	cd "${S}"
 	gunzip man/childsplay.6.gz
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		|| die "epatch failed"
+	python_convert_shebangs -r 2 .
 }
 
 src_install() {
@@ -105,10 +112,10 @@ EOF
 	# initialize the score file
 	cp Data/childsplay.score "${D}/${_SCOREFILE}" || die
 	SCORE_GAMES="Packid,Numbers,Soundmemory,Fallingletters,Findsound,Findsound2,Billiard"
-	python add-score.py "${D}/${_SCOREDIR}" $SCORE_GAMES
+	$(PYTHON) add-score.py "${D}/${_SCOREDIR}" $SCORE_GAMES
 
 	# translate for the letters game
-	python letters-trans.py "${D}/${_ASSETMLDIR}"
+	$(PYTHON) letters-trans.py "${D}/${_ASSETMLDIR}"
 
 	doman man/childsplay.6
 	dodoc doc/README* doc/Changelog doc/copyright
@@ -117,6 +124,7 @@ EOF
 	dogamesbin "${FILESDIR}"/childsplay || die
 	sed -i \
 		-e "s:GENTOO_DIR:${_CPDIR}:" \
+		-e "s:python:$(PYTHON):" \
 		"${D}${GAMES_BINDIR}"/childsplay \
 		|| die "sed failed"
 
diff --git a/games-kids/childsplay/files/childsplay-0.90.2-gentoo.patch b/games-kids/childsplay/files/childsplay-0.90.2-gentoo.patch
new file mode 100644
index 000000000000..742e3e02ee3c
--- /dev/null
+++ b/games-kids/childsplay/files/childsplay-0.90.2-gentoo.patch
@@ -0,0 +1,21 @@
+--- letters-trans.py.old	2010-04-26 12:13:12.000000000 +0200
++++ letters-trans.py	2010-04-26 12:13:49.000000000 +0200
+@@ -39,7 +39,7 @@
+ import os,fnmatch,operator,sys,locale
+ from CPConstants import ASSETMLROOT
+ 
+-if os.environ['USER'] != 'root':
++if os.environ['LOGNAME'] != 'root':
+     print "\nOnly root can use this script, sorry.\n"
+     sys.exit(1)
+ 
+@@ -69,7 +69,8 @@
+     sys.exit(0)
+         
+ # get description names from memory assetml, these are the words used by letters.py
+-parser = pyassetml.AssetmlParser('childsplay/memory-136x136/memory-136x136.assetml')
++assetmlfile = os.path.join(cwd,'memory-136x136.assetml')
++parser = pyassetml.AssetmlParser(assetmlfile)
+ loc = parser.get_locale()# get current locale setting, only the first two chars !!
+ wlist_org = parser.find_names((('file','.'),('description',"en")))
+ wlist = parser.find_names((('file','.'),('description',loc)))