new init.d/dedicated stuff

8 files changed, 51 insertions, 109 deletions

diff --git a/games-fps/enemy-territory/ChangeLog b/games-fps/enemy-territory/ChangeLog
index 10b0ed51d1ec..9a9f4b1e4086 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.7 2003/10/17 23:34:33 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.8 2003/12/09 22:06:38 vapier Exp $
+
+*enemy-territory-2.56-r2 (09 Dec 2003)
+
+  09 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Sync the dedication server stuff to the way the q3 stuff works and fix #29285.
 
 *enemy-territory-2.56-r1 (17 Oct 2003)
 
diff --git a/games-fps/enemy-territory/enemy-territory-2.56-r1.ebuild b/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild
index 2af048d41e3c..a2f20a738824 100644
--- a/games-fps/enemy-territory/enemy-territory-2.56-r1.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild
@@ -5,16 +5,13 @@ inherit 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="ftp://3dgamers.in-span.net/pub/3dgamers3/games/wolfensteinet/et-linux-${PV}-2.x86.run
-	ftp://theuser:Xyz3y@ftp4.3dgamers.com/pub/3dgamers/games/wolfensteinet/et-linux-${PV}-2.x86.run
-	http://3dgamers.planetmirror.com/pub/3dgamers/games/wolfensteinet/et-linux-${PV}-2.x86.run
-	ftp://freeftp.game.net/pub/games/enemyterritory/full_game/et-linux-${PV}-2.x86.run"
+SRC_URI="et-linux-${PV}-2.x86.run"
 
 LICENSE="RTCW-ETEULA"
 SLOT="0"
 KEYWORDS="x86"
 IUSE="dedicated opengl"
-RESTRICT="nomirror nostrip"
+RESTRICT="fetch nostrip"
 
 DEPEND="virtual/glibc"
 RDEPEND="dedicated? ( app-misc/screen )
@@ -23,6 +20,14 @@ RDEPEND="dedicated? ( app-misc/screen )
 
 S=${WORKDIR}
 
+pkg_nofetch() {
+	einfo "Please visit one of these mirrors and download ${A}"
+	einfo "http://www.fileplanet.com/files/120000/124801.shtml"
+	einfo "http://www.fileshack.com/file.x?fid=2743"
+	einfo "http://www.3dgamers.com/games/wolfensteinet/"
+	einfo "Then just put the file in ${DISTDIR}"
+}
+
 pkg_setup() {
 	check_license || die "License check failed"
 	games_pkg_setup
@@ -44,27 +49,32 @@ src_install() {
 
 	dogamesbin ${FILESDIR}/et
 	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/et
-	if [ "`use dedicated`" ];
-	then
+	if [ `use dedicated` ] ; then
 		dogamesbin ${FILESDIR}/et-ded
 		dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/et-ded
-		dosed "s:GAMES_USER_DED:${GAMES_USER_DED}:" ${GAMES_BINDIR}/et-ded
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/et-ded.rc et-ded
-		dosed "s:GENTOO_DIR:${dir}:" /etc/init.d/et-ded
+		exeinto /etc/init.d ; newexe ${FILESDIR}/et-ded.rc et-ded
+		dosed "s:GAMES_USER_DED:${GAMES_USER_DED}:" /etc/init.d/et-ded
+		dosed "s:GENTOO_DIR:${GAMES_BINDIR}:" /etc/init.d/et-ded
+		insinto /etc/conf.d ; newins ${FILESDIR}/et-ded.conf.d et-ded
 	fi
 
+	# TODO: move this to /var/ perhaps ?
+	dodir ${dir}/etwolf-homedir
+	dosym ${dir}/etwolf-homedir ${GAMES_PREFIX}/.etwolf
+	keepdir ${dir}/etwolf-homedir
+
 	prepgamesdirs
 	make_desktop_entry et "Enemy Territory" ET.xpm
+	chmod g+rw ${D}/${dir} ${D}/${dir}/etwolf-homedir
 }
 
 pkg_postinst() {
+	games_pkg_postinst
 	echo
 	einfo "To play the game run:"
 	einfo " et"
 
-	if [ "`use dedicated`" ];
-	then
+	if [ `use dedicated` ] ; then
 		echo
 		einfo "To start a dedicated server run:"
 		einfo " /etc/init.d/et-ded start"
@@ -74,6 +84,4 @@ pkg_postinst() {
 		echo
 		einfo "The dedicated server is started under the ${GAMES_USER_DED} user account"
 	fi
-
-	games_pkg_postinst
 }
diff --git a/games-fps/enemy-territory/enemy-territory-2.56.ebuild b/games-fps/enemy-territory/enemy-territory-2.56.ebuild
deleted file mode 100644
index ebee42785394..000000000000
--- a/games-fps/enemy-territory/enemy-territory-2.56.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-inherit games eutils
-
-DESCRIPTION="Return to Castle Wolfenstein: Enemy Territory - standalone multi-player game based on Return to Castle Wolfenstein"
-HOMEPAGE="http://www.idsoftware.com/"
-SRC_URI="ftp://3dgamers.in-span.net/pub/3dgamers3/games/wolfensteinet/et-linux-2.55.x86.run
-	ftp://theuser:Xyz3y@ftp4.3dgamers.com/pub/3dgamers/games/wolfensteinet/et-linux-2.55.x86.run
-	http://3dgamers.planetmirror.com/pub/3dgamers/games/wolfensteinet/et-linux-2.55.x86.run
-	ftp://freeftp.game.net/pub/games/enemyterritory/full_game/et-linux-2.55.x86.run
-	http://sjcredirvip.xlontech.net/100083/games/wolfensteinet/et-linux-${PV}-update.x86.run
-	ftp://3dgamers.in-span.net/pub/3dgamers3/games/wolfensteinet/et-linux-${PV}-update.x86.run
-	ftp://theuser:Xyz3y@ftp4.3dgamers.com/pub/3dgamers/games/wolfensteinet/et-linux-${PV}-update.x86.run"
-
-LICENSE="RTCW-ETEULA"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="dedicated opengl"
-RESTRICT="nomirror nostrip"
-
-DEPEND="virtual/glibc"
-RDEPEND="dedicated? ( app-misc/screen )
-	!dedicated? ( virtual/opengl )
-	opengl? ( virtual/opengl )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	check_license || die "License check failed"
-	games_pkg_setup
-}
-
-src_unpack() {
-	unpack_makeself et-linux-2.55.x86.run
-	unpack_makeself et-linux-2.56-update.x86.run
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-	dodir ${dir}
-
-	cp -r Docs pb etmain ${D}/${dir}/
-
-	exeinto ${dir} ; doexe bin/Linux/x86/* openurl.sh
-	insinto ${dir} ; doins CHANGES v1.02_Readme.htm
-	insinto /usr/share/pixmaps ; doins ET.xpm
-
-	dogamesbin ${FILESDIR}/et
-	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/et
-	if [ "`use dedicated`" ];
-	then
-		dogamesbin ${FILESDIR}/et-ded
-		dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/et-ded
-		dosed "s:GAMES_USER_DED:${GAMES_USER_DED}:" ${GAMES_BINDIR}/et-ded
-		exeinto /etc/init.d
-		newexe ${FILESDIR}/et-ded.rc et-ded
-		dosed "s:GENTOO_DIR:${dir}:" /etc/init.d/et-ded
-	fi
-
-	prepgamesdirs
-	make_desktop_entry et "Enemy Territory" ET.xpm
-}
-
-pkg_postinst() {
-	echo
-	einfo "To play the game run:"
-	einfo " et"
-
-	if [ "`use dedicated`" ];
-	then
-		echo
-		einfo "To start a dedicated server run:"
-		einfo " /etc/init.d/et-ded start"
-		echo
-		einfo "To run the dedicated server at boot, type:"
-		einfo " rc-update add et-ded default"
-		echo
-		einfo "The dedicated server is started under the ${GAMES_USER_DED} user account"
-	fi
-
-	games_pkg_postinst
-}
diff --git a/games-fps/enemy-territory/files/digest-enemy-territory-2.56 b/games-fps/enemy-territory/files/digest-enemy-territory-2.56
deleted file mode 100644
index 397ae48beb67..000000000000
--- a/games-fps/enemy-territory/files/digest-enemy-territory-2.56
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 71d938bbc6afddbfab73390333964e9d et-linux-2.55.x86.run 270588258
-MD5 b75971eaf9c8b740f213bf1e20249f23 et-linux-2.56-update.x86.run 7022390
diff --git a/games-fps/enemy-territory/files/digest-enemy-territory-2.56-r1 b/games-fps/enemy-territory/files/digest-enemy-territory-2.56-r2
index bd67a300af6d..bd67a300af6d 100644
--- a/games-fps/enemy-territory/files/digest-enemy-territory-2.56-r1
+++ b/games-fps/enemy-territory/files/digest-enemy-territory-2.56-r2
diff --git a/games-fps/enemy-territory/files/et-ded b/games-fps/enemy-territory/files/et-ded
index 21dcd5d2f298..7a9c052674a4 100644
--- a/games-fps/enemy-territory/files/et-ded
+++ b/games-fps/enemy-territory/files/et-ded
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd GENTOO_DIR
-exec ./etded.x86 +set com_hunkmegs 64 +set sv_maxrate 9000 +set com_zonemegs 32 +set dedicated 2 +set sv_hostname "my server" +set g_motd "my motd" +map mp_village +set ttycon 0 "$@"
+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
new file mode 100644
index 000000000000..2292d850574b
--- /dev/null
+++ b/games-fps/enemy-territory/files/et-ded.conf.d
@@ -0,0 +1,5 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/12/09 22:06:38 vapier 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
index 3a6c471573d6..4eb84b9e3afa 100644
--- a/games-fps/enemy-territory/files/et-ded.rc
+++ b/games-fps/enemy-territory/files/et-ded.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.4 2003/12/09 20:37:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/files/et-ded.rc,v 1.5 2003/12/09 22:06:38 vapier Exp $
 
 depend() {
 	need net
@@ -9,18 +9,27 @@ depend() {
 
 start() {
 	ebegin "Starting Enemy Territory dedicated server"
-	export HOME=/opt/enemy-territory
-	screen -A -m -d -S et-ded su - GAMES_USER_DED -c GENTOO_DIR/etded
+	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"
-	pid=`screen -list | grep etded | awk -F . '{print $1}' | sed -e s/.//`
-	kill $pid
-	eend $?
+	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 etded
+	screen -list | grep et-ded
 }