gentoo resync : 16.09.2020

18 files changed, 50 insertions, 238 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 051f22cf6b11..555026da4f94 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/descent1-demodata/Manifest b/games-action/descent1-demodata/Manifest
index e6506d67e07d..130e08bcc389 100644
--- a/games-action/descent1-demodata/Manifest
+++ b/games-action/descent1-demodata/Manifest
@@ -1,3 +1,3 @@
 DIST desc14sw.exe 2892216 BLAKE2B c07751c6e8b59c0980f409d1fe8a5cee68bb0a4ff83d3a18723185c7228f43546f8dba90da1cdce1e698badcea4f29d06c1d0be5e6732f25fcc2a0587cadf0d4 SHA512 121bd909285138eef3009af4a46174a4af241b139230eda5c232fe710b17419e385ffeb97e13678c253390e6393615006c739a8dd4b0e14b375678491629ab3e
-EBUILD descent1-demodata-1.4-r1.ebuild 935 BLAKE2B 2e4c47864e114f285c30fc8cda8ea4b76a5e125d99228719011c36996e705c33b65c61843baf2ae0f4fafa7c97b350f1c19762b5b77b774513101f290d71d62b SHA512 4c05b12a4bb66acac9c9446f77e0f500f27e6081ab1436736143ba3f1a840762c88bb73c1f8041a62215802010f5009d201d01753f94887ce08b5f8d1f8b32a6
+EBUILD descent1-demodata-1.4-r1.ebuild 803 BLAKE2B c8c2fd8a52ddb406f08c65299247456a6ecf17c84c827a80e83dc99ce5677f1586d05ed006e0f4ff60ab541d2fbbadf40dc6d8738c9c73bdd1212ed462e63c9d SHA512 87e255608a401a804edb1ed630b75f912fc52de61ca2f6c6220d5b48e575690b7d1e891b9d1cad383eb3f182ddbf75590d19e880a8c0bb4ddfb7ed9f20b96c41
 MISC metadata.xml 560 BLAKE2B 3a025185ecaf1e128628edb9cf941d61019ce6a79e91807240ee4996738f0e491de62a0ba5cb5503413eb03dfa6b2318c701cc32455bf04be607df374daf6a19 SHA512 0f5457290e5c7f6d5abdd6d9b42ef06c8c6cd3c85032cc4c3aa90c67beb33d467bea45b8371cbb182e2d89bd27bc409c36ed27b438fc41c09825cdff1060c543
diff --git a/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild b/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
index 8a61ba5c2977..700a2496decb 100644
--- a/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
+++ b/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit unpacker
 
@@ -17,21 +17,16 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="!games-action/descent1-data"
 
-DEPEND="app-arch/unzip
-	app-arch/unarj"
+BDEPEND="app-arch/unzip
+	app-arch/arj"
 
 S="${WORKDIR}"
 
 src_unpack() {
 	unpack_zip ${A}
 
-	unarj e DESCENT1.SOW || die
-	mv descent.pig{,1} || die
-	unarj e DESCENT2.SOW || die
-	mv descent.pig{,2} || die
-
-	# From the sows, big porkie pies shall grow
-	cat descent.pig{1,2} > descent.pig || die
+	mv DESCENT2.SOW DESCENT1.S01 || die
+	arj e -v -y -_ DESCENT1.SOW || die
 }
 
 src_install() {
diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
index 7860635c5a7a..e3cb681c604e 100644
--- a/games-action/descent2-data/Manifest
+++ b/games-action/descent2-data/Manifest
@@ -1,4 +1,4 @@
 DIST d2xptch12.tgz 158419 BLAKE2B e4bd0d33fa8912b87f8018673c2f9fa9d965f96787b7af76da5473e0c6b06ca78303977cdb6e1f85affefe187b2f1e947eb477313b379bf2464e2a0ba95b74bf SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b
 DIST setup_descent_2_1.1_(16596).exe 563071744 BLAKE2B f4c81daf5f3fe752687630bf4d9f10076e6f343161ea9675e3ab5698034fd8066727d939263db7a388d1e7e89834b8cea6e58e65433fd83a1d732b5439a693e5 SHA512 baf4577409c011f668d10a1a43385a916b951457b43b90883cef73af6622bed31a717f3d50d5a85698237fc4160281f3e2f4e07c9a261d63f52024ca05839fbd
-EBUILD descent2-data-1.2.ebuild 2902 BLAKE2B e055236406729c46d7d9aee010a7d8d972f5e8c6aaa4bf7601babfde68b3010d4bd1dfb426608effc6e100272422abc1ebb15d952b73c238cd53093cd6fe3cae SHA512 2b3cf4652da001a7a316391083dd04501454b155faa7091945798eecc6a8f020f7b1258a3e9d3da6517fda4ee6f39fceea34a05743bb50ed316bc3f37c679aa8
+EBUILD descent2-data-1.2.ebuild 2904 BLAKE2B 03b6c6fb3597ec44d7bda1f4ee12fe81b766cb53ae9c4366196b0870d5face288561eec5296e64f6f5101d0e346f7625c60ce2a08dea2ee9ec2164855fc3cd7b SHA512 68fa6ebd48908357931e96c11959218959d336b4973de7e36a1e48e13076784170037948f2ded3766677e0ecc7fe9b7034d0331b4508347977318c2ca533c7e9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
index 4ca0152d5ff7..175865f367a1 100644
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -28,7 +28,7 @@ RDEPEND="!<games-action/d2x-0.2.5-r3
 	!games-action/descent2-demodata"
 
 DEPEND="cdinstall? (
-		app-arch/unarj
+		app-arch/arj
 		dev-util/xdelta:3
 	)
 	!cdinstall? (
@@ -52,7 +52,7 @@ src_unpack() {
 		case ${CDROM_SET} in
 			0)
 				einfo "Found Descent 2 CD"
-				unarj e "${CDROM_ABSMATCH}" || die ;;
+				arj e -y -_ "${CDROM_ABSMATCH}" || die ;;
 			1)
 				einfo "Found Descent 2 installation"
 				cd "${CDROM_ABSMATCH%/*}" || die ;;
diff --git a/games-action/descent2-demodata/Manifest b/games-action/descent2-demodata/Manifest
index 5fe6e56e9546..6560d3c6c9b9 100644
--- a/games-action/descent2-demodata/Manifest
+++ b/games-action/descent2-demodata/Manifest
@@ -1,3 +1,3 @@
 DIST d2demo10.zip 4306833 BLAKE2B ae075d0c3d46fc262696e9ec0a7c70cb676295e5fa95c357f81235f46bc00e686de0cf2f611571f215601683a72fc4c41d5abd525e3de46e208c5fe4c34b2c87 SHA512 a4229be701a4b2fc28d3c71591a477d242c1c784dc233c1e9ca6b798b3774de9744d8a91b0b80904b3fe63e1285b79234bf48681cddaeca702b3d9ce4c2b6fab
-EBUILD descent2-demodata-1.0-r1.ebuild 1225 BLAKE2B 13dd6e43e86ed44aed116c0ea11b99d528f37f6427c767325c426dea8d39d67949b320f60aa0b7c584fba6928bb8da31f176439c51fa65dfc235d37b0b1e245b SHA512 a4120c6394aadd9c0f9b3b3e2362b8cfce66114dbff76226770edd35247efcfb6827b0d25b720eca376ed96f872b8bb79748ab24138c2e408d0dc814086cd0fc
+EBUILD descent2-demodata-1.0-r1.ebuild 888 BLAKE2B 859e5e9fb5114bbc6a1ce8aaf36598354f1bd2bcf4d8dd7b1d037a104424399a2e552276027c3f5f2c73fe7f45f4c935f6d66ecf68f3532baa9068b1d3ac778c SHA512 fc8689e710512c758814a1e9d2de99c6747acb81d63d6900b4edcbee03033b761ab57d822fb1e0b796c339b2a009e30305c57a362a095055035bb9fd9c2845b0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild b/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
index 79abcc78e76d..2faad49ef878 100644
--- a/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
+++ b/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="d2demo"
 DEMO="${MY_PN}${PV//.}.zip"
@@ -17,27 +17,17 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="!<games-action/d2x-0.2.5-r3
 	!games-action/descent2-data"
 
-DEPEND="app-arch/unzip
-	app-arch/unarj"
+BDEPEND="app-arch/unzip
+	app-arch/arj"
 
 S="${WORKDIR}"
 
 src_unpack() {
 	default
 
-	# This is much more fun than simply downloading
-	# http://www.icculus.org/d2x/data/d2shar10.tar.gz
-	unarj e D2_1.SOW || die
-	mv ${MY_PN}.ham{,1} || die
-	unarj e D2_2.SOW || die
-	mv ${MY_PN}.ham{,2} || die
-	mv ${MY_PN}.pig{,2} || die
-	unarj e D2_3.SOW || die
-	mv ${MY_PN}.pig{,3} || die
-
-	# From the sows, big porkie pies shall grow
-	cat ${MY_PN}.ham{1,2} > ${MY_PN}.ham || die
-	cat ${MY_PN}.pig{2,3} > ${MY_PN}.pig || die
+	mv D2_2.SOW D2_1.S01 || die
+	mv D2_3.SOW D2_1.S02 || die
+	arj e -v -y -_ D2_1.SOW || die
 }
 
 src_install() {
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index 651f23a49db9..fd3e8c664d53 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,16 +1,4 @@
-AUX dxx-rebirth-0.59.100-flags.patch 371 BLAKE2B 7902a9375b9f6782eb1cdaba1d0e27ede3476149554a711473631eb652d953828a67836515c097c459b2e3ea31014a71e3ee5d2c46d1ed25dce97ac0cde6f88e SHA512 c8bb575a172845b2643838c95ccbe3fac4509a3b5c24178816ea5a1a46a0fa2721d3fae841641950e97dec0e3a9fb74d8ddac493183df8834caca7d8d9ce11b4
-AUX dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch 1060 BLAKE2B d9b62b11ae0aa871f667bb8e75eca0efffad2ba5d2781410886588b9c1dd6cefe430bb97381bf66ac0a99fd505c08547d45ffb3353e6d0edf14a08973bafdf2f SHA512 3c631874a910192e0f2fd594029b789bc79eb9b70eb3c2c172967ccc0ae1a994f138f7d57e1f99b3067cc1f199594fd590a2d3a73f35fda3520edb98cf0b80c9
-AUX dxx-rebirth-0.59.100-sharepath.patch 553 BLAKE2B 651db97d70b177754d7053c400a99a79c5ff7cd82af7743ef4588f0981ac2e17143fc0b41cbc62670d896e7f51cfc21e96f0b77d0a4994b4e2b56853ee29b28b SHA512 6f57832df96b6c927ea6f1d93f57662df24c0127b8a22ee08c73c3ecd21ab027fa7367070d0bec09250042e716409b258373e54c9189de68d41b799f785498b8
-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
-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
 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
+MISC metadata.xml 2537 BLAKE2B 709f8b7ed142ab72535062bda6d890dd4e17a4c37a68689544858d71b932740080444c400a0d86c0365954650e0638162185b4c1447b96a1b5fd4d656ed9857c SHA512 2f326d7d55af3a5d1ac3e35df2e46deb0c8dd1057b6eb2be301b80f7518a138c7518c6794d15ef0d0d60356ac8711d0f2b718f1b033f8d69ae296ee242dfb634
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
deleted file mode 100644
index df2171429517..000000000000
--- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils scons-utils toolchain-funcs xdg
-
-MY_P="${PN}_v${PV}-src"
-DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
-HOMEPAGE="https://www.dxx-rebirth.com/"
-SRC_URI="https://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
-	opl3-musicpack? (
-		descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa )
-		descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) )
-	sc55-musicpack? (
-		descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa )
-		descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) )
-	l10n_de? (
-		descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa )
-		descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) )
-	textures? (
-		descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa ) )"
-
-LICENSE="DXX-Rebirth GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+data debug +descent1 +descent2 ipv6 l10n_de +music +opengl opl3-musicpack sc55-musicpack +textures"
-
-REQUIRED_USE="|| ( descent1 descent2 )
-	?? ( opl3-musicpack sc55-musicpack )
-	opl3-musicpack? ( music )
-	sc55-musicpack? ( music )"
-
-DEPEND="dev-games/physfs:0=[hog,mvl,zip]
-	media-libs/libsdl:0=[joystick,opengl?,sound,video]
-	music? ( media-libs/sdl-mixer:0= )
-	opengl? (
-		virtual/opengl
-		virtual/glu )"
-
-RDEPEND="${DEPEND}
-	data? (
-		descent1? ( || ( games-action/descent1-data games-action/descent1-demodata ) )
-		descent2? ( || ( games-action/descent2-data games-action/descent2-demodata ) ) )
-	music? (
-		!opl3-musicpack? ( !sc55-musicpack? ( media-libs/sdl-mixer:0=[midi] ) )
-		opl3-musicpack? ( media-libs/sdl-mixer:0=[vorbis] )
-		sc55-musicpack? ( media-libs/sdl-mixer:0=[vorbis] ) )
-	!games-action/d1x-rebirth
-	!games-action/d2x-rebirth"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-flags.patch # Remove hardcoded optimisation flags.
-	"${FILESDIR}"/${P}-sharepath.patch # Change share path to use old d1x/d2x locations.
-	"${FILESDIR}"/${P}-physfs-3-no-deprecation.patch # bug #653014
-)
-
-src_compile() {
-	tc-export CXX
-	escons \
-		prefix="${EPREFIX}"/usr \
-		d1x=$(usex descent1 1 0) \
-		d2x=$(usex descent2 1 0) \
-		debug=$(usex debug 1 0) \
-		ipv6=$(usex ipv6 1 0) \
-		opengl=$(usex opengl 1 0) \
-		sdlmixer=$(usex music 1 0) \
-		verbosebuild=1
-}
-
-src_install() {
-	local DV PROGRAM
-
-	for DV in 1 2; do
-		use descent${DV} || continue
-		PROGRAM=d${DV}x-rebirth
-
-		docinto ${PROGRAM}
-		edos2unix ${PROGRAM}/*.txt
-		dodoc ${PROGRAM}/*.txt
-
-		insinto /usr/share/games/d${DV}x
-		use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa
-		use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa
-		use l10n_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa
-
-		dobin ${PROGRAM}/${PROGRAM}
-		make_desktop_entry ${PROGRAM} "Descent ${DV} Rebirth" ${PROGRAM}
-		doicon ${PROGRAM}/${PROGRAM}.xpm
-	done
-
-	if use textures && use descent1; then
-		insinto /usr/share/games/d1x
-		doins "${DISTDIR}"/d1xr-hires.dxa
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use data; then
-		elog "To play the game enable USE=\"data\" or manually "
-		elog "copy the files to ${EPREFIX}/usr/share/games/{d1x,d2x}."
-		elog "See each game's INSTALL.txt for details."
-	fi
-}
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch
deleted file mode 100644
index 75c3a64f893b..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dxx-rebirth_v0.59.100-src/SConstruct	2016-12-12 02:47:40.000000000 +0300
-+++ dxx-rebirth_v0.59.100-src/SConstruct	2016-12-28 02:11:16.657874914 +0300
-@@ -3488,7 +3488,6 @@
- 		env = self.env
- 		user_settings = self.user_settings
- 
--		env.Prepend(CXXFLAGS = ['-g', '-O2'])
- 		# Raspberry Pi?
- 		if user_settings.raspberrypi:
- 			rpi_vc_path = user_settings.rpi_vc_path
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch
deleted file mode 100644
index 86e94d43389e..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8838b46e65c830e8d9ebaeaf568f186eff57d5c7 Mon Sep 17 00:00:00 2001
-From: Kp <kp@valhallalegends.com>
-Date: Sun, 22 Oct 2017 04:20:35 +0000
-Subject: [PATCH] Suppress PhysFS deprecation errors
-
-PhysFS 2.0 only offers PHYSFS_read/PHYSFS_write for I/O.  PhysFS 3.0
-deprecates PHYSFS_read / PHYSFS_write and offers PHYSFS_readBytes /
-PHYSFS_writeBytes.  Converting Rebirth to use the new API is somewhat
-invasive, and would require dropping support for PhysFS 2.0.
-
-For now, for compatibility with PhysFS 2.0, disable the deprecation
-errors and continue to use the older functions.
-
-Reported-by: gabeotisbenson <https://github.com/dxx-rebirth/dxx-rebirth/issues/352>
----
- SConstruct | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/SConstruct b/SConstruct
-index 560a6ef1a..78491cb1a 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -3177,6 +3177,7 @@
- 		def adjust_environment(self,program,env):
- 			env.Append(
- 				CXXFLAGS = ['-pthread'],
-+				CPPDEFINES = [('PHYSFS_DEPRECATED', '')],
- 			)
- 
- 	def __init__(self,__program_instance=itertools.count(1)):
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch
deleted file mode 100644
index ee1b6bb9ea05..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dxx-rebirth_v0.59.100-src/SConstruct	2016-12-12 02:47:40.000000000 +0300
-+++ dxx-rebirth_v0.59.100-src/SConstruct	2016-12-29 19:26:58.987760410 +0300
-@@ -2875,7 +2875,7 @@
- 				return 'GLESv2'
- 			return self.default_OGLES_LIB
- 		def __default_DATA_DIR(self):
--			return '%s/share/games/%s' % (self.prefix, self._program.target)
-+			return '%s/share/games/%s' % (self.prefix, self._program.shortname)
- 		def _generic_variable(key,help,default):
- 			return (key, help, default)
- 		def __get_configure_tests(tests,_filter=lambda s: s.name[0] != '_'):
diff --git a/games-action/dxx-rebirth/metadata.xml b/games-action/dxx-rebirth/metadata.xml
index 2d1f5ab3ad7a..2a9bced3f14e 100644
--- a/games-action/dxx-rebirth/metadata.xml
+++ b/games-action/dxx-rebirth/metadata.xml
@@ -22,8 +22,6 @@
 	<use>
 		<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>
@@ -34,7 +32,6 @@
 		<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="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>
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 89ec7ef5bdfe..d65dbf417fbb 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -2,5 +2,5 @@ AUX minetestserver.confd 313 BLAKE2B 51af7c8d6c23461028774e459d3ff24a867102ac56c
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
 AUX minetestserver.logrotate 85 BLAKE2B 72ca62554a0146305cbafd9050378252bc4214c23a71d1f43041bd78ad332f25e834de3ae382f383ef8aef40fccb4849343fe23223ad2032efd16a12c10022f8 SHA512 19fe1e9264f195ea178cade577cea5cd93f7de1ceaab14ee00cafc051e1ec8f2e2ceac89557a00a3dd7838002e30da622f90a313776de2ad35aab10c68b6ec14
 DIST minetest-5.3.0.tar.gz 10828893 BLAKE2B 0847c040d2874962be79af6fce89b19354f6763cb37dd61d7e5e91bcacb9a76a115e295976056ae761db257612277ceef0d7e8bfc55790b1bc59a9c4961af41b SHA512 7bb34a80107861539a9ac2417812625ef11d145bf9401afdb8e0a1b9f619adcce24e2becf5bf361b805f4610097cf9d44c76d497ab08d489a43655852ce44777
-EBUILD minetest-5.3.0.ebuild 3324 BLAKE2B 2caa63762bd7a9af6547158da1f2aac1b9928219f902177918b23100aba684247fac35e24a19e2e3050a2ef9bfe9f041c13c656ce92c29e098641755aff09eea SHA512 2ec9925d508f64145ef47228a914f1caafb1a97c150d347e192d1ca6468b00020da3ff899ecae25b9809ffd591b74590630559c043133d3cd16989a43305f330
-MISC metadata.xml 2238 BLAKE2B 71d17709848d892d3eb5e99165bc21f41b3d3c4ff51f4b9923f078156eb48c743308cb74c5f84ecc147aa9284332e0968b6e47a34c0c412e32abde9685c1bb1f SHA512 33d80f695f354f623e7dd927881865e074c430b4b562f2ac2bcc716a6be0d9ef89bcd2eb773d9207d3887a00b8ff7b9017b8d613cd603499cb6b0226ed3ffce4
+EBUILD minetest-5.3.0.ebuild 3416 BLAKE2B 2eb08d10b89b9c10c559b7ed8995c1c1775c920b49707151bd2a38d0b75c9ac68485c4e919789a7462408332751b113c05f0b34af4d18f372e58b43e4bf9eb72 SHA512 0da88b6f8f648b6e36dc6a33d1813c771dcf09f17b0eb4e413feab879206cb887abf8a50c9681cbb084a2ff68709d8e9b5d155597a771f649d0a6b9aba1db1f8
+MISC metadata.xml 2304 BLAKE2B 174aa3ecba34e78284cc6b58a622f2aaa3312950b9c52428ea999fea12df4817348b8f0ac85259566d3c131d735be305f86e3bdb27993fb92bdc98bd4d6a6495 SHA512 b84fa111e428ab16114081b56469259f1bc3b4dae74ce530d9fc0512db7bfa500c6920e4913accabade89dcf25fb4463b116a79be969cc91e5d45e3e67aaa4d0
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index 8ca84936bcba..5cd60f0a8711 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -44,6 +44,7 @@
 	<use>
 		<flag name="client">Build Minetest client</flag>
 		<flag name="leveldb">Enable LevelDB backend</flag>
+		<flag name="prometheus">Enable prometheus client support</flag>
 		<flag name="redis">Enable redis backend via <pkg>dev-libs/hiredis</pkg></flag>
 		<flag name="server">Build Minetest server</flag>
 		<flag name="spatial">Enable SpatialIndex AreaStore backend
diff --git a/games-action/minetest/minetest-5.3.0.ebuild b/games-action/minetest/minetest-5.3.0.ebuild
index 94e307d76447..b954c7f0fa33 100644
--- a/games-action/minetest/minetest-5.3.0.ebuild
+++ b/games-action/minetest/minetest-5.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+client +curl doc +leveldb ncurses nls postgres redis +server +sound spatial test +truetype"
+IUSE="+client +curl doc +leveldb ncurses nls postgres prometheus redis +server +sound spatial test +truetype"
 REQUIRED_USE="|| ( client server )"
 RESTRICT="!test? ( test )"
 
@@ -42,6 +42,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
 	nls? ( virtual/libintl )
 	postgres? ( >=dev-db/postgresql-9.5:= )
+	prometheus? ( dev-cpp/prometheus-cpp )
 	redis? ( dev-libs/hiredis:= )
 	server? (
 		acct-group/minetest
@@ -87,6 +88,7 @@ src_configure() {
 		-DENABLE_LEVELDB=$(usex leveldb)
 		-DENABLE_LUAJIT=1
 		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_PROMETHEUS=$(usex prometheus)
 		-DENABLE_REDIS=$(usex redis)
 		-DENABLE_SPATIAL=$(usex spatial)
 		-DENABLE_SOUND=$(usex sound)
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index c47021daeaa6..c86b0a7e7ba1 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,7 +1,7 @@
 AUX supertuxkart-0.9.3-irrlicht-system-libs.patch 1576 BLAKE2B b252cc0036f41e9bcf02e1bf049f82de7cd94aba981cc7e161aac52306890fc490d2d4b213fcec60f9098573b3cc059a26aa2efe524030034e4a29c15bf36b88 SHA512 55d353d492aafec3ddb801b28bbe4058bc0b348980f631057850915849013ec191658c55dbc41b48402219a13ec5db811d89401d5cfbb27e7bf5c68f2478d5b6
 AUX supertuxkart-1.1-fix-buildsystem.patch 761 BLAKE2B 6a3ca6329851b3ad22b4b7617d7d6b7668ac50a7aebaf8a2cb41f5e8036af03f669dab6cd803de2e7315196aa2c6f8698bf3d65280fb90446e7b64d22d7eabd1 SHA512 b15729cc2aea6286ecc55927a26c5e667c1ac51e8ea505622373fe8b6c51ae3a9dc8d57334d3a9ab1bd968c6107bc5a315963731a3b3ad9d89a8839981abfc11
 AUX supertuxkart-1.1-irrlicht-arch-support.patch 1520 BLAKE2B 14c6fc7615e44c5007eb5828ac7e157f69a41343d6f5affb1c6b5af5afdca4c123bd1fe238c90495c097a5eafed976f557212f1e8d89c787069473cf63218fc0 SHA512 7cdb9582248937a9a48aeb1d66cee565fe1bb3255d58ec5dcfd735ee807fa51d7fc0ba661b74156ca12b036af3aefe7cabdf386e71fef98617d24268da2d0c0e
-AUX supertuxkart-1.2-irrlicht-system-libs.patch 1794 BLAKE2B 046d9416ab44830ae50c6fde7a01395f978480c91becf423a3d8c749e21f2ff02a33582a62dec1916fdb88f72c33634d3926b50c8c4304446b2238139b172bdd SHA512 4acd958bd67e39885a49dd87de08e26e6c45e94e5a4e46a6569e02ece16ee72054a9c5bd5e253e313bed5e831b32c055b6d13be4cd03f1d83baf1b401f301cb4
+AUX supertuxkart-1.2-irrlicht-system-libs.patch 1706 BLAKE2B a3007cbcf9a01b44e385b9fe30183811a7cb2183ea8560b904271bd1df6ed02c827d4d02ee914691fa2fa9c39ecaf5cc2933318563c9ad0f40614adcf0298076 SHA512 b616bfe18d990f881a703c4c7a545f49d47cbf3bb42f0d4d657fa6a837667a316a48aec0bdf0e1ae803abdf536a66c6c8bbf39f9ec5c6008db7030b67337530a
 DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7 SHA512 bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835
 DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda SHA512 81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
index 2a23e51323dc..f9681733cfb1 100644
--- a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
+++ b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
@@ -1,5 +1,3 @@
-https://salsa.debian.org/games-team/supertuxkart/-/raw/master/debian/patches/irrlicht/use-system-libs.diff
-----
 Subject: [PATCH] debian/use-system-libs
 
 Path to build irrlicht using the system libraries for png,zlib and
@@ -10,14 +8,14 @@ Signed-off-by: Christoph Egger <debian@christoph-egger.org
 --- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
 +++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
 @@ -35,7 +35,7 @@
- #include <GL/gl.h>
- #ifdef _IRR_OPENGL_USE_EXTPOINTER_
- #define GLX_GLXEXT_PROTOTYPES
--#include "glxext.h"
-+#include <GL/glxext.h>
- #endif
- #endif
- 
+ #include <GL/gl.h>

+ #ifdef _IRR_OPENGL_USE_EXTPOINTER_

+ #define GLX_GLXEXT_PROTOTYPES

+-#include "glxext.h"

++#include <GL/glxext.h>

+ #endif

+ #endif

+ 

 --- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
 +++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
 @@ -24,7 +24,7 @@
@@ -50,20 +48,20 @@ Signed-off-by: Christoph Egger <debian@christoph-egger.org
 --- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
 +++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
 @@ -12,7 +12,7 @@
- 	#define WIN32_LEAN_AND_MEAN
- 	#include <windows.h>
- 	#include <GL/gl.h>
--	#include "glext.h"
-+	#include <GL/glext.h>
- #else
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- 	#define GL_GLEXT_LEGACY 1
+ 	#define WIN32_LEAN_AND_MEAN

+ 	#include <windows.h>

+ 	#include <GL/gl.h>

+-	#include "glext.h"

++	#include <GL/glext.h>

+ #else

+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)

+ 	#define GL_GLEXT_LEGACY 1

 @@ -26,7 +26,7 @@
- 	#include <GL/gl.h>
- #endif
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--	#include "glext.h"
-+	#include <GL/glext.h>
- #endif
- #endif
- 
+ 	#include <GL/gl.h>

+ #endif

+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)

+-	#include "glext.h"

++	#include <GL/glext.h>

+ #endif

+ #endif

+