maybe fix bug #528086

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

3 files changed, 115 insertions, 16 deletions

diff --git a/games-misc/katawa-shoujo/ChangeLog b/games-misc/katawa-shoujo/ChangeLog
index a924a7e95847..3ed5d84502eb 100644
--- a/games-misc/katawa-shoujo/ChangeLog
+++ b/games-misc/katawa-shoujo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-misc/katawa-shoujo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/ChangeLog,v 1.8 2014/07/28 22:36:17 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/ChangeLog,v 1.9 2014/11/06 01:34:10 hasufell Exp $
+
+*katawa-shoujo-1.2-r1 (06 Nov 2014)
+
+  06 Nov 2014; Julian Ospald <hasufell@gentoo.org> +katawa-shoujo-1.2-r1.ebuild:
+  maybe fix bug #528086
 
 *katawa-shoujo-1.2 (28 Jul 2014)
 
diff --git a/games-misc/katawa-shoujo/Manifest b/games-misc/katawa-shoujo/Manifest
index 6513298110a9..20d7293e07a8 100644
--- a/games-misc/katawa-shoujo/Manifest
+++ b/games-misc/katawa-shoujo/Manifest
@@ -8,25 +8,26 @@ DIST katawa-shoujo-256.png 59803 SHA256 8130b39af5341b0e1c85cbd6ef5be229de2877d6
 DIST katawa-shoujo-48.png 3621 SHA256 a366a52fd9dd241182d163e28a37f537fa71d5d46f1fc899da08b492c371a0fd SHA512 ad24156cf446ffe92068baaa6d512e6bab90587db5ce01b3c18e6c42bb9b8c91f7eae3e9547099d3f8f0a5d3f144676c3499c0a38d9af845abf79e153b543bef WHIRLPOOL b62253218dbb981f32007e22cdd36decac8948e4dff416ca60de3daaab8cfad9773622e194b885c0145a499008751c5a09184b7f0a0dc3b9153d751dd0d1b584
 EBUILD katawa-shoujo-1.0-r1.ebuild 1930 SHA256 e432bcf9eef06661ec56f8488485790fa2ed570161d4416e3a7695b422dba466 SHA512 7897535d9ebe3c6558863db0aaf58c45caea2aab67dee3416cafc455880790bf8ec6805a094decefe8b090d3f4185ee6f8115fb96c37684b8be23c71bcde8d5e WHIRLPOOL 18b3175870dd2e1df163594609ebdc520ad260bfa8b812aba74119842aaa2c04daecd30041fc2f9414336a521394b71afbe48996b0e1601afb951d12926bdf92
 EBUILD katawa-shoujo-1.1-r1.ebuild 2134 SHA256 4eb5c77f1c1df6c98d847bcd775bb8bba9e2224f9d505c5db5db6548ab5259e9 SHA512 432455e47c0b1810bc60892f9eebd2b2fdfdffcec58224f9194a15d90647480e8499028ef8bb31dd51ee78fc8b194db31f01e210de6cbf1ea85c3f5d7d7e78fa WHIRLPOOL 07853fab10a46fcd0f6b3c2037e40169d549d7d57f698f5e7cffed375e65c79bce301d468ab4db39132560760a10a7855dc502d9f610584d49b47dccfd5b0d2a
+EBUILD katawa-shoujo-1.2-r1.ebuild 2574 SHA256 5ed5ea0d8a7e353023a65feb8973fb421fbf0152f9ef994cb82ee987dfdacb74 SHA512 944d7fc1c6d2f3ca4742231f687c4e58eb24f86bc1aae1442bcb3ad730f9208e218f9cea1b8ccc6d4afbb97b7cace9a6ea821beb0d789b48d68e935b152e090b WHIRLPOOL a1d779d8eda8f49fb4168b3e9d499eb7df7744e6140ae5aa1039f11f0fba5cc67b967c6b5a588011398c551c26b61dd500932a3cfbd0bb845f261324491fffb8
 EBUILD katawa-shoujo-1.2.ebuild 2169 SHA256 60d28509d8ec4f9df7c484cee4a3e1d35aa7ca9ce71dd86407544f03277e7731 SHA512 ba316a7a06a24002269fac172adf505198b431ac9fecc842224067da95a8f21e2441c4b554113b69ec74795ae154e399d6f7fda25f0383976f87737cb1e5a2a8 WHIRLPOOL 1e6d5e467dc91e125ebf46603f5030befa9d9cad2916988e6ec7702250bdd4b1155fada925854ff31703d011f970c3bea811f4d8abc6e21dbcccd7a9d6b97ec5
-MISC ChangeLog 1428 SHA256 b3001cd51dc4e0ffab259229c070471af3b0dae7b8a906563036ce7100bf216d SHA512 53b04143e3872ff6825dd19ceb4b0c3e07ce4e08e7c14ecc389d753d7a7e8c169e6f7ffa5664a3e1562fbd737b0414c03a9d085d7eb881e052bdea7732853811 WHIRLPOOL 510a94b67361002fe8fb436fc14b18eb484b930a2d1ea79569cd619c119e263d3a79c73d30f9c0b3f9d4403a2260515e14da35725f2da8a770059a229a953317
+MISC ChangeLog 1571 SHA256 45e6baad3b3aa7309f42ecb232f3c326d639a4cf713b39162a65936ee19d1e88 SHA512 671096f6d11274f321e99eeaf8281ec434a2198ceca6971b87bd008b0809ac8ef267450bc282db43b19e9f3b88f63cf1dfa0da804dbdb6d3ac463dc7ade66f13 WHIRLPOOL cd27a294ed14496d9740609d583aaa7fc3411d3a7f45e2aa958c964fcae01c30c4753c258d87adc9575ec77d6ae1978e70df9c6e8bf79a1414befc97a81855bc
 MISC metadata.xml 1254 SHA256 9b3cbd8ebb32ac762a87cb93f76fc5190e5c3498fb584e46ccd312b13d8ce50e SHA512 116194e53d65b7f41e62c6ccdead70f9f2c6e7fd022ee19e41a2c0d2f6dfd4630d4c42d2a91419de96f7b00255df54149d79ad68803a1da328cb122383549ac4 WHIRLPOOL 7d5713fa44127ec7bbb6fb599d7d4ed7f44d8852dd14f8c87905fc82a0e4900025d7ffa6cbcf4e6de375b70344d43a92e5c6bdee4ed2309a314f7ca50f4a4c1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJT1tBmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUWtAXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg4HIP/R2QkNnl4otaQqNJG8qON03m
-/4ndzyoaWLkPp2HlRzxnBwdWUqtkN8AgmwOjg/HbIR4RFtoLvSJIowb10i2UqQZc
-HrWT1kSsFjVtmmK2OAEeeiAQSiO1KQotkL4+7Gb1prfLjcI0PRQQ9vXRGFdiKbva
-HmQLpaJG6VnH0Jfy18TLKlaaznD7jAFtQoiJ0dJxEJfqqS6S6DxxK3F5fU9fKYfY
-IsQgn2zB5s9oRtkFQs2+LWTUYZWhPlNfDkNEdeZ3zS7TzbmPmPUGjExYrYFrn7W1
-IOhFUwotYd3zjDqntnXwUCET30N3MplSaoM5xWOhKcf3zxaQzr+NNsErHsnDy8kk
-jdg/dm16pAdle+7gENobH+Y11NzF8ZRiZeQalF7wW9uWtt7tS8I/Z7txMj4wlfdY
-pYKXmaXb6ZP/JQM0dPzs1nX7kBNZ/ZL0x5mhk5dVlH6NB2lRltMG+wsKg3GY3dzy
-kSWYG1LqitS9qOu2ZadobJZsS/mi1XuZ4EJf3lfOeHqhyY6QwibiG49Szl5s6BqQ
-7WNx+PpHimLgjIWFGDmSywfDmjrd8yO7P6PbVmTHQ87gGfbxP04KlW6CbDYP3hxL
-NBfZFZXhajLDA8XK3ZVDphlCA61CUlRGZ0vrbDp1Wuz4BiQg2OvCxUXzesdmCjz5
-lYdBlsBYcdZB9KUQCVXd
-=BS0T
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgh4sP/0HU4IXCyxEVifzOX/BJHs/j
+Rz8HitLHvcCe3EU791d8qbz5H9fQ6SAsPt1KZ7l5E0JNFgbKAbeepe+DQoJBs01W
+MLAMl6fhQeFyenEwTIfc6DxcRmRUKZpm8aH2k9PNWRfYPwWMOmY90dJvnrZZoz4K
+/KSnjHy56bSO0Xm8UCwPyLExfoD4BPMdeVeFN1nrNfSuOYTtorvywnYTDXzrSnz6
+WQMyWS45P08d1I8Z9fwdNXBUUPIPNzbr3tGcBqWRyLE4iha0SFXgWG4s73lby/nc
+mXBQfFqs//zfEZryHkjn+WKZUCkAy9FdIJOTaWNrF3/is0TJUQKC/8XQDIBqjGLG
+i/qnpWj8tSwsS5pU97aUCthafwE0IIZhU3ISdtwraXeQVn2UE+KXIFYQQGgXosBm
+QzLMCf91VC6Z8H6/sLnoD5yp1IMFX2WQ6YW97hWHWyo/+hxrJuDEyldAMY2XEjcj
+tXVAFD+V49b5lrhsM+Eh/ltLdNiLsLD9CbLHzRyf0NW+pTdCv7akzWy3YvpeAlGf
+RyFuyJlBUXK1zvl6GcVOaAVdOTWbcmw/dfPHbfOa9ppeHUUjKmnrFDzXnBZPHb/x
+dlqV/Ac4ntrjgZ2U3czRhq8IInV2e8BBIWbfpEPNslbQY1LHgQkqbmjAu3BJgurH
+rT9n5Dbw9IsUnobaMYwL
+=yeBy
 -----END PGP SIGNATURE-----
diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.2-r1.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.2-r1.ebuild
new file mode 100644
index 000000000000..6e0b6f901a63
--- /dev/null
+++ b/games-misc/katawa-shoujo/katawa-shoujo-1.2-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 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.2-r1.ebuild,v 1.1 2014/11/06 01:34:10 hasufell Exp $
+
+EAPI=5
+
+inherit eutils gnome2-utils games
+
+DESCRIPTION="Bishoujo-style visual novel set in the fictional Yamaku High School for disabled children"
+HOMEPAGE="http://katawa-shoujo.com/"
+SRC_URI="http://dl.katawa-shoujo.com/gold_1.2/%5b4ls%5d_katawa_shoujo_1.2-%5blinux-x86%5d%5b8F3BA490%5d.tar.bz2 -> ${P}.tar.bz2
+	http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png
+	http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png"
+
+LICENSE="CC-BY-NC-ND-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc system-renpy"
+
+DEPEND="dev-util/patchelf"
+
+# make system-renpy optional due to #459742 :(
+RDEPEND="system-renpy? ( games-engines/renpy )
+	!system-renpy? (
+		|| (
+			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		)
+	)" #495270
+
+QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/lib/*"
+
+S="${WORKDIR}/Katawa Shoujo-linux-x86"
+
+src_prepare() {
+	# Set RPATH for preserve-libs handling (bug #528086).
+	local x
+	while read -r x ; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+		patchelf --set-rpath \
+			"${EPREFIX}${GAMES_PREFIX_OPT}/${PN}/lib" "${x}" || \
+			die "patchelf failed on ${x}"
+	done < <(find . -type f)
+}
+
+src_install() {
+	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
+		newicon -s ${i} "${DISTDIR}"/${PN}-${i}.png ${PN}.png
+	done
+
+	make_desktop_entry ${PN} "Katawa Shoujo"
+
+	if use doc ; then
+		newdoc "Game Manual.pdf" manual.pdf
+	fi
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	elog "Savegames from system-renpy and the bundled version are incompatible"
+
+	if use system-renpy; then
+		ewarn "system-renpy is unstable and not supported upstream"
+	fi
+
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}