gentoo resync : 21.08.2021

6 files changed, 16 insertions, 14 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index f6788d4cb47b..a0e9b6017d98 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index 14e6fbdc3aef..a4913d69c5b3 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -2,5 +2,5 @@ AUX darkplaces-20140513-gcc-11.patch 1432 BLAKE2B a46d76475e074b8ce7a3ddc9fd813d
 DIST darkplacesengine20140513.zip 28113487 BLAKE2B 9e3ffa759921fd61d1308f7c08cc1253a5a3d32c57e8dd8c2a05771aa0b5019fac7932ad337e4be95545bf093f4a2f20d221328ae0bfa45c2b00a7f5700fc04a SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c
 DIST fuhquake-lits.rar 8388829 BLAKE2B fb9c4db151deb43424de9331641154f412394ae6346864bc62a210c7d8d12c6ed6c8647cb4cd83fa853155c5f562f7e9b8d3c779fe74c1bb3f05bb6f627b1d5e SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925
 DIST id1.pk3 350470 BLAKE2B 76426667de5f42633f608b75286671344d439398aa9b819e9ba3979ca317a93930b1077de7efb4b1bad670a6341c7536d572cfc2590a5812c71dd0c4e8def784 SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331
-EBUILD darkplaces-20140513-r1.ebuild 4525 BLAKE2B 1b99e2227e00a4bd33d3729021b53e7f3dcc8b46ee025d506fa482380baf04ba18cd6acc3fec61b649d116b2fd7b6327edc3095f02ec41627047d8645f736044 SHA512 5b8d482f1ec1f245c437f75607faec812020b5f3380b708d2eca8d5affa4964fe5cc980a3947bcfc36aa2485a7057e9ea3dab42bdeeebd5ca639bfc3238fdb28
+EBUILD darkplaces-20140513-r2.ebuild 4535 BLAKE2B 383c1c9ed2fc440452a6bca5f6227757beaa719eb64c17b6e4570c43d184bbb42c2c854dc80f493d688117fe655ed194f8562ad9fdb940fcc6b08315ecc36c2e SHA512 dcbffed6cbf5d2f0677dfa6163804addf6d36672a7766060ffa223067d19e37f0a6612a30e2b85884e5824fd43ea6c6ed223ec26bc78add0e74068e2cdd01e89
 MISC metadata.xml 567 BLAKE2B 46fb34c2aab597b51dd9e8d5effb76af828734a9a7826c503de0a843d12ddeb275d31d846f419635450a3ce1880eb31a1942e684cdc82d1aad83d1aa1cc97d17 SHA512 719f0053b4390b1dccb63e70bddb518f9aad79c8b240dd37ed16b1680a1053a51e309632893c87c51d6057e2602bc6a3fbe8c7d11330da76d5646b3c8c542bbd
diff --git a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild b/games-fps/darkplaces/darkplaces-20140513-r2.ebuild
index 4ac04b2d8f39..5c2d846cf634 100644
--- a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
+++ b/games-fps/darkplaces/darkplaces-20140513-r2.ebuild
@@ -32,7 +32,7 @@ UIRDEPEND="
 	media-libs/libvorbis
 	virtual/opengl
 	alsa? ( media-libs/alsa-lib )
-	sdl? ( media-libs/libsdl )
+	sdl? ( media-libs/libsdl[joystick] )
 	x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXxf86dga
diff --git a/games-fps/worldofpadman/Manifest b/games-fps/worldofpadman/Manifest
index a1240f9f2fd1..97eb9460b017 100644
--- a/games-fps/worldofpadman/Manifest
+++ b/games-fps/worldofpadman/Manifest
@@ -1,5 +1,5 @@
-AUX worldofpadman-1.6-gentoo.patch 2106 BLAKE2B ae27668e8e3e570b5a5beff3fbaefc4fb44c41d3d0686c90437256df66f994eeb66337ec4444d6190cd5398d8f044067fce6234b952082d2ea44a8195c3ceedb SHA512 9c5a3e85a2e67cfca2e066b9f92103020e005988a000029439f0678249041bc3675718beca0addf1bb360180af72d7e1acfa1136e289784d39abaea44096db2d
+AUX worldofpadman-1.6-gentoo.patch 2030 BLAKE2B e3148abf4c4321312b1e146dfbd62c06949ae69b2b3830d8d9b151b87469640e24e1fb0a8b78c880885bc6aa81bbec1fa29db3dc8fd99fcf822f3d1bf543590f SHA512 fe998704dd7b4a71b6dd74f6d5f920581cfa5deb101bb12dd06b2d3393adf62acc554fc738ec91be244de20d7e816dd6e065cb07b65ae5bbf09c2dcba32e65c8
 DIST wop-1.5-unified.zip 947290087 BLAKE2B 5fb87cde661882fc095376012d9aca134d6399b4cedd4f3c78b739dd19e126360070278045d74c3318306e17490338111b8621e1c543b46e6bbecfbcd3658675 SHA512 fea0207efadf15afab7001227e27126aef4a673bd478dccb513c3011d0811074b2788083862f07e2f02f1a80ccb57a45ff64de8de155d8f8f7f1ab53ecf2402b
 DIST wop-1.5.x-to-1.6-patch-unified.zip 122204892 BLAKE2B a0f9feb04a15ec04dd64dbacdf5a158738d625651b2293bc8b3740067e849f33cdd144bce6afd11914524d89fe4bcfd48dbcbc455e51017b1216439e9bae484a SHA512 a45018bd79e9e23c57bcaf692fa14c323671103558caad6acb794c2990cc5fe9cc8bdbe6a6c8254c4560d81eb59f5e3b9a6800a61b21a15870c4439f7179d936
-EBUILD worldofpadman-1.6-r1.ebuild 2074 BLAKE2B 7b4eb271e0ed208b9bbbb052a7021260940960ee0f20e3e51a116db387b70f463c7a7eada7a40c1c0034aea04ff40ef3d17dd7ee8bdd92bbb7b56b2c3709862c SHA512 637675f347fc2494759bf18eefa3b5250e5abf251bfbc2f6df57320175280e32a74034dc4ebe32bb39b7bf6cd7ed44a39af69dfe87bb0223a36ee919434656d2
+EBUILD worldofpadman-1.6-r2.ebuild 2091 BLAKE2B 0d4630f28bece3e37b0d3b12163a1aff741a06e0ad72a02946b1d3147cfbe72e078923170ccf2d5f2a2a46c8daa15a7d50edab9a98b04c7c2b553773cab6a968 SHA512 d8e53c7317e588e6586d75d04bc4220523200e985ec33604ba2728c22d5bf41b535ac1ed3b7b88c2af256fd6059b53cfc8b923c13eabe6ca78c8a0b2198d59dc
 MISC metadata.xml 421 BLAKE2B 0c13dc1221c5aa3f8ba78de2614ec62e48177ab0433652ec97ce454883b4a12ffe767ef6786f7f0ea5a75a2a67e868a01e771d7eb575c7ab8eeb4689ad5a8cdf SHA512 2716235255bd6e00d84c6f11f784850959fd50a6542fd98d9c7815d0c7a6f5a201807b02f1cd7d1ace59f1f19f40cb97aa01b9d649bb198678ac60f84d81eb1e
diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
index d55e43ffcf52..a8b46098eb76 100644
--- a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
+++ b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
@@ -1,5 +1,5 @@
---- a/Makefile.old	2012-04-26 21:40:25.277417417 +0200
-+++ b/Makefile	2012-04-26 21:43:34.300835150 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -344,11 +344,11 @@
    endif
    
diff --git a/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild b/games-fps/worldofpadman/worldofpadman-1.6-r2.ebuild
index 523ca7b597b2..a958dfcfe874 100644
--- a/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild
+++ b/games-fps/worldofpadman/worldofpadman-1.6-r2.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop
 
 DESCRIPTION="A cartoon style multiplayer first-person shooter"
 HOMEPAGE="https://worldofpadman.net/"
 SRC_URI="mirror://sourceforge/${PN}/wop-1.5-unified.zip
 	mirror://sourceforge/${PN}/wop-1.5.x-to-1.6-patch-unified.zip"
+S="${WORKDIR}/${P}_svn2178-src"
 
 LICENSE="GPL-2 worldofpadman"
 SLOT="0"
@@ -19,7 +21,7 @@ RDEPEND="sys-libs/zlib
 		>=media-libs/speex-1.2.0
 		media-libs/speexdsp
 		virtual/jpeg:0
-		media-libs/libsdl[opengl,video,X]
+		media-libs/libsdl[joystick,opengl,video,X]
 		virtual/opengl
 		virtual/glu
 		openal? ( media-libs/openal )
@@ -31,11 +33,8 @@ RDEPEND="sys-libs/zlib
 		)
 	)
 "
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/${P}_svn2178-src"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
 	unpack ${A}
@@ -79,11 +78,13 @@ src_compile() {
 
 src_install() {
 	newbin build/release-*/wopded.* ${PN}-ded
+
 	if ! use dedicated ; then
 		newbin build/release-*/wop.* ${PN}
 		newicon misc/quake3.png ${PN}.png
 		make_desktop_entry ${PN} "World of Padman"
 	fi
+
 	insinto /usr/share/${PN}
 	doins -r ../wop
 
@@ -92,5 +93,6 @@ src_install() {
 		voip-readme.txt \
 		../XTRAS/changelog.txt \
 		../XTRAS/sounds_readme.txt
+
 	HTML_DOCS="../XTRAS/readme ../XTRAS/readme.html" einstalldocs
 }