Moved dedicated server scripts to DISTDIR.

Package-Manager: portage-2.0.51.21

8 files changed, 21 insertions, 59 deletions

diff --git a/games-fps/enemy-territory/ChangeLog b/games-fps/enemy-territory/ChangeLog
index dcc8b5a91542..e941ef2afee9 100644
--- a/games-fps/enemy-territory/ChangeLog
+++ b/games-fps/enemy-territory/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/enemy-territory
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.21 2005/04/20 14:08:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.22 2005/05/02 19:10:04 wolf31o2 Exp $
+
+  02 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> -files/et,
+  -files/et-ded, -files/et-ded.conf.d, -files/et-ded.rc,
+  enemy-territory-2.60.ebuild:
+  Moved dedicated server scripts to DISTDIR.
 
   20 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   enemy-territory-2.60.ebuild:
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index 382c75623336..6b530532cb12 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -1,8 +1,4 @@
-MD5 53e8ff78bc650633f24d403dc6139245 enemy-territory-2.60.ebuild 2788
-MD5 e2d9460bb8da01c28e294fb92e8c0688 ChangeLog 3693
+MD5 f6b7a486c4ab3d3eb51c1c0b46f91c54 enemy-territory-2.60.ebuild 2988
+MD5 d2613ab0576a7830ac94c34614f0598c ChangeLog 3892
 MD5 f414f5eb26874bc33efe3ac1f0beab5d metadata.xml 1049
-MD5 9706616a064d2425aa5d8d8775995955 files/et 43
-MD5 69d783cd9fed81e4aacd11281d36ebe9 files/et-ded 46
-MD5 51ae531a8796cf809651bae90f744db6 files/et-ded.conf.d 333
-MD5 7484d2b7db7794a4a7097cbb1096ac9f files/digest-enemy-territory-2.60 69
-MD5 579bf10dab41adc4d91b9981801e2770 files/et-ded.rc 874
+MD5 981f8d318e6696ee4435f0b5df41e8e1 files/digest-enemy-territory-2.60 142
diff --git a/games-fps/enemy-territory/enemy-territory-2.60.ebuild b/games-fps/enemy-territory/enemy-territory-2.60.ebuild
index b2f4a0548b4d..3f44871e73db 100644
--- a/games-fps/enemy-territory/enemy-territory-2.60.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.60.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60.ebuild,v 1.3 2005/04/20 14:08:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60.ebuild,v 1.4 2005/05/02 19:10:04 wolf31o2 Exp $
 
 inherit eutils games
 
 DESCRIPTION="Return to Castle Wolfenstein: Enemy Territory - standalone multi-player game based on Return to Castle Wolfenstein"
 HOMEPAGE="http://www.idsoftware.com/"
 SRC_URI="mirror://3dgamers/pub/3dgamers4/games/wolfensteinet/et-linux-${PV}.x86.run
-	mirror://3dgamers/pub/3dgamers/games/wolfensteinet/et-linux-${PV}.x86.run"
+	mirror://3dgamers/pub/3dgamers/games/wolfensteinet/et-linux-${PV}.x86.run
+	dedicated? (
+		http://dev.gentoo.org/~wolf31o2/sources/dump/${PN}-all-0.1.tar.bz2
+		mirror://gentoo/${PN}-all-0.1.tar.bz2 )"
 
 LICENSE="RTCW-ETEULA"
 SLOT="0"
@@ -31,7 +34,10 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack_makeself
+	unpack_makeself et-linux-${PV}.x86.run
+	if use dedicated; then
+		unpack ${PN}-all-0.1.tar.bz2 || die
+	fi
 }
 
 src_install() {
@@ -48,10 +54,10 @@ src_install() {
 	if use dedicated ; then
 		doexe bin/Linux/x86/etded.x86 || die "doexe failed"
 		games_make_wrapper et-ded ./etded.x86 ${dir}
-		newinitd ${FILESDIR}/et-ded.rc et-ded || die "newinitd failed"
+		newinitd ${S}/et-ded.rc et-ded || die "newinitd failed"
 		dosed "s:GAMES_USER_DED:${GAMES_USER_DED}:" /etc/init.d/et-ded
 		dosed "s:GENTOO_DIR:${GAMES_BINDIR}:" /etc/init.d/et-ded
-		newconfd ${FILESDIR}/et-ded.conf.d et-ded || die "newconfd failed"
+		newconfd ${S}/et-ded.conf.d et-ded || die "newconfd failed"
 	fi
 
 	# TODO: move this to /var/ perhaps ?
diff --git a/games-fps/enemy-territory/files/digest-enemy-territory-2.60 b/games-fps/enemy-territory/files/digest-enemy-territory-2.60
index cd3361d54877..691611102125 100644
--- a/games-fps/enemy-territory/files/digest-enemy-territory-2.60
+++ b/games-fps/enemy-territory/files/digest-enemy-territory-2.60
@@ -1 +1,2 @@
 MD5 2d2373f29f02e18d365d7f1860eee435 et-linux-2.60.x86.run 270965248
+MD5 579373e28984be9e9f86d6e0730473d5 enemy-territory-all-0.1.tar.bz2 876
diff --git a/games-fps/enemy-territory/files/et b/games-fps/enemy-territory/files/et
deleted file mode 100644
index 87bc110b1f61..000000000000
--- a/games-fps/enemy-territory/files/et
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./et.x86 "$@"
diff --git a/games-fps/enemy-territory/files/et-ded b/games-fps/enemy-territory/files/et-ded
deleted file mode 100644
index 7a9c052674a4..000000000000
--- a/games-fps/enemy-territory/files/et-ded
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./etded.x86 "$@"
diff --git a/games-fps/enemy-territory/files/et-ded.conf.d b/games-fps/enemy-territory/files/et-ded.conf.d
deleted file mode 100644
index 58a9fedf51ce..000000000000
--- a/games-fps/enemy-territory/files/et-ded.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/files/et-ded.conf.d,v 1.2 2004/07/14 22:15:25 agriffis Exp $
-
-et_OPTS="+set com_hunkmegs 64 +set sv_maxrate 9000 +set com_zonemegs 32 +set dedicated 2 +map battery"
diff --git a/games-fps/enemy-territory/files/et-ded.rc b/games-fps/enemy-territory/files/et-ded.rc
deleted file mode 100644
index 9d88f5dab16b..000000000000
--- a/games-fps/enemy-territory/files/et-ded.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/files/et-ded.rc,v 1.6 2004/07/14 22:15:25 agriffis Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Enemy Territory dedicated server"
-	screen -A -m -d -S et-ded su - GAMES_USER_DED -c "GENTOO_DIR/et-ded ${et_OPTS}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Enemy Territory dedicated server"
-	local pid=`screen -list | grep et-ded | awk -F . '{print $1}' | sed -e s/.//`
-	if [ -z "${pid}" ] ; then
-		eend 1 "Lost screen session"
-	else
-		pid=`pstree -p ${pid} | sed -e 's:^.*etded\.x86::'`
-		pid=${pid:1:${#pid}-2}
-		if [ -z "${pid}" ] ; then
-			eend 1 "Lost etded session"
-		else
-			kill ${pid}
-			eend $? "Could not kill etded"
-		fi
-	fi
-}
-
-status() {
-	screen -list | grep et-ded
-}