reworked ebuild and wrapper script from Scarabeus

Package-Manager: portage-2.1.4.4

4 files changed, 68 insertions, 67 deletions

diff --git a/games-strategy/savage-bin/ChangeLog b/games-strategy/savage-bin/ChangeLog
index a63ce76e2aba..91c2cf927c79 100644
--- a/games-strategy/savage-bin/ChangeLog
+++ b/games-strategy/savage-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/savage-bin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/ChangeLog,v 1.6 2008/08/01 08:49:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/ChangeLog,v 1.7 2008/09/05 15:43:44 mr_bones_ Exp $
+
+  05 Sep 2008; Michael Sterrett <mr_bones_@gentoo.org> +files/savage,
+  savage-bin-2.00e.ebuild:
+  reworked ebuild and wrapper script from Scarabeus
 
   01 Aug 2008; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
   Removing myself as maintainer since I'm retiring.
diff --git a/games-strategy/savage-bin/Manifest b/games-strategy/savage-bin/Manifest
index 2d37778dbd11..65ee8c653ce9 100644
--- a/games-strategy/savage-bin/Manifest
+++ b/games-strategy/savage-bin/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST SEP-2C-noSSE.tar.gz 1373174 RMD160 6652f60d51af98242e24bbdfe4540c9c43a9cb73 SHA1 1c6b122d7bac18195e586542b9309ffd0834ec1e SHA256 467fbf10d5a3ea19eddc56790c2837bb7b50f7baf51ae525637f00cbe09f9207
-DIST SEP-3T_3T+-r2.tar.gz 3328787 RMD160 4031c80d26a806283027a6177e38c4c7b075919c SHA1 c438cbd09267cdf61981f164e15337c0127c175b SHA256 2dbd4e4fb8a48f13556f4970d46c76b54fec18d834e4c3fd6af067c17131647b
-DIST Savage_with_sep3t.run 397208452 RMD160 f7b823eaa447ee9cfca9a3793de66deb40373ae6 SHA1 562908346ebb1a3610c28c019e61f3650fd6ef8a SHA256 e10c3b9163fad283dbd5118df7a780dfd22a66d2ac69847f67e141549dcc9849
-EBUILD savage-bin-2.00e.ebuild 2323 RMD160 3ac8317feffc50582d9dd59413135be60895623b SHA1 b55221c4d906d9b86d02fe8bf85bf7d25cfd59a3 SHA256 506aafe83f453d53a04f971dd6db5d46cd08531b2b9b87a2c0833a5f5984f802
-MISC ChangeLog 1099 RMD160 1f4485d70f285d959404e09c96c316cff6ed0678 SHA1 8dffc7e4e168a3be595177a3e22ec62e78683711 SHA256 3b64f01844c664d985aa4649f177bf094e0b24d392d78fcc126f89cfa69bde53
+AUX savage 1060 RMD160 fd312a54e006dcd82604afcb8368a916e6ceca55 SHA1 ec3dae47b10358b731d7bd1317d0c6f2ee9c8398 SHA256 4c3972e4e9f74711ad90644066a663894012257291f462f4dfcd30ab50fd89e9
+DIST SFE-Standalone.tar.gz 158803234 RMD160 a4663cd62b038ebade79e7587e57baea421f9480 SHA1 e38660ea22ce64bde4d9eee452f3ceba7a856d42 SHA256 a6b12837b6d0c643aaa1aa58dcb1b2711b17547e355ba187308472f6e1f52c13
+EBUILD savage-bin-2.00e.ebuild 1623 RMD160 b23c7d24f3ac45d75bb31d8badae07a602fdc690 SHA1 27f68ededbfe5ffdc491c5cd7a25ddf79700e28a SHA256 3642a038e14b9eddb09150acc02147448dc17700a90662eabe6e36989083d92b
+MISC ChangeLog 1250 RMD160 e5f45f890683a3029be84eb0d0de491387904f1d SHA1 ac6a9c84439c9f5957958b474efc7ff650ae4afb SHA256 015687c51b08b2476983104c3603d4c59c8065301978b3a2337be69351f3fb83
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiSzggACgkQkT4lNIS36YESOwCgk0QeTrkh59nOucgcUOmn4seb
-YwMAn1IDEPSZkuwzMgvTR1WeQd4dMEyL
-=c4bg
------END PGP SIGNATURE-----
diff --git a/games-strategy/savage-bin/files/savage b/games-strategy/savage-bin/files/savage
new file mode 100644
index 000000000000..de9640de1fa3
--- /dev/null
+++ b/games-strategy/savage-bin/files/savage
@@ -0,0 +1,28 @@
+#!/usr/bin/env sh
+games_prefix_opt="%GAMES_PREFIX_OPT%"
+if [ -n "${games_prefix_opt}/savage/libs" ] ; then
+	if [ "${LD_LIBRARY_PATH+set}" = "set" ] ; then
+		export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${games_prefix_opt}/savage/libs"
+	else
+		export LD_LIBRARY_PATH="${games_prefix_opt}/savage/libs"
+	fi
+fi
+if [[ ! -e ~/.savage/savage-bin/silverback.bin ]] ; then
+	echo "setting game environment in ~/.savage/savage-bin"
+	mkdir -p ~/.savage/savage-bin/game
+	cd ~/.savage/savage-bin/ || die "squirells hate us"
+	ln -s "${games_prefix_opt}"/savage/silverback.bin ./
+	ln -s "${games_prefix_opt}"/savage/autoupdater ./
+	ln -s "${games_prefix_opt}"/savage/libs ./
+	cd game
+	ln -s "${games_prefix_opt}"/savage/game/* ./
+	rm -f screenshots settings buddylist ignorelist *.cfg *.txt world
+	cp "${games_prefix_opt}"/savage/game/*.cfg ./
+	mkdir screenshots settings world
+	cd settings
+	cp "${games_prefix_opt}"/savage/game/settings/* ./
+	cd ../world
+	ln -s "${games_prefix_opt}"/savage/game/world/* ./
+fi
+cd ~/.savage/savage-bin/
+exec ./silverback.bin set mod game "${@}"
diff --git a/games-strategy/savage-bin/savage-bin-2.00e.ebuild b/games-strategy/savage-bin/savage-bin-2.00e.ebuild
index 3045e2abef6a..5f03867c4ca3 100644
--- a/games-strategy/savage-bin/savage-bin-2.00e.ebuild
+++ b/games-strategy/savage-bin/savage-bin-2.00e.ebuild
@@ -1,84 +1,64 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/savage-bin-2.00e.ebuild,v 1.3 2008/03/11 06:18:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/savage-bin-2.00e.ebuild,v 1.4 2008/09/05 15:43:44 mr_bones_ Exp $
 
-inherit eutils games
-
-SEP_URI="http://www.notforidiots.com/autoupdater/"
-BASE_URI="http://downloads.s2games.com/online_orders/"
+inherit games
 
 DESCRIPTION="Unique mix of strategy and FPS"
-HOMEPAGE="http://www.s2games.com/savage/"
-#SRC_URI="${BASE_URI}/savage_linux.sh.gz
-#		mirror://liflg/savage_${PV}-english.update.run
-#		${SEP_URI}/SEP-3T.tar.gz
-SRC_URI="http://www.happypuppy.com/s2games/Savage_with_sep3t.run
-		${SEP_URI}/SEP-3T_3T+-r2.tar.gz
-		!sse? ( ${SEP_URI}/SEP-2C-noSSE.tar.gz )"
-#		doc? (${MANUAL_URI})"
+HOMEPAGE="http://www.s2games.com/savage/
+	http://www.notforidiots.com/SFE/"
+SRC_URI="http://www.notforidiots.com/SFE/SFE-Standalone.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="sse" #dedicated
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 RESTRICT="mirror strip"
 
-DEPEND=""
-RDEPEND=""
+RDEPEND="virtual/opengl
+	media-libs/libsdl
+	media-libs/jpeg
+	>=media-libs/freetype-2"
 
 S=${WORKDIR}
 
 dir=${GAMES_PREFIX_OPT}/savage
-Ddir=${D}/${dir}
 
 QA_TEXTRELS="${dir:1}/libs/libfmod.so
-	${dir:1}/libs/libfmod-3.63.so
 	${dir:1}/libs/libfmod-3.75.so"
 QA_EXECSTACK="${dir:1}/libs/libfmod.so
 	${dir:1}/libs/libfmod-3.75.so"
 
 src_unpack() {
-	unpack_makeself Savage_with_sep3t.run
-	unpack ./savage.tar.bz2
-	unpack ./graveyard.tar.bz2
-	unpack SEP-3T_3T+-r2.tar.gz
-	if use !sse;then
-		unpack SEP-2C-noSSE.tar.gz
-	fi
-	rm -rf bin setup.* savage.tar.bz2 graveyard.tar.bz2 autoupdater update*
+	unpack ${A}
+	cd "${S}"
+	rm -f graveyard/game.dll *.sh
+	sed \
+		-e "s:%GAMES_PREFIX_OPT%:${GAMES_PREFIX_OPT}:" \
+		"${FILESDIR}"/savage > "${T}"/savage \
+		|| die "sed failed"
 }
 
 src_install() {
-	exeinto "${dir}"
 	insinto "${dir}"
-	doins -r "${S}"/*
-	doexe silverback.bin dedicated_server.bin
-	touch "${Ddir}"/scripts.log
-	fperms ug+w "${dir}"/scripts.log
-
-	# Here, we default to the best resolution.
-	sed -i \
-		's/setsave vid_mode 4/setsave vid_mode 1/' \
-		"${Ddir}"/game/startup.cfg
-
-	newicon icon.xpm savage.xpm
-	games_make_wrapper savage "./silverback.bin set mod game" "${dir}" "${dir}"/libs
-	make_desktop_entry savage "Savage: Battle For Newerth" savage
-
-	games_make_wrapper savage-editor "./silverback.bin set mod editor" "${dir}" "${dir}"/libs
-	make_desktop_entry savage-editor "Savage Editor" savage
+	doins -r * || die "doins failed"
+	fperms g+x "${dir}"/silverback.bin || die "fperms failed"
+	dosym /dev/null "${dir}"/scripts.log || die "dosym failed"
+	
+	dogamesbin "${T}"/savage
+	make_desktop_entry savage "Savage: The Battle For Newerth"
 
-	games_make_wrapper savage-graveyard "./silverback.bin set mod graveyard" "${dir}" "${dir}"/libs
-	make_desktop_entry savage-graveyard "Savage: Graveyard Mod" savage
+	games_make_wrapper savage-graveyard "./silverback.bin set mod graveyard" \
+		"${dir}" "${dir}"/libs
+	make_desktop_entry savage-graveyard "Savage: Graveyard"
 
 	prepgamesdirs
 }
 
 pkg_postinst() {
 	games_pkg_postinst
-	elog " USE CDKEY:00000000000000000000 to activate the game"
-	echo
-	elog "To play the game, use:"
-	elog " savage"
-	echo
+	elog "In order to play \"Savage: The Battle For Newerth\", use:"
+	elog "savage"
+	elog "In order to start Editor, use:"
+	elog "savage-graveyard"
 }