| 1 |
tupone 10/04/26 10:27:00 |
| 2 |
|
| 3 |
Modified: ChangeLog childsplay-0.90.2.ebuild |
| 4 |
Log: |
| 5 |
Force python2 fixing bug #312251 |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.17 games-kids/childsplay/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-kids/childsplay/ChangeLog?rev=1.17&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-kids/childsplay/ChangeLog?rev=1.17&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-kids/childsplay/ChangeLog?r1=1.16&r2=1.17 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/games-kids/childsplay/ChangeLog,v |
| 18 |
retrieving revision 1.16 |
| 19 |
retrieving revision 1.17 |
| 20 |
diff -u -r1.16 -r1.17 |
| 21 |
--- ChangeLog 26 Nov 2009 21:07:05 -0000 1.16 |
| 22 |
+++ ChangeLog 26 Apr 2010 10:27:00 -0000 1.17 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for games-kids/childsplay |
| 25 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/games-kids/childsplay/ChangeLog,v 1.16 2009/11/26 21:07:05 maekke Exp $ |
| 27 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/games-kids/childsplay/ChangeLog,v 1.17 2010/04/26 10:27:00 tupone Exp $ |
| 29 |
+ |
| 30 |
+ 26 Apr 2010; Tupone Alfredo <tupone@g.o> childsplay-0.90.2.ebuild, |
| 31 |
+ +files/childsplay-0.90.2-gentoo.patch: |
| 32 |
+ Force python2 fixing bug #312251 by arfrever@g.o |
| 33 |
|
| 34 |
26 Nov 2009; Markus Meier <maekke@g.o> childsplay-0.90.2.ebuild: |
| 35 |
x86 stable, bug #294562 |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 games-kids/childsplay/childsplay-0.90.2.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-kids/childsplay/childsplay-0.90.2.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-kids/childsplay/childsplay-0.90.2.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-kids/childsplay/childsplay-0.90.2.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: childsplay-0.90.2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/games-kids/childsplay/childsplay-0.90.2.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- childsplay-0.90.2.ebuild 26 Nov 2009 21:07:05 -0000 1.2 |
| 52 |
+++ childsplay-0.90.2.ebuild 26 Apr 2010 10:27:00 -0000 1.3 |
| 53 |
@@ -1,8 +1,9 @@ |
| 54 |
-# Copyright 1999-2009 Gentoo Foundation |
| 55 |
+# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/games-kids/childsplay/childsplay-0.90.2.ebuild,v 1.2 2009/11/26 21:07:05 maekke Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/games-kids/childsplay/childsplay-0.90.2.ebuild,v 1.3 2010/04/26 10:27:00 tupone Exp $ |
| 59 |
|
| 60 |
EAPI=2 |
| 61 |
+PYTHON_DEPEND="2" |
| 62 |
inherit eutils python games |
| 63 |
|
| 64 |
DESCRIPTION="A suite of educational games for young children" |
| 65 |
@@ -18,27 +19,33 @@ |
| 66 |
KEYWORDS="~amd64 x86" |
| 67 |
IUSE="" |
| 68 |
|
| 69 |
-DEPEND=">=dev-lang/python-2.1 |
| 70 |
- >=dev-python/pygame-1.7.1 |
| 71 |
+DEPEND=">=dev-python/pygame-1.7.1 |
| 72 |
>=media-libs/sdl-image-1.2[gif,jpeg,png] |
| 73 |
>=media-libs/sdl-ttf-2.0 |
| 74 |
>=media-libs/sdl-mixer-1.2[vorbis] |
| 75 |
media-libs/libogg" |
| 76 |
|
| 77 |
-src_unpack() { |
| 78 |
+pkg_setup() { |
| 79 |
+ python_set_active_version 2 |
| 80 |
+ games_pkg_setup |
| 81 |
+} |
| 82 |
+ |
| 83 |
+src_prepare() { |
| 84 |
local DIR |
| 85 |
|
| 86 |
# Copy the plugins into the main package. |
| 87 |
- unpack ${A} |
| 88 |
+ mv ../${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds Data || die |
| 89 |
+ mv ../${PN}_plugins-${PLUGINS_VERSION}/add-score.py . || die |
| 90 |
for DIR in ${PN}_plugins-${PLUGINS_VERSION} ${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}; do |
| 91 |
- cp -r ${DIR}/Data/*.icon.png ${P}/Data/icons || die |
| 92 |
- cp -r ${DIR}/lib/* ${P}/lib || die |
| 93 |
- cp -r ${DIR}/assetml/* ${P}/assetml || die |
| 94 |
+ mv ../${DIR}/Data/*.icon.png Data/icons || die |
| 95 |
+ cp -r ../${DIR}/lib/* lib || die |
| 96 |
+ mv ../${DIR}/assetml/${PN}/* assetml/${PN} || die |
| 97 |
+ rm -rf ../${DIR} |
| 98 |
done |
| 99 |
- cp -r ${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds ${P}/Data || die |
| 100 |
- cp ${PN}_plugins-${PLUGINS_VERSION}/add-score.py ${P} || die |
| 101 |
- cd "${S}" |
| 102 |
gunzip man/childsplay.6.gz |
| 103 |
+ epatch "${FILESDIR}"/${P}-gentoo.patch \ |
| 104 |
+ || die "epatch failed" |
| 105 |
+ python_convert_shebangs -r 2 . |
| 106 |
} |
| 107 |
|
| 108 |
src_install() { |
| 109 |
@@ -105,10 +112,10 @@ |
| 110 |
# initialize the score file |
| 111 |
cp Data/childsplay.score "${D}/${_SCOREFILE}" || die |
| 112 |
SCORE_GAMES="Packid,Numbers,Soundmemory,Fallingletters,Findsound,Findsound2,Billiard" |
| 113 |
- python add-score.py "${D}/${_SCOREDIR}" $SCORE_GAMES |
| 114 |
+ $(PYTHON) add-score.py "${D}/${_SCOREDIR}" $SCORE_GAMES |
| 115 |
|
| 116 |
# translate for the letters game |
| 117 |
- python letters-trans.py "${D}/${_ASSETMLDIR}" |
| 118 |
+ $(PYTHON) letters-trans.py "${D}/${_ASSETMLDIR}" |
| 119 |
|
| 120 |
doman man/childsplay.6 |
| 121 |
dodoc doc/README* doc/Changelog doc/copyright |
| 122 |
@@ -117,6 +124,7 @@ |
| 123 |
dogamesbin "${FILESDIR}"/childsplay || die |
| 124 |
sed -i \ |
| 125 |
-e "s:GENTOO_DIR:${_CPDIR}:" \ |
| 126 |
+ -e "s:python:$(PYTHON):" \ |
| 127 |
"${D}${GAMES_BINDIR}"/childsplay \ |
| 128 |
|| die "sed failed" |
Archives