gentoo resync : 22.01.2021

16 files changed, 234 insertions, 114 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 62aeb89ea2de..4f1838a0778d 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 9689b64de99f..823ea1c6ccd2 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,3 +1,5 @@
 DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3
-EBUILD doomsday-2.1.1-r1.ebuild 2045 BLAKE2B 3f48f09f357c53fe7c0e96c85d747ef1211b0aa26a8ceca561ea4611c15d4a21a747a3b623ed2a35749be0b1f4fe4f04dd9870b7172b02a995c84d2f457690d1 SHA512 fe309cf8aa0c04651587496bae8d7cccf9234aec68fb2b43a2d6c0f87b79e68f9f33c51c98ee3589f108bc8bf44576a48ca3365884fff8e702f23da5307902c4
+DIST doomsday-2.3.0.tar.gz 47838189 BLAKE2B 807204cd5e716f57291e383b6a2f0570c01f3e4a92d575f5e585cf1e793785031edd845399dd6896766b1c77425b2fefd6f5f5913adc5fcb7bb1415b2f906c98 SHA512 46d92743e981804eca3ed6e486c4a748114621053d6269a0c0bc5fa84a591f6556ad3226ab6fb3cbc8642ac2f128885261c0bdc78bb5f2012a25f2cab6413461
+EBUILD doomsday-2.1.1-r1.ebuild 2049 BLAKE2B 43dd6207986857887d73c2a9d4504701df1aec8894a2e582df6f3aad16be0941cb964e0ec0ae33220701ca73bdcf8a0ae07717b9206779f3b44ebe6e35d8c9e5 SHA512 2419f7fdf37a2f1aa635963a235f8b119cac60ba0340884ba7c45589875659c19e6a6702a5fbf45c65d97c0976bfa2b1a2ddf03bbd429d85553e576dfc52f701
+EBUILD doomsday-2.3.0.ebuild 2049 BLAKE2B 43dd6207986857887d73c2a9d4504701df1aec8894a2e582df6f3aad16be0941cb964e0ec0ae33220701ca73bdcf8a0ae07717b9206779f3b44ebe6e35d8c9e5 SHA512 2419f7fdf37a2f1aa635963a235f8b119cac60ba0340884ba7c45589875659c19e6a6702a5fbf45c65d97c0976bfa2b1a2ddf03bbd429d85553e576dfc52f701
 MISC metadata.xml 771 BLAKE2B 8a5effc2f449a9b4448dead1a37e9df047ae2e1608c26522d99b02e2d9561e8c129dbdb93f5a713dce72cee09edd8eaed61f38a278d995b3a7fc7e1a5c468bed SHA512 8bc89aa4bab55338472489ec1e92b47cb676b3110a1d3609d8e5a0d51965955770f045405665bff2e401f34697ef4d4b52341a668d08909a92db8eb660c18e00
diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index 8aa9456f5752..47cd24259c18 100644
--- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
 
diff --git a/games-fps/doomsday/doomsday-2.3.0.ebuild b/games-fps/doomsday/doomsday-2.3.0.ebuild
new file mode 100644
index 000000000000..47cd24259c18
--- /dev/null
+++ b/games-fps/doomsday/doomsday-2.3.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
+
+DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
+HOMEPAGE="https://www.dengine.net"
+SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="demo fmod freedoom fluidsynth openal tools"
+
+RDEPEND="
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5=[-gles2-only]
+	dev-qt/qtnetwork:5=
+	dev-qt/qtopengl:5=
+	dev-qt/qtwidgets:5=
+	dev-qt/qtx11extras:5=
+	media-libs/assimp
+	net-misc/curl
+	sys-libs/zlib
+	fmod? ( media-libs/fmod:1 )
+	fluidsynth? ( media-sound/fluidsynth:= )
+	openal? ( media-libs/openal )
+	tools? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+PDEPEND="
+	demo? ( games-fps/doom-data )
+	freedoom? ( games-fps/freedoom )
+"
+
+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_src_prepare
+
+	# Fix QA warning for "installing to one or more unexpected paths"
+	sed -e "10s:/texc:/${PF}:" -i tools/texc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDENG_ASSIMP_EMBEDDED="OFF"
+		-DDENG_ENABLE_TOOLS="$(usex tools)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DQMAKE=$(qt5_get_bindir)/qmake
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use tools; then
+		mv -v "${ED}"/usr/bin/md2tool{,.${PN}} || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if use tools; then
+		einfo "In order to prevent a file collision with games-fps/eduke32[tools],"
+		einfo "the utility md2tool has been renamed to md2tool.doomsday."
+	fi
+}
diff --git a/games-fps/duke3d-data/Manifest b/games-fps/duke3d-data/Manifest
index 6870e3782c80..d46c53f66443 100644
--- a/games-fps/duke3d-data/Manifest
+++ b/games-fps/duke3d-data/Manifest
@@ -1,3 +1,4 @@
+DIST 3dduke13.zip 5924374 BLAKE2B 177329f04defdd2a2ab35a1926a321bbc8de023878ad6bec610669b5578cbe2f38bc0b03a37c0d0d2dcc99acf2b473ddf683b498b971b857b20964bcdbc7d7c8 SHA512 eb92daa88b4e7cfeebe1fb3d2c021e0a4a66262d0d6e76b5e27fe3cedd382e381d23b392a6d9adb42a418b9318e011c2d8adfbdc77d7c5371e61d8c091c7eb65
 DIST gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh 31969896 BLAKE2B 7e93515f8aedaedf6f0dc90faf5e7fef165c000414ae9dc62bad77c78568ecdec1f16b72befe1c80c7c9c8c4bd7fb11f2fd3c36f53aa9ef9d787f8b7215228f3 SHA512 d06f20bc1334172b80e4a75bd3321c3835cd95ac823836899fda8d5f8667ac83471b04a5863646aa953a39fd1cb64eb1818ee668340ede62d0a356ebdcb4065c
-EBUILD duke3d-data-1.0-r4.ebuild 1775 BLAKE2B cc1291fa2c00ecac68c924a571060e44d3c86988a0a944efbd919560bfa959e6c544aadf61052da29d42eded802077d4aecf474b6df39df4885c29ad9622908c SHA512 5fcf67946a0e8d979d9c6050c9c1bb28b8887b57e1178e4fce3df265c4918b91a6ed2662f31d2bc7720bb6f4847e978606a8465618f7ec01b7c7ba5d63643159
-MISC metadata.xml 339 BLAKE2B afb442a147713d5f9000bb54afb2b62841086063b530f74a1da843ed7d08c3ffa995d98964f5e59b344c54eea7ea27ccc3eb563ea94e31452b352c80dc3848d3 SHA512 f5cfb8b76fafaea5c08660ecb9ed1a3d25efc85898b37a249c945547c4c4fc40335ec19711025955e12f6e3922f418f81e42c5dcc9a7f8ad82d3cc9dabbe50ef
+EBUILD duke3d-data-1.0-r5.ebuild 2554 BLAKE2B 1b2c6771b3b5b24d55b90be950f0f295a538a8e3ddab33e3dd32410b3e3c524cf6ce86b72f1b72fa9dcb34014825e9d9bbd8e760a1b19c1b955308a0f8993e9b SHA512 342f82c813053f6f7ab619d6218f770667ee44f40ac6160fbb3d0c0d24b47b17f4b8687b2e241f3cd5826bb68a561a08402ed2db7192bd36188caa235c27d8ee
+MISC metadata.xml 524 BLAKE2B 043a6909768a8c1185386ea8f253acab43709f4d302c495a3df341b0afd73a14e595ac42cde5b49ea73981728cd55243cadb99ca0ee314f3f6fbc2e1579acaa8 SHA512 1ad693d92dc6fa9856b2fc8b650de82fc200b1d9863328813a99664905f27519788f78b766086a43e6d325d9d245fd31647621456461c87fe940eed799519262
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
deleted file mode 100644
index a466c316ad86..000000000000
--- a/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CDROM_OPTIONAL="yes"
-inherit eutils cdrom unpacker
-
-GOG_FILE="gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh"
-DESCRIPTION="Duke Nukem 3D data files"
-HOMEPAGE="http://www.3drealms.com/"
-SRC_URI="gog? ( ${GOG_FILE} )"
-
-LICENSE="DUKE3D gog? ( GOG-EULA )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="gog"
-REQUIRED_USE="^^ ( cdinstall gog )"
-RESTRICT="mirror bindist gog? ( fetch )"
-
-RDEPEND="games-fps/eduke32"
-DEPEND="gog? ( app-arch/unzip )"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
-	einfo "Please download ${GOG_FILE} from your GOG.com account after buying Duke Nukem 3d"
-	einfo "and put it into your DISTDIR directory."
-}
-
-src_unpack() {
-	if use cdinstall ; then
-		export CDROM_NAME_SET=(
-			"Existing Install"
-			"Duke Nukem 3D CD"
-			"Duke Nukem 3D Atomic Edition CD"
-			)
-		cdrom_get_cds duke3d.grp:dvd/dn3dinst/duke3d.grp:atominst/duke3d.grp
-
-		if [[ ${CDROM_SET} -ne 0
-			&& ${CDROM_SET} -ne 1
-			&& ${CDROM_SET} -ne 2 ]]
-		then
-			die "Error locating data files.";
-		fi
-	else
-		unpack_zip "${DISTDIR}"/${GOG_FILE}
-		cd data/noarch/data || die
-
-		# convert to lowercase
-		find . -type f \
-			-execdir sh -c 'echo "converting ${1} to lowercase"
-			lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-			[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-	fi
-}
-
-src_install() {
-	local DATAROOT
-
-	insinto /usr/share/duke3d
-
-	if use cdinstall ; then
-		case ${CDROM_SET} in
-		0) DATAROOT="" ;;
-		1) DATAROOT="dn3dinst/" ;;
-		2) DATAROOT="atominst/" ;;
-		esac
-
-		# avoid double slash
-		doins "${CDROM_ROOT}"/${DATAROOT}{duke3d.grp,duke.rts,game.con,user.con,demo?.dmo,defs.con}
-	else
-		doins data/noarch/data/{duke3d.grp,duke.rts,game.con,user.con,demo?.dmo,defs.con}
-	fi
-}
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild
new file mode 100644
index 000000000000..27e3d9014112
--- /dev/null
+++ b/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CDROM_OPTIONAL="yes"
+MY_PN_DEMO="3dduke"
+MY_PN_GOG="gog_duke_nukem_3d_atomic_edition"
+MY_PV_DEMO="13"
+MY_PV_GOG="2.0.0.9"
+MY_P_DEMO="${MY_PN_DEMO}${MY_PV_DEMO}"
+MY_P_GOG="${MY_PN_GOG}_${MY_PV_GOG}"
+
+inherit cdrom
+
+DESCRIPTION="Duke Nukem 3D (Atomic Edition) data files"
+HOMEPAGE="http://www.3drealms.com/"
+SRC_URI="
+	demo? ( "ftp://ftp.3drealms.com/share/${MY_P_DEMO}.zip" )
+	gog? ( "${MY_P_GOG}.sh" )
+"
+S="${WORKDIR}"
+
+LICENSE="DUKE3D gog? ( GOG-EULA )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+demo gog"
+REQUIRED_USE="^^ ( cdinstall demo gog )"
+RESTRICT="bindist gog? ( fetch ) mirror"
+
+BDEPEND="
+	demo? ( app-arch/unzip )
+	gog? ( app-arch/unzip )
+"
+
+pkg_nofetch() {
+	if use gog; then
+		einfo "Please download ${MY_P_GOG}.sh from your GOG.com account after"
+		einfo "buying Duke Nukem 3D and place it into your DISTDIR directory."
+	fi
+}
+
+src_unpack() {
+	if use cdinstall ; then
+		local CDROM_NAMES=(
+			"Existing installation"
+			"Duke Nukem 3D CD"
+			"Duke Nukem 3D Atomic Edition CD"
+		)
+
+		cdrom_get_cds duke3d.grp:dn3dinst/duke3d.grp:atominst/duke3d.grp
+
+		! [[ "${CDROM_SET}" -ge 0 && "${CDROM_SET}" -le 2 ]] && die "Could not locate data files."
+	fi
+
+	if use demo; then
+		# Use '-LL' to extract everything in lowercase.
+		unzip "${DISTDIR}/${MY_P_DEMO}.zip" || die
+		unzip -LL "DN3DSW${MY_PV_DEMO}.SHR" || die
+	fi
+
+	if use gog; then
+		# Since 'unpacker' eclass does not support options,
+		# doing manual unpack and checking for return code,
+		# as all non-fatal errors should be ignored, because
+		# it's a self-extracting archive and will fail otherwise.
+		# Also use '-LL' to extract everything in lowercase.
+		unzip -LL "${DISTDIR}/${MY_P_GOG}.sh"
+		[[ $? -le 1 ]] || die
+	fi
+}
+
+src_install() {
+	if use cdinstall; then
+		local DATAROOT
+
+		case ${CDROM_SET} in
+			0) DATAROOT="" ;;
+			1) DATAROOT="dn3dinst" ;;
+			2) DATAROOT="atominst" ;;
+		esac
+
+		pushd "${CDROM_ROOT}/${DATAROOT}" || die
+	fi
+
+	if use gog; then
+		pushd "${S}/data/noarch/data" || die
+	fi
+
+	insinto /usr/share/duke3d
+	for file in *.con *.dmo *.grp *.rts; do
+		newins "${file}" "${file,,}"
+	done
+
+	if ! use demo; then
+		if use cdinstall && [[ "${CDROM_SET}" -ne 0 ]]; then
+			doins ../goodies/build/*.map
+		else
+			doins *.map
+		fi
+
+		popd || die
+	fi
+}
+
+pkg_postinst() {
+	if use demo; then
+		einfo "Please keep in mind, that many addons for Duke Nukem 3D will require"
+		einfo "the registered version and will not work with the shareware version."
+	fi
+}
diff --git a/games-fps/duke3d-data/metadata.xml b/games-fps/duke3d-data/metadata.xml
index bb71cbd28b6a..c4c07706b939 100644
--- a/games-fps/duke3d-data/metadata.xml
+++ b/games-fps/duke3d-data/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="gog">Extract the data from the GOG.com installer.</flag>
+		<flag name="demo">Extract data files from the shareware version.</flag>
+		<flag name="gog">Extract data files from the GOG.com version.</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 60560a1e8c73..0adae2ab9470 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -10,6 +10,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_20201214-9286-74aceda66.tar.xz 19917364 BLAKE2B e871d18c216a11dc5c8396a06d23f42feb40dff7b6a2652601b9a13234e7e5e2f7194ccf1d3750a52f4fb66c6a3ca1386a4869a02ecaf11c64b34a082996dd05 SHA512 584cb1219d19c1d48f3f812c0e1378c9d672a1761ff568addd1094d040301b18feadc6340989a811fe7f80f6ef3046753bc261517fee133452aafbe50aabfb1a
-EBUILD eduke32-20201214.9286.ebuild 5980 BLAKE2B 4dad84a1be403dbf6638069484bc50bd5cabd9bb955e0855b2990c0f01fe807968414c8b4d2a3cd8ba8c93046984675a74360bf00bac02c462f87a936347b69e SHA512 33dcb32f29e72668477193c3d85103a9d30d4dee5257443bfe217185dd3ef52a435d3c520b739a165a36d234df3843437602faf0f3c1f6b727b716d4eb2a321f
-MISC metadata.xml 1697 BLAKE2B 76ea172154c71939d93fb4599f516b782682b9d774daf740e8c6a31810926e9a42b9f0c91f131de51975ecde8d2f99a542ddad1757da60b21f4934baadf0222a SHA512 c8f3410f58e8da648e6b0399b5167829d60800aab710df2a370e3976eb27bd1c3f8ad313b964c6e8d47eb22236010ef6bd6bd148b989ee5489122e7b174e17a7
+DIST eduke32_src_20210109-9300-a32832192.tar.xz 19941188 BLAKE2B 0aa7657384fb92352a4f1cd4bbe4b403ccacc4a77e50aa78f3cd44f9e8fcddc38dfc44897c8f768d9a4c1ae701188fc781b54491f310e2162723aa714231dae4 SHA512 4c54f83f08f150506b76ffa73a41de81a7719c14c14adadbf90bfc93f0fb48ef64f4fd43081e5f49726f8c71137b2e4f567251ff9b83a9a25fb09ffb2ab48315
+EBUILD eduke32-20210109.9300-r1.ebuild 5804 BLAKE2B 0a1fbe9bfcd3df1926be91c13560b8ad3d1d33302f0722626ce109b1d839492c12ca0b5c741181f4775da2057aed9de8bba3f00b73779730da30118c1ecfb563 SHA512 f661552e7c99e680187322bdf172986b9f1870c90972aeb232e2924ddec3f582a6624db6013539eef7a65387602e65a03737a902995eeaee5ecad78a9217015d
+MISC metadata.xml 1695 BLAKE2B 0d309ad2873afa0f103b2f37a585f0a80aed38fc360cac2e15bf7bbde421b30193bbcfa068339f2105ddf1bc02155fb3e803ce0d555a7659f88c6248dfeba62f SHA512 252924650afd01827d4cd39d6a7b43eb4fb8616f629e89a9b8ee9828de68f1586c63e458623e31f7e954320e50b081279edf88b0da935daaa5154d8a7d901597
diff --git a/games-fps/eduke32/eduke32-20201214.9286.ebuild b/games-fps/eduke32/eduke32-20210109.9300-r1.ebuild
index 7529d21a544e..f936eea405ff 100644
--- a/games-fps/eduke32/eduke32-20201214.9286.ebuild
+++ b/games-fps/eduke32/eduke32-20210109.9300-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit desktop toolchain-funcs xdg-utils
 
-EGIT_COMMIT="74aceda66"
+EGIT_COMMIT="a32832192"
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
 MY_PV_HRP="5.4"
@@ -31,18 +31,13 @@ SRC_URI="
 LICENSE="BUILDLIC GPL-2 HRP"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="cdinstall demo fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw vorbis voxels vpx xmp"
+IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw vorbis voxels vpx xmp"
 REQUIRED_USE="
-	cdinstall? ( !demo )
-	demo? ( !cdinstall )
-	hrp? ( ^^ ( demo cdinstall )
-		!voxels )
-	offensive? ( ^^ ( demo cdinstall ) )
-	opl? ( ^^ ( demo cdinstall )
-		!sc-55 )
-	psx? ( ^^ ( demo cdinstall ) )
-	sc-55? ( ^^ ( demo cdinstall )
-		!opl )
+	hrp? ( duke3d !voxels )
+	offensive? ( duke3d )
+	opl? ( duke3d !sc-55 )
+	psx? ( duke3d )
+	sc-55? ( duke3d !opl )
 	voxels? ( !hrp )
 	vpx? ( opengl )
 "
@@ -82,10 +77,7 @@ BDEPEND="
 	x86? ( dev-lang/nasm )
 "
 
-PDEPEND="
-	cdinstall? ( games-fps/duke3d-data )
-	demo? ( games-fps/duke3d-demodata )
-"
+PDEDEND="duke3d? ( games-fps/duke3d-data )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 225b31ad73f5..0e39e17f6496 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -15,7 +15,7 @@
 		for short to Windows, Linux, Mac OS X, FreeBSD and several handhelds.
 	</longdescription>
 	<use>
-		<flag name="demo">Install the Duke Nukem 3D demo files, provided by <pkg>games-fps/duke3d-demodata</pkg>.</flag>
+		<flag name="duke3d">Install the Duke Nukem 3D data files, provided by <pkg>games-fps/duke3d-data</pkg>.</flag>
 		<flag name="fluidsynth">Install <pkg>media-libs/sdl2-mixer</pkg> with fluidsynth support.</flag>
 		<flag name="hrp">Install the Duke Nukem 3D High Resolution Pack.</flag>
 		<flag name="offensive">Install the Duke Nukem 3D XXX Pack.</flag>
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 6ff014848790..bc699a96ef39 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,5 @@
 AUX gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch 1215 BLAKE2B b2b24d2c1eaff1b9c5de6d2fdd614fb3f6c21b676b1c56283bc3b376bbf31e29c6eed27112c03d8738564215824583338acbfa84289fe69cb78ab8ee613643b4 SHA512 55fecbdbda330ae0e95a3ac99f8780d37ca386704f115680204da5403ad380eec14559f0522f7d2b55e1340aeebb9ecd1cbc41fe61e519689e7bd2feed5745a1
 DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5 SHA512 0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
 DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
-EBUILD gzdoom-4.5.0.ebuild 2183 BLAKE2B bbba5e98ff15aa6273f126d72e493ea07715936346647ad8046094e21282fbf080f49a0ba92e2e28e4220b5dc2e38e7ebdb987868f0071edc549d339cfb81056 SHA512 13e6463e9d3aa140884bb1b40666eef7883a6123e8636f37f14b288b60f288d005514bff1cfa293cb15449850558b40c43102dfd64175c103bbc2563afd3b2c1
+EBUILD gzdoom-4.5.0.ebuild 2243 BLAKE2B 18cc0e0e8dc7e2fcf794cf3821154103d1a2176c266d298fa768dd842730311218c812f68497747efd493ad0ee40fc734848cb7371998ab4cc62d9bc0a5bc600 SHA512 0efc66911e83d3d732426929e81061b8d2984872f206f3350222b5b565b3567dc7640e630371c01b52386d7cca727b503f0373d65ae06303dab7448c14f9caeb
 MISC metadata.xml 818 BLAKE2B 5036a4b1f33c1fbe8dda683e35d5b0969bcf939eb2ecc1bb3a1b0c30efe2cc92db3405b31c04cc5416675517b6ed0f9fd0e1029dd81a8a4b53f894533e6bf571 SHA512 de0d5ad463c9dadb7cabf3919ba98d4d245e0d001be36890268b297a6727bb992cbb1785de5a3c9990ed92302fc1242c429b92f78083577140c23645b2a354de
diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
index bf1ddc570ec4..60680a131e1c 100644
--- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop xdg
+inherit cmake desktop xdg flag-o-matic
 
 DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org"
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
 	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk gtk2 +non-free openmp"
+IUSE="debug gtk gtk2 +non-free openmp"
 
 DEPEND="
 	app-arch/bzip2
@@ -58,6 +58,9 @@ src_configure() {
 		-DNO_OPENMP="$(usex !openmp)"
 		-DBUILD_NONFREE="$(usex non-free)"
 	)
+
+	use debug || append-cppflags -DNDEBUG
+
 	cmake_src_configure
 }
 
diff --git a/games-fps/redeclipse/Manifest b/games-fps/redeclipse/Manifest
index 491ed5be018a..08806a64e462 100644
--- a/games-fps/redeclipse/Manifest
+++ b/games-fps/redeclipse/Manifest
@@ -1,6 +1,6 @@
 AUX redeclipse 400 BLAKE2B e2f26d4883194948f32a68e1c7ebe0967b41f8cd7678aa282d1647beeefdd44952af9588ece5f7dddd2e4b6ea2ef51faac614eb88f435e382518ca82c01838de SHA512 da4deee6f5ffbc54bfeb501b3a3b4377a0cd04a2dca4284e51113d5073c9f267fb7d1a2b7b59095a200eeff17abff66d60de9b28106259aa0b2ce5b726912768
 DIST redeclipse_1.6.0_nix.tar.bz2 898467399 BLAKE2B 85b4d02ea95cc44d902f6512ec5ce512583353107deb690ec24608d9b96fd4a6b7fd720250413a192cf7229b2f66294ddeb81230e5ace06abdcd4f6f3dc8d92f SHA512 e944aed8155b5e89e8df000516d4a019a63d38d7ad9c3982b2e111f8a20bc848a98e30c1b60f4fdaf006c2ff9e2cb04647c07778eb2562eaf7db733dbce11233
 DIST redeclipse_2.0.0_nix.tar.bz2 948705751 BLAKE2B 00cb03320f80433db1cc5bb9b895cdc829453e64e32d0e481eeac6c5dec9332b2e763f511bee4e9917b334d3f383c2c2a2605dfbd07cc73ffeb3f8efb90278fc SHA512 179a8177ddafefb09de38629c7cc15e8843cd49ad3580093c9f4243dd0d2d2fe095e8df770c2a8f3996d4e273822d6bc955acca73f8191266adb95a34beaf6dd
-EBUILD redeclipse-1.6.0-r2.ebuild 2014 BLAKE2B 57d781179e4f91ca1fa637251978af63deeecab6a09b959bfc001ae32f39fa26bf1aab184d53e9ca87e01de3c8738626602fd4f5c0e0c5f6003d6367af6fc897 SHA512 e460594124b265f6c1db43411488d7b8453127ca7cba35a132065f56c3b21055e8a8f0cc5b9d1e290b53cc41ab2697564b2b63c8e972045cd177b68f844270a6
-EBUILD redeclipse-2.0.0.ebuild 1999 BLAKE2B 67b61cc421d256a06601e630ba53efd2f9f802aec973f18580ec96f987a2a516c6066f770c51ddd31d1a2be5dcb2de4618499f90e52b06471ae0c368e9c7e52b SHA512 e3bc02c9685512894258effa8697cb0a544a0a23e18a2994c3c71f425aa0e754336001021de60754e79332dc9d89741304d111c6bad654b5fd9eff987b6d10be
+EBUILD redeclipse-1.6.0-r3.ebuild 2012 BLAKE2B 5dcaef0b90f51dc7b5d23107ebdf03101383a4c39e58fce82851b24f08431477bd21bbc17347087e3db9ad00c46a38cbb7bd1ed1f64af0246bce7b24a872cf37 SHA512 e62090569d98899300906ba5fb84a167318a568767dde981035630695adce9364445d3e4a113d41ac773d8a912567672c6bae2da6b64125fb7f5f93a8d55935e
+EBUILD redeclipse-2.0.0-r1.ebuild 2000 BLAKE2B 90f9be0280dbb5ca1ece46c8fd3631bd90dd8302778d41aba8b396aa2df1d9c0f40744a96b16075e12b5fb32d366a28390b1264ff259f17d7f5e1fdd6940bf3c SHA512 7087b14112b928efe399fc7a36b780ea4d4448bfc61731870ad14a33ac2fb57a8c72bbdf37701b36a37ab5d7c06dc8db6aa457b35ce85f5ea06e3c3f35e66ea2
 MISC metadata.xml 574 BLAKE2B 6a74f40eb547d6ebcc8ca987609c22ebf171cde9286351e2f459f8eb95e8545399dcce6107540c249bdfc0a431f3282a50ae8a1fbe6239cb1b372755dd638c36 SHA512 1f78ab3ec83d4c8887f2f15addf8935f0026a8494340b346ae4c694fd7bf753962830274c572036490d514b2683df8164f9943b6714cff8cebaba896d70d549d
diff --git a/games-fps/redeclipse/redeclipse-1.6.0-r2.ebuild b/games-fps/redeclipse/redeclipse-1.6.0-r3.ebuild
index a752c8763624..f9fc63f5d111 100644
--- a/games-fps/redeclipse/redeclipse-1.6.0-r2.ebuild
+++ b/games-fps/redeclipse/redeclipse-1.6.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,13 +17,13 @@ IUSE="dedicated"
 
 DEPEND="!dedicated? (
 		media-libs/freetype:2
-		media-libs/libsdl:0[opengl]
+		media-libs/libsdl2[opengl]
 		media-libs/sdl2-image:0[jpeg,png]
 		media-libs/sdl2-mixer:0[mp3,vorbis]
 		virtual/opengl
 		x11-libs/libX11
 	)
-	>=net-libs/enet-1.3.9
+	>=net-libs/enet-1.3.9:=
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
diff --git a/games-fps/redeclipse/redeclipse-2.0.0.ebuild b/games-fps/redeclipse/redeclipse-2.0.0-r1.ebuild
index 8af7b5e88911..14c1520b9b5b 100644
--- a/games-fps/redeclipse/redeclipse-2.0.0.ebuild
+++ b/games-fps/redeclipse/redeclipse-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,13 +16,13 @@ IUSE="dedicated"
 
 DEPEND="!dedicated? (
 		media-libs/freetype:2
-		media-libs/libsdl:0[opengl]
+		media-libs/libsdl2[opengl]
 		media-libs/sdl2-image:0[jpeg,png]
 		media-libs/sdl2-mixer:0[mp3,vorbis]
 		virtual/opengl
 		x11-libs/libX11
 	)
-	>=net-libs/enet-1.3.9
+	>=net-libs/enet-1.3.9:=
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"