From 6fe5af3f06c92a6b1a6b21ff5e1bc9d107490971 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 25 Jun 2023 19:30:41 +0100
Subject: gentoo auto-resync : 25:06:2023 - 19:30:41

---
 games-action/dxx-rebirth/Manifest                  |  10 +-
 .../dxx-rebirth-0.61.0_pre20210623.ebuild          | 256 --------------------
 .../dxx-rebirth-0.61.0_pre20230618.ebuild          | 260 +++++++++++++++++++++
 games-action/dxx-rebirth/dxx-rebirth-9999.ebuild   |  34 +--
 ...-rebirth-0.61.0_pre20210623-gcc-12-editor.patch |  23 --
 .../dxx-rebirth-0.61.0_pre20210623-gcc-12.patch    |  25 --
 .../dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch |  51 ----
 ...x-rebirth-0.61.0_pre20230618-sdl12-compat.patch |  38 +++
 8 files changed, 321 insertions(+), 376 deletions(-)
 delete mode 100644 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
 create mode 100644 games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
 delete mode 100644 games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
 delete mode 100644 games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
 delete mode 100644 games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
 create mode 100644 games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch

(limited to 'games-action/dxx-rebirth')

diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index 91229db74e6a..d0a8a435fdb9 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,7 +1,5 @@
-AUX dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch 964 BLAKE2B c0fb0dd89195eec975c30b83a35b0bd163e6fa5fc1fd17f8560a747f1b474420d9ec3fa3c808305e88de7748bbdc2c03ac0e4958a0f64d79bf2db2d88f44821f SHA512 24aad4db804e276a9a4e741aa169b35a5e35841ea72cf187231976f9b30f69540a2d8036cc09ae609522390e08be6ad0f4a9ec67fc253ce38b44719b0992e57b
-AUX dxx-rebirth-0.61.0_pre20210623-gcc-12.patch 1204 BLAKE2B 3482928a1ec1ca2020b77dbbea64f485bb40537c24373b01068a907f1abde7d3bea5d1e165c7f467256e4c1663e62c49c47845760df04e6093e06019ae25bf5d SHA512 33d213c7225bd0be1e2eea9ace068b5a7ffc28e3ce034014000e88b7c741dcaddbe44947fced67dfe3a9af8277df3dc196145433da3898d9572ea1a171603b5d
-AUX dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch 2754 BLAKE2B 088954d04e6ab23dacdf565adfc033af9d7b002a15ec86d07b66b2e864a6b013bed0532a58592f51b3790a1647b2c3fd780f35c3416f7c8a54618c7d0fdcef27 SHA512 b5df1e52b7f4602b6b2dbb7dc928749b532c57d59ede2af7d7329b8415b33347744b93cd2428e9344f1fb575dcf776c1de55b4b4263cacdc8c6dee6ec2005b3e
-DIST dxx-rebirth_20210623-src.tar.xz 1340044 BLAKE2B f16a8904d777559e789d719bc0d6d2dbb7d26c1128984117b6c64a334ae589dd5806439cc51e458a583e1b6cc831dae7c51bf7bd3fbc972989b0ce4e5b932a4e SHA512 150d873fa045df6fb2f9bb70334d08eeae0cc7a639e825f1352fed28501ab9541a27bf3395fc1929bc8d76ed9126b038eed67c5a01657f43116da4663e929821
-EBUILD dxx-rebirth-0.61.0_pre20210623.ebuild 8632 BLAKE2B 7f178fb25351f021b406f141781d815ecd3d3b5da8ce9eee30e2bb41bec196e51adf4f4825c3650ca9da30d066bdc0bcfcaaaafeb6155ceed3c0936c9cf8c7ee SHA512 af0c70052b494b32554c3ed9b14ea887b0994d8e5ad09fd652101f8f08732226eed3539263ed3d7691e7bc6447c12c3e996f275c3ebe18f9ae6d06b4b1038865
-EBUILD dxx-rebirth-9999.ebuild 8546 BLAKE2B 9634616c01b562de777d19f309dc197a152cf453368292dcd0824a454e6568d37420471d04140fc1de4f41a9b1488595f106b5e8d06fea4957be8f85dd3a1868 SHA512 b3e95904bfd97b86ada1d91bdd9d9669f47e8856c9decadcbdfdc8547d1e537d8314608c9fc97e766c47ffe9ed943185ae2d739358a28b75b885388ecd9767f7
+AUX dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch 1508 BLAKE2B 95aeba4f6e77d20e7a4e3bbcbfe6844e48c0b52763dd0407920b5afcd3a012867ab698b730c14d5e7d0b4b2244aa57f460b012607ba5d9c49a5c0b807b278eec SHA512 807dd3483b470438fc10e6440752b350956bf77382674a99af09bea035ebd9702158a82a693f2aaccf131eac2897434217fb79b6137840dc7f6620988e41cf62
+DIST dxx-rebirth-0.61.0_pre20230618.tar.gz 2063234 BLAKE2B d602e8e92f8a494eabe3645e4c465f1f1b1bc10a0b27d4b518a617f07c90c86c903b7a6bed42085bfe992cd8533f57ac6eca2c10ee0b02d5fc677859f0d80bd3 SHA512 a0a0318169ed55ef9969fe9827d87871bec3d168fb94bed1e7d0c61ce62fdad9f57040181f2c05f9107a0f898ba4876b802e74d43028c90169eefebd2b9eb79d
+EBUILD dxx-rebirth-0.61.0_pre20230618.ebuild 8813 BLAKE2B e4c8ba037c924577b1437cf8cb2bf500b7161c3760e578142fa71a8954b284972b0bf92e8b5527a2f91069f2cd2fd78b9120b90e0a5ffdbb32a596d3ac9ff85c SHA512 c4933a48f56497cf77da27c33d9aeefa49a0323cf581f67c3e5f9eaa8549d5e2d9bee59359d5b4afc4deb3f566404da20e44e814c4fe1141bb081c45be7075e8
+EBUILD dxx-rebirth-9999.ebuild 8721 BLAKE2B 6310d16f6be4c40bb40474f81763a64d362ee5684389ac2053d39f0a1fe07f3a12e5712b86dea7fb9c51e3b9dfb3cc00065e0372dc536056630b41a778c8278c SHA512 ea78a739b730e949599ae375a8de2bf0a018ec7c1118a7fd2805b9fa09cc80479446df4af549fac812d0f059ee2e2998e689ed15d5bb8875763b789ca71e2e5f
 MISC metadata.xml 2427 BLAKE2B e1a42d52d5ba0038e9ee63e6cc477239189e665812217abec4f5ed9f450f505472b611e3a2031ccf1508eee8b71ad651304eae79cad9ff00d91c4737100838ad SHA512 5e7f527575308ee42bd16c6df893fc300ee298da805b16aa825ff0f2013135c88656de1ed264a7c6d5ae0424ae4dedf79ab4d55debd0c09d4044917ab2f17f8c
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
deleted file mode 100644
index 77aab2a2ddca..000000000000
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 2017-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
-
-if [[ "${PV}" = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth"
-else
-	S="${WORKDIR}/${PN}_${PV##*_pre}-src"
-	SRC_URI="https://www.dxx-rebirth.com/download/dxx/rebirth/${PN}_${PV##*_pre}-src.tar.xz"
-
-	# Games under Gentoo are marked as 'testing' by convention
-	#
-	# Other architectures are reported to work, but not tested regularly by
-	# the core team.
-	#
-	# Raspberry Pi support is tested by an outside contributor, and his
-	# fixes are merged into the main source by upstream.
-	#
-	# Cross-compilation to Windows is also supported.
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
-HOMEPAGE="https://www.dxx-rebirth.com/"
-
-LICENSE="DXX-Rebirth GPL-3"
-SLOT="0"
-
-# Default to building both game engines.  The total size is relatively
-# small.
-IUSE="+d1x +d2x +data debug editor +flac ipv6 +joystick l10n_de +midi +mp3 +music +opengl opl3-musicpack +png sc55-musicpack sdl2 tracker valgrind +vorbis"
-
-# Game data is stored in HOG files.
-# Game movies are in MVL files.
-# Various add-ons use zip files to bundle their content together.
-#
-# PNG support enables writing screenshots as PNG instead of TGA (for
-# USE=opengl) or PCX (for USE=-opengl).
-DEPEND="dev-games/physfs[hog,mvl,zip]
-	opengl? (
-		virtual/opengl
-		virtual/glu )
-	png? ( media-libs/libpng )
-"
-
-# As of this writing, there is no Portage shorthand syntax to express:
-# "
-# 	flag1? ( package[flag1] )
-# 	flag2? ( package[flag2] )
-# 	...
-# 	flagN? ( package[flagN] )
-# ", such that unsetting all flags removes the dependency on package.
-# Fake it by using a text fragment that is repeatedly expanded with
-# differing substitutions.
-#
-# The use of single quotes is intentional here.  The ${word} is a
-# placeholder to be matched by text substitution when the fragment is
-# expanded, not a shell variable reference.
-#
-# For each flag, depend on freedata using the same flag.  If none of the
-# flags are set, freedata is not needed.
-DXX_RDEPEND_USE_FREEDATA_FRAGMENT='
-	${USE}? ( games-action/descent${ENGINE}-freedata[${USE}] )
-'
-# Block <0.59.100 due to file collision.
-#
-# If USE=data, then require a game data package.
-# The build process does not use the game data, nor change how the game
-# is built based on what game data will be used.  At startup, the game
-# will search for both types of game data and use what it finds.  Users
-# can switch between shareware/retail data at any time by
-# adding/removing the appropriate data packages.  A rebuild is _not_
-# required after swapping the data files.
-#
-# USE-depend on freedata for various extras, but only if any of those
-# extras are enabled.
-DXX_RDEPEND_ENGINE_FRAGMENT='
-	d${ENGINE}x? (
-		!<games-action/d${ENGINE}x-rebirth-0.59.100
-		data? (
-			|| (
-				games-action/descent${ENGINE}-data
-				games-action/descent${ENGINE}-demodata
-			)
-		)
-		'"
-		${DXX_RDEPEND_USE_FREEDATA_FRAGMENT//\$\{USE\}/l10n_de}
-		${DXX_RDEPEND_USE_FREEDATA_FRAGMENT//\$\{USE\}/opl3-musicpack}
-		${DXX_RDEPEND_USE_FREEDATA_FRAGMENT//\$\{USE\}/sc55-musicpack}
-		"'
-	)
-'
-
-DXX_DEPEND_USE_SDL_VERSION_FRAGMENT='
-	media-libs/lib${SDL_version}[joystick?,opengl?,sound,video]
-	media-libs/${SDL_version}-image
-	music? ( media-libs/${SDL_version}-mixer )
-'
-DXX_RDEPEND_USE_SDL_VERSION_FRAGMENT='
-	music? ( media-libs/${SDL_version}-mixer[flac?,midi?,mp3?,vorbis?] )
-'
-DEPEND="${DEPEND}
-	!sdl2? ( ${DXX_DEPEND_USE_SDL_VERSION_FRAGMENT//\$\{SDL_version\}/sdl} )
-	sdl2? ( ${DXX_DEPEND_USE_SDL_VERSION_FRAGMENT//\$\{SDL_version\}/sdl2} )
-"
-unset DXX_DEPEND_USE_SDL_VERSION_FRAGMENT
-
-unset DXX_RDEPEND_USE_FREEDATA_FRAGMENT
-RDEPEND="${DEPEND}
-	!sdl2? ( ${DXX_RDEPEND_USE_SDL_VERSION_FRAGMENT//\$\{SDL_version\}/sdl} )
-	sdl2? ( ${DXX_RDEPEND_USE_SDL_VERSION_FRAGMENT//\$\{SDL_version\}/sdl2} )
-	${DXX_RDEPEND_ENGINE_FRAGMENT//\$\{ENGINE\}/1}
-	${DXX_RDEPEND_ENGINE_FRAGMENT//\$\{ENGINE\}/2}
-"
-unset DXX_RDEPEND_ENGINE_FRAGMENT
-unset DXX_RDEPEND_USE_SDL_VERSION_FRAGMENT
-
-# USE=valgrind enables use of a Valgrind header.  A build with valgrind
-# instrumentation can be run without installing Valgrind, so this
-# dependency is only in DEPEND, instead of being in both DEPEND and
-# RDEPEND.
-DEPEND+='
-	valgrind? ( dev-util/valgrind )
-'
-
-# This ebuild builds d1x-rebirth, d2x-rebirth, or both.  Building none
-# would mean this ebuild installs zero files.
-#
-# For each of the supported music flags, require USE=music, so that the
-# package is built with sdl-mixer support.  Individual music types can be
-# changed without a Rebirth rebuild by rebuilding sdl-mixer with
-# appropriate support, but Rebirth must have sdl-mixer support at build
-# time in order to support any of these music formats at runtime.
-#
-# All music files in the optional musicpack downloads are .ogg, so
-# require USE=vorbis if those packs are enabled.
-REQUIRED_USE='
-	|| ( d1x d2x )
-	flac? ( music )
-	midi? ( music )
-	mp3? ( music )
-	vorbis? ( music )
-	opl3-musicpack? ( vorbis )
-	sc55-musicpack? ( vorbis )
-	sdl2? ( opengl )
-'
-
-BDEPEND="virtual/pkgconfig"
-
-# As of this writing, IUSE_RUNTIME is a GLEP, but not an implemented
-# feature.  This variable is stored here to be ready to activate when
-# Portage implements this feature.
-#
-# Note that while individual music formats can be switched without a
-# rebuild, the master flag USE=music controls whether sdl-mixer is used,
-# and therefore requires a rebuild when changed.
-#IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-12.patch
-	"${FILESDIR}"/${P}-gcc-12-editor.patch
-	"${FILESDIR}"/${P}-scons-4.5.patch
-)
-
-dxx_scons() {
-	# Always build profile `m`.  If use editor, also build profile `e`.
-	# Set most variables in the default anonymous profile.  Only
-	# `builddir` and `editor` are set in the named profiles, since those
-	# must be different between the two builds.
-	#
-	# Notes for end users:
-	# - Per-engine options can be set with an engine prefix, as shown
-	#   for sharepath.  Such options are used in place of
-	#   engine-unqualified options.  For example, to disable sdlmixer
-	#   for Descent 2: Rebirth, but use the setting below for Descent 1:
-	#   Rebirth, set EXTRA_ESCONS="d2x_sdlmixer=0".
-	# - Profile `site` is searched before the anonymous profile, and is
-	#   deliberately unused in this ebuild.  Set options in the site
-	#   profile to affect both engines:
-	#   EXTRA_ESCONS="site_verbosebuild=0".
-	local scons_build_profile=m mysconsargs=(
-		sdl2=$(usex sdl2 1 0)
-		sdlmixer=$(usex music 1 0)
-		verbosebuild=1
-		debug=$(usex debug 1 0)
-		ipv6=$(usex ipv6 1 0)
-		opengl=$(usex opengl 1 0)
-		use_tracker=$(usex tracker 1 0)
-		prefix="${EPREFIX}"/usr
-		screenshot=$(usex png png legacy)
-		m_builddir=build/main/
-		m_editor=0
-	)
-	if use editor; then
-		scons_build_profile+=+e
-		mysconsargs+=( \
-			e_builddir=build/editor/
-			e_editor=1
-		)
-	fi
-	if ! use joystick; then
-		mysconsargs+=( \
-			max_joysticks=0
-		)
-	fi
-	# Add sharepath and enable build of selected games.  The trailing
-	# comma after `$scons_build_profile` is required to cause scons to
-	# search the anonymous profile.  If omitted, only settings from the
-	# named profile would be used.
-	use d1x && mysconsargs+=( d1x_sharepath="/usr/share/games/d1x" d1x="$scons_build_profile,site," )
-	use d2x && mysconsargs+=( d2x_sharepath="/usr/share/games/d2x" d2x="$scons_build_profile,site," )
-	use valgrind && mysconsargs+=( poison=valgrind )
-	escons "${mysconsargs[@]}" "$@"
-}
-
-src_compile() {
-	tc-export CXX PKG_CONFIG
-	replace-flags -O3 -O2 #831896
-	dxx_scons register_install_target=0 build
-}
-
-src_install() {
-	# Use upstream install target to handle the various combinations of
-	# enabled/disabled engines and optional editor support.
-	dxx_scons register_compile_target=0 register_install_target=1 DESTDIR="${D}" "${D}"
-	local DV
-	for DV in 1 2; do
-		if ! use d${DV}x; then
-			continue
-		fi
-		local PROGRAM=d${DV}x-rebirth
-		docinto "${PROGRAM}"
-		dodoc "${PROGRAM}"/*.txt
-		make_desktop_entry "${PROGRAM}" "Descent ${DV} Rebirth" "${PROGRAM}"
-		doicon "${PROGRAM}/${PROGRAM}.xpm"
-	done
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use data; then
-		elog "${PN} requires game data to play."
-		elog "Game data is not included in this package.  To play the game,"
-		elog "emerge the packages required by USE=data or install the game"
-		elog "data by hand."
-		elog
-		elog "Changing USE=data does not change how this package is built,"
-		elog "only its runtime dependencies."
-	fi
-}
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
new file mode 100644
index 000000000000..833ffdb92ee8
--- /dev/null
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20230618.ebuild
@@ -0,0 +1,260 @@
+# Copyright 2017-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+MY_COMMIT="111f6f2f0dd8de7c2f669eb4d784a0d9e9f124f9"
+
+# Games under Gentoo are marked as 'testing' by convention
+#
+# Other architectures are reported to work, but not tested regularly by
+# the core team.
+#
+# Raspberry Pi support is tested by an outside contributor, and his
+# fixes are merged into the main source by upstream.
+#
+# Cross-compilation to Windows is also supported.
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
+
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth"
+	unset KEYWORDS
+elif [[ -n ${MY_COMMIT} ]]; then
+	S="${WORKDIR}/${PN}-${MY_COMMIT}"
+	SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/${MY_COMMIT} -> ${PN}-${PVR}.tar.gz"
+	unset MY_COMMIT
+else
+	S="${WORKDIR}/${PN}_${PV##*_pre}-src"
+	SRC_URI="https://www.dxx-rebirth.com/download/dxx/rebirth/${PN}_${PV##*_pre}-src.tar.xz"
+fi
+
+DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
+HOMEPAGE="https://www.dxx-rebirth.com/"
+
+LICENSE="DXX-Rebirth GPL-3"
+SLOT="0"
+
+# Default to building both game engines.  The total size is relatively
+# small.
+IUSE="+d1x +d2x +data debug editor +flac ipv6 +joystick l10n_de +midi +mp3 +music +opengl opl3-musicpack +png sc55-musicpack sdl2 tracker valgrind +vorbis"
+
+# Game data is stored in HOG files.
+# Game movies are in MVL files.
+# Various add-ons use zip files to bundle their content together.
+#
+# PNG support enables writing screenshots as PNG instead of TGA (for
+# USE=opengl) or PCX (for USE=-opengl).
+DEPEND="dev-games/physfs[hog,mvl,zip]
+	opengl? (
+		virtual/opengl
+		virtual/glu )
+	png? ( media-libs/libpng )
+"
+
+# As of this writing, there is no Portage shorthand syntax to express:
+# "
+# 	flag1? ( package[flag1] )
+# 	flag2? ( package[flag2] )
+# 	...
+# 	flagN? ( package[flagN] )
+# ", such that unsetting all flags removes the dependency on package.
+# Fake it by using a text fragment that is repeatedly expanded with
+# differing substitutions.
+#
+# The use of single quotes is intentional here.  The ${word} is a
+# placeholder to be matched by text substitution when the fragment is
+# expanded, not a shell variable reference.
+#
+# For each flag, depend on freedata using the same flag.  If none of the
+# flags are set, freedata is not needed.
+DXX_RDEPEND_USE_FREEDATA_FRAGMENT='
+	${USE}? ( games-action/descent${ENGINE}-freedata[${USE}] )
+'
+# Block <0.59.100 due to file collision.
+#
+# If USE=data, then require a game data package.
+# The build process does not use the game data, nor change how the game
+# is built based on what game data will be used.  At startup, the game
+# will search for both types of game data and use what it finds.  Users
+# can switch between shareware/retail data at any time by
+# adding/removing the appropriate data packages.  A rebuild is _not_
+# required after swapping the data files.
+#
+# USE-depend on freedata for various extras, but only if any of those
+# extras are enabled.
+DXX_RDEPEND_ENGINE_FRAGMENT='
+	d${ENGINE}x? (
+		!<games-action/d${ENGINE}x-rebirth-0.59.100
+		data? (
+			|| (
+				games-action/descent${ENGINE}-data
+				games-action/descent${ENGINE}-demodata
+			)
+		)
+		'"
+		${DXX_RDEPEND_USE_FREEDATA_FRAGMENT//\$\{USE\}/l10n_de}
+		${DXX_RDEPEND_USE_FREEDATA_FRAGMENT//\$\{USE\}/opl3-musicpack}
+		${DXX_RDEPEND_USE_FREEDATA_FRAGMENT//\$\{USE\}/sc55-musicpack}
+		"'
+	)
+'
+
+DXX_DEPEND_USE_SDL_VERSION_FRAGMENT='
+	media-libs/lib${SDL_version}[joystick?,opengl?,sound,video]
+	media-libs/${SDL_version}-image
+	music? ( media-libs/${SDL_version}-mixer )
+'
+DXX_RDEPEND_USE_SDL_VERSION_FRAGMENT='
+	music? ( media-libs/${SDL_version}-mixer[flac?,midi?,mp3?,vorbis?] )
+'
+DEPEND="${DEPEND}
+	!sdl2? ( ${DXX_DEPEND_USE_SDL_VERSION_FRAGMENT//\$\{SDL_version\}/sdl} )
+	sdl2? ( ${DXX_DEPEND_USE_SDL_VERSION_FRAGMENT//\$\{SDL_version\}/sdl2} )
+"
+unset DXX_DEPEND_USE_SDL_VERSION_FRAGMENT
+
+unset DXX_RDEPEND_USE_FREEDATA_FRAGMENT
+RDEPEND="${DEPEND}
+	!sdl2? ( ${DXX_RDEPEND_USE_SDL_VERSION_FRAGMENT//\$\{SDL_version\}/sdl} )
+	sdl2? ( ${DXX_RDEPEND_USE_SDL_VERSION_FRAGMENT//\$\{SDL_version\}/sdl2} )
+	${DXX_RDEPEND_ENGINE_FRAGMENT//\$\{ENGINE\}/1}
+	${DXX_RDEPEND_ENGINE_FRAGMENT//\$\{ENGINE\}/2}
+"
+unset DXX_RDEPEND_ENGINE_FRAGMENT
+unset DXX_RDEPEND_USE_SDL_VERSION_FRAGMENT
+
+# USE=valgrind enables use of a Valgrind header.  A build with valgrind
+# instrumentation can be run without installing Valgrind, so this
+# dependency is only in DEPEND, instead of being in both DEPEND and
+# RDEPEND.
+DEPEND+='
+	valgrind? ( dev-util/valgrind )
+'
+
+# This ebuild builds d1x-rebirth, d2x-rebirth, or both.  Building none
+# would mean this ebuild installs zero files.
+#
+# For each of the supported music flags, require USE=music, so that the
+# package is built with sdl-mixer support.  Individual music types can be
+# changed without a Rebirth rebuild by rebuilding sdl-mixer with
+# appropriate support, but Rebirth must have sdl-mixer support at build
+# time in order to support any of these music formats at runtime.
+#
+# All music files in the optional musicpack downloads are .ogg, so
+# require USE=vorbis if those packs are enabled.
+REQUIRED_USE='
+	|| ( d1x d2x )
+	flac? ( music )
+	midi? ( music )
+	mp3? ( music )
+	vorbis? ( music )
+	opl3-musicpack? ( vorbis )
+	sc55-musicpack? ( vorbis )
+	sdl2? ( opengl )
+'
+
+BDEPEND="virtual/pkgconfig"
+
+# As of this writing, IUSE_RUNTIME is a GLEP, but not an implemented
+# feature.  This variable is stored here to be ready to activate when
+# Portage implements this feature.
+#
+# Note that while individual music formats can be switched without a
+# rebuild, the master flag USE=music controls whether sdl-mixer is used,
+# and therefore requires a rebuild when changed.
+#IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sdl12-compat.patch
+)
+
+dxx_scons() {
+	# Always build profile `m`.  If use editor, also build profile `e`.
+	# Set most variables in the default anonymous profile.  Only
+	# `builddir` and `editor` are set in the named profiles, since those
+	# must be different between the two builds.
+	#
+	# Notes for end users:
+	# - Per-engine options can be set with an engine prefix, as shown
+	#   for sharepath.  Such options are used in place of
+	#   engine-unqualified options.  For example, to disable sdlmixer
+	#   for Descent 2: Rebirth, but use the setting below for Descent 1:
+	#   Rebirth, set EXTRA_ESCONS="d2x_sdlmixer=0".
+	# - Profile `site` is searched before the anonymous profile, and is
+	#   deliberately unused in this ebuild.  Set options in the site
+	#   profile to affect both engines:
+	#   EXTRA_ESCONS="site_verbosebuild=0".
+	local scons_build_profile=m mysconsargs=(
+		sdl2=$(usex sdl2 1 0)
+		sdlmixer=$(usex music 1 0)
+		verbosebuild=1
+		debug=$(usex debug 1 0)
+		ipv6=$(usex ipv6 1 0)
+		opengl=$(usex opengl 1 0)
+		use_tracker=$(usex tracker 1 0)
+		prefix="${EPREFIX}"/usr
+		screenshot=$(usex png png legacy)
+		m_builddir=build/main/
+		m_editor=0
+	)
+	if use editor; then
+		scons_build_profile+=+e
+		mysconsargs+=( \
+			e_builddir=build/editor/
+			e_editor=1
+		)
+	fi
+	if ! use joystick; then
+		mysconsargs+=( \
+			max_joysticks=0
+		)
+	fi
+	# Add sharepath and enable build of selected games.  The trailing
+	# comma after `$scons_build_profile` is required to cause scons to
+	# search the anonymous profile.  If omitted, only settings from the
+	# named profile would be used.
+	use d1x && mysconsargs+=( d1x_sharepath="/usr/share/games/d1x" d1x="$scons_build_profile,site," )
+	use d2x && mysconsargs+=( d2x_sharepath="/usr/share/games/d2x" d2x="$scons_build_profile,site," )
+	use valgrind && mysconsargs+=( poison=valgrind )
+	escons "${mysconsargs[@]}" "$@"
+}
+
+src_compile() {
+	tc-export CXX PKG_CONFIG
+	replace-flags -O3 -O2 #831896
+	dxx_scons register_install_target=0 build
+}
+
+src_install() {
+	# Use upstream install target to handle the various combinations of
+	# enabled/disabled engines and optional editor support.
+	dxx_scons register_compile_target=0 register_install_target=1 DESTDIR="${D}" "${D}"
+	local DV
+	for DV in 1 2; do
+		if ! use d${DV}x; then
+			continue
+		fi
+		local PROGRAM=d${DV}x-rebirth
+		docinto "${PROGRAM}"
+		dodoc "${PROGRAM}"/*.txt
+		make_desktop_entry "${PROGRAM}" "Descent ${DV} Rebirth" "${PROGRAM}"
+		doicon "${PROGRAM}/${PROGRAM}.xpm"
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use data; then
+		elog "${PN} requires game data to play."
+		elog "Game data is not included in this package.  To play the game,"
+		elog "emerge the packages required by USE=data or install the game"
+		elog "data by hand."
+		elog
+		elog "Changing USE=data does not change how this package is built,"
+		elog "only its runtime dependencies."
+	fi
+}
diff --git a/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
index b13187e490c0..81bd934fd3b2 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
@@ -1,31 +1,35 @@
 # Copyright 2017-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..11} )
+MY_COMMIT=""
+
+# Games under Gentoo are marked as 'testing' by convention
+#
+# Other architectures are reported to work, but not tested regularly by
+# the core team.
+#
+# Raspberry Pi support is tested by an outside contributor, and his
+# fixes are merged into the main source by upstream.
+#
+# Cross-compilation to Windows is also supported.
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 if [[ "${PV}" = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth"
-else
-	MY_COMMIT=''
+	unset KEYWORDS
+elif [[ -n ${MY_COMMIT} ]]; then
 	S="${WORKDIR}/${PN}-${MY_COMMIT}"
 	SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/${MY_COMMIT} -> ${PN}-${PVR}.tar.gz"
 	unset MY_COMMIT
-
-	# Games under Gentoo are marked as 'testing' by convention
-	#
-	# Other architectures are reported to work, but not tested regularly by
-	# the core team.
-	#
-	# Raspberry Pi support is tested by an outside contributor, and his
-	# fixes are merged into the main source by upstream.
-	#
-	# Cross-compilation to Windows is also supported.
-	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	S="${WORKDIR}/${PN}_${PV##*_pre}-src"
+	SRC_URI="https://www.dxx-rebirth.com/download/dxx/rebirth/${PN}_${PV##*_pre}-src.tar.xz"
 fi
 
 DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
deleted file mode 100644
index fbb03cf8f334..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12-editor.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-With USE=editor and gcc12:
-
-    similar/main/piggy.cpp: In function 'void d2x::piggy_new_pigfile(char*)':
-    similar/main/piggy.cpp:870:62: error: '%u' directive output may be truncated writing between 1 and 10 bytes into a region of size between 7 and 19 [-Werror=format-truncation=]
-
-But the offending code is unused, so can just drop it.
-
-Backport from:
-https://github.com/dxx-rebirth/dxx-rebirth/commit/12cca97870efe419613462dc279963a77bc80d9a
---- a/similar/main/piggy.cpp
-+++ b/similar/main/piggy.cpp
-@@ -889,11 +889,8 @@ void piggy_new_pigfile(char *pigname)
- 				}
- 			
- 				for (fnum=0;fnum<nframes; fnum++)       {
--					char tempname[20];
- 					int SuperX;
- 
--					snprintf(tempname, sizeof(tempname), "%s#%u", basename, fnum);
--
- 					//SuperX = (GameBitmaps[i+fnum].bm_flags&BM_FLAG_SUPER_TRANSPARENT)?254:-1;
- 					SuperX = (GameBitmapFlags[i+fnum]&BM_FLAG_SUPER_TRANSPARENT)?254:-1;
- 					//above makes assumption that supertransparent color is 254
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
deleted file mode 100644
index 3681385976a6..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/894678
-https://github.com/dxx-rebirth/dxx-rebirth/commit/092daecb6118b3c072c71a8bea24f119e300bd49
-
-From 092daecb6118b3c072c71a8bea24f119e300bd49 Mon Sep 17 00:00:00 2001
-From: Kp <kp@valhallalegends.com>
-Date: Sat, 28 May 2022 21:04:37 +0000
-Subject: [PATCH] Use static_cast<> to convert player_marker_num to
- game_marker_index
-
-gcc-12 rejects the list initialization syntax.  Switch to static_cast<>,
-which generates equivalent code.
-
-Reported-by: dbermond <https://github.com/dxx-rebirth/dxx-rebirth/issues/638>
---- a/similar/main/automap.cpp
-+++ b/similar/main/automap.cpp
-@@ -370,7 +370,7 @@ game_marker_index convert_player_marker_index_to_game_marker_index(const game_mo
- 		return static_cast<game_marker_index>((player_num * MAX_DROP_MULTI_COOP) + static_cast<unsigned>(player_marker_num));
- 	if (game_mode & GM_MULTI)
- 		return static_cast<game_marker_index>((player_num * MAX_DROP_MULTI_COMPETITIVE) + static_cast<unsigned>(player_marker_num));
--	return game_marker_index{player_marker_num};
-+	return static_cast<game_marker_index>(player_marker_num);
- }
- 
- unsigned d_marker_state::get_markers_per_player(const game_mode_flags game_mode, const unsigned max_numplayers)
-
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
deleted file mode 100644
index 0adc507cada5..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-scons-4.5.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://bugs.gentoo.org/902463
-
-https://github.com/dxx-rebirth/dxx-rebirth/pull/705
-https://github.com/dxx-rebirth/dxx-rebirth/commit/189ac23f61605903eb3eaa0004d287b7bd9296bc
---- a/SConstruct
-+++ b/SConstruct
-@@ -324,3 +324,3 @@
- 		def __init__(self,env,keyviews,_l=[]):
--			self.flags = {k: env.get(k, _l)[:] for k in itertools.chain.from_iterable(keyviews)}
-+			self.flags = {k: env.get(k, _l).copy() for k in itertools.chain.from_iterable(keyviews)}
- 		def restore(self,env):
-@@ -1493,3 +1493,3 @@
- 			user_settings.max_axes_per_joystick = user_settings.max_buttons_per_joystick = user_settings.max_hats_per_joystick = 0
--		successflags['CPPDEFINES'] = CPPDEFINES = successflags.get('CPPDEFINES', [])[:]
-+		successflags['CPPDEFINES'] = CPPDEFINES = successflags.get('CPPDEFINES', []).copy()
- 		# use Redbook if at least one of the following applies
-@@ -4608,3 +4608,3 @@
- 		for test in runtime_test_boost_tests:
--			LIBS = [] if test.nodefaultlibs else env['LIBS'][:]
-+			LIBS = [] if test.nodefaultlibs else env['LIBS'].copy()
- 			LIBS.append('boost_unit_test_framework')
-@@ -4850,3 +4850,3 @@
- 			kwargs['CXXFLAGS'] = (env['CXXFLAGS'] or []) + ['-E']
--			kwargs['CPPDEFINES'] = (env['CPPDEFINES'] or []) + [
-+			kwargs['CPPDEFINES'] = list(env['CPPDEFINES'] or []) + [
- 					# Define these tokens to themselves so that
-@@ -4870,3 +4870,3 @@
- 	def _apply_env_version_seq(self,env,_empty={}):
--		return _empty if self.user_settings.pch else {'CPPDEFINES' : env['CPPDEFINES'] + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
-+		return _empty if self.user_settings.pch else {'CPPDEFINES' : list(env['CPPDEFINES']) + [('DXX_VERSION_SEQ', self.DXX_VERSION_SEQ)]}
- 	get_objects_similar_arch_ogl = DXXCommon.create_lazy_object_states_getter((LazyObjectState(sources=(
-@@ -4966,3 +4966,3 @@
- ),
--		transform_env = (lambda self, env: {'CPPDEFINES' : env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH + env.__dxx_CPPDEFINE_git_version}),
-+		transform_env = (lambda self, env: {'CPPDEFINES' : list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH + env.__dxx_CPPDEFINE_git_version}),
- 		transform_target=_apply_target_name,
-@@ -4976,3 +4976,3 @@
- ),
--		transform_env = (lambda self, env: {'CPPDEFINES' : env['CPPDEFINES'] + env.__dxx_CPPDEFINE_SHAREPATH}),
-+		transform_env = (lambda self, env: {'CPPDEFINES' : list(env['CPPDEFINES']) + env.__dxx_CPPDEFINE_SHAREPATH}),
- 		transform_target=_apply_target_name,
-@@ -5185,3 +5185,3 @@
- 		versid_build_environ = ['CXX', 'CPPFLAGS', 'CXXFLAGS', 'LINKFLAGS']
--		versid_cppdefines = env['CPPDEFINES'][:]
-+		versid_cppdefines = env['CPPDEFINES'].copy()
- 		extra_version = user_settings.extra_version
-@@ -5303,3 +5303,3 @@
- 		else:
--			syspath = sys.path[:]
-+			syspath = sys.path.copy()
- 			cocoa = 'common/arch/cocoa'
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch
new file mode 100644
index 000000000000..4c01c8cd0dbb
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20230618-sdl12-compat.patch
@@ -0,0 +1,38 @@
+From e9daf03769d8408719c1b420a133155cb700b9a2 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 25 Jun 2023 15:16:55 +0100
+Subject: [PATCH] Skip SDL OpenGL build check when the SDL2 wrapper is detected
+
+The wrapper does not define SDL_VIDEO_OPENGL in SDL_config.h. This
+appears to be deliberate, although it's not entirely clear why.
+
+    /* Don't define most of the SDL backends, under the assumption checking for these against the headers won't work anyhow.
+       The exception is the X11 backend; you need its define to know if you can use its syswm interface. */
+
+We could check SDL2's SDL_config.h instead, but that seems awkward to
+pull off.
+
+Closes: https://github.com/dxx-rebirth/dxx-rebirth/issues/689
+---
+ SConstruct | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index c98a22bc8..59210a802 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1586,9 +1586,11 @@ static void terminate_handler()
+ 		init_cdrom = '0' if sdl2 else 'SDL_INIT_CDROM'
+ 		error_text_opengl_mismatch = f'Rebirth configured with OpenGL enabled, but SDL{sdl2} configured with OpenGL disabled.  Disable Rebirth OpenGL or install an SDL{sdl2} with OpenGL enabled.'
+ 		test_opengl = (f'''
++#if !((SDL_MAJOR_VERSION == 1) && (SDL_MINOR_VERSION == 2) && (SDL_PATCHLEVEL >= 50))
+ #ifndef SDL_VIDEO_OPENGL
+ #error "{error_text_opengl_mismatch}"
+ #endif
++#endif
+ ''') if user_settings.opengl else ''
+ 		main = '''
+ 	SDL_RWops *ops = reinterpret_cast<SDL_RWops *>(argv);
+-- 
+2.40.1
+
-- 
cgit v1.2.3