gentoo resync : 22.01.2021

3 files changed, 13 insertions, 21 deletions

diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 60560a1e8c73..0adae2ab9470 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -10,6 +10,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20201214-9286-74aceda66.tar.xz 19917364 BLAKE2B e871d18c216a11dc5c8396a06d23f42feb40dff7b6a2652601b9a13234e7e5e2f7194ccf1d3750a52f4fb66c6a3ca1386a4869a02ecaf11c64b34a082996dd05 SHA512 584cb1219d19c1d48f3f812c0e1378c9d672a1761ff568addd1094d040301b18feadc6340989a811fe7f80f6ef3046753bc261517fee133452aafbe50aabfb1a
-EBUILD eduke32-20201214.9286.ebuild 5980 BLAKE2B 4dad84a1be403dbf6638069484bc50bd5cabd9bb955e0855b2990c0f01fe807968414c8b4d2a3cd8ba8c93046984675a74360bf00bac02c462f87a936347b69e SHA512 33dcb32f29e72668477193c3d85103a9d30d4dee5257443bfe217185dd3ef52a435d3c520b739a165a36d234df3843437602faf0f3c1f6b727b716d4eb2a321f
-MISC metadata.xml 1697 BLAKE2B 76ea172154c71939d93fb4599f516b782682b9d774daf740e8c6a31810926e9a42b9f0c91f131de51975ecde8d2f99a542ddad1757da60b21f4934baadf0222a SHA512 c8f3410f58e8da648e6b0399b5167829d60800aab710df2a370e3976eb27bd1c3f8ad313b964c6e8d47eb22236010ef6bd6bd148b989ee5489122e7b174e17a7
+DIST eduke32_src_20210109-9300-a32832192.tar.xz 19941188 BLAKE2B 0aa7657384fb92352a4f1cd4bbe4b403ccacc4a77e50aa78f3cd44f9e8fcddc38dfc44897c8f768d9a4c1ae701188fc781b54491f310e2162723aa714231dae4 SHA512 4c54f83f08f150506b76ffa73a41de81a7719c14c14adadbf90bfc93f0fb48ef64f4fd43081e5f49726f8c71137b2e4f567251ff9b83a9a25fb09ffb2ab48315
+EBUILD eduke32-20210109.9300-r1.ebuild 5804 BLAKE2B 0a1fbe9bfcd3df1926be91c13560b8ad3d1d33302f0722626ce109b1d839492c12ca0b5c741181f4775da2057aed9de8bba3f00b73779730da30118c1ecfb563 SHA512 f661552e7c99e680187322bdf172986b9f1870c90972aeb232e2924ddec3f582a6624db6013539eef7a65387602e65a03737a902995eeaee5ecad78a9217015d
+MISC metadata.xml 1695 BLAKE2B 0d309ad2873afa0f103b2f37a585f0a80aed38fc360cac2e15bf7bbde421b30193bbcfa068339f2105ddf1bc02155fb3e803ce0d555a7659f88c6248dfeba62f SHA512 252924650afd01827d4cd39d6a7b43eb4fb8616f629e89a9b8ee9828de68f1586c63e458623e31f7e954320e50b081279edf88b0da935daaa5154d8a7d901597
diff --git a/games-fps/eduke32/eduke32-20201214.9286.ebuild b/games-fps/eduke32/eduke32-20210109.9300-r1.ebuild
index 7529d21a544e..f936eea405ff 100644
--- a/games-fps/eduke32/eduke32-20201214.9286.ebuild
+++ b/games-fps/eduke32/eduke32-20210109.9300-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit desktop toolchain-funcs xdg-utils
 
-EGIT_COMMIT="74aceda66"
+EGIT_COMMIT="a32832192"
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
 MY_PV_HRP="5.4"
@@ -31,18 +31,13 @@ SRC_URI="
 LICENSE="BUILDLIC GPL-2 HRP"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="cdinstall demo fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw vorbis voxels vpx xmp"
+IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw vorbis voxels vpx xmp"
 REQUIRED_USE="
-	cdinstall? ( !demo )
-	demo? ( !cdinstall )
-	hrp? ( ^^ ( demo cdinstall )
-		!voxels )
-	offensive? ( ^^ ( demo cdinstall ) )
-	opl? ( ^^ ( demo cdinstall )
-		!sc-55 )
-	psx? ( ^^ ( demo cdinstall ) )
-	sc-55? ( ^^ ( demo cdinstall )
-		!opl )
+	hrp? ( duke3d !voxels )
+	offensive? ( duke3d )
+	opl? ( duke3d !sc-55 )
+	psx? ( duke3d )
+	sc-55? ( duke3d !opl )
 	voxels? ( !hrp )
 	vpx? ( opengl )
 "
@@ -82,10 +77,7 @@ BDEPEND="
 	x86? ( dev-lang/nasm )
 "
 
-PDEPEND="
-	cdinstall? ( games-fps/duke3d-data )
-	demo? ( games-fps/duke3d-demodata )
-"
+PDEDEND="duke3d? ( games-fps/duke3d-data )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 225b31ad73f5..0e39e17f6496 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -15,7 +15,7 @@
 		for short to Windows, Linux, Mac OS X, FreeBSD and several handhelds.
 	</longdescription>
 	<use>
-		<flag name="demo">Install the Duke Nukem 3D demo files, provided by <pkg>games-fps/duke3d-demodata</pkg>.</flag>
+		<flag name="duke3d">Install the Duke Nukem 3D data files, provided by <pkg>games-fps/duke3d-data</pkg>.</flag>
 		<flag name="fluidsynth">Install <pkg>media-libs/sdl2-mixer</pkg> with fluidsynth support.</flag>
 		<flag name="hrp">Install the Duke Nukem 3D High Resolution Pack.</flag>
 		<flag name="offensive">Install the Duke Nukem 3D XXX Pack.</flag>