gentoo resync : 04.07.2020

20 files changed, 812 insertions, 241 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index ae73ab2eef9b..1f9b81012783 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/d1x-rebirth/Manifest b/games-action/d1x-rebirth/Manifest
deleted file mode 100644
index aa2c13c8adcb..000000000000
--- a/games-action/d1x-rebirth/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX d1x-rebirth-0.58.1-flags.patch 447 BLAKE2B 1a20e8de3e6fd064238b6c44716cdf72b3e4133baf86c57e6ca4898eb5e0ec5a268a6de36b8a972168750ac1b73f953b55d648716aaac3cb3984911e0c574b06 SHA512 2d3406a61deea19ea741fdf39963013342e88d69323a1929592fd2f909985ad2e63d2677863a50be7882cce30fec082cbcd5d114f326b638c16331ac3dabcae8
-DIST d1datapt.zip 439942 BLAKE2B dbe0c0fc4aeb25d7ea01296e78680a5388aed622452ee7d7ce163eb1e60741216e998730a30da0404963561a78ffb28e12d154efa3654c40cfca49d2a3451b5d SHA512 41b7777ef679ed0904a5e64534ef0b145e9c49546c9449a569cf0ac75ada3d6095a603136211f939daaf97aa7f09511db85416fefea7ce1447cfe8df7a16b555
-DIST d1x-rebirth_v0.58.1-src.tar.gz 1247599 BLAKE2B 813b971e695a5376129991424ec349b448bf9fda21dfc04f2665a7aa344ecefbd48d7c44cd6e474d3ff8648e13aa9c09498034c19d447f526ac4cfbf8afecefb SHA512 d1bdaeee07c5ac34b2e6839fea1449344d206f76f1eb2ba3fd4fa7cbe6acd82c2e8d7140b2d6297add3d5e8fb7fe4ca2b1c22c900def94603c218f6660644c80
-DIST d1xr-briefings-ger.zip 16798 BLAKE2B f5e1f4f91cb3464b3d356fab1e3993700cc19f3f2db8682f5194e59aa5d2623efa427db4135c3595534e5dac0f2589b53aac7df3610501b759407e1ead342458 SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
-DIST d1xr-opl3-music.zip 81503503 BLAKE2B b560597e0f08139109a6dc4ee7996c05010561686029d1fd754375278b8a11e6df0f6106c797d524e92d4998683d6e1e07b6cfc982ea3ff167a0b9ca92ba0dc2 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
-DIST d1xr-sc55-music.zip 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dda0b8e5ae1a79ec36122a17c01e3b2a731f369d72fe0e069e1188bdaf03f82d0845b574d76b6798be33481e3b84 SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
-DIST d1xrdata.zip 1364601 BLAKE2B b17f76cf9a0f967d4462275d48113ca0161df09053c98eb6031766ce424632b5fb190386f852887242d1e709fc18ec5fad93490a610b754f047b9482c2e9de95 SHA512 9ca4ac459367476250bef6eb7f3fccdb4070f4ed5c00dad318c1d63e7bcb2c61ef8cb8233f3f2156f46ed4ba57232033f2b456078f883a96ab7ebd5b5df84c59
-DIST dxx-rebirth_icons.zip 137392 BLAKE2B 34b975cd0b1ada2d7ba6f8b39bf2e4b753462b5876be18dbc2fb6e19767814b61af850533f575bb12446e4f6b42d1bd1960f19cc1af26e0d96a18cb7f0571a99 SHA512 d13edc1897cf047a1fa0bf23c2b64334f095d9a28255fb500f7f0ffb6122559eb10fea372b02c52c71ac467d8276ece4c7dff4069585ab74dfa9ebb8bda2deb2
-EBUILD d1x-rebirth-0.58.1.ebuild 3093 BLAKE2B 45ee7144b1435ef8d5b1251dac04138cb9778debb8495fe37dcd080c3b969bec4622bedcd1f64d878dde385b3455fb0f8e2073d152d358dce7b30503327d6cab SHA512 339f353c55c02b9b9a0a029cab990f24316ffa1829a79be3238bbf537ed7fecc74105982cc47a6588b25320ca0c82dedf6910e41ac051e6ceeea1d117e6b9174
-MISC metadata.xml 1149 BLAKE2B 9407595ea1b3fc4113809e994be96dd9ee91a119855b10cc50d9d639baa7201c587f71c6274c3c7fdcedc3cd68e0618b8360acb7d9a1c18102e90d8cc819711a SHA512 e7624d4b93a002ec39ada63ae54e23f1ce46c2bdf8a1c4b15a2ffe2a71558379ebf357aea2a66a470419e191ff751fa0c6db0a0ce1bd8964d5d05ba1ae87edb0
diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
deleted file mode 100644
index 04e178288320..000000000000
--- a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CDROM_OPTIONAL="yes"
-inherit eutils cdrom scons-utils games
-
-DV=1
-MY_P=${PN}_v${PV}-src
-DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine"
-HOMEPAGE="https://www.dxx-rebirth.com/"
-SRC_URI="https://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
-	https://www.dxx-rebirth.com/download/dxx/res/d1xrdata.zip
-	https://www.dxx-rebirth.com/download/dxx/res/dxx-rebirth_icons.zip
-	opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.zip )
-	sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.zip )
-	cdinstall? ( https://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip )
-	l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.zip )"
-
-LICENSE="D1X GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall debug demo ipv6 l10n_de +music opengl opl3-musicpack sc55-musicpack"
-REQUIRED_USE="?? ( cdinstall demo )
-	?? ( opl3-musicpack sc55-musicpack )
-	opl3-musicpack? ( music )
-	sc55-musicpack? ( music )"
-
-RDEPEND="dev-games/physfs[hog,zip]
-	media-libs/libsdl[X,sound,joystick,opengl?,video]
-	cdinstall? ( !games-action/descent1-demodata )
-	music? (
-		media-libs/sdl-mixer[timidity]
-	)
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-PDEPEND="demo? ( games-action/descent1-demodata )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz dxx-rebirth_icons.zip
-	if use cdinstall ; then
-		unpack d1datapt.zip
-		cdrom_get_cds descent/descent.hog
-		mkdir "${S}"/Data
-		cp \
-			${CDROM_ROOT}/descent/descent.{hog,pig} \
-			${CDROM_ROOT}/descent/chaos.{hog,msn} \
-			"${S}"/Data || die
-	fi
-}
-
-src_prepare() {
-	if use cdinstall ; then
-		cd Data
-		patch -p0 < "${WORKDIR}"/d1datapt/descent.hog.diff descent.hog
-		patch -p0 < "${WORKDIR}"/d1datapt/descent.pig.diff descent.pig
-	fi
-	epatch "${FILESDIR}"/${P}-flags.patch
-}
-
-src_compile() {
-	escons \
-		verbosebuild=1 \
-		sharepath="${GAMES_DATADIR}/d${DV}x" \
-		$(use_scons ipv6) \
-		$(use_scons music sdlmixer) \
-		$(use_scons debug) \
-		$(use_scons opengl) || die
-}
-
-src_install() {
-	dodoc {CHANGELOG,INSTALL,README,RELEASE-NOTES}.txt
-
-	insinto "${GAMES_DATADIR}/d${DV}x"
-	doins "${DISTDIR}"/d1xrdata.zip
-	# None of the following zip files need to be extracted.
-	use l10n_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.zip
-	use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.zip
-	use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.zip
-
-	if use cdinstall ; then
-		doins Data/descent.{hog,pig}
-		insinto "${GAMES_DATADIR}"/d${DV}x/missions
-		doins Data/chaos.{hog,msn}
-	fi
-	doicon "${WORKDIR}/${PN}.xpm"
-
-	dogamesbin d${DV}x-rebirth
-	make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! use cdinstall ; then
-		echo
-		elog "To play the full game enable USE=\"cdinstall\" or manually "
-		elog "copy the files to ${GAMES_DATADIR}/d${DV}x."
-		elog "See /usr/share/doc/${PF}/INSTALL.txt for details."
-		echo
-	fi
-}
diff --git a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch b/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
deleted file mode 100644
index 51723ffb137b..000000000000
--- a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru d1x-rebirth_v0.58.1-src.orig/SConstruct d1x-rebirth_v0.58.1-src/SConstruct
---- d1x-rebirth_v0.58.1-src.orig/SConstruct	2013-08-03 08:13:39.000000000 -0400
-+++ d1x-rebirth_v0.58.1-src/SConstruct	2015-01-27 02:38:03.847800615 -0500
-@@ -218,7 +218,6 @@
- 			env.Append(CPPFLAGS = ['-g'])
- 		else:
- 			env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
--			env.Append(CPPFLAGS = ['-O2'])
- 
- 		# profiler?
- 		if (self.user_settings.profiler == 1):
diff --git a/games-action/d1x-rebirth/metadata.xml b/games-action/d1x-rebirth/metadata.xml
deleted file mode 100644
index 23d592266dfb..000000000000
--- a/games-action/d1x-rebirth/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-		Descent 1 is a classic first-person shooter released in 1995 by Interplay
-		and Parallax.  It was one of the first games with true 3-dimensional
-		graphics, movement, and light sourcing.  D1X-Rebirth is a modification of the
-		Descent 1 source that was released by Parallax and is based on the D1X source.
-	</longdescription>
-	<use>
-		<flag name="demo">Use the demo data instead of the full game</flag>
-		<flag name="music">Support for ingame music</flag>
-		<flag name="l10n_de">Provides German translations for the game's briefings, robot descriptions, and outro of the original campaign</flag>
-		<flag name="opl3-musicpack">Include alternate version of the game's music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
-		<flag name="sc55-musicpack">Include alternate version of the game's music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-action/descent1-freedata/Manifest b/games-action/descent1-freedata/Manifest
new file mode 100644
index 000000000000..f0ab982c4d56
--- /dev/null
+++ b/games-action/descent1-freedata/Manifest
@@ -0,0 +1,6 @@
+DIST d1xr-briefings-ger.dxa 16798 BLAKE2B f5e1f4f91cb3464b3d356fab1e3993700cc19f3f2db8682f5194e59aa5d2623efa427db4135c3595534e5dac0f2589b53aac7df3610501b759407e1ead342458 SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
+DIST d1xr-hires.dxa 1426884 BLAKE2B c4d9b950353fc450c64568779bc3d2e93a46e17980c8df08a2ef06bff5b9709869fdbbaf4fb6698be994b3faae7a75036a53357743d47b728bb3ef9df126afd8 SHA512 3fc84d5610ba40ee383c1720f80513a21b4644ff8b6da4b84ebca13b11c1131deb4897ded6324b54845b6c847dfc0f16700535e16afdd7ebe83bfff042892302
+DIST d1xr-opl3-music.dxa 81503503 BLAKE2B b560597e0f08139109a6dc4ee7996c05010561686029d1fd754375278b8a11e6df0f6106c797d524e92d4998683d6e1e07b6cfc982ea3ff167a0b9ca92ba0dc2 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
+DIST d1xr-sc55-music.dxa 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dda0b8e5ae1a79ec36122a17c01e3b2a731f369d72fe0e069e1188bdaf03f82d0845b574d76b6798be33481e3b84 SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
+EBUILD descent1-freedata-1.ebuild 1868 BLAKE2B ddd1204dc283dd7ed820f29c3ba5ca74a054ac613fcfdc940db18999863c7d0a4db9b084dbfafd287cee319418685f1e8e925615ac6f8ed89e64b4067e5ead9b SHA512 f344b748ea811d59403fb10d25af18292f249eee204d8e596f895d7d74ebbe88def11e243c1b92f8d8b1378d5d5b974eeeb0aedfd8ef93dee12c04c586ec669b
+MISC metadata.xml 1771 BLAKE2B 1a6753adc2f5a7b42d4c52bb3fa6632c92add52dccfa6afc7f9c693cf09fac6e2934dddc77a77508871779621e9c0629c6e55f7e50c50c17a7be9ec531331c6d SHA512 daf00ef90e3110c6992267ee43fe28157de3f64fe03465f3507dc23638059165bea419d9caf5991e2fd5e81f4f5550736ba349823e215ba57da78d6b8d6d27d8
diff --git a/games-action/descent1-freedata/descent1-freedata-1.ebuild b/games-action/descent1-freedata/descent1-freedata-1.ebuild
new file mode 100644
index 000000000000..6339583ee80b
--- /dev/null
+++ b/games-action/descent1-freedata/descent1-freedata-1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 DXX Rebirth project contributors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file is part of the DXX-Rebirth project.
+#
+# It is copyright by its individual contributors, as recorded in the
+# project's Git history.  See COPYING.txt at the top level for license
+# terms and a link to the Git history.
+
+EAPI=7
+
+DXX_ENGINE="${PN:7:1}"
+DESCRIPTION="Free content for games-action/d${DXX_ENGINE}x-rebirth"
+HOMEPAGE="https://www.dxx-rebirth.com/"
+IUSE="l10n_de opl3-musicpack sc55-musicpack"
+SRC_URI="
+	l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-briefings-ger.dxa )
+	opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-opl3-music.dxa )
+	sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-sc55-music.dxa )
+"
+
+if [[ "${PN}" = descent1-freedata ]]; then
+	IUSE+=" +textures"
+	SRC_URI+="
+	textures? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa )
+"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+S="$WORKDIR"
+
+# If all USE flags are unset, this ebuild installs zero files.  Require
+# at least one to be set.
+REQUIRED_USE="|| ( ${IUSE//+/} )"
+
+RDEPEND="
+	!<games-action/dxx-rebirth-0.60
+	!games-action/d${DXX_ENGINE}x-rebirth
+	"
+
+unset DXX_ENGINE
+
+src_install() {
+	local DXX_ENGINE="${PN:7:1}"
+	insinto /usr/share/games/d${DXX_ENGINE}x
+	use opl3-musicpack && doins "${DISTDIR}"/d${DXX_ENGINE}xr-opl3-music.dxa
+	use sc55-musicpack && doins "${DISTDIR}"/d${DXX_ENGINE}xr-sc55-music.dxa
+	use l10n_de && doins "${DISTDIR}"/d${DXX_ENGINE}xr-briefings-ger.dxa
+
+	# This ebuild is used for both Descent 1 free data and Descent 2
+	# free data.  Only Descent 1 provides alternate textures.
+	if [[ "${PN}" = descent1-freedata ]] && use textures; then
+		insinto /usr/share/games/d1x
+		doins "${DISTDIR}"/d1xr-hires.dxa
+	fi
+}
diff --git a/games-action/descent1-freedata/metadata.xml b/games-action/descent1-freedata/metadata.xml
new file mode 100644
index 000000000000..c1aebfb8b109
--- /dev/null
+++ b/games-action/descent1-freedata/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>iansilvester@fastmail.fm</email>
+		<name>Ian Silvester</name>
+	</maintainer>
+	<longdescription>
+		Descent 1 is a classic first-person shooter released in 1995
+		by Interplay and Parallax. Descent 2 released for the PC in
+		1996. It, along with its predecessor, was one of the first
+		games with true 3-dimensional graphics, 6 degrees of freedom
+		in movement, light sourcing, and the capability to join
+		multiplayer games on-the-fly. D1X-Rebirth and DXX-Rebirth are
+		modifications of the original Descent 1 and 2 sources that was
+		released by Parallax (and are based on the D1X and D2X
+		sources). It offering OpenGL graphics, advanced multiplayer,
+		new features, and cross-platform compatibility. Now code bases
+		of D1X-Rebirth and DXX-Rebirth merged and released as
+		DXX-Rebirth. This package provides the free level data.
+	</longdescription>
+	<use>
+		<flag name="l10n_de">Provides German translations for the game's briefings, robot descriptions, and outro of the original campaign</flag>
+		<flag name="opl3-musicpack">Include alternate version of the game's music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
+		<flag name="sc55-musicpack">Include alternate version of the game's music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
+		<flag name="textures">Include high resolution (640x480) backgrounds, briefing images and fonts (Descent 1)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">dxx-rebirth/dxx-rebirth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/descent2-freedata/Manifest b/games-action/descent2-freedata/Manifest
new file mode 100644
index 000000000000..1fea1dfbac2a
--- /dev/null
+++ b/games-action/descent2-freedata/Manifest
@@ -0,0 +1,5 @@
+DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb730094cccb53298b07f2e2031935033b8db765b40fdad93fb55b157a2be07906ea45185b754e5ec7c205803cc92 SHA512 479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
+DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
+DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
+EBUILD descent2-freedata-1.ebuild 1868 BLAKE2B ddd1204dc283dd7ed820f29c3ba5ca74a054ac613fcfdc940db18999863c7d0a4db9b084dbfafd287cee319418685f1e8e925615ac6f8ed89e64b4067e5ead9b SHA512 f344b748ea811d59403fb10d25af18292f249eee204d8e596f895d7d74ebbe88def11e243c1b92f8d8b1378d5d5b974eeeb0aedfd8ef93dee12c04c586ec669b
+MISC metadata.xml 1655 BLAKE2B 49a8189efa4d1bf286042d9e9dc8d6df80b1f440b0d745506b5bc722449eb1dc8f6dc3d28fd408433a48af3fff4a829f26c796d1d62b73407cd0691a2eed2b23 SHA512 2548c12d629904d7a7c9bbb4c260ce928820aca4753ad922bfbcd535d39c6eaf2f0cda2763c238fa805b1451dbeb49fc4cf314f6dd7313b0c91b263047a133ca
diff --git a/games-action/descent2-freedata/descent2-freedata-1.ebuild b/games-action/descent2-freedata/descent2-freedata-1.ebuild
new file mode 100644
index 000000000000..6339583ee80b
--- /dev/null
+++ b/games-action/descent2-freedata/descent2-freedata-1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 DXX Rebirth project contributors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file is part of the DXX-Rebirth project.
+#
+# It is copyright by its individual contributors, as recorded in the
+# project's Git history.  See COPYING.txt at the top level for license
+# terms and a link to the Git history.
+
+EAPI=7
+
+DXX_ENGINE="${PN:7:1}"
+DESCRIPTION="Free content for games-action/d${DXX_ENGINE}x-rebirth"
+HOMEPAGE="https://www.dxx-rebirth.com/"
+IUSE="l10n_de opl3-musicpack sc55-musicpack"
+SRC_URI="
+	l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-briefings-ger.dxa )
+	opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-opl3-music.dxa )
+	sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-sc55-music.dxa )
+"
+
+if [[ "${PN}" = descent1-freedata ]]; then
+	IUSE+=" +textures"
+	SRC_URI+="
+	textures? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa )
+"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+S="$WORKDIR"
+
+# If all USE flags are unset, this ebuild installs zero files.  Require
+# at least one to be set.
+REQUIRED_USE="|| ( ${IUSE//+/} )"
+
+RDEPEND="
+	!<games-action/dxx-rebirth-0.60
+	!games-action/d${DXX_ENGINE}x-rebirth
+	"
+
+unset DXX_ENGINE
+
+src_install() {
+	local DXX_ENGINE="${PN:7:1}"
+	insinto /usr/share/games/d${DXX_ENGINE}x
+	use opl3-musicpack && doins "${DISTDIR}"/d${DXX_ENGINE}xr-opl3-music.dxa
+	use sc55-musicpack && doins "${DISTDIR}"/d${DXX_ENGINE}xr-sc55-music.dxa
+	use l10n_de && doins "${DISTDIR}"/d${DXX_ENGINE}xr-briefings-ger.dxa
+
+	# This ebuild is used for both Descent 1 free data and Descent 2
+	# free data.  Only Descent 1 provides alternate textures.
+	if [[ "${PN}" = descent1-freedata ]] && use textures; then
+		insinto /usr/share/games/d1x
+		doins "${DISTDIR}"/d1xr-hires.dxa
+	fi
+}
diff --git a/games-action/descent2-freedata/metadata.xml b/games-action/descent2-freedata/metadata.xml
new file mode 100644
index 000000000000..b40e76a533cb
--- /dev/null
+++ b/games-action/descent2-freedata/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>iansilvester@fastmail.fm</email>
+		<name>Ian Silvester</name>
+	</maintainer>
+	<longdescription>
+		Descent 1 is a classic first-person shooter released in 1995
+		by Interplay and Parallax. Descent 2 released for the PC in
+		1996. It, along with its predecessor, was one of the first
+		games with true 3-dimensional graphics, 6 degrees of freedom
+		in movement, light sourcing, and the capability to join
+		multiplayer games on-the-fly. D1X-Rebirth and DXX-Rebirth are
+		modifications of the original Descent 1 and 2 sources that was
+		released by Parallax (and are based on the D1X and D2X
+		sources). It offering OpenGL graphics, advanced multiplayer,
+		new features, and cross-platform compatibility. Now code bases
+		of D1X-Rebirth and DXX-Rebirth merged and released as
+		DXX-Rebirth. This package provides the free level data.
+	</longdescription>
+	<use>
+		<flag name="l10n_de">Provides German translations for the game's briefings, robot descriptions, and outro of the original campaign</flag>
+		<flag name="opl3-musicpack">Include alternate version of the game's music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
+		<flag name="sc55-musicpack">Include alternate version of the game's music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">dxx-rebirth/dxx-rebirth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index 13b35b3bb2a9..651f23a49db9 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -8,6 +8,9 @@ DIST d1xr-sc55-music.dxa 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dd
 DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb730094cccb53298b07f2e2031935033b8db765b40fdad93fb55b157a2be07906ea45185b754e5ec7c205803cc92 SHA512 479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
 DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
 DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
+DIST dxx-rebirth-0.61.0_pre20200615.tar.gz 1959226 BLAKE2B 08d66eb1599100172e2bd8dcb8e13ca11314f3b06658c36851ddc7d91897a8376899b7c33b6e7a2d7b72e93cf7f20f157994d06f880e138dc807350e4c64c517 SHA512 3470e2b9cf20268f1af5e8084f0b361d1dd5d797bee9a1d97ce5509046f79750ac214d0f34e7eef1acc4ee4ae868ad3f34d33b45ff163863333e9d8a7d758db2
 DIST dxx-rebirth_v0.59.100-src.tar.gz 1809614 BLAKE2B 6826380312fa23dbc99459db9272cf7ffb5a00a14cfdd777339633fbd943a288af00f182692ebc3078e4c39bf6b6cc9fb05cc6a533ec126b8c881eb22c465868 SHA512 dc9b7ad263e189e779756b62613d4bc62371cb5fec2176a4013395fc18c9d03ab0c9ddc5ccf2668b87e4a77b25d500bdef373126f176bfce49f73b5a98de23d7
 EBUILD dxx-rebirth-0.59.100.ebuild 3355 BLAKE2B 11173d9573253619102874c4f5fd49088e57f977c97f015b56ca4184e36b8e7b2d8ba11474c83c26c9e4a24978f2dee79064f181e27743315a1850b0583224b3 SHA512 4cdba9cfe109516d574824e360772b2c042b5aab5753b02107c2fccc47a7f71f0048ea177cd04c6a3202727787b075ba7e1d8deca6da3a6f74ab25f7eee52c4d
-MISC metadata.xml 1857 BLAKE2B 66afcf3f91a73bbbb3db2fd25a4e3d25acf6d8820a7f6a156835839a1c24cffbdf05f076d067631cea492df5dc82a32e19299f67330a4d92b0c59809b55844e9 SHA512 42aa859e049ed85e7dccb884ee9ff4462c5f459358856920a0b986d1c1f22dfefcb8053bd389db273dffb584cc3ccb1bce196d84b5c1baba829f538d22619580
+EBUILD dxx-rebirth-0.61.0_pre20200615.ebuild 9133 BLAKE2B 6b0864eb02a9b8abbe8eb2cb63a961648555947eaba32024fdab6841b53624450e0c3ccea0cda273df74b76f542f835a2d9afd157a8b7075678a0e52a9fe7197 SHA512 1b846477d8e5588f2f58fb308112bd7e41b729864a1e89c4bdca54faca2fdb460c2143682f951318bff25c6e34000df8a73fa515bffcac2774d3edaa4d8dcf3f
+EBUILD dxx-rebirth-9999.ebuild 8697 BLAKE2B f7dd928b1a9785893fd2714b4b65bafefd0df743b5fdcf1f9f978e8cc8586e2206b1026e312c0449e8965400e8bb94cbc13090972384e02ab0fd3e13e7aa57cb SHA512 aefd20964d76a855c4b21fb22a27f8c2a1aa8804d4a4a23b823b9eab28d759c61353bb48b84303b46e423d4a2df8a145f1d872ab5c071cbd20fbcdb0dce8e9d6
+MISC metadata.xml 2863 BLAKE2B 31f607bd479f52200f34d8a6a5f6e870e323838c686db88c9322ea315f981e8467b35171e4b6758c06ffc007839b6ea5962330e3d3d061e2056dc77611bb6605 SHA512 c335470146978bcff55067af49d7cab5d1e065c1f7578492d51e3ab12c0c7cf3fb618b9c30946d56c427e0b7438a8c4508c567cfd7f0d54e46e4fa95f9671828
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
new file mode 100644
index 000000000000..484618e8c27c
--- /dev/null
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
@@ -0,0 +1,262 @@
+# Copyright 2017-2020 DXX Rebirth project contributors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file is part of the DXX-Rebirth project.
+#
+# It is copyright by its individual contributors, as recorded in the
+# project's Git history.  See COPYING.txt at the top level for license
+# terms and a link to the Git history.
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+
+inherit desktop eutils 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"
+	# Live ebuilds have blank keywords.
+	KEYWORDS=
+	PROPERTIES="live"
+else
+	# dxx-rebirth-0.61.0_pre20190720.ebuild
+	#MY_COMMIT='a17792c89fd49dd12fdf5981670dd7f64b42850f'
+	# dxx-rebirth-0.61.0_pre20200615.ebuild
+	MY_COMMIT='0c2fcf691ffb2a586991350d67f3efd1cca2a1f3'
+	# dxx-rebirth-0.61.0_pre20200627.ebuild
+	#MY_COMMIT='aba40babb47d36a88011af01e4bc0fc00dca74ef'
+	S="$WORKDIR/$PN-$MY_COMMIT"
+	#SRC_URI="https://github.com/dxx-rebirth/dxx-rebirth/archive/$MY_COMMIT.tar.gz -> $PN-$PVR.tar.gz"
+	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 ~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 )
+'
+
+# 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"
+
+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
+	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
new file mode 100644
index 000000000000..119e998d23c3
--- /dev/null
+++ b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
@@ -0,0 +1,254 @@
+# Copyright 2017-2020 DXX Rebirth project contributors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file is part of the DXX-Rebirth project.
+#
+# It is copyright by its individual contributors, as recorded in the
+# project's Git history.  See COPYING.txt at the top level for license
+# terms and a link to the Git history.
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+
+inherit desktop eutils 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"
+	# Live ebuilds have blank keywords.
+	KEYWORDS=
+	PROPERTIES="live"
+else
+	MY_COMMIT=''
+	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
+
+	# 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 ~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 )
+'
+
+# 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"
+
+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
+	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/metadata.xml b/games-action/dxx-rebirth/metadata.xml
index fe3cc527f00d..2d1f5ab3ad7a 100644
--- a/games-action/dxx-rebirth/metadata.xml
+++ b/games-action/dxx-rebirth/metadata.xml
@@ -20,14 +20,22 @@
 		DXX-Rebirth.
 	</longdescription>
 	<use>
-		<flag name="data">Install data files</flag>
-		<flag name="descent1">Install Descent 1 resources and executable</flag>
-		<flag name="descent2">Install Descent 2 resources and executable</flag>
+		<flag name="d1x">Install Descent 1 resources and executable</flag>
+		<flag name="d2x">Install Descent 2 resources and executable</flag>
+		<flag name="descent1">Install Descent 1 resources and executable (used prior to version 0.61)</flag>
+		<flag name="descent2">Install Descent 2 resources and executable (used prior to version 0.61)</flag>
+		<flag name="data">Ensure some game levels are present; if the full game's level data is not already installed then install the playable demo data (i.e. shareware levels)</flag>
+		<flag name="debug">Enable various debugging code paths and sanity checks, not just output. Some of these checks date back to the retail build, and choke on some custom levels because the game was never coded to sufficiently distrust inputs</flag>
+		<flag name="editor">Enable level editor support</flag>
 		<flag name="l10n_de">Provides German translations for the game's briefings, robot descriptions, and outro of the original campaign</flag>
+		<flag name="midi">Enforce that SDL-mixer is used and has midi support</flag>
 		<flag name="music">Enable music support</flag>
 		<flag name="opl3-musicpack">Include alternate version of the game's music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
 		<flag name="sc55-musicpack">Include alternate version of the game's music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
-		<flag name="textures">Include high resolution (640x480) backgrounds, briefing images and fonts (Descent 1)</flag>
+		<flag name="sdl2">Use libSDL2, SDL2-mixer instead of libSDL-1* and SDL-mixer-1*</flag>
+		<flag name="tracker">Enable support for the PHP-based multiplayer game tracker</flag>
+		<flag name="textures">Include high resolution (640x480) backgrounds, briefing images and fonts (for Descent 1)</flag>
+		<flag name="valgrind">Include a Valgrind header in build in order to support Memcheck client requests</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">dxx-rebirth/dxx-rebirth</remote-id>
diff --git a/games-action/slune/Manifest b/games-action/slune/Manifest
deleted file mode 100644
index 54a7660a2910..000000000000
--- a/games-action/slune/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Slune-1.0.15.tar.bz2 9549694 BLAKE2B 2178f5bc5f111cc408a7e1391e87bca1a9bd934668c2519b604a9aecc889a560e9bd576e70d1738f51fb9afd9450f47e331c3c036258b6223ed059546d12ee31 SHA512 7f26f91a7db5ccfd2b7063592c53a0b5791f5db5dee582c0f2208af7615c3b7f0b1ed420ecef1f1396a6b1573cb99cc40e886bc47bc22d064bc3ad4814421920
-EBUILD slune-1.0.15-r1.ebuild 1514 BLAKE2B 5e4f254cebb24fc46a44f494f333a56279bbbf61cabe3c08a1d7845b589a6dce546335741f9b9a3e7b2b6f44487f4ae2b6476f43aee1f47c99916a8ac8f5a5c6 SHA512 cc8fce11aa1566bff77ab8f1f97b528bd7c2a187b4f517f55651b716d749f8aa27ba6122134276dac15cab47286912e254c3a5f1bcd1925cc64449a86abe9afe
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/slune/metadata.xml b/games-action/slune/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/slune/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/slune/slune-1.0.15-r1.ebuild b/games-action/slune/slune-1.0.15-r1.ebuild
deleted file mode 100644
index 0787e30df9e0..000000000000
--- a/games-action/slune/slune-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2-utils distutils-r1 games
-
-DESCRIPTION="A 3D action game with multiplayer mode and amazing graphics"
-HOMEPAGE="http://oomadness.tuxfamily.org/en/slune/"
-SRC_URI="http://download.gna.org/slune/Slune-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	>=media-libs/libsdl-1.2.6
-	>=dev-python/soya-0.9
-	>=dev-python/py2play-0.1.9
-	>=dev-python/pyopenal-0.1.3
-	>=dev-python/pyogg-1.1
-	>=dev-python/pyvorbis-1.1"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/Slune-${PV}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-scripts="${GAMES_BINDIR}" \
-		--install-data="${GAMES_DATADIR}" \
-		--install-lib="$(python_get_sitedir)"
-
-	# FHS broke the logic, fix it
-	local i
-	for i in $(ls -I locale "${ED}${GAMES_DATADIR}"/${PN}) ; do
-		dosym "${GAMES_DATADIR}/${PN}/${i}" "$(python_get_sitedir)/${PN}/${i}"
-	done
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# fix install dest of locales
-	mv "${ED}${GAMES_DATADIR}"/${PN}/locale "${ED}"/usr/share/locale || die
-
-	newicon -s 48 images/${PN}.48.png ${PN}.png
-	make_desktop_entry ${PN} "Slune"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 60fff8a5150f..974067913c11 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -7,5 +7,10 @@ AUX teeworlds-init.d 1000 BLAKE2B 7681574d8e35583ea029b604925fa0ed3af50dafb17993
 AUX teeworlds.xpm 2785 BLAKE2B 288e6fe273e38d802c102403f5e70d0a2c004bba28c3c1744f0a5f3d77168cc76dccf8039b9eca761d159cf7c1d127755171cc313ef3d614a195d9858426700a SHA512 f8a8a1c3a5675f12b13ddaf9b68bc2757698725d406356c871d58e62f735413b5f4f0bcb3dbf783e0aa6b3ecb0ec7f9eddbcef044506a6a07a374fe46d2616c0
 AUX teeworlds_srv.cfg 193 BLAKE2B dbbad582189f5b098e9f199dc59227ef90485e7a1bc406372d69f9985ee5a7fe39db68c52d8eb394a1c6e1320496925fa8c5474dd91204bf6e93787c2c0ba838 SHA512 d9a55f749f6974caddf96438eb38e490e0e507fbe07ebdac070fe91ab46eed93afb5dd6300a5b7a86b6282c6b97fdd178a00720483c3e71490be816b8c6a73b5
 DIST teeworlds-0.6.4-src.tar.gz 8771622 BLAKE2B 14493fcad458b0e1c749e40bdd6a5a858704bf971d53d11782d52fbe9b5fe2a09235dcac25340e51a3330001d46ee512f2971e8db06eb9f51eec5e6b3cd2a328 SHA512 7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce
+DIST teeworlds-0.7.5-maps.tar.gz 151689 BLAKE2B f8ffbb6a024755bb972955a8c7d277709e17021c0554be0e2803e8c1b4848f5dca6d91b9f7f4e0731766745878c1143d27be3fa8aede01ff9cc69ac557ca70a8 SHA512 74084e169c1870cd541f5bb719c209210227055d304b3ce22fbad3d32d24b3356fbdec8d948edf3aa582270a8b0db7dec41e4924401f8398f7d5feba5ded49b3
+DIST teeworlds-0.7.5-translation.tar.gz 169121 BLAKE2B 1c649392385abf8e00d8c9e64ca7eaaa5af5848878566081cda83c7d78c417652137e7285d16038f302a6fdf94eb3993c506886d4cc1359694d534c7be5ea925 SHA512 41c69cd9e9290857b44be18f89ab9f3a7ccd6804757332966b973aec3a9e6fd5a40d323696a044a724228b2bb67b097311fa8c24fdec226eecb7a27c2da559dc
+DIST teeworlds-0.7.5.tar.gz 8654985 BLAKE2B ebeb9aa1119950e4d78d8c0d6c7be5711894c3212755a6db3b8b8c1f1803dba1e0d2e1a0e294e1a1fffe84a28beab8fac0e55fa0e94c68ed97e8764ac3b742d3 SHA512 673410a5fb5e488229ddc4ea4a1ac9cd8143a6e9499bde9f5535d7f0be5b6c85163065da9580c3de0d240f1cad63e0bc12c10caf1d893c324edb301bc150653b
+DIST teeworlds.png 21502 BLAKE2B 8064e0c2149f20f182b2ca2f7454f0e8395e199a432b8f21a9963cc771b1504ebe8cbe427ecd738d35313b1a378eaf8e305d509cd5360a07e9ab3c5224b78b77 SHA512 a272a1d9f13504c43ba873d93899df93c435f58cec20ae68bc9493a983e54cdd4c8f0f2e0630558c5e915aec891d2267bc3459ecc78c25738602452a2123fadf
 EBUILD teeworlds-0.6.4.ebuild 2391 BLAKE2B 83f8fe3b44e3bc40d93dadbe98aa38fb36e38963dd20394673d197f194ed23a8e6f7c7edc914c1f37ee48d339f7195530e608335aef639d850c64d61261c718a SHA512 214e0c0a4210ab302d48db14424d24c6444d3df6a1dda576ab084d8017a3898fcb6558da320717ca0a679e4e586638f83dfb3710da24dc30d5cfbe69b83cdbb3
+EBUILD teeworlds-0.7.5.ebuild 1947 BLAKE2B a1bbdbaa360202dcdf8092077e847cf591644b9893a913d462354cf95145e3a03394c60ecbf849ce9e805f3420c489a8a0c53e909d7ebc99b46e41935ee8da67 SHA512 1e4e539c77b549fc6183098aac12c4d30c89743ef2cd037204d047fa9ced2519893a2252cc2802fb99ed14ad7c854fc6a7f913b226c12afd659763d007bf9f98
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/teeworlds/teeworlds-0.7.5.ebuild b/games-action/teeworlds/teeworlds-0.7.5.ebuild
new file mode 100644
index 000000000000..7e5532fed006
--- /dev/null
+++ b/games-action/teeworlds/teeworlds-0.7.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+COMMIT_LANG="4ba6f824e9c34565e61340d25bc8c3cc004d40fb"
+COMMIT_MAPS="1d3401a37a3334e311faf18a22aeff0e0ac9ee65"
+inherit cmake desktop python-any-r1 xdg-utils
+
+DESCRIPTION="Online multi-player platform 2D shooter"
+HOMEPAGE="https://www.teeworlds.com/"
+SRC_URI="
+	https://github.com/ktrace/gentoo-blobs/raw/master/teeworlds.png
+	https://github.com/teeworlds/teeworlds/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/teeworlds/teeworlds-maps/archive/${COMMIT_MAPS}.tar.gz -> ${P}-maps.tar.gz
+	https://github.com/teeworlds/teeworlds-translation/archive/${COMMIT_LANG}.tar.gz -> ${P}-translation.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated"
+
+RDEPEND="
+	!dedicated? (
+		app-arch/bzip2:=
+		media-libs/freetype
+		media-libs/libsdl[X,sound,opengl,video]
+		media-libs/pnglite
+		media-sound/wavpack
+		virtual/glu
+		virtual/opengl
+		x11-libs/libX11
+	)
+	dev-libs/openssl:0=
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND} ${PYTHON_DEPS}"
+
+src_prepare() {
+	cmake_src_prepare
+	rm -r "${S}/datasrc/languages" || die
+	rm -r "${S}/datasrc/maps" || die
+	mv "${WORKDIR}/${PN}-translation-${COMMIT_LANG}" "${S}/datasrc/languages" || die
+	mv "${WORKDIR}/${PN}-maps-${COMMIT_MAPS}" "${S}/datasrc/maps" || die
+	cp "${DISTDIR}/${PN}.png" "${S}/" || die
+	python_fix_shebang scripts/
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLIENT=$(usex dedicated OFF ON)
+		-DDEV=$(usex debug ON OFF)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doicon -s 256 "${PN}.png"
+	domenu other/teeworlds.desktop
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+	insinto "/etc/${PN}"
+	doins "${FILESDIR}"/teeworlds_srv.cfg
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}