games-fps/bloodfrontier: Updated to -r1, improved the ebuild

svn path=/sunrise/; revision=7974

5 files changed, 24 insertions, 39 deletions

diff --git a/games-fps/bloodfrontier/ChangeLog b/games-fps/bloodfrontier/ChangeLog
index e5846c962..3757a27a0 100644
--- a/games-fps/bloodfrontier/ChangeLog
+++ b/games-fps/bloodfrontier/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Feb 2009; Michael Mair-Keimberger (d3vion) <miki3@gmx.net>
+  -bloodfrontier-0.8_beta_rc1.ebuild, +bloodfrontier-0.8_beta_rc1-r1.ebuild,
+  -files/wrapper, metadata.xml:
+  Updated to -r1, improved the ebuild
+
   12 Feb 2009; Christian Ruppert (idl0r) <spooky85@gmail.com>
   bloodfrontier-0.8_beta_rc1.ebuild:
   RDEPEND assigned
diff --git a/games-fps/bloodfrontier/Manifest b/games-fps/bloodfrontier/Manifest
index 5a7f4beec..b7adb8726 100644
--- a/games-fps/bloodfrontier/Manifest
+++ b/games-fps/bloodfrontier/Manifest
@@ -1,6 +1,5 @@
 AUX bloodfrontier.png 3883 RMD160 1c0d9293deab3414442cbedda17ceab874e6e2e9 SHA1 b43e64a1301956c91f6d5e4507aea961d5efe764 SHA256 37b404b271dfd758b903a8b5ec7764dba71d685964cbd48fdc224632ef63f460
-AUX wrapper 161 RMD160 7d68ed6c85de463ab8f63905258524e012bf71b0 SHA1 debf50c04e6b608e5ce97e521d37decd3824720f SHA256 a19e0dda6d4f1e39e780aaba019bd2d010eeecec927e72774585cb3f66decef2
 DIST bloodfrontier-B1-RC1-linux.tar.bz2 252791862 RMD160 1c57ce644348c1981a1f85a4b78307d69cc1a309 SHA1 8ccca329de358a58e11a2754c188db8c73bc64ff SHA256 22bb3a915b5640f119f2b81aa355672fc51b653dd79354acf26eedafe6ba8109
-EBUILD bloodfrontier-0.8_beta_rc1.ebuild 1559 RMD160 efe408e790da693b4fa30b39c31a20fa49e24d4d SHA1 60c2a5602b1325bdd16ca8ccbcaa9b11008f137d SHA256 aa27511fed8d83536c2af371978cdb2f5ed701300725d89c04d1ba3355c3766b
-MISC ChangeLog 433 RMD160 48262c31ae6800eec78878a979f438fbe5422805 SHA1 dc07a4d3a26cdb70333a318815b538b1e311a717 SHA256 d07af890fec1a69598a8f13a424137654e003ae217c16de7052425a0341d09c8
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+EBUILD bloodfrontier-0.8_beta_rc1-r1.ebuild 1300 RMD160 5d2fad95a49644cb995d6675ba6944f20dfbeecd SHA1 e4d160811fa7d7c1826ca0f171f0a8306fa0c625 SHA256 226307549c226747a8a487b4732544f7a2c356d522385429e63d12cd1d73ed3d
+MISC ChangeLog 645 RMD160 1325776f4eb902d35d0d379f66bd221ebca3817f SHA1 2474f048521e3a49cbf64ef6fae16c9066175a9c SHA256 ea8b6568da46a4c1fca695de137ab88e8f1633676662436981113f6d7db5dc91
+MISC metadata.xml 242 RMD160 2e15033dc25ed773c6eeb373cb5d3eab822e0dd8 SHA1 81d4f8d084e15ebed06b16aa914b9643003391eb SHA256 a14ce2fe27887d1ccae91d97af83d91ac69aa2fe3b9361c097612cb80a607ace
diff --git a/games-fps/bloodfrontier/bloodfrontier-0.8_beta_rc1.ebuild b/games-fps/bloodfrontier/bloodfrontier-0.8_beta_rc1-r1.ebuild
index e27723308..47762d0df 100644
--- a/games-fps/bloodfrontier/bloodfrontier-0.8_beta_rc1.ebuild
+++ b/games-fps/bloodfrontier/bloodfrontier-0.8_beta_rc1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-B1-RC1-linux.tar.bz2"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="server"
 RESTRICT="strip"
 
 DEPEND="virtual/opengl
@@ -26,10 +26,9 @@ DEPEND="virtual/opengl
 	amd64? (
 		app-emulation/emul-linux-x86-sdl
 	)"
-RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
-dir="$(games_get_libdir)"/${PN}
+dir="${GAMES_DATADIR}"/${PN}
 
 QA_PRESTRIPPED="${dir:1}/bfclient
 		${dir:1}/bfserver"
@@ -37,35 +36,23 @@ QA_PRESTRIPPED="${dir:1}/bfclient
 src_install() {
 	use amd64 && multilib_toolchain_setup x86
 
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe bin/bf{client,server} || die "doexe failed"
+	exeinto "${dir}"
+	doexe bin/bfclient || die "doexe failed"
 
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto "${dir}"
 	doins -r data || die "doins failed"
 
-	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}/bf${x}:g" \
-			"${D}/${GAMES_BINDIR}"/${PN}_${x}-bin \
-			|| die "sed failed"
-	done
+	games_make_wrapper bloodfrontier-client ./bfclient "${dir}" "${dir}"
+
+	if use server ; then
+		doexe bin/bfserver || die "doexe failed"
+		games_make_wrapper bloodfrontier-server ./bfserver "${dir}" "${dir}"
+	fi
 
 	dodoc readme.txt || die "dodoc failed"
 
 	doicon "${FILESDIR}"/"${PN}".png || die "doicon failed"
-	make_desktop_entry ${PN}_client-bin "Blood Frontier" ${PN}
+	make_desktop_entry bloodfrontier-client "Blood Frontier" ${PN}
 
 	prepgamesdirs
 }
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	echo
-	elog "To play the game, run:"
-	elog " bloodfrontier_client-bin"
-	echo
-}
diff --git a/games-fps/bloodfrontier/files/wrapper b/games-fps/bloodfrontier/files/wrapper
deleted file mode 100755
index c02715735..000000000
--- a/games-fps/bloodfrontier/files/wrapper
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-
-mkdir -p ~/.bloodfrontier
-cd ~/.bloodfrontier
-for l in data ; do
-	rm -f ${l}
-	ln -s "@GENTOO_GAMESDIR@"/${l} ${l}
-done
-exec "@GENTOO_EXEC@" "$@"
diff --git a/games-fps/bloodfrontier/metadata.xml b/games-fps/bloodfrontier/metadata.xml
index 7e3286984..c1c814bbb 100644
--- a/games-fps/bloodfrontier/metadata.xml
+++ b/games-fps/bloodfrontier/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>maintainer-wanted</herd>
+	<herd>maintainer-wanted</herd>
+	<use>
+		<flag name='server'>Installs the Server Binary</flag>
+	</use>
 </pkgmetadata>