gentoo resync : 15.01.2020

18 files changed, 46 insertions, 190 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 2781be5faf26..95b8826ad98b 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 68683a92606c..628bad1f7cc6 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 2051 BLAKE2B 340282de073df21eb1c4d7f11601f9cbc7a93d99ab48dac9fedd611d81e56dd7c2a82ed36cd59e93d23b89bea46b74ed47401b9db1dc9b33f24dd13b578a3ce1 SHA512 4317fa757753ad646c1f11e19e72a25c070e8d5a029b08463bfff1ef69546f20414aaf914659dfd46bf5504a1644393ffaf483fc886f3771ac470b4e79c209f4
+EBUILD doomsday-2.1.1.ebuild 2027 BLAKE2B 7422420cd913ae8e8bad1ad8725457c66fa7248f07f7b986242056cb342de25662f9a83809e54fb35ef82fb6c569d34598771cf3003d02c1d153d15bdff53693 SHA512 cf2e4c760562c919fef08390d7e7241d78b1dd4a88b81b5d67f971f57450d9342b9a0bfd17d4885c70d652c322ab8fc1958d9579360e8e2fc1649c562583a314
 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.ebuild
index 757a7f8c4729..8eb5fd81fbea 100644
--- a/games-fps/doomsday/doomsday-2.1.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
-inherit cmake-utils python-any-r1 readme.gentoo-r1
+inherit cmake python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
 HOMEPAGE="https://www.dengine.net"
@@ -45,7 +45,7 @@ S="${WORKDIR}/${P}/${PN}"
 DOC_CONTENTS="You need to copy Doom, Doom 2, Chex Quest, Heretic, Hexen, HexenDD, or Doom64 wads to a folder of your choice and then tell the game engine where that folder is. This is different to older versions, which had separate launchers for each game and required the files to be in a specific place."
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Fix QA warning for "installing to one or more unexpected paths"
 	sed -e "10s:/texc:/${PF}:" -i tools/texc/CMakeLists.txt || die
@@ -58,11 +58,11 @@ src_configure() {
 		-DDENG_ENABLE_TOOLS="$(usex tools)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use tools; then
 		mv -v "${ED}"/usr/bin/md2tool{,.${PN}} || die
diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest
index a410001f3785..860a71afc3c6 100644
--- a/games-fps/freedm-data/Manifest
+++ b/games-fps/freedm-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
-EBUILD freedm-data-0.12.1.ebuild 1083 BLAKE2B 72e29f856f04e0e8deb19dcc79187bb41934fd8dc962151225b1beb721096e8300942535fcefaf2dad1c7b82c5c352e04cbe249b18c3e1bd47d6e5f76431e93d SHA512 8fa0e8b8e490e984260e36e8107c838e1212db9eb75aa8189cace035123f5f92c9d1ecb7b29d399b884f95c159abd9b33fd037d7d7ae7a53ba485d585257c7b5
+EBUILD freedm-data-0.12.1.ebuild 1086 BLAKE2B 8c7c26c0f2e62a82296cd22e70a32b526a3c08042fcb222aa97c7c509a9f97990bad5226993a2212ed7cd93a43d344251cd8c3fb12e4d8c9cf2738a9dc6af2dd SHA512 82f35e18a3040b3662901463ce18635e1b743665a35fa240a54953a45124660ee142551ab694e9b4f1c32ce27f4f3b72daa366cb2a8baf469b9ec95d0efd0057
 MISC metadata.xml 1480 BLAKE2B 0755aba8cc597778e420a8142e5febd305e317057870abdaa2f5761e2b45f86c139f63aa096fdb20a5984552d886b47ba7b458ed7f3e971ce4442d03f31e75f9 SHA512 d5847035c6bfa72c3af95a8af203df5909236616726a474dcc33c051de8149f82f4d8c9d1bc8be05b6b05ae1f3a8ec3064f400aa120a6c87d43358ab2e7e20f3
diff --git a/games-fps/freedm-data/freedm-data-0.12.1.ebuild b/games-fps/freedm-data/freedm-data-0.12.1.ebuild
index 35bb73d7d7ef..ee96b6571c08 100644
--- a/games-fps/freedm-data/freedm-data-0.12.1.ebuild
+++ b/games-fps/freedm-data/freedm-data-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit prefix python-any-r1 xdg
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 BDEPEND="
 	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]')
diff --git a/games-fps/freedm/Manifest b/games-fps/freedm/Manifest
index 0e207117fe88..2eb8ff3d65e0 100644
--- a/games-fps/freedm/Manifest
+++ b/games-fps/freedm/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedm-0.12.1.ebuild 531 BLAKE2B 0f87d3684698305c2e18fa0d02ac8db1ac8fa278e37d8a8b74dbb1b322dbfa2b55d54b52b30f42e7280cbe002ead9ed16a82a1c4dca508f06a9b9d79000099bf SHA512 32740a2d960044be1dc24ca0f721988d344881e42af68bb6698782b72fb9a1458657273771a4979cad27373762fda7427d376fdf93d6fcb100bfce3f90c6ec86
+EBUILD freedm-0.12.1.ebuild 536 BLAKE2B fc9ee7720e3a36b8ad7b72350a1cff8dec00c47684791846487ac2e6413f3cedf0bd297e9316776b5ef8990ac164cb68c63f348e958cc2191349bcb83296334e SHA512 b84ef44f4b09104fc4449a601f523a082cce08cd0565f73f9489d861765c2fec1954640d72d0bd68cce7b16bb628696174e706966d010229f282aee83a4b6475
 MISC metadata.xml 1480 BLAKE2B 0755aba8cc597778e420a8142e5febd305e317057870abdaa2f5761e2b45f86c139f63aa096fdb20a5984552d886b47ba7b458ed7f3e971ce4442d03f31e75f9 SHA512 d5847035c6bfa72c3af95a8af203df5909236616726a474dcc33c051de8149f82f4d8c9d1bc8be05b6b05ae1f3a8ec3064f400aa120a6c87d43358ab2e7e20f3
diff --git a/games-fps/freedm/freedm-0.12.1.ebuild b/games-fps/freedm/freedm-0.12.1.ebuild
index 9608368a1cc8..992811543c68 100644
--- a/games-fps/freedm/freedm-0.12.1.ebuild
+++ b/games-fps/freedm/freedm-0.12.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://freedoom.github.io"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	~games-fps/freedm-data-${PV}
diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index ca9b4cdd8340..81f6f2fed70a 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
-EBUILD freedoom-data-0.12.1.ebuild 1120 BLAKE2B cdc4a60a9c05c2363368db6e83623193811d886daeabceb9e18be3fd05ebaa563537240302b9b2701511818dd59d5423631e227dd8ca5aee99a9824ca0f96267 SHA512 710ace62c00997e51b9eb41d375f406f14d98a5ce593820eb07f6b28491468c03957a778580fdb81a68fd7a57c017963de4e701d5395ea4ac0cf5c8663281806
+EBUILD freedoom-data-0.12.1.ebuild 1118 BLAKE2B 0f6a4d0f9325dd061d97661c0065c9bcd598cd5de6b6e964ee18bb8c3ff450a5cfbf7550349c8ab0ea0d13f38ce4af14b2a697611a6fe0b0d4c8f8df63377f6f SHA512 dfb2934f9c104e01b3336df94eb6edf6211fe058ea2a2ee03e8c16b4adc5606581dec61213c5839059f01071d2581784ede7b97fa568d540109d7d93af06f73d
 MISC metadata.xml 1809 BLAKE2B 84960851e0fcb2354c71c796ebd28f3c1bea2762e1810d851c04d375cbc90bf6a6cddd9629f802829bb495cea44260b352291e2d3adbb17516c8cb97697da450 SHA512 a1e68567ab9be93d88e5debbba73e2704e5ef9f063bc98f30bc480064e9037b3841fdd3cec24a8f61ba0c76a68d20b63a329dd880d8c99a8c11a3ba39c3de89d
diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
index 268e336d47e9..2fc22d4f026b 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit prefix python-any-r1 xdg
 
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 99955eb9fb01..6eccd699962a 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,5 @@
 AUX gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch 1066 BLAKE2B 9c47664abd809215d3691edcf434e6b1bb22e52ffa08aeea00c7f057719f909b6ce94833fe7e71ed582f1cc3490bbe7a843d911d1b24bef2c53c9f5f808edb3b SHA512 fc3ccd4ccd9994e0544e8e56255ad9d065ef11a004be8fc0a41ee39309d2a05f38b7381193c1c0de8da6bba69bc6212dc1e7c73a93435f781625fe29464e8611
 AUX gzdoom-4.2.1-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd
-DIST gzdoom-4.2.4.tar.gz 13683768 BLAKE2B cfdecaf6d92720b3a61fe986a63e6230674cafc65d02f5496a073ffe870319eec62c58377204fd8509fce4869b2a970cc4d1ad98db055d063393ce59d04b1d4f SHA512 555e280db3d66a643cf1412ac1bae5f8c607af339a11a61b1039061de60cf6165c41b3de0c3323ac852b0b2f63f787a1c10ba9240da3174a85ec09d61f5b271a
-EBUILD gzdoom-4.2.4.ebuild 2026 BLAKE2B ede308bda476e6ae1e7dca328b616fc1d306e5e7a3013689e5d1c6a55b0f56675053050727795d043ff2c76d14abdf6eff76bc786098f9bb87748eda4803c96a SHA512 0ab8d7be4370c16eaf7411cec7a4b4e099e3c227cdeea0347050946236b42462e9afde966920172372312a4578412a399a43a42f96bbf3d04fb61baec8aef53c
-MISC metadata.xml 940 BLAKE2B 85d6dcb7986f8a27f1ad929abe60899e01709bb8778668a0cda11ac7c3c4f33349bb832dcdc369e7c136ba022d6ac6673565cb674cb9f642157fc89c9b678e72 SHA512 c27939efdfa612bfea201fd4f1e4399c050b5d0244cb7be914dc1b033f4f09c5614b5f226a9ce29c07cfb31247133a8b69bc81274ddf5b38e159287a85a97a30
+DIST gzdoom-4.3.1.tar.gz 13689272 BLAKE2B 3bc26732bc2f3281d0e5a1c667226153d411048877d3a716b6e4ce89534a38cde3763e5cf5d409d99bb053e75d5922b20b4b4d93ce574de58420ae89158eab32 SHA512 6904b8a132f720f07ba15bb4959cf248bba753c318e248d882c5701d919d35492a4fb460a4d4716bc26fde8a1c59d4bceaf3f626326a90a06d4f6cde6a180b96
+EBUILD gzdoom-4.3.1.ebuild 2342 BLAKE2B 5144a68cf0e6bc01f4e8153b87d858df53a360117331eae2c55f6c0202db45bdd82dab6eef12213e1f6373b836a6ccbcaf9db99fe111dc8dd469471a88ad0c20 SHA512 ad3451f9539dfbfd4af50ea97b2082e98e98ac05fe85155c0642c524d7e285537b98710ad9eee00a6d9ae545208a263a6420c6063b6de8ae457f0295642c59d0
+MISC metadata.xml 1138 BLAKE2B 7ce7919829951fab600fa57bc9da7bbd78bbef548b2a967fd76a65748aeb02864022778516bac6a2d0bdb1a5bd4c8877c612167aee08293c161969f9f465734e SHA512 d771f3700ff95f65eba89ebda0ea15bb2126e93bce79b10000262ff6e7489f9f8ae2ccfb8be59cf993f3ff126e19ff9b2172269860754829a12611f4e3109636
diff --git a/games-fps/gzdoom/gzdoom-4.2.4.ebuild b/games-fps/gzdoom/gzdoom-4.3.1.ebuild
index da843dc71ad1..1ba984d753b4 100644
--- a/games-fps/gzdoom/gzdoom-4.2.4.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.3.1.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org"
 SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT
-	nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk gtk2 +nonfree openmp"
+IUSE="alsa fluidsynth gtk gtk2 mpg123 +non-free openmp sndfile"
 
 DEPEND="
 	media-libs/libsdl2[opengl]
-	media-libs/libsndfile
 	media-libs/openal
-	media-sound/fluidsynth:=
-	media-sound/mpg123
 	sys-libs/zlib
 	virtual/jpeg:0
+	alsa? ( media-libs/alsa-lib )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	gtk? (
 		gtk2? ( x11-libs/gtk+:2 )
 		!gtk2? ( x11-libs/gtk+:3 )
-	)"
+	)
+	mpg123? ( media-sound/mpg123 )
+	sndfile? ( media-libs/libsndfile )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
@@ -38,11 +39,11 @@ PATCHES=(
 
 src_prepare() {
 	rm -rf docs/licenses || die
-	if ! use nonfree ; then
+	if ! use non-free ; then
 		rm -rf wadsrc_bm wadsrc_extra || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -57,24 +58,28 @@ src_configure() {
 		-DNO_GTK="$(usex !gtk)"
 		-DNO_OPENAL=OFF
 		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex nonfree)"
+		-DBUILD_NONFREE="$(usex non-free)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	newicon src/posix/zdoom.xpm "${PN}.xpm"
 	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-	cmake-utils_src_install
+	cmake_src_install
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	if ! use nonfree ; then
+	if ! use non-free ; then
 		ewarn
-		ewarn "GZDoom installed without nonfree components."
-		ewarn "Note: The nonfree game_support.pk3 file is needed to play"
+		ewarn "GZDoom installed without non-free components."
+		ewarn "Note: The non-free game_support.pk3 file is needed to play"
 		ewarn "      games natively supported by GZDoom."
 		ewarn "A list of games natively supported by GZDoom is available"
 		ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 5b213dc39913..5e66764ba70e 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -17,8 +17,10 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
+		<flag name="fluidsynth">Enable support for MIDI via <pkg>media-sound/fluidsynth</pkg></flag>
 		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
-		<flag name="nonfree">Enable non-free components</flag>
+		<flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
+		<flag name="non-free">Enable non-free components</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>
diff --git a/games-fps/ut2004-bonuspack-cbp1/Manifest b/games-fps/ut2004-bonuspack-cbp1/Manifest
index 1049e9498f29..2412993b999e 100644
--- a/games-fps/ut2004-bonuspack-cbp1/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp1/Manifest
@@ -1,3 +1,3 @@
 DIST cbp1.zip 144163647 BLAKE2B ff32fbf431475ae2c24920574e5d158c4242fca2359bf1817131e189c0cd25e52d17de3232acb0b118d7f689ee67821cf6707a2e416e1a9b3f2b5f2e8fbcca86 SHA512 e2ead75796fd68b3f0d6ea50b4ed9988fef043730c6b81487d34c45aa26f63cac7b6a43991b673fbd6315f1496d2eecc52a5845c12f244411cd71fedab93c6fd
-EBUILD ut2004-bonuspack-cbp1-1-r3.ebuild 532 BLAKE2B 616c2ee44b85a6d6a0e8f88e61f2845623aa1a6907f40762a21ddd5ee8ca90cfd8df79cdeec931cf15c8a8dc1cc53048f0847bfdd7c3c5a6788c92c2f851d901 SHA512 8eed5c3bb018af4b4d62009945136f7e1a271084e5445ea55327035f97bd6ad730fcecfe526822d8bc58a06be4ffeaa8341b246a014e3f525ac12e230fb21055
+EBUILD ut2004-bonuspack-cbp1-1-r3.ebuild 536 BLAKE2B dd9200478ff8c3d564a497438575e5f7803c3c21d00e17a3bb8d07868eb5031986ae62a5ec6b3f4457beacc65f98ed44e2a8edf72157a81f5bb99b14c37475d7 SHA512 ca746aa05d2f15e6457f75131e45508842a4d89250459d363190e8a76dfaa2f022f2ee345ed64f7ed6fdcdb319f9d34d5703b1d32a1ac78b10e4876d8a8ef1b1
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild
index fefd2792ecc6..e2723ebdde7d 100644
--- a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild
+++ b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="UT2003 Community Bonus Pack for UT2004 Volume 1"
 HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
 SRC_URI="https://ut2004.ut-files.com/BonusPacks/cbp1.zip"
-LICENSE="freedist"
+LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="strip"
diff --git a/games-fps/ut2004-bonuspack-cbp2/Manifest b/games-fps/ut2004-bonuspack-cbp2/Manifest
index 6bb521f4f68f..0eb8e115ba6a 100644
--- a/games-fps/ut2004-bonuspack-cbp2/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp2/Manifest
@@ -1,4 +1,4 @@
 DIST cbp2-volume1_zip.zip 203766207 BLAKE2B 7f7d19f4a1a1caaf388eccecadb8123a103d4aafbb95f2b344e106b881507f9bac0ffdda48435be7c2303b8bd70545d3d74ca7971f97a989bfa955d3155d956c SHA512 9e425985640f9fcf9c1696d75e0794b31110715ba3bf664087ede1f1925a68e76e4ee87d248b245429702c2bffc1fb16362fcc43f795681efcc5880a2a7c3213
 DIST cbp2-volume2_zip.zip 200444127 BLAKE2B 21d61d09af54e86047d46cc8d136cd6ba746098c4d0a53ade1e8e5c4143b543f0a90eb0dbca2cb00e29754f916dc84e7040a5d64f582bedd2a0107bb4c182291 SHA512 52982b302bb2d8f0839392f8bad05935bb8c5cae9e98528dfada7fa80f595050829ff6872b834197486c3401256f60c6c023133f6446299cbd72e1fd7ec3c8f4
-EBUILD ut2004-bonuspack-cbp2-1-r3.ebuild 1013 BLAKE2B 65affde00f8af3ee2185ad7e422d01d30ea6a469f22983535fcb70d0ef7665f49695876d7f0851adf02c45148b61ff3748cc21f98a68bd8e8210c241ee05c215 SHA512 1263bed67a955c265fada3a1499d3144d4f1a1a15aa0ba6d9f61fe585c877e14cab6be245719695dd3f97c03cea968590e63b1dc34be26f65f6f6259919d7cd5
+EBUILD ut2004-bonuspack-cbp2-1-r3.ebuild 1052 BLAKE2B f92e0ebfe0fec33bd26165affe515b2bfb69e5df0fe7e073546385b92a6473e2224db158da56c95627e65a2390b61ddea27eec5d673dbb1871e19eff25f7a05d SHA512 182370907dce26dec74b50d57d85f30b5d6575ff79e0e70d3ccf6ff157d1f9cb14b2115de4e5404f2efcae280d830901d20649cb18f208735a2b73fa44e6ac4d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild
index c14a79c5917f..a25036f26be7 100644
--- a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild
+++ b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild
@@ -7,10 +7,10 @@ DESCRIPTION="UT2004 Community Bonus Pack 2 Volume 1 and 2"
 HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
 SRC_URI="https://ut2004.ut-files.com/BonusPacks/cbp2-volume1_zip.zip
 	https://ut2004.ut-files.com/BonusPacks/cbp2-volume2_zip.zip"
-LICENSE="freedist"
+LICENSE="free-noncomm all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
+RESTRICT="mirror bindist strip"
 
 BDEPEND="app-arch/unzip"
 RDEPEND="|| ( games-fps/ut2004 >=games-server/ut2004-ded-3369.3-r2 )
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 012373cad2dd..ba45874d1f2e 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,10 +1,8 @@
 AUX yamagi-quake2-addon-respect-flags-r2.patch 966 BLAKE2B 08c2259fbbbc45ea41e2472ff544f8a51082069f0c340c548694d26dafc8f7d86418deed928b8150f52115cf23c399f4886c90570185ff78fe7c6a9d5b6c5286 SHA512 4f5d0402f9b3c227363681bdd38cb098795b18589d2a44f3ab5d9682cf58d6315015c22747167298a63f1fcbca00109208894b1c35ac2e6e4dec3900e25e7780
 AUX yamagi-quake2-respect-flags.patch 1209 BLAKE2B 757b7f1757a752871525ed397f53db8992292dde7a68fb22030ded806e64f4853ac1c2e75304afb2f88f1f2d36edc99758dee4fa6cbfe353fa5004aabb65b982 SHA512 abaa7041640556d1b7272fec820a987e02b4a7d466765a637ddc0ce39c38eafe95e46f91e5bdcf74030df2dff7674e96c8a49ca48b99400f74b85551e0d9a5c3
-DIST quake2-7.40.tar.xz 1972020 BLAKE2B be5c01dbcb226f343d18f9d318022edff56bac6f953a0b85cbe3c108451c51020339a12b63fd82803cb9cfbbc26f5dfc230b4cad870ab116cb0333baa0160173 SHA512 23ac94b3b5aa28ad7d36e585f00af4aa285db3f93044175c9f65169fb2f89f5d721a3833a386146cf278c4db47846a442ebd8acd98c97ffa6f149d5949dcd5b1
 DIST quake2-7.41.tar.xz 1978952 BLAKE2B 9d3626f102b652c443caea294f7f66dc46869612b64d16c5f2e9b7f28a83800a0653450f8fc44ebaa83e01ddfaf2b2cd5dd9c6feb8001b5cabd7df32171e035b SHA512 fd2c991274415eb38cf3deb7562f7c51c7f8e935cf7215eba7e8ae088f25cddf95e86221fcbbb5fcc8bd97e264b147951bf5f4aecb8ee54973d46af7ef39d3af
 DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
 DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff
 DIST quake2-xatrix-2.06.tar.xz 190560 BLAKE2B 945e80159cd7630280290f6930e1343fdf9dccdbd44d14cd5b36eccae9499d2cd6eddb1a3967721b61349fa60e48c720e4db66fdc1d8930628864c7fe2cd4ada SHA512 98557ed3fc4fddcd36d47dab207b8101b82f40bd976b11195b229a1073ec04216c06dc119269f287fbd9da0418671521ab6393008f2486ab113940d5fec6bfdc
-EBUILD yamagi-quake2-7.40.ebuild 3506 BLAKE2B bcd0bfd72fe5d400340b30d68409d62ec56460e8ea294c602c3a9517d5a70a0b3c4aed25a5e580cebe3bbdbb4a3e389e66e363591466e206f786431062a30929 SHA512 7adc7b327244e9e4a409a03522830552d5f150d697f2e2c8169224916fb63aa4b8663f86f2d939d8f71e6ee4ace54cc9876284b5ee855acec9ea8aae36f0323a
 EBUILD yamagi-quake2-7.41.ebuild 3506 BLAKE2B bcd0bfd72fe5d400340b30d68409d62ec56460e8ea294c602c3a9517d5a70a0b3c4aed25a5e580cebe3bbdbb4a3e389e66e363591466e206f786431062a30929 SHA512 7adc7b327244e9e4a409a03522830552d5f150d697f2e2c8169224916fb63aa4b8663f86f2d939d8f71e6ee4ace54cc9876284b5ee855acec9ea8aae36f0323a
 MISC metadata.xml 902 BLAKE2B 5431861cde41e065d91af512cbac3e1f41c8c28dc253d54124eef822a38a021be9e9fd6b000bf6571ae242fc87009ea2a4c5045a568adaa37a99302eb1fe8e7f SHA512 7303da58e949237b5d1c6a6fe83c597c4e5dd955ce07368876ee03114cb124cedc44c8d4c51bb4e530c3194ed7041c694167a4495a698fb3b8a6beaf4b8b6f77
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild
deleted file mode 100644
index 5e8aa0b53d2d..000000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils
-
-CTF_V=1.06
-ROGUE_V=2.05
-XATRIX_V=2.06
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
-	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
-	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
-	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
-REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
-
-COMMON_DEPEND="
-	client? (
-		media-libs/libsdl2[video]
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-		opengl? (
-			media-libs/libsdl2[opengl]
-			virtual/opengl
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	client? ( openal? ( media-libs/openal ) )
-"
-
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-flags.patch
-)
-DOCS=( CHANGELOG README.md doc/. )
-
-mymake() {
-	emake \
-		VERBOSE=1 \
-		WITH_SYSTEMWIDE=yes \
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_OPENAL=$(usex openal) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r2.patch
-		popd >/dev/null || die
-	done
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	if use client; then
-		targets+=( client )
-		use opengl && targets+=( ref_gl1 ref_gl3 )
-		use softrender && targets+=( ref_soft )
-	fi
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		if use client; then
-			local addon_name
-			case ${addon} in
-				ctf)    addon_name="CTF" ;;
-				rogue)  addon_name="Ground Zero" ;;
-				xatrix) addon_name="The Reckoning" ;;
-			esac
-
-			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-		fi
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you must at least install:"
-		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
-		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
-		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}