gentoo resync : 25.11.2020

4 files changed, 23 insertions, 8 deletions

diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index bac14ee9e407..814736cec989 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -2,6 +2,7 @@ AUX eduke32-20190820.8043-log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144
 AUX eduke32-20190820.8043-search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 AUX eduke32-20200505.8904-gcc10.patch 294 BLAKE2B fe527a1a38b17731322dd5d7c9c1ea16dce86eb2c023966a28e87477c9b25001294fcda456fc2bdbfdfbbefb67991e67f9693db69ef18d8485035546e231e0cf SHA512 a79859e6f167203ee0d09db1740cfd223e0e196f2ed5f65e51830e27c8a7bf284ff9bd20d1527dfc2679a08f1ec2aa92a1e582599e656bd0e655bfda189608c7
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
+AUX voidsw-bin 265 BLAKE2B 61ff722fbf4a161aaf0851d00fe3c4c0ecd9544ef95e9d19df779b52feedbaba3a40c5b094b4ef21360b00e10058fc2773de0971dc4427b9c0e8ca6e135d5890 SHA512 ffeaca39dde274b4eec2cb3d2e59e2503140b3a6fe1451abd57557e3030ecc89425ae98beecf2595920d338b72b582ce40d8439c11b63ac1935cfbf409d9c6e5
 DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638223b934795320046922311533d6ecaefa3923650568aaa4e026927b53087032415d2d343fc4bd179c9e9ddd640 SHA512 fd5aba0a09193ccd49781d3f06a040000a134ad90f099ab7bf10a8abe474c3a742f922f8fa31522b8993828d516bdd0b5ded327e9c4615c2c101fe655d533f4d
 DIST duke3d_music-sc55-4.02.zip 155441427 BLAKE2B 7fa0c98927dd9a18411ad473269a795d1bc809fa8f9479deef06e12cd0dc97953680e7519c9d22e2d32b6ff79726682746820f78429ad11cb5edf1b64d2e4fe7 SHA512 70d3d7b4705e30cdb19ddc95e11a88afff1dc01dfc6495a488ea665f8097c1200695ec67246ac47a2480d0e68cd7d74e1d61c2120485f53bb93d9c0fb16ba9b2
 DIST duke3d_musopl-2.01.zip 266444823 BLAKE2B 5255c671782279c7723fb1f848a331645a89fdc8dd5336250d06e6eed5b63511c37bfbb07d22d7e7ce29707efe2c55406f2ee81522374de3633f2b448c7dbd6b SHA512 08308b672516a6f3a3b9b85fd836f2a29a24c8fa5f353953f5f55a281dea370046817ccfb8467b4ce25385277ced8afd83c00882e8a246b03afa5e0e349efd35
@@ -9,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_20200829-9253-156963ddc.tar.xz 19786792 BLAKE2B beff97aa7fa6e0db841abddfba6287034b501c6c727239157e986ded0993edf5bfbb891138d95e54a181b1f769b4a36a0406cceb531fed4a5b2c9cdd63dd59e9 SHA512 f69ad01c958cc180e75e4f6c231106634f57257b3d8fd14db5b5079721633df4dde8b72c93397fa75c2782735eb5baf0e00708b2fc5d8781e36c6cda9b949f4d
-EBUILD eduke32-20200829.9253.ebuild 5825 BLAKE2B 5af498587f796380697d51c3b1843a2d0a320a61b0ae33badc433f44d754e0f0264713653e1953d63d5ba89305d968cdd7a06b24a69a19878295eacbdeb01aa6 SHA512 ee28a6597158a2adfc68b3471bf84ec7ce89b35ad106d60acdb6943440425ccde474c8a27d58c6f10185ca65bd4dd41dbf6d45db6c7b940490fb4f1d04324349
-MISC metadata.xml 1608 BLAKE2B 73414a3516a4a690254e70ad071f160688ac11e8fe0634b0218565fc32e01d1e4b8ed0ce830ecd995e715552f23fd50f8c7cb0b0af95f6cdb07a35940639e779 SHA512 2392e18cc53663943341397d3a92f07b3dbbb04497b584739095bef5e9b2f60376115a2952e0d2eba524b3a678e7c205ad3e66a78709a2f4d36b3ea76d8b8c09
+DIST eduke32_src_20200907-9257-93f62bbad.tar.xz 19787388 BLAKE2B 932bb679ac83320c56284371967e3f18e9d44b2635c743443a2e73511bd62557fb478c035136fc63276b3ada97736c18d05ed809772266d5b16dfdcaf03104d6 SHA512 43b5fd11382cdbc589a32c5f8f2ef36abcd0a41ba0251d4edf1c45466ad2ff875bc237c304b5a6668a44d01fb8f465a761f9e654b306762fa086b40f8bd75284
+EBUILD eduke32-20200907.9257.ebuild 5981 BLAKE2B eff5e356e6614be49a9a29e592588bcb05c4aae00b1fe12b3feee13672317ae1407feafbea099478bd826ff92f2100ab666eb9b006b7f2a173bb38454518a9e5 SHA512 d42dfd9c765621988a46ca098440444124cc976a4e9eec3f1bdc7a9102cc0a9af514884ee64813c8362f9831829b39af48dd2137df218f6e1add01310d0209d6
+MISC metadata.xml 1697 BLAKE2B 76ea172154c71939d93fb4599f516b782682b9d774daf740e8c6a31810926e9a42b9f0c91f131de51975ecde8d2f99a542ddad1757da60b21f4934baadf0222a SHA512 c8f3410f58e8da648e6b0399b5167829d60800aab710df2a370e3976eb27bd1c3f8ad313b964c6e8d47eb22236010ef6bd6bd148b989ee5489122e7b174e17a7
diff --git a/games-fps/eduke32/eduke32-20200829.9253.ebuild b/games-fps/eduke32/eduke32-20200907.9257.ebuild
index bf134c4e55b2..b3342d7aa9ce 100644
--- a/games-fps/eduke32/eduke32-20200829.9253.ebuild
+++ b/games-fps/eduke32/eduke32-20200907.9257.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop toolchain-funcs xdg-utils
 
-EGIT_COMMIT="156963ddc"
+EGIT_COMMIT="93f62bbad"
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
 MY_PV_HRP="5.4"
@@ -31,7 +31,7 @@ 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 vorbis voxels vpx xmp"
+IUSE="cdinstall demo 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 )
@@ -162,13 +162,13 @@ src_compile() {
 
 	emake "${myemakeopts[@]}"
 
-	if use tools; then
-		emake utils "${myemakeopts[@]}"
-	fi
+	use tools && emake utils "${myemakeopts[@]}"
+	use voidsw && emake sw "${myemakeopts[@]}"
 }
 
 src_install() {
 	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
+	use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
 
 	if use tools; then
 		local tools=(
@@ -209,6 +209,7 @@ src_install() {
 
 	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
 	make_desktop_entry mapster32 Mapster32 eduke32 Game
+	use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
 
 	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
 	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
diff --git a/games-fps/eduke32/files/voidsw-bin b/games-fps/eduke32/files/voidsw-bin
new file mode 100644
index 000000000000..5d572204848d
--- /dev/null
+++ b/games-fps/eduke32/files/voidsw-bin
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Get all installed zip files
+zips=$(ls /usr/share/games/eduke32/*.zip)
+
+# Create opts for voidsw
+for zip in ${zips[@]}; do
+	opts+="-g ${zip} "
+done
+
+# Switch to /tmp, for writing there the log file and run voidsw with set opts
+cd /tmp && voidsw ${opts}
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 0ce346f0721f..225b31ad73f5 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -25,6 +25,7 @@
 		<flag name="server">Enable support for multiplayer.</flag>
 		<flag name="sdk">Install the SDK files.</flag>
 		<flag name="tools">Install the support tools for mapster32.</flag>
+		<flag name="voidsw">Enable support for Shadow Warrior (Classic) through VoidSW.</flag>
 		<flag name="voxels">Install the Duke Nukem 3D Voxels Pack.</flag>
 		<flag name="vpx">Enable support for <pkg>media-libs/libvpx</pkg>.</flag>
 		<flag name="xmp">Enable support for <pkg>media-libs/exempi</pkg>.</flag>