dontstarve-1377999049 - system-fmod support

Also added live version.

5 files changed, 93 insertions, 12 deletions

diff --git a/games-rpg/dontstarve/Manifest b/games-rpg/dontstarve/Manifest
index b7c26a5..ea10bd9 100644
--- a/games-rpg/dontstarve/Manifest
+++ b/games-rpg/dontstarve/Manifest
@@ -1,6 +1,7 @@
-AUX launcher.sh 289 SHA256 395311852a692b608d56de11e0e414f3bc451b88b479fa0d342c3b106dcfda01 SHA512 492f21eccd62d23740e0f054e3cde43145b61a9ce99796bed0d11607ff104f7805bcf303236d5fd405ef8b576c50f2c8ef5dbdf4feec19c050261e97de6624b1 WHIRLPOOL e3e275b6c8f543e1a9fd14ca85d53adebbd7e3cb72b9c24c67a70553b25c1ab6ae97688a9cdefddecab0460349ce83e8874810eaef27457ff14fac75b8543c6c
+AUX launcher.sh 158 SHA256 2efc28965591f440758601d18ad51d4c83667abd3f1c403be0834bacbd8caf2e SHA512 413be40b8a134237710dcb2144a2ba6650a892e80c53f350c3298ba88ff165a0cce621123dc14653c2ca72737f775bfae0cf6b92c37b43446bb91a389390605c WHIRLPOOL fb81cb5d179887e3c67ccbd1a5381c0838159739348eaa17593778fa4690216638f2b96a0c99e04ba30c49a9cb0b47102f1a754dbe1a1019a69a36b9cb547062
 DIST dontstarve_x641369852738.tar.gz 109454976 SHA256 6b8cf611c55732aea2d3c422af85277267789f355f017894635c5761db04f0eb SHA512 995608cb25b58eb5e3056f9bc5bf23d42db6ab2ca68a1d4056d640ea24eb0c460a2191aea2d365d6046e3f523e74f284963b5ffb9321bfd0d881ad258d02ce61 WHIRLPOOL 7570ff5e2fd8598790520a97f196c8b74f155a174b53152f03472b4908c080333298cc6a79f9b6caba745575e4febae74f80c1ca54c62c52f27817b2573ac180
 DIST dontstarve_x64_1377999049.tar.gz 125252627 SHA256 8224098e5a55b278ab108984c4aef8feb54cc78005724961ada7517571a05c1c SHA512 f5b95172811b55a967bc94b04bb6cbced5b14ea85309f89d7e9a5c925b70316f64af13629d3ce71868fa959ae11c8bf1e6808278b1eadf516145fab2904f0936 WHIRLPOOL 4a201941d76d4e8ced9e42f06b7ae434b673a0035e583c9e7c6f9fa85c9587bd4c9127386936c0526b8e9564a2ff0994387890db8204d42200e7185437a0f07c
 EBUILD dontstarve-0.ebuild 1295 SHA256 95c1ea1784f491c138b871a09ccdc06dd70be21babe42db847e75223439c655b SHA512 405e06062cd685fed54e8be2a9281db715201a10101bb1757889b335eb760b7766366833cc4f9a0f8ad41131c46644c4c3a87bdeb5f4d55b6eaf329454345e76 WHIRLPOOL 4e7240dc227fed0e45f5999158136003a02847c4fce06b5fdf9c9e41b7a004fdd865d9566423338a1aaf896b64e5014453389161b9abf0db7ea8c0285474fcbc
-EBUILD dontstarve-1377999049.ebuild 1324 SHA256 db5acbcd7d0bb80869c3eefcf596d988bf4b01e826d288ac9275cb2eab921e09 SHA512 ec1142d3f634f1704b8526cdc6e16574b65c01ac698f133dec52137b778ceb842e2cf8dc047870f114218faae75f7cbb032cbfc655c9ad65ef3b68a75ddc7e77 WHIRLPOOL a3a4df29b504c220656f105c14007d52e083e94b4041a1f8b87a7496aab1fd41280ea78d24c9cfef6de347a588845c453efe9236f2d2436909c9f24d2520f097
-MISC metadata.xml 418 SHA256 f33d6fbdd054d00f5ecebc10edd1fa2754c2b5560b97681cff11fab88d94847a SHA512 16f33deff45fe75911ca19da71b990c675e203b21901aae883d8a637db2a3f17090022f10acecd500e3bc18f1c535a62a9f7748d199b85de3be1c5f992dd61b6 WHIRLPOOL 2ab960e002fea1f41ce5aa65514c1b7fce5924504e3fed8e95f95004dbd7e3a8b0cb751f4218defdfa9edfb2fa9c25f539bb04a5db4713d8e190b6c26698f034
+EBUILD dontstarve-1377999049.ebuild 1456 SHA256 e0546a550cd68059406746abd5a0fe5237383b1a972ca8c1b31525a810cc5bfd SHA512 f798812afbcde986e97cb87f27bb0466275873ce5fd740b00cbf02c8a7452ff67a28f82508ee342d32ad701789d7c56d4b49cd047c22a5bb753174866b57eb9e WHIRLPOOL abf8586df52d612a2c2840341bc023cbc20fc4a7de37b68e5bec32c4cfa528090e9e315d97ce86770f38e9a1a120b28418e1cdc02ac9f8b265455c9ab0c3fb7a
+EBUILD dontstarve-1377999049_p9999.ebuild 2216 SHA256 797a8b3f7f7e24c6da1c842b03cce0273de5b1814345ac55cc164cd2847b4450 SHA512 9d80b9b7fa1c5aac2c382c214ca4a55879c50f19cbd284b8fcdb12419594cab357f19ba97664ab7df1a9db1904c8bf882274af1ef2ed01fd749b611f8af1c7fc WHIRLPOOL d61e33264a1cdcfa04bf4dfe90c3e06875e9ad863e225e0cb977cb9e3499b6b6403bdbff41eddb02d8fdbff243c0a016f142e2f486d5cd3265395a7e2318d37e
+MISC metadata.xml 382 SHA256 6beab4f1d8c92d56e66585693d8f0a116f0b08fb573bc010d8d0de4334398c91 SHA512 29c65937a6d1df06bf54c1e9dcb4e444b560963ad4a19fd34e49c93d6bd6a04fa93e5a1ac37e22a003ecd77cbb3bc4906bf2ff80c4cadd715b150696ba5a3ff2 WHIRLPOOL 637d793d7113767f2612c60f558ca0966af2bed3f97f9f67da8241cc5d1fe8e86a17d0cb72fe9ebd4e1cac245a4d0dde6cdf44b2e27cc1e517a158459b9552d6
diff --git a/games-rpg/dontstarve/dontstarve-1377999049.ebuild b/games-rpg/dontstarve/dontstarve-1377999049.ebuild
index 39892de..4bac131 100644
--- a/games-rpg/dontstarve/dontstarve-1377999049.ebuild
+++ b/games-rpg/dontstarve/dontstarve-1377999049.ebuild
@@ -10,16 +10,17 @@ DESCRIPTION="An uncompromising wilderness survival game full of science and magi
 HOMEPAGE="http://www.dontstarvegame.com/"
 SRC_URI="dontstarve_x64_${PV}.tar.gz"
 
+# BSD MIT - various files in data/scripts/
 LICENSE="dontstarve-EULA BSD MIT"
 RESTRICT="fetch strip"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE=""
+IUSE="+system-fmod"
 
 HDEPEND=""
-LIBDEPEND="media-libs/fmod
-	media-libs/libsdl2
+LIBDEPEND="system-fmod? ( >=media-libs/fmod-4.44.07[designer(+)] )
 	virtual/opengl"
+	# system libsdl2 breaks input
 	# updater wants sys-libs/zlib
 DEPEND=""
 RDEPEND="${LIBDEPEND}"
@@ -37,7 +38,8 @@ src_install() {
 
 	insinto "$(games_get_libdir)"/${PN}
 	doins bin/dontstarve
-	doins bin/lib64/libSDL2{.so,-2.0.so.0{,.0.0}} \
+	doins bin/lib64/libSDL2{.so,-2.0.so.0{,.0.0}}
+	use system-fmod || doins \
 		bin/lib64/libfmodevent64{,-4.44.07}.so \
 		bin/lib64/libfmodex64{,-4.44.07}.so
 
diff --git a/games-rpg/dontstarve/dontstarve-1377999049_p9999.ebuild b/games-rpg/dontstarve/dontstarve-1377999049_p9999.ebuild
new file mode 100644
index 0000000..a808c79
--- /dev/null
+++ b/games-rpg/dontstarve/dontstarve-1377999049_p9999.ebuild
@@ -0,0 +1,81 @@
+# By eroen, 2013
+# Distributed under the terms of the ISC licence
+# $Header: $
+
+EAPI=5
+
+inherit eutils versionator games
+
+DESCRIPTION="An uncompromising wilderness survival game full of science and magic."
+HOMEPAGE="http://www.dontstarvegame.com/"
+SRC_URI="dontstarve_x64_$(get_major_version).tar.gz"
+
+# BSD MIT - various files in data/scripts/
+LICENSE="dontstarve-EULA BSD MIT"
+RESTRICT="fetch strip"
+SLOT="0"
+#KEYWORDS="-* ~amd64"
+IUSE="+system-fmod"
+
+if [[ "$(get_version_components 2)" == "9999" ]]; then
+	LIVE=yes
+fi
+
+HDEPEND=""
+[[ -n "${LIVE}" ]] && HDEPEND+=" games-util/dontstarve-updater-ng"
+LIBDEPEND="system-fmod? ( >=media-libs/fmod-4.44.07[designer(+)] )
+	virtual/opengl"
+	# system libsdl2 breaks input
+	# updater wants sys-libs/zlib
+DEPEND=""
+RDEPEND="${LIBDEPEND}"
+[[ ${EAPI} == *-hdepend ]] || DEPEND+=" ${HDEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+pkg_pretend() {
+	default
+	if [[ -n "${LIVE}" ]] && ! [[ -n "${dontstarve_KEY}" ]]; then
+		eerror "dontstarve_KEY is not set, but a live install is requested."
+		die
+	fi
+}
+
+src_unpack() {
+	default
+
+	if [[ -n "${LIVE}" ]]; then
+		einfo "Will run dontstarve-updater-ng to fetch latest version"
+		pushd "${S}" || die
+		mkdir -p ~/.klei/DoNotStarve || die
+		echo -n "{\"key\": \"${dontstarve_KEY}\"}" > ~/.klei/DoNotStarve/updater.json
+		/usr/games/bin/dontstarve-updater-ng --checkconsistency || die \
+			"the updater failed. It does that sometimes, perhaps trying again helps."
+		popd || die
+	fi
+}
+
+src_install() {
+	exeinto "${GAMES_BINDIR}"
+	newexe "${FILESDIR}"/launcher.sh ${PN}
+	sed -e "s:@VAR0@:${GAMES_DATADIR}/${PN}/data:" \
+		-e "s:@VAR1@:$(games_get_libdir)/${PN}/${PN}:" \
+		-e "s:@VAR2@:$(games_get_libdir)/${PN}:" \
+		-i "${D}${GAMES_BINDIR}"/${PN} || die
+
+	insinto "$(games_get_libdir)"/${PN}
+	doins bin/dontstarve
+	doins bin/lib64/libSDL2{.so,-2.0.so.0{,.0.0}}
+	use system-fmod || doins \
+		bin/lib64/libfmodevent64{,-4.44.07}.so \
+		bin/lib64/libfmodex64{,-4.44.07}.so
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	#doins -r data/* # takes a year
+	mkdir -p "${D}${GAMES_DATADIR}"/${PN} || die
+	cp -r data "${D}${GAMES_DATADIR}"/${PN}/ || die
+	cp -r mods "${D}${GAMES_DATADIR}"/${PN}/ || die
+
+	prepgamesdirs
+	chmod og+x "${D}$(games_get_libdir)"/${PN}/${PN}
+}
diff --git a/games-rpg/dontstarve/files/launcher.sh b/games-rpg/dontstarve/files/launcher.sh
index e078372..c986637 100644
--- a/games-rpg/dontstarve/files/launcher.sh
+++ b/games-rpg/dontstarve/files/launcher.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-# for media-libs/fmod
-#export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}/opt/fmodex/fmoddesignerapi/api/lib"
-
-# neither my libsdl2 or fmod work right for some reason
+# my libsdl2 does not work right for some reason
 export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}@VAR2@"
 
 cd "@VAR0@"
diff --git a/games-rpg/dontstarve/metadata.xml b/games-rpg/dontstarve/metadata.xml
index 31c4037..97960b2 100644
--- a/games-rpg/dontstarve/metadata.xml
+++ b/games-rpg/dontstarve/metadata.xml
@@ -5,6 +5,6 @@
 		An Uncompromising Wilderness Survival Game Full of Science & Magic!
 	</longdescription>
 	<use>
-		<flag name="update">Run update after unpacking the tarball. Requires a configured update key, a network connection and an X server.</flag>
+		<flag name="system-fmod">Use system <pkg>media-libs/fmod</pkg> in stead of the bundled version.</flag>
 	</use>
 </pkgmetadata>