add system-renpy useflag and fix bug #459742

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 40 insertions, 18 deletions

diff --git a/games-misc/katawa-shoujo/ChangeLog b/games-misc/katawa-shoujo/ChangeLog
index 22f0a95b8969..06c3ae23c946 100644
--- a/games-misc/katawa-shoujo/ChangeLog
+++ b/games-misc/katawa-shoujo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-misc/katawa-shoujo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/ChangeLog,v 1.1 2013/02/27 22:13:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/ChangeLog,v 1.2 2013/02/28 21:38:07 hasufell Exp $
+
+*katawa-shoujo-1.0-r1 (28 Feb 2013)
+
+  28 Feb 2013; Julian Ospald <hasufell@gentoo.org> -katawa-shoujo-1.0.ebuild,
+  +katawa-shoujo-1.0-r1.ebuild:
+  add system-renpy useflag and fix bug #459742
 
 *katawa-shoujo-1.0 (27 Feb 2013)
 
diff --git a/games-misc/katawa-shoujo/Manifest b/games-misc/katawa-shoujo/Manifest
index 7f6be4c09656..1efa21155010 100644
--- a/games-misc/katawa-shoujo/Manifest
+++ b/games-misc/katawa-shoujo/Manifest
@@ -4,17 +4,17 @@ Hash: SHA256
 DIST katawa-shoujo-1.0.tar.bz2 476084998 SHA256 7c39ff74fd47f235bf9c9ad3440b3c5c45e63f8d7aa8069ae49dd3acdfd7477a SHA512 737d5ccffe5977c6d7dddc6b4f3cac2e059b39cb8c981239c4c64046f0d718b5f58964a7ba277968d4857db2e4ab67c3ac8b1befa5c1ca560ade6fdce8fea857 WHIRLPOOL 84df55dfbe12792ea9d7a6890e5de56d8765b9c21410ae64374560623a410d18f1d8ecc55fed4bcd5b619613a6f08ca5be3741559584ffd883bccd2ed83a04d1
 DIST katawa-shoujo-256.png 59803 SHA256 8130b39af5341b0e1c85cbd6ef5be229de2877d696e5b372e1aacf176778df45 SHA512 7d920c24f4182ba72d5b3d641d7d373c166ca4c7d0b6a396f5e3b9281cb43f7e6e8e761f2f181ff061705118b3080807866fcd290d2b471e98c3a584d5fa8e0e WHIRLPOOL d2b06b26d2ea5bae5292fc5e6f3f4571fa82a4f70155e38a3c8a21778caabc37b2a13b2cb7637a0fb05a55243a63e23c96d0538bbcbc631810f15c069d26f590
 DIST katawa-shoujo-48.png 3621 SHA256 a366a52fd9dd241182d163e28a37f537fa71d5d46f1fc899da08b492c371a0fd SHA512 ad24156cf446ffe92068baaa6d512e6bab90587db5ce01b3c18e6c42bb9b8c91f7eae3e9547099d3f8f0a5d3f144676c3499c0a38d9af845abf79e153b543bef WHIRLPOOL b62253218dbb981f32007e22cdd36decac8948e4dff416ca60de3daaab8cfad9773622e194b885c0145a499008751c5a09184b7f0a0dc3b9153d751dd0d1b584
-EBUILD katawa-shoujo-1.0.ebuild 1264 SHA256 26d3f9595d3ace3a073d197701f68c3a652822f95d311a5872a8e03f7fff2b01 SHA512 c35e35ca212fa50626c36fc6cc7aff226131ff112fd03387efde9db637584d7ecfaec2a06f38d157efd6588ec92f3cf202cf988eb5b2ac33fdc3c025576daf0c WHIRLPOOL b27845942354f3ec74bf03e4be470122027242544ac12beb9fb2a82d9d1a11d0eb9c47245956e65032968debd5ddccd2c61b18ab1101068864c43bd6fa6301b7
-MISC ChangeLog 387 SHA256 5c01f7c76c1ec08b9e57ae30c62ecf832fb9c2a7cb199f96e8aad8d496140254 SHA512 cc5130eb29f4059de418cc6445e17682fbf37365eb017030d34dd89e873ac0783e684b5f1b0ce419b78a1f98cc67c9f30191b17eac40e9f3f445ec81b4b81133 WHIRLPOOL 04269b06e7066be28a924e4069eb18964118277c4b795df586af9dd3b7734b7cd2029ad72f15fbfabb605e415c1e3052ef78b22230dca1cde7771fea77cf4b9d
-MISC metadata.xml 1095 SHA256 58fc2e13beb5856f2f3d1c4cfd457e88e5ae949a076887ac350fc207a5be1dab SHA512 c39681a65d45f40a244711167212c6bb319d9022297df17268e69239f2e4950800e8a22262fe840cfe27624cd922b84a6738822a79228fa3c387026555060d80 WHIRLPOOL 306c2511aff499286f0e1db10fb81376ccee6d280052a2af8e6832318b7eff3308c653919ea847960170ee72f9c2d30300de6d2ab6badf4ef05e5d595d60895b
+EBUILD katawa-shoujo-1.0-r1.ebuild 1871 SHA256 0fdd8e6879c0ed77f4e587d05d7ff9f63c82b3e0ac1632ef765f94850925a907 SHA512 f4ccb0380714ba1b3e6264d7cc4f9ef80115bb8df4f707fa43e5be6366c99bd30e96032986c8b205d0d936c379cd286bff1bfb1c6de8df119002549b39a5658e WHIRLPOOL 13413c6242846681ba8f4b27c062da784d921e115d508530cbaf61fc5550d1ca0106b630b750449446a694ec513564eef6bf5533a768bac3087a528d12a2eb35
+MISC ChangeLog 582 SHA256 b09287d143e20934e188f99e10ac0693d8d2ee9114d16c3700ccdadcd8ea6247 SHA512 efac12fe7b82fe86e349a0b182fa74554736e06d70c35985558157a71ffae65d2b6d270ab5ea57493df7556341229d25d3d4802b1a61b4c44989ccafc6669f7c WHIRLPOOL 73ec327f03ae71384f80cfdd3f087c34e16e7a1f44f050cf27d38d5eac6f76189a0126f7017239e28f35d1235a4d0ffe38740176703334a3199ffa10b2e4620a
+MISC metadata.xml 1222 SHA256 45af0ad6c8f104faadca91b8d3416566caec50dd516e72001a0180aae81996fe SHA512 e3e4196c1220218baa20394495769f0f92d6b4016ce36fff654a179bdfd68de5522967d3bec1819cf0ea9bee09edf39d2e4277e8f3ee6aabba0120415f249ad1 WHIRLPOOL 2c5865a3254fbd795e690899be493ddec164c0fb8b47296693562b1221eee26917b195463a52288347ba27a3f0b49fb2e44da1133989d5477b3caa79dcccd6be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRLoT1AAoJEFpvPKfnPDWzd8AH/RyB5+VojjrhcA5GZif17vmA
-aFz4Y4V8SNMVKIfF6LnFZ2YXON48VsXQA9RBNValet3+LoL7dE5j6tUtnFbauRSi
-oBQZDCLZv5gzNBIzNH9s+yS3qioEuYUgmm60hEeDhR6+q0xodkMk3R4LWzDqGGAH
-0lVUCSVQo9+XAYO3LqEpfQtnrFth7BEd2X1d5xqTlfLdRizTn7kX5irVeBtmzHuu
-0+4ZldJfGqYnhrub6RWGZVbwSEavlcYEkade5e3O5GSTL6gXREuprmS2TmArvIWq
-MNBWaQCLWus7eckGUJaDtDTzvoEXA/waJLvgv+ilM0/GQBeoItkSN9V6bmd3mOg=
-=ZPHA
+iQEcBAEBCAAGBQJRL85DAAoJEFpvPKfnPDWzIf4IAK1QmHtZ3cw1prj4GYeE+Z08
+1NQ/PcfKBTPaYT8Ux+YFO4m7bExgbNrNykXXnPzfRLp9FXUJa7dyk0UdasM2pL43
+NjufqIuqOvuueqD9pfQ5i3xWWZvwWl6rGBkarfMGAQMLEo69HLCpTo/F2IrrdWET
+WBBn/IdyqrbimabtFAGh9WYE88h3guFD+Iu6Mj0qN237+cgqLkKuDA+QsU808jMt
+zqMIQxEj4p6g7gfAsl1VJ2G2zEt6CCH7WGyDhGT46Dpo34PkdUj54OXOa08Fjt+c
+npSuBVz8xrNE9wKIA+MrcDDd+QNms4ANRxHio/RVn0AVStsjUl02Kqc0G/q+pBU=
+=CMJG
 -----END PGP SIGNATURE-----
diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.0.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild
index ed1648498cb7..8589d91f1acb 100644
--- a/games-misc/katawa-shoujo/katawa-shoujo-1.0.ebuild
+++ b/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/katawa-shoujo-1.0.ebuild,v 1.1 2013/02/27 22:13:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild,v 1.1 2013/02/28 21:38:07 hasufell Exp $
 
 EAPI=5
 
@@ -15,17 +15,28 @@ SRC_URI="http://naodesu.org/files/katawa-shoujo/${P}.tar.bz2
 LICENSE="CC-BY-NC-ND-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc system-renpy"
 
-RDEPEND="games-engines/renpy"
+# make system-renpy optional due to #459742 :(
+RDEPEND="system-renpy? ( games-engines/renpy )"
+
+QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/lib/*"
 
 S="${WORKDIR}/Katawa Shoujo-linux-x86"
 
 src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r game/.
-
-	games_make_wrapper ${PN} "renpy '${GAMES_DATADIR}/${PN}'"
+	if use system-renpy ; then
+		insinto "${GAMES_DATADIR}/${PN}"
+		doins -r game/.
+		games_make_wrapper ${PN} "renpy '${GAMES_DATADIR}/${PN}'"
+	else
+		insinto "${GAMES_PREFIX_OPT}"/${PN}
+		doins -r common game lib renpy "Katawa Shoujo.py" "Katawa Shoujo.sh"
+		games_make_wrapper ${PN} "./Katawa\ Shoujo.sh" "${GAMES_PREFIX_OPT}/${PN}"
+		fperms +x "${GAMES_PREFIX_OPT}/${PN}"/lib/{python,linux-x86/python.real} \
+			"${GAMES_PREFIX_OPT}/${PN}/Katawa Shoujo.sh" \
+			"${GAMES_PREFIX_OPT}/${PN}/Katawa Shoujo.py"
+	fi
 
 	local i
 	for i in 48 256; do
@@ -47,6 +58,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	elog "Savegames from system-renpy and the bundled version are incompatible"
+
 	games_pkg_postinst
 	gnome2_icon_cache_update
 }
diff --git a/games-misc/katawa-shoujo/metadata.xml b/games-misc/katawa-shoujo/metadata.xml
index 1046abad4c4a..7f6495fee9f3 100644
--- a/games-misc/katawa-shoujo/metadata.xml
+++ b/games-misc/katawa-shoujo/metadata.xml
@@ -12,6 +12,9 @@
 		<name>Maks Verver</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<use>
+		<flag name="system-renpy">Use <pkg>games-engines/renpy</pkg> instead of the bundled one (experimental)</flag>
+	</use>
 	<longdescription>
 		Katawa Shoujo is a bishoujo-style visual novel set in the fictional
 		Yamaku High School for disabled children, located somewhere in modern