gentoo resync : 14.05.2020

7 files changed, 13 insertions, 12 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 21dde0356cf4..bfa1ac93c321 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 0d76ce72bb53..7c333f13facd 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -9,6 +9,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_20200311-8738.tar.xz 16544548 BLAKE2B 6f05a6384b4837dc5d4738cef83c4faace2233bf7bde7420d1e00fac45dbdfbd8f7da4b3702205fda914a853790fb0f730b564ae779bce29174337abb1e750fd SHA512 40b69472692bea703d6d6f911a8bff8d18f9fda1e19427ba23572d76717efbe2d13a023622cbfe86bcf9c30966e2fb5e3fe52baac8178587acb2aa092dd86617
-EBUILD eduke32-20200311.8738.ebuild 5825 BLAKE2B 7665196a07ff3185a35d79f1ae7163184980945d49fb793e0ff04b35902f1092ac9c2e8823a21e20f31cb95d6a7d089d530946771dd2b1a7e9f58ad406a6aa02 SHA512 55072b8ab96ef9fcdecaf1d951a5a6f8bcd035402a46ed6da5e5f4047cdf91fe70d72b1088daedcb206fcbb51dbb58dc651e48277151e171373e0355fccbd9e7
+DIST eduke32_src_20200505-8904-0b0e9923c.tar.xz 16569468 BLAKE2B 557a4547e13ff422dacf0885f8ddff8b62bb658bc63c2b70564b5f40cabaf55abd30103a28af474391cd3662641768bcec5f3338f882f82fc657cfa24a566436 SHA512 6b86b1fd16c0175c7dea1816e8d2b4f92f6d5a26c9f68bbbd5cf5ed7821524ef72ef646bc931d4d82773a33438f0de7a33b84429719e485f8cf05cd8ab92cb6b
+EBUILD eduke32-20200505.8904.ebuild 5878 BLAKE2B a1283a8344fe05b764b6ddc8ee98f1d0c63c06b5fdbcbcd5abe7000aebea2686a93d795b08e5847776547a8423367cbe10861b17220f2b6a6b12745b2894297d SHA512 ffb1be12c84b4c72027e91fad3282f43a05bad5060f04345189a2534db5b670d5866bdfe925bb080a619f31c63de28ed6c4c7e01939d7be21b677de781a7e872
 MISC metadata.xml 1608 BLAKE2B 73414a3516a4a690254e70ad071f160688ac11e8fe0634b0218565fc32e01d1e4b8ed0ce830ecd995e715552f23fd50f8c7cb0b0af95f6cdb07a35940639e779 SHA512 2392e18cc53663943341397d3a92f07b3dbbb04497b584739095bef5e9b2f60376115a2952e0d2eba524b3a678e7c205ad3e66a78709a2f4d36b3ea76d8b8c09
diff --git a/games-fps/eduke32/eduke32-20200311.8738.ebuild b/games-fps/eduke32/eduke32-20200505.8904.ebuild
index 1b0613bf663d..c0662991c699 100644
--- a/games-fps/eduke32/eduke32-20200311.8738.ebuild
+++ b/games-fps/eduke32/eduke32-20200505.8904.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 inherit desktop toolchain-funcs xdg-utils
 
+EGIT_COMMIT="0b0e9923c"
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
 MY_PV_HRP="5.4"
@@ -17,7 +18,7 @@ MY_PV_VOXELS="1.21"
 DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
 HOMEPAGE="http://www.eduke32.com/"
 SRC_URI="
-	https://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
+	https://dukeworld.com/eduke32/synthesis/latest/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
 	https://www.eduke32.com/images/eduke32_classic.png
 	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
 	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
@@ -50,7 +51,7 @@ REQUIRED_USE="
 # instead it tries to build a test game, which does not compile
 RESTRICT="bindist test"
 
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
+S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
 
 RDEPEND="
 	media-libs/libsdl2[joystick,opengl?,sound,video]
@@ -91,7 +92,7 @@ PATCHES=(
 
 src_unpack() {
 	# Extract only the eduke32 archive
-	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
+	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
 
 	# Unpack only the documentation
 	if use hrp; then
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 4f65d6203b75..a25508ccb09d 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1,4 +1,4 @@
 AUX prboom-plus-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch 907 BLAKE2B efbd5fda7e4e1d8ac57f4d17381b9ea0ae3c2a64e1edfec0f55c25c5fa96c22d842cb510773bd7cfb4e244b3533b0b36a2112d6537ec6cf895c6aa6c922bdf38 SHA512 5582a1a7a69960eea22ed6bc7cfeb4e3e75480f5f6495cb44691548e5cf3ed80901a9059c19eba1c8ddcb2ce02aa52570e13906348c65d8a3f25960543d31b65
 DIST prboom-plus-2.5.1.5.4540.1.tar.xz 1023228 BLAKE2B 5b1c6aa80516cef4ced73701b640a261188c6eed818a204ef19f183061c0456f4af70dc8b466c240f5c8985903fe4daf0fed42cd32b47849c02b6c890fa807f0 SHA512 9fe207a395d92305dd3b89a38bc1376de6bd2a7bb29d454da42aea03a4ded82b49033d482d97c76377cbd1ecb7d8a65c9e0948af81ecd4e10bd49b0bad791bbc
-EBUILD prboom-plus-2.5.1.5.4540.1.ebuild 1663 BLAKE2B 4e43d1563003043a81e450dc4964673567a4057155bb8b6b64e82be668e525ffab4d1d584031772928a3d3a3d102b1f4d2a437e9531df18fc7de36407c7c395f SHA512 7bd746e2ee3ef6ef2795910d75c09194b09ec3e0c2c667e8827b86634e020ef9528a6257097b2933be7874c4d819199a54a0baa9b11add345af16481e521cbd0
+EBUILD prboom-plus-2.5.1.5.4540.1.ebuild 1664 BLAKE2B 2e9d98fe14a8f442fbf4a92935c94b6b125c8ced03b82dd8cca3e4d9c76c599ad65bf4d842c82b30b05ad3967945f9a5fd5a33a53f6ad4213edb2c63dbe1ec8d SHA512 fb1c5e4ca5b68bc8a6f04c690712382f94e9f9f45b6eb4ad8a426157a438a6e08423fd5f52271cb5fa47e543543b4d7e08663c97cf311df9d19b6d7bd9f12d45
 MISC metadata.xml 1838 BLAKE2B b979e9ba17d881da816fd681d0fc43e70f451b8ec0e8dab47dd9e8b870931df5a6a3b5896f75e391afef668ddb8238ae45d1174612653626910a932fc34ee119 SHA512 3dfcc5e4bec610993506298a3427ef21470f106d19e1f7d0810d6dd69d2691b639112fa09d70a54b0cadbb7dc9b89c93d5b48c5c104caecc68aca96a0a99cd04
diff --git a/games-fps/prboom-plus/prboom-plus-2.5.1.5.4540.1.ebuild b/games-fps/prboom-plus/prboom-plus-2.5.1.5.4540.1.ebuild
index 3e0833b7215c..8ac28f7f6e9f 100644
--- a/games-fps/prboom-plus/prboom-plus-2.5.1.5.4540.1.ebuild
+++ b/games-fps/prboom-plus/prboom-plus-2.5.1.5.4540.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools desktop xdg
 MY_PV=$(ver_rs 4 "+svn" 5 "+dfsg")
 MY_P=${PN}-${MY_PV}
 DESCRIPTION="An enhanced clone of the classic first-person shooter Doom"
-HOMEPAGE="https://prboom-plus.sourceforge.net"
+HOMEPAGE="http://prboom-plus.sourceforge.net"
 SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${MY_PV}.orig.tar.xz -> ${P}.tar.xz"
 
 LICENSE="GPL-2+ BSD BSD-with-disclosure LGPL-2.1+ MIT public-domain"
@@ -19,7 +19,7 @@ REQUIRED_USE="sdl2-image? ( opengl )"
 
 DEPEND="
 	media-libs/libsdl2[opengl?,joystick,sound,video]
-	dumb? ( media-libs/dumb )
+	dumb? ( media-libs/dumb:= )
 	fluidsynth? ( media-sound/fluidsynth:= )
 	mad? ( media-libs/libmad )
 	net? ( media-libs/sdl2-net )
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 98854d97a35d..1121d6a33ef9 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -16,5 +16,5 @@ DIST maxpak.pak 3282742 BLAKE2B 3ad4dd5aade5747b100a24499bae0f0d7fd5cc610e4671c1
 DIST quake2-r0.16.1.tar.gz 1525384 BLAKE2B b95db08ed3799d2788a20d24f63ea3a84d7ff4b581ee5f01dc5d588a1d5af50d52586a04ca28d9942e953d028e140112737432e499edcebf999085a29c63fcfb SHA512 63e8fa10446698b1f1cbd20b4bbfeec75d7620cb6454bb90b853cd2a3d6cd9040041a164666a5e015c3a8289423127f9164b500f57793505f6e4671dec932cf2
 DIST roguesrc320.shar.Z 626769 BLAKE2B f6d79630ee41e834ad07907f886766fdc9fd99152c2a1964629d2c74de259b9a232f691e5e3c4ad26ff3239d127f06d20878422dd7c1b896591db7c732a41ef7 SHA512 330db4966b758b8e363eb8d699b30ce5ec7d9fa581936288e7267000d0815996388adebc0206a8903734cdc1c5658616b15518a2bf888ad9e6059f8155960141
 DIST xatrixsrc320.shar.Z 455917 BLAKE2B 646801fad3c7eaac4957a971f507b13fff0ea6ae0423cb7fe8e8276666c4f89165384e2e2148e828b692533f9f582b64db849efe8d858e51026b9fb847282101 SHA512 6723440d3cfdaf7f9b260d5777d9823937a4c3ee800c8c204e8a5c3d29f2b37f6bdc7c0786025a19d040b5692aa54b99b9db2dc121bc0ca2b53c8763b4ab4dfa
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5264 BLAKE2B d13e7c1fff7379b29901f44e2508a16a62c8b3680426e8ada2dc31ada52300c23e114c8eef7f2c891fbfec1c8acbdba02419462f38db1aa9f56f20df5b54368a SHA512 90cd244070c6f4a85747cb9afcf4f8781565c6afc1934694287548cf1dcace4dae59fe3207228e94535aa675986e02b24d253481c797e0296b9048401dc11e0e
+EBUILD quake2-icculus-0.16.1-r1.ebuild 5197 BLAKE2B 0ecece40469fbca27259502d3a2623d9fee73257b8c679e86ab78e3998f059cd23e1e9d3b45a2610420f1c9575f97d81de8d0340cfec4f601f18f0f17cbfc1d6 SHA512 eb648f823a1798427537ad48d0fdf8602ad3ce53391195ff42df21353464df9e575281ba348b4c33352782d07794140db4f8eb208313fb439d23461097714c96
 MISC metadata.xml 612 BLAKE2B 0e452fab96a1eaa0cdbb5113cd957576e968eef662103403cef968ae05b909a3d3bc25939dfbb4d36a191d18853e1af0d342ce37cbd6a30defc4fb5ac9e4285c SHA512 0c143ca3470f6b33b35d660e3ad55678356e7139cab94589d18947617988f63f8c69485167d9d8c3e21ef231b0521f993a5063df26ae3e5e5cf4c64bee30d45b
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index fb8623c74ea9..13756e436dc6 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,8 +30,8 @@ RDEPEND="${UIDEPEND}
 	demo? ( games-fps/quake2-demodata )"
 DEPEND="${UIDEPEND}
 	X? ( x11-base/xorg-proto )
-	rogue? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )
-	xatrix? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )"
+	rogue? ( app-arch/sharutils )
+	xatrix? ( app-arch/sharutils )"
 
 S=${WORKDIR}/${MY_P}