gentoo resync : 03.11.2019

5 files changed, 102 insertions, 122 deletions

diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
index f1252ea06936..26ac316ca72f 100644
--- a/games-server/ut2004-ded/Manifest
+++ b/games-server/ut2004-ded/Manifest
@@ -1,7 +1,7 @@
-AUX ut2004-ded.confd 228 BLAKE2B 18e5f0d823b266a4463cc5b83c4982fc662c4bdfb4b8f9f9e6ae22256d0ac2d463d0987db2fdf419dbcc9b3fbda777511adbf6ac7d0ad34a09184a08fc28f6b1 SHA512 f304c134139a29e43f6a297969462d8ca667071be898bf0b5495785eba7b0042e7103b5df2dc2c1fa333f4c16f75efcfdcd8ddc2dc88bf46d93cf8a9739eb300
-AUX ut2004-ded.initd 561 BLAKE2B a30dfd055e00d42df3b5214c7429203fb1188617ac469e1cb9e3fa66c99df3ed3691eff0a1d932b0cf1a44f300623d720e8c87ce47e8999d5607f969c883f7c9 SHA512 0d5be8488cdbb357ab10223c4a5c6a3f302622782c0432d28e0a5ec7c38e886a44ea2931cde82403db807225bf6cf2ebcbb7f3abf62b8ea6bfd8ffb41c316c58
+AUX ut2004-ded.confd 175 BLAKE2B 7384ec15a4dd1ea03ddf06068032a69d32a8bfb7536bbfc5ea91ef369ee2668c1f3c9c66d249d6b24dec60dfe22fe4a91522e5a6958e75df568d132f062eb6d8 SHA512 96bf28c03faf04736f9447e3e6c549e5ec77e477683f805847b53f0ae2b5280863876fd49c787d63d4f3d2019b9379d3fa4573c32f4ebf3be636b0a272321a93
+AUX ut2004-ded.initd 320 BLAKE2B 34e3fdf38eb9e5bc2623581c73fea3af040f9dca829c8c46d649b5124472989931278a93c5a2a52acc2faf7c53df74dfaf772a35e52d127b357097070e3c3c12 SHA512 a307105dc110ec1009eabfe61777b33ad89c9e22cebc199ab7e990e9b170b97ab8e176865e62ebed40f4a80f7e5ddee6f248a1e73f25bac1a61c32f0c90a126d
 DIST dedicatedserver3339-bonuspack.zip 914213907 BLAKE2B 883253d9817b4ee7f9594bf611e9d440d7e90c8cd43d34b366cfb4e781d4ad78e2812a0aa4f5acaed4880b1bc47f0dffed6fbb0caf9cc53477c01bc92d891325 SHA512 353161a7c811ac5c688c6438e3ecfad1aa37bcfd13a3e17f2a9deaf510eda9311a423524bd4635fcf972001cfe24c1a1b71a2bb6a060c37a24351f3bce0c7f26
 DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
 DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B 72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
-EBUILD ut2004-ded-3369.3-r1.ebuild 3062 BLAKE2B b84c7c344d026a4fc032c7d6ef5ade6525bfe4c64df81338588cad8c26253dd328e47d0d89e4bee882535f73aff900a7e8fbe449e3fab476d0eec0fea7953587 SHA512 7fe93eecabf3401265ec7c84341471b432fd590f30562d940dddcfb6c0fa9e24728a40d4a137fc506ffe5496a8b59f8c75fa924caf803ee09492eb735f0cc842
+EBUILD ut2004-ded-3369.3-r2.ebuild 2623 BLAKE2B c6f2990eb2a0d10d6c5154545ce1359f751e8d03833cc020d7d86f8f56cabb7683efee0c66d59d2a89b69106be33e56279aa069a7dfd698222d16ca3a6f4c4ef SHA512 59cb24ba36d170a221e7e2fcb77d12c4519b54f2cd26d61b15f0fa804d3fb3b598847388c4481010ed326888169690896597632038d7aa6405e2e8c69d4f616a
 MISC metadata.xml 641 BLAKE2B 6f4b33ffb4810e9161f185859d8a822bf655f70f40220968a1638398072506486a72180065d2f1589446f09d61416b2cc379bdfafd540162bf8b817834002849 SHA512 637588c313e117912d01da6345324d455f7c1c658e413d936b60f1fcceff88d8ecae084e11727479c8cf72438f14412336d9c81d94cccc1ffb54a5ec2d69ebc7
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 $?
-}
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild b/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
deleted file mode 100644
index cfee57c4fc69..000000000000
--- a/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-BONUSPACK_P="dedicatedserver3339-bonuspack.zip"
-PATCH_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
-DESCRIPTION="Unreal Tournament 2004 Linux Dedicated Server"
-HOMEPAGE="http://www.unrealtournament.com/"
-SRC_URI="
-	https://files.chaoticdreams.org/UT2004/DedicatedServer3339-BonusPack.zip -> ${BONUSPACK_P}
-	http://ut2004.ut-files.com/index.php?dir=Patches/Linux/&file=${PATCH_P} -> ${PATCH_P}
-	https://dev.gentoo.org/~chewi/distfiles/ut2004-v${PV/./-}-linux-dedicated.7z
-"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-DEPEND="app-arch/unzip
-	app-arch/p7zip"
-RDEPEND="sys-libs/glibc
-	!games-fps/ut2004[dedicated]
-	games-fps/ut2004-bonuspack-ece
-	games-fps/ut2004-bonuspack-mega"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-src_prepare() {
-	cp -rf UT2004-Patch/* . || die
-	rm -rf System/{ucc-bin*,ut2004-bin*,*.dll,*.exe} UT2004-Patch
-	if use amd64 ; then
-		mv -f ut2004-ucc-bin-09192008/ucc-bin-linux-amd64 System/ucc-bin || die
-	else
-		mv -f ut2004-ucc-bin-09192008/ucc-bin System/ || die
-	fi
-	rm -rf ut2004-ucc-bin-09192008
-	# Owned by ut2004-bonuspack-ece
-	rm -f Animations/{MetalGuardAnim,ONSBPAnimations,NecrisAnim,MechaSkaarjAnims}.ukx
-	rm -f Help/BonusPackReadme.txt
-	rm -f Maps/{ONS-Adara,ONS-IslandHop,ONS-Tricky,ONS-Urban}.ut2
-	rm -f Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
-	rm -f StaticMeshes/{HourAdara,BenMesh02,BenTropicalSM01,ONS-BPJW1,PC_UrbanStatic}.usx
-	rm -f System/{ONS-IslandHop,ONS-Tricky,ONS-Adara,ONS-Urban,OnslaughtBP}.int
-	rm -f System/xaplayersl3.upl
-	rm -f Textures/{ONSBPTextures,BonusParticles,HourAdaraTexor,BenTex02,BenTropical01,PC_UrbanTex,AW-2k4XP,ONSBP_DestroyedVehicles,UT2004ECEPlayerSkins,CicadaTex,Construction_S}.utx
-	# Owned by ut2004-bonuspack-mega
-	rm -f System/{Manifest.ini,Manifest.int,Packages.md5}
-}
-
-src_install() {
-	einfo "This will take a while... go get a pizza or something"
-
-	games_make_wrapper ${PN} "./ucc-bin server" "${dir}"/System
-
-	insinto "${dir}"
-	doins -r *
-	fperms +x "${dir}"/System/ucc-bin
-
-	sed \
-		-e "s:@USER@:${GAMES_USER_DED}:" \
-		-e "s:@GROUP@:${GAMES_GROUP}:" \
-		-e "s:@HOME@:${GAMES_PREFIX}:" \
-		"${FILESDIR}"/${PN}.confd > "${T}"/${PN}.confd || die
-	newconfd "${T}"/${PN}.confd ${PN}
-
-	sed \
-		-e "s:@DIR@:${GAMES_BINDIR}:g" \
-		"${FILESDIR}"/${PN}.initd > "${T}"/${PN}.initd || die
-	newinitd "${T}"/${PN}.initd ${PN}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	ewarn "You should take the time to edit the default server INI."
-	ewarn "Consult the INI Reference at http://www.unrealadmin.org/"
-	ewarn "for assistance in adjusting the following file:"
-	ewarn "${dir}/System/Default.ini"
-	ewarn
-	ewarn "To have your server authenticate properly to the"
-	ewarn "central server, you MUST visit the following site"
-	ewarn "and request a key. This is not required if you"
-	ewarn "want an unfindable private server. [DoUplink=False]"
-	ewarn
-	ewarn "http://unreal.epicgames.com/ut2004server/cdkey.php"
-}
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild b/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
new file mode 100644
index 000000000000..63f7dcb52408
--- /dev/null
+++ b/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs eutils
+
+BONUSPACK_P="dedicatedserver3339-bonuspack.zip"
+PATCH_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
+DESCRIPTION="Unreal Tournament 2004 Linux Dedicated Server"
+HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
+SRC_URI="
+	https://ut2004.ut-files.com/Entire_Server_Download/${BONUSPACK_P}
+	https://ut2004.ut-files.com/Patches/Linux/${PATCH_P}
+	https://dev.gentoo.org/~chewi/distfiles/ut2004-v${PV/./-}-linux-dedicated.7z
+"
+
+LICENSE="ut2003"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror strip"
+
+BDEPEND="
+	app-arch/p7zip
+	app-arch/unzip
+"
+
+RDEPEND="
+	!games-fps/ut2004
+	!games-fps/ut2004-data
+	games-fps/ut2004-bonuspack-ece
+	games-fps/ut2004-bonuspack-mega
+	sys-libs/glibc
+"
+
+CHECKREQS_DISK_BUILD="2G"
+QA_PREBUILT="*"
+
+S="${WORKDIR}"
+DIR="/opt/${PN%-ded}"
+
+src_prepare() {
+	default
+
+	if use amd64; then
+		mv ut2004-ucc-bin-09192008/ucc-bin{-linux-amd64,} || die
+	fi
+
+	cp -r UT2004-Patch/* ./ || die
+	mv ut2004-ucc-bin-09192008/ucc-bin System/ || die
+	rm -r System/{ut2004-bin*,*.dll,*.exe} UT2004-Patch/ ut2004-ucc-bin-09192008/ || die
+
+	# In ut2004-bonuspack-ece.
+	rm \
+		Animations/{MechaSkaarjAnims,MetalGuardAnim,NecrisAnim,ONSBPAnimations}.ukx \
+		Help/BonusPackReadme.txt \
+		Maps/ONS-{Adara,Aridoom,Ascendancy,IslandHop,Tricky,Urban}.ut2 \
+		Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax \
+		StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx \
+		System/{ONS-{Adara,IslandHop,Tricky,Urban},OnslaughtBP}.int \
+		System/xaplayersl3.upl \
+		Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S,HourAdaraTexor,ONSBP{_DestroyedVehicles,Textures},PC_UrbanTex,UT2004ECEPlayerSkins}.utx \
+		|| die
+
+	# In ut2004-bonuspack-mega.
+	rm System/{Manifest.in[it],Packages.md5} || die
+}
+
+src_install() {
+	insinto "${DIR}"
+	doins -r *
+	fperms +x "${DIR}"/System/ucc-bin
+
+	make_wrapper ${PN} "./ucc-bin server" "${DIR}"/System
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	elog "You should take the time to edit the default server INI. Consult the INI"
+	elog "Reference at https://unrealadmin.org/server_ini_reference/ut2004 for"
+	elog "assistance in adjusting ${DIR}/System/Default.ini."
+	elog
+	elog "To have your server authenticate properly to the central server, you"
+	elog "MUST visit https://www.unrealadmin.org/server_cdkey and request a key."
+	elog "This is not required if you want an unlisted private server with"
+	elog "[DoUplink=False]."
+}