games-server/ut2004-ded: EAPI 7, drop games eclass, misc improvements

This now blocks games-server/ut2004(-data) entirely rather than just
the dedicated USE flag. This allows both to be installed to
/opt/ut2004, vastly simplying the related ebuilds.

This was admittedly done in a hurry but it seems to work. I have
chosen nobody:nobody for the server user and group because I don't
have time to formally request one. This may be sufficient anyway.

Also fixes collision with games-fps/ut2004-bonuspack-ece.

Closes: https://bugs.gentoo.org/594642
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

2 files changed, 11 insertions, 26 deletions

diff --git a/games-server/ut2004-ded/files/ut2004-ded.confd b/games-server/ut2004-ded/files/ut2004-ded.confd
index a485b12d221e..e82238b93de0 100644
--- a/games-server/ut2004-ded/files/ut2004-ded.confd
+++ b/games-server/ut2004-ded/files/ut2004-ded.confd
@@ -1,9 +1,6 @@
-# User and group the server should run as
-ut2004_ded_user="@USER@"
-ut2004_ded_group="@GROUP@"
+# User and group the server should run as.
+ut2004_ded_user="nobody"
+ut2004_ded_group="nobody"
 
-# Directory to use for HOME
-ut2004_ded_home="@HOME@"
-
-# Any extra options you want to pass to the server
+# Any extra options you want to pass to the server.
 ut2004_ded_opts="DM-Deck17"
diff --git a/games-server/ut2004-ded/files/ut2004-ded.initd b/games-server/ut2004-ded/files/ut2004-ded.initd
index fe323a9e00ee..c4cf9810cd15 100644
--- a/games-server/ut2004-ded/files/ut2004-ded.initd
+++ b/games-server/ut2004-ded/files/ut2004-ded.initd
@@ -1,25 +1,13 @@
 #!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command_background="true"
+command_user="${ut2004_ded_user}:${ut2004_ded_group}"
+command="ut2004-ded"
+command_args="${ut2004_ded_opts}"
+
 depend() {
 	need net
 }
-
-start() {
-	ebegin "Starting ut2004-ded"
-	start-stop-daemon --start --quiet --background --make-pidfile \
-		--pidfile /var/run/ut2004-ded.pid \
-		--chuid ${ut2004_ded_user}:${ut2004_ded_group} \
-		--env HOME="${ut2004_ded_home}" \
-		--exec "@DIR@/ut2004-ded" \
-		-- ${ut2004_ded_opts}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ut2004-ded"
-	start-stop-daemon --stop \
-		--pidfile /var/run/ut2004-ded.pid
-	eend $?
-}