7 files changed, 17 insertions, 86 deletions
diff --git a/games-fps/americas-army/ChangeLog b/games-fps/americas-army/ChangeLog
index c34ef2dacc83..8e021d3c2968 100644
--- a/games-fps/americas-army/ChangeLog
+++ b/games-fps/americas-army/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/americas-army
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/ChangeLog,v 1.29 2005/04/07 20:13:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/ChangeLog,v 1.30 2005/05/02 18:41:23 wolf31o2 Exp $
+
+  02 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/armyops-ded.conf, -files/armyops-ded.conf.d,
+  -files/armyops-ded.init, -files/armyops-ded.rc, americas-army-230.ebuild:
+  Moved dedicated server scripts to DISTDIR.
 
   07 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   -americas-army-221.ebuild, -americas-army-221-r1.ebuild,
diff --git a/games-fps/americas-army/americas-army-230.ebuild b/games-fps/americas-army/americas-army-230.ebuild
index c0ad85844bf7..78356c604a9d 100644
--- a/games-fps/americas-army/americas-army-230.ebuild
+++ b/games-fps/americas-army/americas-army-230.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/americas-army/americas-army-230.ebuild,v 1.2 2005/04/07 20:13:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/americas-army-230.ebuild,v 1.3 2005/05/02 18:41:23 wolf31o2 Exp $
 
 inherit eutils games
 
 MY_P="armyops${PV}-linux.run"
 DESCRIPTION="America's Army: Special Forces - military simulations by the U.S. Army to provide civilians with insights on soldiering"
 HOMEPAGE="http://www.americasarmy.com/"
-SRC_URI="mirror://3dgamers/pub/3dgamers/games/${PN/-/}/${MY_P}"
+SRC_URI="mirror://3dgamers/pub/3dgamers/games/${PN/-/}/${MY_P}
+	dedicated? (
+		http://dev.gentoo.org/~wolf31o2/sources/dump/${PN}-all-0.1.tar.bz2
+		mirror://gentoo/${PN}-all-0.1.tar.bz2 )"
 
 LICENSE="Army-EULA"
 SLOT="0"
@@ -38,6 +41,9 @@ pkg_setup() {
 src_unpack() {
 	unpack_makeself ${DISTDIR}/${MY_P} || die "unpacking game"
 	tar -zxf setupstuff.tar.gz || die
+	if use dedicated; then
+		unpack armyops-all-support.tar.bz2 || die
+	fi
 }
 
 src_install() {
@@ -57,8 +63,8 @@ src_install() {
 	doexe bin/armyops || die "doexe failed"
 
 	if use dedicated; then
-		exeinto /etc/init.d ; newexe ${FILESDIR}/armyops-ded.init armyops-ded
-		insinto /etc/conf.d ; newins ${FILESDIR}/armyops-ded.conf armyops-ded
+		newinitd ${S}/armyops-ded.rc armyops-ded
+		newconfd ${S}/armyops-ded.conf. armyops-ded
 		games_make_wrapper armyops-ded ./server-bin ${dir}/System
 	fi
 
diff --git a/games-fps/americas-army/files/armyops-ded.conf b/games-fps/americas-army/files/armyops-ded.conf
deleted file mode 100644
index 680562878e4d..000000000000
--- a/games-fps/americas-army/files/armyops-ded.conf
+++ /dev/null
@@ -1 +0,0 @@
-aa_OPTS="global bridge.aao ini=ctc.ini"
diff --git a/games-fps/americas-army/files/armyops-ded.conf.d b/games-fps/americas-army/files/armyops-ded.conf.d
deleted file mode 100644
index 34ba8d4801a5..000000000000
--- a/games-fps/americas-army/files/armyops-ded.conf.d
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/files/armyops-ded.conf.d,v 1.2 2004/09/28 01:58:30 mr_bones_ Exp $
-
-# Type of Server
-# This can be lan, global, lantournament, tournament
-SERVERTYPE="lan"
-
-# starting map of the Server
-MAP="Bridge.aao"
-
-# INI-File the Server should use.
-# Do NOT change the content of /opt/americas-army/System/Default.ini !!
-# See the comment in the file for reasons.
-INIFILE="/opt/americas-army/System/Default.ini"
-
-# LOG-File the server should write to.
-# LOGFILE="/var/log/armyopsserver.log"
-LOGFILE="/dev/null"
-
diff --git a/games-fps/americas-army/files/armyops-ded.init b/games-fps/americas-army/files/armyops-ded.init
deleted file mode 100644
index a19d6c682ec3..000000000000
--- a/games-fps/americas-army/files/armyops-ded.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-        need net
-}
-
-start() {
-        ebegin "Starting Americas Army dedicated server"
-        screen -A -m -d -S armyops-ded su - games -c "/usr/games/bin/armyops-ded ${aa_OPTS}"
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Americas Army dedicated server"
-        local pid=`screen -list | grep armyops-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:^.*server-bin::'`
-		pid=${pid:1:${#pid}-2}
-                if [ -z "${pid}" ] ; then
-                        eend 1 "Lost armyops-ded session"
-                else
-                        kill ${pid}
-                        eend $? "Could not kill armyops-ded"
-                fi
-        fi
-}
-
-status() {
-        screen -list | grep armyops-ded
-}
-
diff --git a/games-fps/americas-army/files/armyops-ded.rc b/games-fps/americas-army/files/armyops-ded.rc
deleted file mode 100644
index e2c8fe7e3c33..000000000000
--- a/games-fps/americas-army/files/armyops-ded.rc
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/files/armyops-ded.rc,v 1.2 2004/09/28 01:58:30 mr_bones_ Exp $
-
-depend() {
-	use net
-	}
-
-start() {
-	ebegin "Starting Americas Army Server"
-	cd /opt/americas-army/System
-	start-stop-daemon --start --chuid games \
-		--background --make-pidfile \
-		--pidfile /var/run/armyopsserver.pid \
-		--exec ./server-bin -- ${SERVERTYPE} ${MAP} log=${LOGFILE} ini=${INIFILE}
-		eend $?
-	}
-
-stop() {
-	ebegin "Stopping Americas Army Server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/armyopsserver.pid
-	rm /var/run/armyopsserver.pid
-	eend $?
-	}
diff --git a/games-fps/americas-army/files/digest-americas-army-230 b/games-fps/americas-army/files/digest-americas-army-230
index 0a90c036f6c3..d358bced05b7 100644
--- a/games-fps/americas-army/files/digest-americas-army-230
+++ b/games-fps/americas-army/files/digest-americas-army-230
@@ -1 +1,2 @@
 MD5 a0df99cc9933120905f2de51f2ad613b armyops230-linux.run 781095534
+MD5 e60202fcd14a192d64d2522e205afdb4 americas-army-all-0.1.tar.bz2 680