Force python2 to fix bug #312255

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

diff --git a/games-kids/tuxmathscrabble/ChangeLog b/games-kids/tuxmathscrabble/ChangeLog
index 86b4fa723c748c8e4c791eb2b8acb0fdd59e11ae..6ef8345f054d0a3a85a02ef47c5f4e1531338ef2 100644 (file)
--- a/games-kids/tuxmathscrabble/ChangeLog
+++ b/games-kids/tuxmathscrabble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/tuxmathscrabble
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxmathscrabble/ChangeLog,v 1.14 2007/10/24 01:28:06 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxmathscrabble/ChangeLog,v 1.15 2010/04/22 12:09:35 tupone Exp $
+
+  22 Apr 2010; Tupone Alfredo <tupone@gentoo.org>
+  tuxmathscrabble-4.5.ebuild:
+  Force python2 to fix bug #312255 by arfrever@gentoo.org
 
 *tuxmathscrabble-4.5 (24 Oct 2007)
 

diff --git a/games-kids/tuxmathscrabble/Manifest b/games-kids/tuxmathscrabble/Manifest
index f0ff99bcee33eae54825d950e9a6c82c4583a136..de96cd42c859b05f345936807cf4c27b26d651c4 100644 (file)
--- a/games-kids/tuxmathscrabble/Manifest
+++ b/games-kids/tuxmathscrabble/Manifest
@@ -2,6 +2,6 @@ AUX 2.7-gentoo.patch 1037 RMD160 472155e0ec525c8b4ec75183060e4af201f9833c SHA1 4
 DIST TuxMathScrabble-0.4.5.tgz 4359261 RMD160 055625a81042ebf1a486efeef8138f0e24f5bcc1 SHA1 23dfd41b8b1a75348f76bcab55c70b62f18c6a85 SHA256 4983dafcc3c5f93bc569715da93739e3aca219a09921c9df934dba48a5dada49
 DIST tuxmathscrabble-2.7.tgz 607089 RMD160 b07e05ffd5273d486b32bbe2ebdc30056a55244d SHA1 c6c6fc40df50e7c5cda87e36ac135be89e9f25b0 SHA256 9f9a08defac5718fb460022e33c512b6a4a5f0da74497d0345f66ce7634aaea3
 EBUILD tuxmathscrabble-2.7.ebuild 873 RMD160 99e482b087a432f9b5337921c30bdb454b67ee7f SHA1 ff1a4a229e1b6ae42e53d6a214afb6d47b3ee7ff SHA256 9759709cf5129a8f91a4bcf5ff199db02830afbe9858b38718376331b245b86c
-EBUILD tuxmathscrabble-4.5.ebuild 1449 RMD160 bc4f9dfcf9056d0313bd756f3eec11c0b5f225cd SHA1 930dd19faea2148665e22f698ffacb9accea3e4c SHA256 0c6939bd20a28953cdc3996e6a63c226262119edb19d8bd6d1bde4255a00e1ca
-MISC ChangeLog 1923 RMD160 12d5abb838c3033967c638bf5d21a8dc441b9dfc SHA1 b0c1987cdbcef6762790a76085d32b06dc9a3f38 SHA256 5b78a5a43d03a9804adaa1dd84ed6c88a52c61e389b73c77e539e756c992be98
+EBUILD tuxmathscrabble-4.5.ebuild 1508 RMD160 6c77a8f8abac82d518a9252fe296e851959614d3 SHA1 09cc3be06b8a46659d0052a8821d8eeca056d3ff SHA256 ad3ef584b08de6ad0d99f9b7cbd1af3a317a6c0e42a9cdcccae81d4a70c898bb
+MISC ChangeLog 2064 RMD160 beab0e26230d6744e23966cba283b8c64ca5966c SHA1 76312348d634638dd991e703ee9d211732c582d4 SHA256 124971f49e48c1ae7dcf5292cc520a6bda29c76a1274c7b6c906806bbc840988
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-kids/tuxmathscrabble/tuxmathscrabble-4.5.ebuild b/games-kids/tuxmathscrabble/tuxmathscrabble-4.5.ebuild
index d6fc048794c01276c339c034399408fcf0e50e6f..15113fcb4d56392275c04b2ba82bdd2fbeff81e3 100644 (file)
--- a/games-kids/tuxmathscrabble/tuxmathscrabble-4.5.ebuild
+++ b/games-kids/tuxmathscrabble/tuxmathscrabble-4.5.ebuild
@@ -1,6 +1,8 @@
-# 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-kids/tuxmathscrabble/tuxmathscrabble-4.5.ebuild,v 1.1 2007/10/24 01:28:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/tuxmathscrabble/tuxmathscrabble-4.5.ebuild,v 1.2 2010/04/22 12:09:35 tupone Exp $
+EAPI="2"
+PYTHON_DEPEND="2"
 
 inherit eutils python multilib games
 
@@ -21,21 +23,24 @@ DEPEND="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() {
        rm -f $(find . -name '*.pyc')
        mv -f ${MY_PN}/{Accounts,Globals,Simulation,StudentData} .
        sed -i "s:'/','var','games':'${GAMES_STATEDIR}':" \
                asymptopia_0_1_3/environment.py \
                || die "sed failed"
+       python_convert_shebangs -r 2 .
 }
 
 src_install() {
        newgamesbin ${MY_PN}.py ${PN} || die "newgamesbin failed"
 
-       python_version
-       insinto /usr/$(get_libdir)/python${PYVER}/site-packages
+       insinto $(python_get_sitedir)
        doins -r ${MY_PN} || die "doins failed"
        doins -r asymptopia_0_1_3 || die "doins asymptopia_0_1_2 failed"