gentoo resync : 04.08.2018

3 files changed, 42 insertions, 18 deletions

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index ea0bfa2f217c..f2dd5ac2c563 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.10.tar.xz 1792748 BLAKE2B 853d6db1eec46ce40952fd413a259653275081599a940941fc883921b310f436be62b80a1d911a0d8f95a33e540e60bd6db2377370cc443cbaa9c3eec6ae055f SHA512 46247c3e2c8e6dcb056dfc7785dd63bf4f896719894a1c5467f2eb313cc3d8a892fda9bafc2ca760a9ac96f6b8e23485a8740b03e118cf9a524f68657183fbb9
 DIST quake2-7.20.tar.xz 1852212 BLAKE2B 87a19be70680866b8b697ea4632239d33fe196dc648553d4a113025d9dc7996a27db2ec0178b28c04ad77854400d9f159bd800681a2bdf5a0121ef764e163ecb SHA512 466c21777e07da6aaec29cf9d3c9246a23d2157398a7e5ff1ad006f0fa7fd89e379b109936780361f03722f896ac34a188d12fc0a51cb543079e07aa6c9240df
+DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
 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.10.ebuild 3007 BLAKE2B 5084aa0d925ad93d3f8e27b27b8548625469ba3dfc611583657150c04541b50d3cc71a2b8f2c7ad6816771ddf0a8ada67285e17d030263178a6216db930b79ef SHA512 ecf02bc816b1913d75a4c8b8c8cd01c042f762c825252d4f797cbbe71152db376524f50a0611844cacee7b10dcc385119b5c31960f39008ec77b1997bf35fb27
 EBUILD yamagi-quake2-7.20.ebuild 3403 BLAKE2B b62a57e2a7c11093718dee95ec19bf9a386bd6555ac1c1f960b1088157ecba2f58ba8a79ac97220b2d6cfb0dc5ddbca896f2909199f99f64ee7216bb189ce37e SHA512 7047e2a0c6232396d03a6d7ab538885a0b01b89d653e0072874ac02c4d48ecd2c55a6065e05b2647379f723ca1bf64237dc74a898f6b0a1c2aff9a36135dcb3b
-MISC metadata.xml 731 BLAKE2B 42af3854a50b6c7ef6a715af0a6d20c574a9e8ac8011f3ad3cc0d28af9834a32df3ba8b1e546b7017e634e323a4823610d6ffec111b29f4341b2a4f7bb4e7f96 SHA512 faa5df8f6af6efa7e90e17909ae8659d9b9273ad7ff6684845fde8849ad4eee4a933cd04dfd2b5578d661277da331a58076d87a8a4dde45b8f4afa7e408e4095
+EBUILD yamagi-quake2-7.21-r1.ebuild 3617 BLAKE2B 548a194cc4272205742910b1d8c12c556662ff8f8518fa845c820ca7eef0fa11a1da749d88c22890b8e3f87a0d3bf7796677f080d3b1c313ff1107a5d254a87a SHA512 54537512dde14d87ccc79eeee5663ecd61ce0652e69f180331277c45b46a8f9ee8b6367d3baa1863ebc57d6af179d503f75ae8b0d97b895da570b3535f46ae99
+MISC metadata.xml 788 BLAKE2B 4cde6f9131f2ab9cf23094ef634b7c77608c34f783a54779ae4dff32724d4bd7982b8ca3edb1148819b8b193f319bbe0a75eda3dfdcd83680c6a3c164ce7eea7 SHA512 8dc5c8a0163f78c49aa9eec53740405aeffd1fff2ee5301a4300002f986484563169345a8a4dd255c7efac497aed5375f23878c9d86a380a931c88b80ab806ec
diff --git a/games-fps/yamagi-quake2/metadata.xml b/games-fps/yamagi-quake2/metadata.xml
index c573477de061..d965a72ff594 100644
--- a/games-fps/yamagi-quake2/metadata.xml
+++ b/games-fps/yamagi-quake2/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="client">Build client</flag>
 		<flag name="ctf">Build support for the 'Capture The Flag' addon</flag>
 		<flag name="rogue">Build support for the 'Ground Zero' Mission Pack</flag>
+		<flag name="softrender">Build software renderer</flag>
 		<flag name="xatrix">Build support for the 'The Reckoning' Mission Pack</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild
index 09f38aad41cf..843343c0acaf 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild
@@ -19,19 +19,22 @@ 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 ogg openal +opengl rogue softrender xatrix"
+REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
 
 RDEPEND="sys-libs/zlib:0=
 	client? (
-		media-libs/libsdl2[opengl,video]
-		virtual/opengl
+		media-libs/libsdl2[video]
 		ogg? (
 			media-libs/libogg
 			media-libs/libvorbis
 		)
 		openal? ( media-libs/openal )
 		!openal? ( media-libs/libsdl2[sound] )
+		opengl? (
+			media-libs/libsdl2[opengl]
+			virtual/opengl
+		)
 	)
 "
 
@@ -39,7 +42,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/quake2-${PV}"
 
-PATCHES=( "${FILESDIR}"/${PN}-respect-flags.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-flags.patch
+	"${FILESDIR}"/${PN}-zlib.patch
+)
 DOCS=( CHANGELOG CONTRIBUTE README.md )
 
 mymake() {
@@ -70,7 +76,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
@@ -113,15 +123,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
@@ -130,3 +142,14 @@ src_install() {
 		dodoc stuff/cdripper.sh
 	fi
 }
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you must at least install:"
+		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
+		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
+		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}