gentoo resync : 21.09.2018

5 files changed, 33 insertions, 30 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 23a62945ea62..81fe03137040 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 5b8252e377dc..7a892047fcce 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -8,6 +8,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_20180809-6969.tar.xz 14708992 BLAKE2B 64a7f8ef6c6772634ed376d59322d75da6eb3e4993a2123c86280ed95ffd562e452cad88b50833b0b77753c365b9d366f4bb392b947ac45819a10908cc505d2f SHA512 5c1d6e151fbd8bdbeed3ed94073e4a53170a79036b86e4303663b842f2fd2ddc2ee45e0685887c56a0321638b69d9a40b880f5a33e69115ed7f9fa89a18bc321
-EBUILD eduke32-20180809.6969.ebuild 6076 BLAKE2B e3e92d3a8fbca3591855495294ec06bedd7b545f8d618f3730e9544df02a7559229291915db32ed0ae236fdcd0c9eb058c3ee2ec6345daabfe7c469e20ab88e2 SHA512 ab65151e77139a4805a6a2292540e6c30c8eec695195bc28d2ff294ddac29fbbac42eacc00a35e61e4270aa25dbfe483b2c0448cb265421e1d5b1439d2c5e2d5
+DIST eduke32_src_20180906-6978.tar.xz 14706836 BLAKE2B ed7b3718d73fe633ada5312ffc21feec00bcbcc07844038976efc16c8c91f8d7f3de4f0887a8a5914b33d118bd34b87ccbfce424b3d0803fa89db63fb0bd377b SHA512 6637966c8ace0fe197805a472b46b485dbc759ad7505964a32338c50b806cf269815e773e965cd5c3ddf11b02f3aa2c4e2b27bdb9dda4c909fcd8ac1bef22115
+EBUILD eduke32-20180906.6978.ebuild 6078 BLAKE2B ffdd69b00e482624e930d11d9dd040d5c77d185258ef930c86baa66a1960b84d8f9806ce0db4632531388932f82046f6065b786b99386164bde036464fc9aa67 SHA512 46b0c0353bf81b0d66e3edff1a8905b5d0a6779de9fe29cc1308c76cbc537474d1656d1398ff5fa4b868661273ddbc88e416ca1bc36b6b3f578f46a57293c7d4
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20180809.6969.ebuild b/games-fps/eduke32/eduke32-20180906.6978.ebuild
index c42e95c4417b..0d1b2e7c24aa 100644
--- a/games-fps/eduke32/eduke32-20180809.6969.ebuild
+++ b/games-fps/eduke32/eduke32-20180906.6978.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
 inherit desktop eapi7-ver gnome2-utils toolchain-funcs
 
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index f2dd5ac2c563..9902cb40968b 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,11 +1,11 @@
 AUX yamagi-quake2-addon-respect-flags.patch 823 BLAKE2B 348115f8a35d61e9dc4a1121bb98cfe1c2d6925fc7fc3bb7965d1f10d8bc4958f222982892216ee312ec245c3e505c9e9b8c20c65539f24145af4355959a4542 SHA512 c570ea602d3d5fedc6defae5c6b8d99f079ea5562b9c864f896a97c01ca504dbbb669e9a43eb5757abca884ad39c7a2f685c3fb915d32bd8dd5ff22f6934a4fd
 AUX yamagi-quake2-respect-flags.patch 1209 BLAKE2B 757b7f1757a752871525ed397f53db8992292dde7a68fb22030ded806e64f4853ac1c2e75304afb2f88f1f2d36edc99758dee4fa6cbfe353fa5004aabb65b982 SHA512 abaa7041640556d1b7272fec820a987e02b4a7d466765a637ddc0ce39c38eafe95e46f91e5bdcf74030df2dff7674e96c8a49ca48b99400f74b85551e0d9a5c3
 AUX yamagi-quake2-zlib.patch 592 BLAKE2B 836093baf5f0a7554d07e8305dfb9fe83ece7069562d7c0d7941c241ba8442d02819234e5a4f89031e9d9b82ad5bdb85cdfd507bab5f3f1f9a53cec9ed948527 SHA512 cc0e0ee7807a4aa0edc540ccde8ee37f4550a34ee24efadb876d0defc08fb06d4d3be7c94e5ebf45247798b4d7d3b98184b0c93a6511fc7369f8ae1c5b4aa2d1
-DIST quake2-7.20.tar.xz 1852212 BLAKE2B 87a19be70680866b8b697ea4632239d33fe196dc648553d4a113025d9dc7996a27db2ec0178b28c04ad77854400d9f159bd800681a2bdf5a0121ef764e163ecb SHA512 466c21777e07da6aaec29cf9d3c9246a23d2157398a7e5ff1ad006f0fa7fd89e379b109936780361f03722f896ac34a188d12fc0a51cb543079e07aa6c9240df
 DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
+DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
 DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
 DIST quake2-rogue-2.04.tar.xz 240436 BLAKE2B e7c3660378fe40b3f514b6e1de8714e3d3550baa244897b98bb81f362fa2b0aa57e3abceb5a38ea77cfec7621e2fcfab342a45bf9b66ccd0e44cc70292888fc2 SHA512 546deb74175c60ed7e5600a3d4b1c983fc0b1fae5922ebdb8fc3cdc5584931a0a5e34914ec2cd4ef9815323ba82cb56d427986d5c91dc040d6b68baff68ca5a8
 DIST quake2-xatrix-2.05.tar.xz 189888 BLAKE2B 9d884af6033d529ce8cca7a70a36608e45db47dab74ab0d88c04f4d928425cf22901b1299a69330bfa83810034c9f1eff2d9618b222db68564d81d569f0596cd SHA512 f7e14bb870eaf4515405f5f1162057669351a334993410101973b75e52d6d576c35c91112911f961ad122ebe664b294649e94e88a2f62b79f51e28d02f50487a
-EBUILD yamagi-quake2-7.20.ebuild 3403 BLAKE2B b62a57e2a7c11093718dee95ec19bf9a386bd6555ac1c1f960b1088157ecba2f58ba8a79ac97220b2d6cfb0dc5ddbca896f2909199f99f64ee7216bb189ce37e SHA512 7047e2a0c6232396d03a6d7ab538885a0b01b89d653e0072874ac02c4d48ecd2c55a6065e05b2647379f723ca1bf64237dc74a898f6b0a1c2aff9a36135dcb3b
 EBUILD yamagi-quake2-7.21-r1.ebuild 3617 BLAKE2B 548a194cc4272205742910b1d8c12c556662ff8f8518fa845c820ca7eef0fa11a1da749d88c22890b8e3f87a0d3bf7796677f080d3b1c313ff1107a5d254a87a SHA512 54537512dde14d87ccc79eeee5663ecd61ce0652e69f180331277c45b46a8f9ee8b6367d3baa1863ebc57d6af179d503f75ae8b0d97b895da570b3535f46ae99
+EBUILD yamagi-quake2-7.30.ebuild 3511 BLAKE2B 60ab56562da9039fa4c025123a0e4e0a4967d7b10f3bcfd8264ab8d0f333c7591c87c144112ab8f7a641f657ea467a6991cb99945d9c9ba42834de4c0c49284d SHA512 e5e715a5dcfbdac444a483586598ddcc2e5591113a9e3d2518733839b5cc35cb33f2b239b0c341af7fecd36e52e26428541c7a0669a94d0c17ebcf8cb052d0f5
 MISC metadata.xml 788 BLAKE2B 4cde6f9131f2ab9cf23094ef634b7c77608c34f783a54779ae4dff32724d4bd7982b8ca3edb1148819b8b193f319bbe0a75eda3dfdcd83680c6a3c164ce7eea7 SHA512 8dc5c8a0163f78c49aa9eec53740405aeffd1fff2ee5301a4300002f986484563169345a8a4dd255c7efac497aed5375f23878c9d86a380a931c88b80ab806ec
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild
index 779346e191f7..f8c0f14af230 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild
@@ -19,41 +19,38 @@ SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated ogg openal rogue xatrix"
-REQUIRED_USE="|| ( client dedicated )"
+IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
+REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
 
-RDEPEND="sys-libs/zlib:0=
+COMMON_DEPEND="
 	client? (
-		media-libs/libsdl2[opengl,video]
-		virtual/opengl
-		ogg? (
-			media-libs/libogg
-			media-libs/libvorbis
-		)
+		media-libs/libsdl2[video]
 		openal? ( media-libs/openal )
 		!openal? ( media-libs/libsdl2[sound] )
+		opengl? (
+			media-libs/libsdl2[opengl]
+			virtual/opengl
+		)
 	)
 "
+RDEPEND="${COMMON_DEPEND}
+	client? ( openal? ( media-libs/openal ) )
+"
 
-DEPEND="${RDEPEND}"
+DEPEND="${COMMON_DEPEND}"
 
 S="${WORKDIR}/quake2-${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-respect-flags.patch
-	"${FILESDIR}"/${PN}-zlib.patch
 )
 DOCS=( CHANGELOG CONTRIBUTE README.md )
 
 mymake() {
 	emake \
 		VERBOSE=1 \
-		DLOPEN_OPENAL=no \
-		WITH_CDA=no \
 		WITH_SYSTEMWIDE=yes \
 		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_ZIP=yes \
-		WITH_OGG=$(usex ogg) \
 		WITH_OPENAL=$(usex openal) \
 		"$@"
 }
@@ -73,7 +70,11 @@ src_prepare() {
 
 src_compile() {
 	local targets=( game )
-	use client && targets+=( client ref_gl1 ref_gl3 )
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
 	use dedicated && targets+=( server )
 
 	mymake config
@@ -116,15 +117,17 @@ src_install() {
 		insinto /usr/lib/yamagi-quake2/${addon}
 		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
 
-		local addon_name
-		case ${addon} in
-			ctf)    addon_name="CTF" ;;
-			rogue)  addon_name="Ground Zero" ;;
-			xatrix) addon_name="The Reckoning" ;;
-		esac
-
-		make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-		make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
 	done
 
 	einstalldocs