gentoo Easter resync : 12.04.2020

12 files changed, 127 insertions, 108 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 5357b398f70f..b84eb1872cb1 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 62636d018e40..71fc10263a02 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,3 +1,3 @@
 DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3
-EBUILD doomsday-2.1.1.ebuild 2017 BLAKE2B ef3cbff22d70d19c999c57afa7c5efb089986a0bc1f579fa1be8635b6e94d2b0dd34be86a17cee7645c602743cf74e4bb1f277c405feb2a8138b05d71dcf2a00 SHA512 6ac4eead43a79d307f695ddf24499b0526af0bd3f9c665ca0a013d37e0be138edab932a3db1dc1f3b9a84a4ae15c7ec34b31349a5ec1d1b77f68cbd1f7de5d00
+EBUILD doomsday-2.1.1-r1.ebuild 2022 BLAKE2B a45fe50a076d2f7e6769d5e33b16b0ed7885fb77c83ceb531e9f13f8c23dc6b6058252772eab6315fc61bc2f6d00b710ff89493b2c8d3e539f94c415358041cd SHA512 21dfcc5e015161b97472f172b4494772707c4f6acc64bcf0a702d20d4470ba20bdc11e6cbc041ae80c241c5f0647e17aa9906032c55231562301e18fa86b4e41
 MISC metadata.xml 771 BLAKE2B 8a5effc2f449a9b4448dead1a37e9df047ae2e1608c26522d99b02e2d9561e8c129dbdb93f5a713dce72cee09edd8eaed61f38a278d995b3a7fc7e1a5c468bed SHA512 8bc89aa4bab55338472489ec1e92b47cb676b3110a1d3609d8e5a0d51965955770f045405665bff2e401f34697ef4d4b52341a668d08909a92db8eb660c18e00
diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index fd675553b0fe..eb08301295ed 100644
--- a/games-fps/doomsday/doomsday-2.1.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="demo fmod freedoom fluidsynth openal tools"
 
 RDEPEND="
 	dev-qt/qtcore:5=
-	dev-qt/qtgui:5=[-gles2]
+	dev-qt/qtgui:5=[-gles2-only]
 	dev-qt/qtnetwork:5=
 	dev-qt/qtopengl:5=
 	dev-qt/qtwidgets:5=
diff --git a/games-fps/duke3d-data/Manifest b/games-fps/duke3d-data/Manifest
index c6f6dbc7d4a4..f916d8f569a3 100644
--- a/games-fps/duke3d-data/Manifest
+++ b/games-fps/duke3d-data/Manifest
@@ -1,3 +1,3 @@
 DIST gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh 31969896 BLAKE2B 7e93515f8aedaedf6f0dc90faf5e7fef165c000414ae9dc62bad77c78568ecdec1f16b72befe1c80c7c9c8c4bd7fb11f2fd3c36f53aa9ef9d787f8b7215228f3 SHA512 d06f20bc1334172b80e4a75bd3321c3835cd95ac823836899fda8d5f8667ac83471b04a5863646aa953a39fd1cb64eb1818ee668340ede62d0a356ebdcb4065c
-EBUILD duke3d-data-1.0-r4.ebuild 1774 BLAKE2B e4809d7a47faf5ca5eb8891d9ada43edf1db453f001696e71a38f8ebb1910b218463d666728a2487f0b651ea2c050fe66c9abf9deff5ff0c94ff33e6fe254cc4 SHA512 b3636aff034a761fec0dcd4b1350a337395ec9991df95c1989655c33af3fde4f5a5e4a5d5e9e3b519bc8d27e6a2c6b439efe5aefe05537880bfa475ffb294f79
+EBUILD duke3d-data-1.0-r4.ebuild 1768 BLAKE2B 86a29a253791f283d7092863d553843639a39a71e0f2d637013492af42d8d49743534c502a463bb14cb316746f2c92ee1486c65b40fea48c325932d5cec794b2 SHA512 00aa75fb4197e82ede5096ed97d7f80c043ef9cd2ca2d9a1a2bf23a58ccc6f2130a91479c57fa101403d4fa8d5f1cdb7572f8ff66d4762a55ed6a165171324a9
 MISC metadata.xml 339 BLAKE2B afb442a147713d5f9000bb54afb2b62841086063b530f74a1da843ed7d08c3ffa995d98964f5e59b344c54eea7ea27ccc3eb563ea94e31452b352c80dc3848d3 SHA512 f5cfb8b76fafaea5c08660ecb9ed1a3d25efc85898b37a249c945547c4c4fc40335ec19711025955e12f6e3922f418f81e42c5dcc9a7f8ad82d3cc9dabbe50ef
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
index 7be1ed35cfca..a367bad4e4be 100644
--- a/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
+++ b/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="gog? ( ${GOG_FILE} )"
 
 LICENSE="DUKE3D gog? ( GOG-EULA )"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gog"
 REQUIRED_USE="^^ ( cdinstall gog )"
 RESTRICT="mirror bindist gog? ( fetch )"
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 3531155a5106..0d76ce72bb53 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -9,6 +9,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20200201-8603.tar.xz 16390468 BLAKE2B 9112aeb7f5940f962c67c18b32a5a2b23053249468b415cf387bd789d311e0b5b412eea3b6197c8c425dc88e6292aa82ffe76eec222b1bff42a4d6f67e6dadb6 SHA512 a882c178201a21968ff86108ec0a393b40eb712e57d4fa172fea97ad2a6135fe970240395c985d7ebf68ce9794671ec0031a6651cb52c256c5123527122cded2
-EBUILD eduke32-20200201.8603.ebuild 5831 BLAKE2B d3e511ee4621cd761ca7aa1ba8879a6e21afc495c94a7c7a9d259d821236fce52bd0fda767a8b7a1ccc268b6c18075662605d5bbeab6c513faf5f4994d586b38 SHA512 d5172058553bcf8c4141bb323d89d15e2f6734c8e813be96876772da84acdf1eb4c04144a00497544dd38c10665511cd77f2d5fb886dd931feb0e9b511d5e7c5
+DIST eduke32_src_20200311-8738.tar.xz 16544548 BLAKE2B 6f05a6384b4837dc5d4738cef83c4faace2233bf7bde7420d1e00fac45dbdfbd8f7da4b3702205fda914a853790fb0f730b564ae779bce29174337abb1e750fd SHA512 40b69472692bea703d6d6f911a8bff8d18f9fda1e19427ba23572d76717efbe2d13a023622cbfe86bcf9c30966e2fb5e3fe52baac8178587acb2aa092dd86617
+EBUILD eduke32-20200311.8738.ebuild 5825 BLAKE2B 7665196a07ff3185a35d79f1ae7163184980945d49fb793e0ff04b35902f1092ac9c2e8823a21e20f31cb95d6a7d089d530946771dd2b1a7e9f58ad406a6aa02 SHA512 55072b8ab96ef9fcdecaf1d951a5a6f8bcd035402a46ed6da5e5f4047cdf91fe70d72b1088daedcb206fcbb51dbb58dc651e48277151e171373e0355fccbd9e7
 MISC metadata.xml 1608 BLAKE2B 73414a3516a4a690254e70ad071f160688ac11e8fe0634b0218565fc32e01d1e4b8ed0ce830ecd995e715552f23fd50f8c7cb0b0af95f6cdb07a35940639e779 SHA512 2392e18cc53663943341397d3a92f07b3dbbb04497b584739095bef5e9b2f60376115a2952e0d2eba524b3a678e7c205ad3e66a78709a2f4d36b3ea76d8b8c09
diff --git a/games-fps/eduke32/eduke32-20200201.8603.ebuild b/games-fps/eduke32/eduke32-20200311.8738.ebuild
index 24c4a39ab661..1b0613bf663d 100644
--- a/games-fps/eduke32/eduke32-20200201.8603.ebuild
+++ b/games-fps/eduke32/eduke32-20200311.8738.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="BUILDLIC GPL-2 HRP"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
 REQUIRED_USE="
 	cdinstall? ( !demo )
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
+}