dev-games/renpy: New version. Thanks to Tommy[D], _AxS_, Mr_Bones_.

svn path=/sunrise/; revision=11486

6 files changed, 102 insertions, 30 deletions

diff --git a/dev-games/renpy/ChangeLog b/dev-games/renpy/ChangeLog
index 45d0be997..165122337 100644
--- a/dev-games/renpy/ChangeLog
+++ b/dev-games/renpy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Oct 2010; Nao Nakashima (nao) <nao.nakashima@gmail.com>
+  renpy-6.9.3-r1.ebuild, -renpy-6.10.2-r2.ebuild, +renpy-6.10.2-r3.ebuild,
+  +renpy-6.11.1.ebuild, +files/renpy.sh:
+  New version. Should work if python-3 is set as default.
+  Other minor changes. Thanks to Tommy[D], _AxS_, Mr_Bones_.
+
   01 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
   renpy-6.9.3-r1.ebuild, renpy-6.10.2-r2.ebuild:
   Adjust 'find' calls to be POSIX-compliant.
diff --git a/dev-games/renpy/Manifest b/dev-games/renpy/Manifest
index 02bf490ee..e430c7248 100644
--- a/dev-games/renpy/Manifest
+++ b/dev-games/renpy/Manifest
@@ -1,7 +1,10 @@
 AUX renpy-jedit-path.patch 362 RMD160 fd7a17f48b4911ddda89414f8eccc3da0d4ccbe6 SHA1 f592f721646354220b671d042730ef54b336d2b3 SHA256 a957962ed4d848b9c94330df809764107926e659f43c4f4f2d545767e1591253
+AUX renpy.sh 85 RMD160 1701cad7c3fe5bfbed3c9e2687a9525ef212ee28 SHA1 efd08e9f7f172e5afdd6de79e976a366e947c469 SHA256 260b6b69efdf401d31656903a527eb4266830ff802b2f0d239fdd9f653dd4c3c
 DIST renpy-6.10.2-source.tar.bz2 8860957 RMD160 5571738ca5db8b6e24da17a26913b4477760629f SHA1 747b01131756ce019b32e34ae70ae8ea803cf1d1 SHA256 80d590a0605e16d99bbfcb5bdb96957cd423f35e29ddceefa623e8d322d30de4
+DIST renpy-6.11.1-source.tar.bz2 8696540 RMD160 e738b2d5c479b9179e2e795164c1592ce9ef35ac SHA1 a12be521c1fdcfd340f47f4d04f184489d1087aa SHA256 501a03f131c46d158bb7c5edd941df0edbb9cac7f82d75d7c5a0fbac466888b6
 DIST renpy-6.9.3-source.tar.bz2 6060203 RMD160 105c1c8e51fdfae64e07d41fb51508249c4ef219 SHA1 5f250c3b045a6c07a828020f6f99a40d8cbc0344 SHA256 f47bcf0e678a41eb3c73fe345c03387730661f9b38837ef993e69af9e926d955
-EBUILD renpy-6.10.2-r2.ebuild 1939 RMD160 7f9d1b933aa13bb00aead9b2daa8ae6baee826ff SHA1 10080abb13be7ab626b6cb7dbd26bc5645a4385f SHA256 38d98d2b5ed5ea16643a906b879572a46c84a350cb87154b77c0037ae978191a
-EBUILD renpy-6.9.3-r1.ebuild 1220 RMD160 dfe5c73c8ad7612ddd3173d4b073fb74a12d07d2 SHA1 bd0f6a9a218bbdae299d583c7f6b7adbff65bd97 SHA256 6817bf04bba6306e172ecdb96f318d9e68fbbd28e1766def0d72971eb4e3dbd2
-MISC ChangeLog 1318 RMD160 4b31aaace7bfeb75239bb30c7405b14e4ac73cdc SHA1 02d177574aa17036d49b3c1960c238ab49d28cbb SHA256 5e8d28d6b4af6b27f69ff161d44a5070bed1749a53ee53543f7745e9bd2d53c3
+EBUILD renpy-6.10.2-r3.ebuild 1157 RMD160 21a5dc2726543dd14a87079bcf3e29b6b52aae82 SHA1 3c66831fae4a7fda2e3b7bab6e16a023bd53e35f SHA256 d2256373a1a96994c9b605c42c023ae22b2adf8a5113e877319058f21b21bd2e
+EBUILD renpy-6.11.1.ebuild 1821 RMD160 d5e061ec0d946ca5632d081a296b90e5291e1e99 SHA1 02826c968f59b620d6d2672469e23bb811d04e63 SHA256 924f487bce6703b483346c5f39c0fa775d0e5214d209271f2b6042b87cf81504
+EBUILD renpy-6.9.3-r1.ebuild 1157 RMD160 21a5dc2726543dd14a87079bcf3e29b6b52aae82 SHA1 3c66831fae4a7fda2e3b7bab6e16a023bd53e35f SHA256 d2256373a1a96994c9b605c42c023ae22b2adf8a5113e877319058f21b21bd2e
+MISC ChangeLog 1615 RMD160 448496c472dc435b13bdf6180ba95f4e233efd27 SHA1 6a9a8906bc5a552101f18584635d43ee9834e805 SHA256 71b3cd372c7f20a811661d30c0a149dc5d08f45989a7b3e26925faf362238ca7
 MISC metadata.xml 980 RMD160 feafd46cb258cf88bbc8ecc9131ba9ead790fe9f SHA1 78f3565bb0934b79bbd52758b922651d0a069641 SHA256 7ac64d18d9c165487a215a7729ecb0a7859c8bd7410e2a0e2aeabd71e42a14b8
diff --git a/dev-games/renpy/files/renpy.sh b/dev-games/renpy/files/renpy.sh
new file mode 100644
index 000000000..cf299d7da
--- /dev/null
+++ b/dev-games/renpy/files/renpy.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+RENPY_BASE="GAMES_DATADIR/PACKAGE" "GAMES_DATADIR/PACKAGE/renpy.py" "${@}"
diff --git a/dev-games/renpy/renpy-6.10.2-r3.ebuild b/dev-games/renpy/renpy-6.10.2-r3.ebuild
new file mode 100644
index 000000000..ab4be3f0f
--- /dev/null
+++ b/dev-games/renpy/renpy-6.10.2-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+PYTHON_DEPEND="2:2.5"
+
+inherit python versionator games
+
+DESCRIPTION="Visual novel engine written in python"
+HOMEPAGE="http://www.renpy.org"
+SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pygame[X]
+	>=dev-games/renpy-modules-${PV}"
+
+pkg_setup() {
+	python_set_active_version 2
+	games_pkg_setup
+}
+
+src_prepare() {
+	find renpy -name '*.pyo' -exec rm -f {} + || die
+	python_convert_shebangs 2 renpy.py
+
+	sed -e "s:GAMES_DATADIR:${GAMES_DATADIR}:g" \
+		-e "s:PACKAGE:${P}:g" \
+		"${FILESDIR}"/${PN}.sh > "${T}"/${PN}.sh || die
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}"/${P}
+	exeinto "${GAMES_DATADIR}"/${P}
+
+	doexe renpy.py || die
+
+	newgamesbin "${T}"/${PN}.sh ${PN}-${SLOT}|| die
+
+	doins -r common renpy || die
+	dodoc CHANGELOG.txt || die
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	python_mod_optimize "${GAMES_DATADIR}/${P}"
+	games_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${GAMES_DATADIR}/${P}"
+}
diff --git a/dev-games/renpy/renpy-6.10.2-r2.ebuild b/dev-games/renpy/renpy-6.11.1.ebuild
index c618f81bc..9c67c6f30 100644
--- a/dev-games/renpy/renpy-6.10.2-r2.ebuild
+++ b/dev-games/renpy/renpy-6.11.1.ebuild
@@ -5,7 +5,7 @@
 EAPI="2"
 PYTHON_DEPEND="2:2.5"
 
-inherit confutils eutils games python versionator
+inherit confutils eutils python versionator games
 
 DESCRIPTION="Visual novel engine written in python"
 HOMEPAGE="http://www.renpy.org"
@@ -16,11 +16,13 @@ SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~amd64 ~x86"
 IUSE="development doc examples"
 
-RDEPEND="dev-python/pygame[X]
+RDEPEND="dev-python/argparse
+	dev-python/pygame[X]
 	>=dev-games/renpy-modules-${PV}"
 
 pkg_setup() {
 	confutils_use_depend_any examples development
+	python_set_active_version 2
 	games_pkg_setup
 }
 
@@ -29,39 +31,40 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-jedit-path.patch
 
 	find renpy -name '*.pyo' -exec rm -f {} + || die
+	python_convert_shebangs 2 renpy.py
+
+	sed -e "s:GAMES_DATADIR:${GAMES_DATADIR}:g" \
+		-e "s:PACKAGE:${P}:g" \
+		"${FILESDIR}"/${PN}.sh > "${T}"/${PN}.sh || die
 }
 
 src_install() {
 	insinto "${GAMES_DATADIR}"/${P}
 	exeinto "${GAMES_DATADIR}"/${P}
 
-	doexe renpy.py || die "doexe failed"
+	doexe renpy.py || die
 
-	dodir "${GAMES_BINDIR}" || die "dodir failed"
-	P_SLOT=${PN}-${SLOT}
-	cat <<-EOF > "${D}"/"${GAMES_BINDIR}"/${P_SLOT} || die "Failed to create ${P_SLOT}"
-		#!/bin/sh
-		RENPY_BASE="${GAMES_DATADIR}"/${P} "${GAMES_DATADIR}"/${P}/renpy.py "\${@}"
-	EOF
+	local P_SLOT=${PN}-${SLOT}
+	newgamesbin "${T}"/${PN}.sh ${P_SLOT} || die
 
-	doins -r common renpy || die "doins failed"
+	doins -r common renpy || die
 
 	if use development; then
-		doins -r launcher template || die "doins failed"
+		doins -r launcher template || die
 
-		newicon launcher/logo32.png ${P}.png || die "newicon failed"
-		make_desktop_entry ${P_SLOT} "Ren'Py ${PV}" ${P} Game "${GAMES_DATADIR}"/${P} || die "make_desktop_entry failed"
+		newicon launcher/logo32.png ${P}.png || die
+		make_desktop_entry ${P_SLOT} "Ren'Py ${PV}" ${P} Game Path="${GAMES_DATADIR}"/${P}
 	fi
 
 	if use examples; then
-		doins -r the_question || die "doins failed"
-		doins -r tutorial || die "doins failed"
+		doins -r the_question || die
+		doins -r tutorial || die
 	fi
 
-	dodoc CHANGELOG.txt || die "dodoc failed"
+	dodoc CHANGELOG.txt || die
 
 	if use doc; then
-		dohtml -r doc || die "dohtml failed"
+		dohtml -r doc || die
 	fi
 
 	prepgamesdirs
diff --git a/dev-games/renpy/renpy-6.9.3-r1.ebuild b/dev-games/renpy/renpy-6.9.3-r1.ebuild
index d9a56cdb2..ab4be3f0f 100644
--- a/dev-games/renpy/renpy-6.9.3-r1.ebuild
+++ b/dev-games/renpy/renpy-6.9.3-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="2"
 PYTHON_DEPEND="2:2.5"
 
-inherit eutils games python versionator
+inherit python versionator games
 
 DESCRIPTION="Visual novel engine written in python"
 HOMEPAGE="http://www.renpy.org"
@@ -20,28 +20,29 @@ RDEPEND="dev-python/pygame[X]
 	>=dev-games/renpy-modules-${PV}"
 
 pkg_setup() {
+	python_set_active_version 2
 	games_pkg_setup
 }
 
 src_prepare() {
 	find renpy -name '*.pyo' -exec rm -f {} + || die
+	python_convert_shebangs 2 renpy.py
+
+	sed -e "s:GAMES_DATADIR:${GAMES_DATADIR}:g" \
+		-e "s:PACKAGE:${P}:g" \
+		"${FILESDIR}"/${PN}.sh > "${T}"/${PN}.sh || die
 }
 
 src_install() {
 	insinto "${GAMES_DATADIR}"/${P}
 	exeinto "${GAMES_DATADIR}"/${P}
 
-	doexe renpy.py || die "doexe failed"
+	doexe renpy.py || die
 
-	dodir "${GAMES_BINDIR}" || die "dodir failed"
-	P_SLOT=${PN}-${SLOT}
-	cat <<-EOF > "${D}"/"${GAMES_BINDIR}"/${P_SLOT} || die "Failed to create ${P_SLOT}"
-		#!/bin/sh
-		RENPY_BASE="${GAMES_DATADIR}"/${P} "${GAMES_DATADIR}"/${P}/renpy.py "\${@}"
-	EOF
+	newgamesbin "${T}"/${PN}.sh ${PN}-${SLOT}|| die
 
-	doins -r common renpy || die "doins failed"
-	dodoc CHANGELOG.txt || die "dodoc failed"
+	doins -r common renpy || die
+	dodoc CHANGELOG.txt || die
 
 	prepgamesdirs
 }