Allow user editable configuration (map editation wont work as it is CANTFIX). Per bug #232028. Remove old.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

7 files changed, 52 insertions, 152 deletions

diff --git a/games-fps/sauerbraten/ChangeLog b/games-fps/sauerbraten/ChangeLog
index 34f800c38051..d7f5e6391da8 100644
--- a/games-fps/sauerbraten/ChangeLog
+++ b/games-fps/sauerbraten/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/sauerbraten
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/ChangeLog,v 1.10 2008/06/18 07:06:15 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/ChangeLog,v 1.11 2009/03/09 18:33:04 scarabeus Exp $
+
+  09 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/sauerbraten_unix.patch, -files/wrapper,
+  -sauerbraten-2007.08.29.ebuild, -sauerbraten-2007.12.27.ebuild,
+  sauerbraten-2008.06.17.ebuild:
+  Allow user editable configuration (map editation wont work as it is
+  CANTFIX). Per bug #232028. Remove old.
 
 *sauerbraten-2008.06.17 (18 Jun 2008)
 
diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index 787c25d41742..063e81fbdbfa 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -1,10 +1,5 @@
-AUX wrapper 166 RMD160 2ef2e9eae4862302c76ca96bd831715a9641307f SHA1 4e82510a45c559661aa5f7469dbda0063ff50cd5 SHA256 3af32c9d753c17d320d76b407feb0e008c6ba7c1877ab6c830ed3bb7587b66e6
-DIST patch-2007-12-27_linux.tar.gz 795433 RMD160 a3105a5e9d277142a063b1436cac72586380cc4a SHA1 36b7217376f2959cde64af1570704a9d4fa1fcc3 SHA256 add6bb3cd524efdc3623ab8bff81e67847352f83d0f81c318d140198a9d14eb7
-DIST sauerbraten_2007_08_29_summer_edition_linux.tar.bz2 205739364 RMD160 5d80b34fd7805ba5310e21210b33a51bbbae0946 SHA1 fd388a7f28d52580f0f4022b490f6f919a0d05ee SHA256 66468021af6a551aad666deda3716d21420482371573f6fd0ac6d7242c0d8370
-DIST sauerbraten_2007_12_24_assassin_edition_linux.tar.bz2 233583167 RMD160 63b80bad5c20438cfaa7f52f7c797be37db1483b SHA1 4013620b537298607101a1e9f991ed29d28fab56 SHA256 cc20bb05fe196904f3c8d42ff7eecc21e1bb90d083db0100c4c16641cc2c3b60
+AUX sauerbraten_unix.patch 644 RMD160 bcb380a16ffe1da5e077dff76f732edc9215890d SHA1 887442110e36a71b535d8b11fe1b541bd885a872 SHA256 0198017bd3c88d06ad0b0f369b7f0c71ff2451bf82345eb8869fdd34a5b81c79
 DIST sauerbraten_2008_06_17_ctf_edition_linux.tar.bz2 314942420 RMD160 3cb4661494618610eb0149b402ecc5b6bdfd879f SHA1 9e34f4d15b861a58645b6378fc27bb0e7a835605 SHA256 9ea0ce8b4978c7d506c3f53d4a8fe0bc7e50dad34740964562bce170295e1270
-EBUILD sauerbraten-2007.08.29.ebuild 1463 RMD160 c2e64fe2fe07cefed5aeb3c9ccbe1b5eac7458f4 SHA1 da389285e47e2379d827cc81a083d38296861253 SHA256 218bfaae7beab279dc836abcb4e01b2fa3a904c2266b89e01ac5d93e86d8d306
-EBUILD sauerbraten-2007.12.27.ebuild 1531 RMD160 9269e7ff1f1601280d605c96dec29a57890e2e5b SHA1 1e74f606951121222691f261df18a7853ca7ffba SHA256 5dfd943410e6ed073eac326c113e282cb6b784f912207edcaa15284b19782ff5
-EBUILD sauerbraten-2008.06.17.ebuild 1462 RMD160 a4cb83adf030479031b1bfbbd2a5200af89e7024 SHA1 dace23f145796ae71806a3f79d32215f4d81d99a SHA256 ebf4e683e7582e54fe1d240ef80730aa3b31a57eb8094703f85d236853b76f13
-MISC ChangeLog 1661 RMD160 2c6b2d55b921976f75e32ffff2a34974b0f47da6 SHA1 c80a27f9cc8934258d5752b881ede950feba2f50 SHA256 aab198e36c50d880438b274ba9f625f6a8d94bc6d2f8d8e977024c1026efb2ed
+EBUILD sauerbraten-2008.06.17.ebuild 1725 RMD160 b4218650d205a7fec12a62b2260528092135e9f6 SHA1 7bdf6d7589b8bb083c36fdd9a19db84c6c23af64 SHA256 e63a35d92726a203b6c719dfa0b7a187eb8a0c0d9de0868c14feba2b54a7067d
+MISC ChangeLog 1973 RMD160 7fd2d62edb389fcccceb3dad0b597ed9c76addf5 SHA1 b80bfc00663de793cc3a1a369705438bbbf15743 SHA256 be99c298832757892b3e87dbf961eac651dea0e582af7068b9b96313c51ec75b
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-fps/sauerbraten/files/sauerbraten_unix.patch b/games-fps/sauerbraten/files/sauerbraten_unix.patch
new file mode 100644
index 000000000000..db2a032becf6
--- /dev/null
+++ b/games-fps/sauerbraten/files/sauerbraten_unix.patch
@@ -0,0 +1,19 @@
+--- sauerbraten_unix.orig	2008-08-15 20:05:44.000000000 +0200
++++ sauerbraten_unix	2008-08-15 22:49:47.000000000 +0200
+@@ -3,6 +3,7 @@
+ #SAUER_DIR=~/sauerbraten
+ #SAUER_DIR=/usr/local/sauerbraten
+ SAUER_DIR=.
++SAUER_DATADIR=.
+ 
+ # SAUER_OPTIONS contains any command line options you would like to start Sauerbraten with.
+ #SAUER_OPTIONS="-f"
+@@ -46,7 +47,7 @@
+ 
+ if [ -x ${SAUER_DIR}/bin_unix/${MACHINE_NAME}${SYSTEM_NAME}client ]
+ then
+-  cd ${SAUER_DIR}
++  cd ${SAUER_DATADIR}
+   exec ${SAUER_DIR}/bin_unix/${MACHINE_NAME}${SYSTEM_NAME}client ${SAUER_OPTIONS} $@
+ else
+   echo "Your platform does not have a pre-compiled Sauerbraten client."
diff --git a/games-fps/sauerbraten/files/wrapper b/games-fps/sauerbraten/files/wrapper
deleted file mode 100755
index dfd7946eeeae..000000000000
--- a/games-fps/sauerbraten/files/wrapper
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-
-mkdir -p ~/.sauerbraten
-cd ~/.sauerbraten
-for l in data packages ; do
-	rm -f ${l}
-	ln -s "@GENTOO_GAMESDIR@"/${l} ${l}
-done
-exec "@GENTOO_EXEC@" "$@"
diff --git a/games-fps/sauerbraten/sauerbraten-2007.08.29.ebuild b/games-fps/sauerbraten/sauerbraten-2007.08.29.ebuild
deleted file mode 100644
index 1074dc6499a0..000000000000
--- a/games-fps/sauerbraten/sauerbraten-2007.08.29.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/sauerbraten-2007.08.29.ebuild,v 1.2 2007/12/25 22:47:58 solar Exp $
-
-inherit eutils multilib games
-
-DESCRIPTION="free multiplayer/singleplayer first person shooter (major redesign of the Cube FPS)"
-HOMEPAGE="http://sauerbraten.org/"
-SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten_${PV//./_}_summer_edition_linux.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="sys-libs/glibc
-	x86? (
-		media-libs/libsdl
-		media-libs/sdl-mixer
-		media-libs/sdl-image
-		media-libs/libpng
-		virtual/opengl
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-soundlibs
-		app-emulation/emul-linux-x86-sdl
-	)"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	find -name CVS -print0 | xargs -0 rm -rf
-}
-
-src_install() {
-	use amd64 && multilib_toolchain_setup x86
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe bin_unix/linux_{client,server} || die
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data packages || die
-
-	local x
-	for x in client server ; do
-		newgamesbin "${FILESDIR}"/wrapper ${PN}_${x}-bin || die
-		sed -i \
-			-e "s:@GENTOO_GAMESDIR@:${GAMES_DATADIR}/${PN}:g" \
-			-e "s:@GENTOO_EXEC@:$(games_get_libdir)/${PN}/linux_${x}:g" \
-			"${D}/${GAMES_BINDIR}"/${PN}_${x}-bin
-	done
-
-	dohtml -r README.html docs/*
-
-	make_desktop_entry ${PN}_client-bin ${PN}
-
-	prepgamesdirs
-}
diff --git a/games-fps/sauerbraten/sauerbraten-2007.12.27.ebuild b/games-fps/sauerbraten/sauerbraten-2007.12.27.ebuild
deleted file mode 100644
index 426462c572c9..000000000000
--- a/games-fps/sauerbraten/sauerbraten-2007.12.27.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/sauerbraten-2007.12.27.ebuild,v 1.1 2008/01/07 22:32:30 mr_bones_ Exp $
-
-inherit eutils multilib games
-
-DESCRIPTION="free multiplayer/singleplayer first person shooter (major redesign of the Cube FPS)"
-HOMEPAGE="http://sauerbraten.org/"
-SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten_2007_12_24_assassin_edition_linux.tar.bz2
-	mirror://sourceforge/sauerbraten/patch-2007-12-27_linux.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="sys-libs/glibc
-	x86? (
-		media-libs/libsdl
-		media-libs/sdl-mixer
-		media-libs/sdl-image
-		media-libs/libpng
-		virtual/opengl
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-soundlibs
-		app-emulation/emul-linux-x86-sdl
-	)"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	find -name CVS -print0 | xargs -0 rm -rf
-}
-
-src_install() {
-	use amd64 && multilib_toolchain_setup x86
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe bin_unix/linux_{client,server} || die
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data packages || die
-
-	local x
-	for x in client server ; do
-		newgamesbin "${FILESDIR}"/wrapper ${PN}_${x}-bin || die
-		sed -i \
-			-e "s:@GENTOO_GAMESDIR@:${GAMES_DATADIR}/${PN}:g" \
-			-e "s:@GENTOO_EXEC@:$(games_get_libdir)/${PN}/linux_${x}:g" \
-			"${D}/${GAMES_BINDIR}"/${PN}_${x}-bin
-	done
-
-	dohtml -r README.html docs
-
-	make_desktop_entry ${PN}_client-bin ${PN}
-
-	prepgamesdirs
-}
diff --git a/games-fps/sauerbraten/sauerbraten-2008.06.17.ebuild b/games-fps/sauerbraten/sauerbraten-2008.06.17.ebuild
index 26d63b8c5394..5e81ed8da877 100644
--- a/games-fps/sauerbraten/sauerbraten-2008.06.17.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2008.06.17.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/sauerbraten-2008.06.17.ebuild,v 1.1 2008/06/18 07:06:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/sauerbraten-2008.06.17.ebuild,v 1.2 2009/03/09 18:33:04 scarabeus Exp $
+
+EAPI=2
 
 inherit eutils multilib games
 
@@ -14,13 +16,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
-DEPEND="sys-libs/glibc
+DEPEND="" # binary
+RDEPEND="sys-libs/glibc
 	x86? (
-		media-libs/libsdl
-		media-libs/sdl-mixer
-		media-libs/sdl-image
-		media-libs/libpng
-		virtual/opengl
+		media-libs/libsdl[opengl]
+		media-libs/sdl-mixer[mp3,vorbis]
+		media-libs/sdl-image[jpeg,png]
 	)
 	amd64? (
 		app-emulation/emul-linux-x86-soundlibs
@@ -34,6 +35,10 @@ src_unpack() {
 	find -name CVS -print0 | xargs -0 rm -rf
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}_unix.patch
+}
+
 src_install() {
 	use amd64 && multilib_toolchain_setup x86
 
@@ -45,11 +50,15 @@ src_install() {
 
 	local x
 	for x in client server ; do
-		newgamesbin "${FILESDIR}"/wrapper ${PN}_${x}-bin || die
+		newgamesbin "${S}"/sauerbraten_unix ${PN}_${x}-bin || die
 		sed -i \
-			-e "s:@GENTOO_GAMESDIR@:${GAMES_DATADIR}/${PN}:g" \
-			-e "s:@GENTOO_EXEC@:$(games_get_libdir)/${PN}/linux_${x}:g" \
-			"${D}/${GAMES_BINDIR}"/${PN}_${x}-bin
+			-e "s:SAUER_DIR=.:SAUER_DIR=$(games_get_libdir)/${PN}:g" \
+			-e "s:bin_unix/::g" \
+			-e "s:client:${x}:g" \
+			-e "s:MACHINE_NAME=\`uname -m\`:MACHINE_NAME=i686:g" \
+			-e "s:SAUER_DATADIR=.:SAUER_DATADIR=${GAMES_DATADIR}/${PN}:g" \
+			"${D}/${GAMES_BINDIR}"/${PN}_${x}-bin \
+			|| die "unable to sed ${D}/${GAMES_BINDIR}/${PN}_${x}-bin"
 	done
 
 	dohtml -r README.html docs