gentoo Easter resync : 12.04.2020

5 files changed, 120 insertions, 101 deletions

diff --git a/games-fps/ut2003/Manifest b/games-fps/ut2003/Manifest
index 6ac1a309e252..dae918dfad5e 100644
--- a/games-fps/ut2003/Manifest
+++ b/games-fps/ut2003/Manifest
@@ -1,3 +1,5 @@
-DIST ut2003lnx_patch2225.tar.tar 10039316 BLAKE2B a15398eb2b66606f3e7b1382b01fda6b5d38982bc3fe7065184232eb18a8c85792147187951e810ecb6af738b5f5a15a2e56832d7e91fb21ab8956d699817f76 SHA512 3c44b6254b2b778bf2aca826c710f51db4ec0687c21f1c98e1070f3a9ad7e1a809e741a5b94e20a44c56c60a8b1e4a049788ff5f2a4d581c4eedf3dbbc0da86d
-EBUILD ut2003-2225-r4.ebuild 2648 BLAKE2B 4f364cbbbbfa6ce83e036b4298ffc343d5471d5c42fd47ac7453fb5901b7ece17c7178434253bb41d71a8b4fc2062d8bd065665d1917b95930f7b58566c17789 SHA512 1cc26772985386dcd3f8928808fd995eee9f1b5ca0b802a012b81971aa9663b9f46ba6e6d51e6ce204358d327aa98a559d4f488c5fa207be33cb1f5cf530b42a
+AUX ut2003-ded.confd 176 BLAKE2B 7cae571353911bd619fe5bb9d3fd49ae65e99c95a5313dde923ec15063537682454510f58c02c565c994abee29143868e581994ae48fc095afd8d289cf6a9f1e SHA512 98b2912dbf9639021a20690c5f1a3bf5a67a6d07ac450c926f79e9bce0dbe4b3adc1d6bf009cd5d08d4a812b002de329ba1221c254c921aa39045635d36fc99b
+AUX ut2003-ded.initd 320 BLAKE2B c534f4485877144e400e8bb9d0b5b9687e19d9f5846973bbe1abfa9e81caa9d89a8e74d336c658ee91f20e61520a9a02f88eb59d4b6d5a4f4e04f5a21f85ae71 SHA512 21fd4385bd1faeb005cbaefaea31abd43de7ebf58529817d7e08fdb5d606bb0835ca305062118f94764f5ca4ad589d5ae577fa99f40520357ab4c6b8742369e3
+DIST ut2003lnx_patch2225.tar.bz2 10039316 BLAKE2B a15398eb2b66606f3e7b1382b01fda6b5d38982bc3fe7065184232eb18a8c85792147187951e810ecb6af738b5f5a15a2e56832d7e91fb21ab8956d699817f76 SHA512 3c44b6254b2b778bf2aca826c710f51db4ec0687c21f1c98e1070f3a9ad7e1a809e741a5b94e20a44c56c60a8b1e4a049788ff5f2a4d581c4eedf3dbbc0da86d
+EBUILD ut2003-2225-r6.ebuild 2674 BLAKE2B 9fdaced3e551d58ae5e6c23e6e15b1d724342aa44bd6b7e70a7c327b27e4ca83b085c22f9c7dc6f943bae657c0980388b50eaf7f6369e8a6f3ff0a798e0ac5bf SHA512 75872151c0b0ac43c604f53bbb5b8db030320890da51ed2132c96014c35ebc078311023f729a756f4b09a78ac7e9345b87f66f89beeef26510b9b3aa5a900ac6
 MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003/files/ut2003-ded.confd b/games-fps/ut2003/files/ut2003-ded.confd
new file mode 100644
index 000000000000..e6f81661a928
--- /dev/null
+++ b/games-fps/ut2003/files/ut2003-ded.confd
@@ -0,0 +1,6 @@
+# User and group the server should run as.
+ut2003_ded_user="nobody"
+ut2003_ded_group="nobody"
+
+# Any extra options you want to pass to the server.
+ut2003_ded_opts="DM-Antalus"
diff --git a/games-fps/ut2003/files/ut2003-ded.initd b/games-fps/ut2003/files/ut2003-ded.initd
new file mode 100644
index 000000000000..19c8f1ada616
--- /dev/null
+++ b/games-fps/ut2003/files/ut2003-ded.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command_background="true"
+command_user="${ut2003_ded_user}:${ut2003_ded_group}"
+command="ut2003-ded"
+command_args="${ut2003_ded_opts}"
+
+depend() {
+	need net
+}
diff --git a/games-fps/ut2003/ut2003-2225-r4.ebuild b/games-fps/ut2003/ut2003-2225-r4.ebuild
deleted file mode 100644
index 5e82f5af64dc..000000000000
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="Sequel to the 1999 Game of the Year multi-player first-person shooter"
-HOMEPAGE="http://www.unrealtournament2003.com/"
-SRC_URI="ftp://ftp.infogrames.net/misc/ut2003/ut2003lnx_patch2225.tar.tar"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated"
-RESTRICT="bindist strip"
-
-RDEPEND="
-	games-fps/ut2003-data
-	dedicated? ( games-server/ut2003-ded )
-	!dedicated? ( virtual/opengl[abi_x86_32(-)] )
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-dir="${GAMES_PREFIX_OPT}/${PN}"
-Ddir="${D}/${dir}"
-
-src_unpack() {
-	unpack ut2003lnx_patch${PV}.tar.tar
-}
-
-src_install() {
-	insinto "${dir}"
-
-	games_make_wrapper ut2003 ./ut2003 "${dir}" "${dir}"
-	make_desktop_entry ut2003 "Unreal Tournament 2003" ut2003
-
-	# TODO: change this to use doexe/doins
-	# this brings our install up to the newest version
-	cp -r "${S}"/ut2003-lnx-2225/* "${Ddir}" || die
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	# here is where we check for the existence of a cdkey...
-	# if we don't find one, we ask the user for it
-	if [[ -f "${dir}"/System/cdkey ]] ; then
-		elog "A cdkey file is already present in ${dir}/System"
-	else
-		ewarn "You MUST run this before playing the game:"
-		ewarn "emerge --config =${CATEGORY}/${PF}"
-		ewarn "That way you can (re)enter your cdkey."
-	fi
-	elog
-	elog "To play the game run:"
-	elog " ut2003"
-	ewarn
-	ewarn "If you are not installing for the first time and you plan on running"
-	ewarn "a server, you will probably need to edit your"
-	ewarn "~/.ut2003/System/UT2003.ini file and add a line that says"
-	ewarn "AccessControlClass=crashfix.iaccesscontrolini to your"
-	ewarn "[Engine.GameInfo] section to close a security issue."
-}
-
-pkg_postrm() {
-	ewarn "This package leaves a cdkey file in ${dir}/System that you need"
-	ewarn "to remove to completely get rid of this game's files."
-}
-
-pkg_config() {
-	ewarn "Your CD key is NOT checked for validity here."
-	ewarn "  Make sure you type it in correctly."
-	eerror "If you CTRL+C out of this, the game will not run!"
-	echo
-	einfo "CD key format is: XXXX-XXXX-XXXX-XXXX"
-	while true ; do
-		einfo "Please enter your CD key:"
-		read CDKEY1
-		einfo "Please re-enter your CD key:"
-		read CDKEY2
-		if [[ "${CDKEY1}" == "" ]] ; then
-			echo "You entered a blank CD key.  Try again."
-		else
-			if [[ "${CDKEY1}" == "${CDKEY2}" ]] ; then
-				echo "${CDKEY1}" | tr a-z A-Z > ${dir}/System/cdkey
-				einfo "Thank you!"
-				chown games:games "${dir}"/System/cdkey
-				break
-			else
-				eerror "Your CD key entries do not match.  Try again."
-			fi
-		fi
-	done
-}
diff --git a/games-fps/ut2003/ut2003-2225-r6.ebuild b/games-fps/ut2003/ut2003-2225-r6.ebuild
new file mode 100644
index 000000000000..0f36cd042f78
--- /dev/null
+++ b/games-fps/ut2003/ut2003-2225-r6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+DESCRIPTION="Sequel to the 1999 Game of the Year multi-player first-person shooter"
+HOMEPAGE="https://en.wikipedia.org/wiki/Unreal_Tournament_2003"
+SRC_URI="https://ftp.snt.utwente.nl/pub/games/UT2003/Patches/Linux/${PN}lnx_patch${PV}.tar.bz2"
+
+LICENSE="ut2003"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="dedicated"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	!games-server/ut2003-ded
+	games-fps/ut2003-data
+	sys-libs/glibc
+	virtual/opengl[abi_x86_32]
+"
+
+BDEPEND="app-admin/chrpath"
+
+S="${WORKDIR}/${PN}-lnx-${PV}"
+DIR="/opt/${PN}"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+	chrpath -d System/{{ucc,${PN}}-bin,*.so} || die
+}
+
+src_install() {
+	insinto "${DIR}"
+	doins -r .
+	fperms +x "${DIR}"/System/{ucc,${PN}}-bin
+
+	make_wrapper ${PN} ./${PN}-bin "${DIR}"
+	make_wrapper ${PN}-ded ./ucc "${DIR}"
+
+	make_desktop_entry ${PN} "Unreal Tournament 2003" applications-games
+
+	newconfd "${FILESDIR}"/${PN}-ded.confd ${PN}-ded
+	newinitd "${FILESDIR}"/${PN}-ded.initd ${PN}-ded
+}
+
+pkg_postinst() {
+	# Here is where we check for the existence of a cdkey.
+	# If we don't find one, we ask the user for it.
+	if [[ -f ${EROOT}${DIR}/System/cdkey ]] ; then
+		einfo "A cdkey file is already present in ${EPREFIX}${DIR}/System"
+	else
+		ewarn "You MUST run this before playing the game:"
+		ewarn "emerge --config =${CATEGORY}/${PF}"
+		ewarn "That way you can (re)enter your cdkey."
+	fi
+	ewarn
+	ewarn "If you are not installing for the first time and you plan on running"
+	ewarn "a server, you will probably need to edit your"
+	ewarn "~/.ut2003/System/UT2003.ini file and add a line that says"
+	ewarn "AccessControlClass=crashfix.iaccesscontrolini to your"
+	ewarn "[Engine.GameInfo] section to close a security issue."
+}
+
+pkg_postrm() {
+	ewarn "This package leaves a cdkey file in ${EROOT}${DIR}/System that you need"
+	ewarn "to remove to completely get rid of this game's files."
+}
+
+pkg_config() {
+	ewarn "Your CD key is NOT checked for validity here so"
+	ewarn "make sure you type it in correctly."
+	ewarn "If you CTRL+C out of this, the game will not run!"
+	echo
+	einfo "CD key format is: XXXX-XXXX-XXXX-XXXX"
+	while true ; do
+		einfo "Please enter your CD key:"
+		read CDKEY1
+		einfo "Please re-enter your CD key:"
+		read CDKEY2
+		if [[ -z ${CDKEY1} || -z ${CDKEY2} ]] ; then
+			echo "You entered a blank CD key. Try again."
+		else
+			if [[ ${CDKEY1} == ${CDKEY2} ]] ; then
+				echo "${CDKEY1^^}" > "${EROOT}${DIR}"/System/cdkey || die
+				einfo "Thank you!"
+				break
+			else
+				eerror "Your CD key entries do not match. Try again."
+			fi
+		fi
+	done
+}