From d673479575557277babcaaac08e25697765b28b2 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Mon, 9 Mar 2009 18:33:04 +0000 Subject: Allow user editable configuration (map editation wont work as it is CANTFIX). Per bug #232028. Remove old. (Portage version: 2.2_rc23/cvs/Linux x86_64) --- games-fps/sauerbraten/ChangeLog | 11 +++- games-fps/sauerbraten/files/sauerbraten_unix.patch | 19 +++++++ games-fps/sauerbraten/files/wrapper | 9 ---- .../sauerbraten/sauerbraten-2007.08.29.ebuild | 60 --------------------- .../sauerbraten/sauerbraten-2007.12.27.ebuild | 61 ---------------------- .../sauerbraten/sauerbraten-2008.06.17.ebuild | 33 +++++++----- 6 files changed, 49 insertions(+), 144 deletions(-) create mode 100644 games-fps/sauerbraten/files/sauerbraten_unix.patch delete mode 100755 games-fps/sauerbraten/files/wrapper delete mode 100644 games-fps/sauerbraten/sauerbraten-2007.08.29.ebuild delete mode 100644 games-fps/sauerbraten/sauerbraten-2007.12.27.ebuild (limited to 'games-fps') 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 + +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/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 -- cgit v1.2.3-65-gdbad