gentoo resync : 31.01.2021

6 files changed, 11 insertions, 14 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index b8dd9a156c4f..a25b2a7a122b 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 823ea1c6ccd2..4e9bb8240bb3 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,5 +1,5 @@
 DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3
 DIST doomsday-2.3.0.tar.gz 47838189 BLAKE2B 807204cd5e716f57291e383b6a2f0570c01f3e4a92d575f5e585cf1e793785031edd845399dd6896766b1c77425b2fefd6f5f5913adc5fcb7bb1415b2f906c98 SHA512 46d92743e981804eca3ed6e486c4a748114621053d6269a0c0bc5fa84a591f6556ad3226ab6fb3cbc8642ac2f128885261c0bdc78bb5f2012a25f2cab6413461
-EBUILD doomsday-2.1.1-r1.ebuild 2049 BLAKE2B 43dd6207986857887d73c2a9d4504701df1aec8894a2e582df6f3aad16be0941cb964e0ec0ae33220701ca73bdcf8a0ae07717b9206779f3b44ebe6e35d8c9e5 SHA512 2419f7fdf37a2f1aa635963a235f8b119cac60ba0340884ba7c45589875659c19e6a6702a5fbf45c65d97c0976bfa2b1a2ddf03bbd429d85553e576dfc52f701
-EBUILD doomsday-2.3.0.ebuild 2049 BLAKE2B 43dd6207986857887d73c2a9d4504701df1aec8894a2e582df6f3aad16be0941cb964e0ec0ae33220701ca73bdcf8a0ae07717b9206779f3b44ebe6e35d8c9e5 SHA512 2419f7fdf37a2f1aa635963a235f8b119cac60ba0340884ba7c45589875659c19e6a6702a5fbf45c65d97c0976bfa2b1a2ddf03bbd429d85553e576dfc52f701
+EBUILD doomsday-2.1.1-r1.ebuild 2047 BLAKE2B f9962e9c9f496fe04e3bffdeafcd9eaf3a3dba135fb3678518b69647e7e4b888a8fb750512cb62f3dc2b89067dc4a83bf5057654026be666c3ecdeab90d9c0ce SHA512 fc337d70e436cb91f96a1a916da2afc1d997eede8ca97f80826077b10fbe375d343fb25cda1b5e0c8bf8580fce9911f1a19cc43a33af052ab27c8c5ba62f2803
+EBUILD doomsday-2.3.0.ebuild 2047 BLAKE2B f9962e9c9f496fe04e3bffdeafcd9eaf3a3dba135fb3678518b69647e7e4b888a8fb750512cb62f3dc2b89067dc4a83bf5057654026be666c3ecdeab90d9c0ce SHA512 fc337d70e436cb91f96a1a916da2afc1d997eede8ca97f80826077b10fbe375d343fb25cda1b5e0c8bf8580fce9911f1a19cc43a33af052ab27c8c5ba62f2803
 MISC metadata.xml 771 BLAKE2B 8a5effc2f449a9b4448dead1a37e9df047ae2e1608c26522d99b02e2d9561e8c129dbdb93f5a713dce72cee09edd8eaed61f38a278d995b3a7fc7e1a5c468bed SHA512 8bc89aa4bab55338472489ec1e92b47cb676b3110a1d3609d8e5a0d51965955770f045405665bff2e401f34697ef4d4b52341a668d08909a92db8eb660c18e00
diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index 47cd24259c18..5d0d361898a0 100644
--- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
 
diff --git a/games-fps/doomsday/doomsday-2.3.0.ebuild b/games-fps/doomsday/doomsday-2.3.0.ebuild
index 47cd24259c18..5d0d361898a0 100644
--- a/games-fps/doomsday/doomsday-2.3.0.ebuild
+++ b/games-fps/doomsday/doomsday-2.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
 
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index eb90f8c6aa06..c61f683a8e8d 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_20210109-9300-a32832192.tar.xz 19941188 BLAKE2B 0aa7657384fb92352a4f1cd4bbe4b403ccacc4a77e50aa78f3cd44f9e8fcddc38dfc44897c8f768d9a4c1ae701188fc781b54491f310e2162723aa714231dae4 SHA512 4c54f83f08f150506b76ffa73a41de81a7719c14c14adadbf90bfc93f0fb48ef64f4fd43081e5f49726f8c71137b2e4f567251ff9b83a9a25fb09ffb2ab48315
-EBUILD eduke32-20210109.9300-r1.ebuild 5809 BLAKE2B fbe35017dc3ebf8caadab41b5db26caad69c286ac665af1ffa3fd20acbc3d8f0d5ef0e6beeb9e320bd8b380526d367c1faa953124f4bf1776c9836c8608501df SHA512 5d7fc879607852ad4e0ebd5f11330f2256dc1b96cbef8de105f30b2c5533dcb2cca5217dd214fa058c7e36c2caa24f0af28189dcec0ac7cfa55dd66d5b46bdc4
+DIST eduke32_src_20210127-9308-421b54a8a.tar.xz 19944696 BLAKE2B 196ff6f81e5b87de3c5111c192c1c27c37afca786341eb03c8f704639291e182f2e14a7dd042c92a19fc6b0b5d8639356974a609bade614c4c33f42e04c1f017 SHA512 99299dded2874df996ef00e458ea644a769b46969d296ed5596838978d8835d12d6123445dfa3fd3a6a9e9eefc447fe4af8d2a9c36c000a76a515681bbded636
+EBUILD eduke32-20210127.9308.ebuild 5752 BLAKE2B c175876464d8bc54fd15f83dc21a3b7bb92a797429373c653ce76447119bb0dadebf0c11466637eb507f6c4ee8d5b5b3a0864d830daa8f2c1826b513717daf9a SHA512 ba4c95168883606ae3109807c92524106e75de93c04d65bc043c9edbb85d8bb346a17c6e09355fe8d7858bac570b36c5bcf7ee674b0569f54cc8e760f4b2aae3
 MISC metadata.xml 1695 BLAKE2B 0d309ad2873afa0f103b2f37a585f0a80aed38fc360cac2e15bf7bbde421b30193bbcfa068339f2105ddf1bc02155fb3e803ce0d555a7659f88c6248dfeba62f SHA512 252924650afd01827d4cd39d6a7b43eb4fb8616f629e89a9b8ee9828de68f1586c63e458623e31f7e954320e50b081279edf88b0da935daaa5154d8a7d901597
diff --git a/games-fps/eduke32/eduke32-20210109.9300-r1.ebuild b/games-fps/eduke32/eduke32-20210127.9308.ebuild
index c5f3b293fe59..7ae2cbd8524c 100644
--- a/games-fps/eduke32/eduke32-20210109.9300-r1.ebuild
+++ b/games-fps/eduke32/eduke32-20210127.9308.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop toolchain-funcs xdg-utils
 
-EGIT_COMMIT="a32832192"
+EGIT_COMMIT="421b54a8a"
 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 ~arm ~arm64 ~x86"
-IUSE="duke3d 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 voxels vpx xmp"
 REQUIRED_USE="
 	hrp? ( duke3d !voxels )
 	offensive? ( duke3d )
@@ -50,8 +50,10 @@ S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
 
 RDEPEND="
 	media-libs/flac
+	media-libs/libogg
 	media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
-	media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis?]
+	media-libs/libvorbis
+	media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis]
 	sys-libs/zlib
 	gtk? ( x11-libs/gtk+:2 )
 	opengl? (
@@ -60,10 +62,6 @@ RDEPEND="
 	)
 	png? ( media-libs/libpng:0= )
 	vpx? ( media-libs/libvpx:= )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
 	xmp? ( media-libs/exempi:2= )
 "
 
@@ -122,7 +120,6 @@ src_compile() {
 		FORCEDEBUG=0
 		HAVE_FLAC=1
 		HAVE_GTK2=$(usex gtk 1 0)
-		HAVE_VORBIS=$(usex vorbis 1 0)
 		HAVE_XMP=$(usex xmp 1 0)
 		LINKED_GTK=$(usex gtk 1 0)
 		LTO=1