gentoo resync : 08.05.2018

7 files changed, 5 insertions, 32 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index b7a1f3cb8f19..2e43bd319fad 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/quake4-bin/Manifest b/games-fps/quake4-bin/Manifest
index 35d979852cf0..02bd8299ed75 100644
--- a/games-fps/quake4-bin/Manifest
+++ b/games-fps/quake4-bin/Manifest
@@ -1,3 +1,3 @@
 DIST quake4-linux-1.4.2.x86.run 287552973 BLAKE2B 93c507f17c91168108545e581baf3a7ab7e75a8c7b8a89772292191b87a81ccf6fbd331592e3442a1781df5b71f357c00bb955244a609c48c51d3d4b8c815c6c SHA512 a6a390a8f46c7e696fe865d0688c9a95eb0d9e32ad62ecb796dcc03618994ec065e8c74358518221cb6c8771d2414ed7e144c77a1a8ecd4ae9ce6406459c5f36
-EBUILD quake4-bin-1.4.2-r1.ebuild 4014 BLAKE2B ff4585f36cc2c14fa09b35b76f18dbb883342069ca634568a05d36f4e8fa999116c18eb6077ce80331932035d6fd8283679a01faad118b3dffda968ff05b266e SHA512 ebccf6fc69382f4b0d1ec2d039db72a623a25845defd73c272211225f0b64e868664378a001aa96cfaf72508ac6dbe8f0e8af5334b8f7607d989f7fef8bf1a6a
+EBUILD quake4-bin-1.4.2-r2.ebuild 3429 BLAKE2B 148a5141c9424fa9d3f6bdbd20e0782cf985eb8329154e2e5248e5f48065e799130daa59a75417a8a54783d9c5881e8237a6a2f17d5d83baad941d8a161b76d0 SHA512 20c98d4f1cb9226e333ab8d5194b35edef3560aa656eb7d45eac0a7cd6926bfc70877bf01b605f7d5e8e4053f19053d2875d5d362309d9563d4f1cf18af6f837
 MISC metadata.xml 1137 BLAKE2B e7787584e4ccd9af82c56f186188e21df5b5c13783685d3b65227e27ccf32e8a860ec065f7a4edb506e2dca604d88d43f5af0ba0e89ee9accc6233d3bfdd0891 SHA512 1ede51f4fcebc6a451ab4790e5d26fd07f464461d15b31c065eb02a77bdc114ba4ec35fb0ca380d980c416007e4671532b053477709fd7d28210b64423132d31
diff --git a/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild b/games-fps/quake4-bin/quake4-bin-1.4.2-r2.ebuild
index dc0663f1a30f..9fcbebba8bf3 100644
--- a/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
+++ b/games-fps/quake4-bin/quake4-bin-1.4.2-r2.ebuild
@@ -14,20 +14,14 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall dedicated l10n_cs l10n_fr l10n_it l10n_pl l10n_ru"
 RESTRICT="strip"
 
-# QUAKE4 NEEDS s3tc support, which can be obtained for OSS drivers via
-# media-libs/libtxc_dxtn and is built into the proprietary drivers.
-# depend optionally on them but elog too, in case a user has both
-# proprietary and OSS drivers installed and sees the segfault.
-
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
 	sys-libs/zlib[abi_x86_32(-)]
 	dedicated? ( app-misc/screen )
 	!dedicated? (
 		|| (
-			>=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
 			x11-drivers/nvidia-drivers
-			>=x11-drivers/ati-drivers-8.8.25-r1
 		)
 		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
@@ -133,11 +127,6 @@ pkg_postinst() {
 		elog " sed -i 's:spanish:english:' ~/.quake4/q4base/Quake4Config.cfg"
 		elog
 		elog "Saved games from previous Quake 4 versions might not be compatible."
-		elog
-		elog "If you get a segmentation fault or an error regarding"
-		elog "'GL_EXT_texture_compression_s3tc', you can obtain the"
-		elog "necessary support for your mesa drivers by installing"
-		elog "media-libs/libtxc_dxtn (for abi_x86_32 if multilib)."
 		echo
 	fi
 	elog "To start the dedicated server, run:  quake4-ded"
diff --git a/games-fps/quake4-demo/Manifest b/games-fps/quake4-demo/Manifest
index 8846472e4689..e57e9828b5f2 100644
--- a/games-fps/quake4-demo/Manifest
+++ b/games-fps/quake4-demo/Manifest
@@ -1,3 +1,3 @@
 DIST quake4-linux-1.0-demo.x86.run 337276597 BLAKE2B 1fa657287210e717486955c5b6190e52665c2c8eb4faf44b1a4ba851347e934436f1153c9df2c3296e3e981c7cf981dbcf5bdb042b6eab1d36214f6937839161 SHA512 c7fa64ca9f95ab61fd02f2d7d3a85c718a5dea9f60a89ba8b46e7500f090fe45bbe498775e41541e33a0bb3483b75da10529755bef3a97d3e362d1c173a02abe
-EBUILD quake4-demo-1.0-r1.ebuild 2482 BLAKE2B 273f21a1ec2ad111e37a16ac425bf9007ea79718b46a916ad0c7b6aada3321102425584459e5397e7c0d30d89d8dd6a4820cfe2295399cac060c061ddfec8b0d SHA512 e236f932419db3c5ee6b50c6103ee7c8d24cdc31c7dc154740ebd614243e740489bf739c0e2f18ccb0b727368719cf8e7a26878ed17046ad913c47965e5b8462
+EBUILD quake4-demo-1.0-r2.ebuild 1897 BLAKE2B aa7a681e68bcf05f42f660cfff2916c0accb0a91db2b297bd57deba6b4e123d2679a554c14d7b6f8b561ae881dfeb925b9f8717ac7388cbfc4cdb02bc2e9739f SHA512 743e53e31e2c88114e7ee02b5869447e3a0930006b6673f191895e89dec2113c56ef85d7e44ec76cf3b42955055b2449b5194ddc5dda9d897ddf6452ed3d7acb
 MISC metadata.xml 1090 BLAKE2B 0cef05f0bb46b9e1ddc0a2c30a3441d98bba5e5f16563b52eefccf1a7bcb4d4c5f2528413ed2ca4680c8bfe9bcbadf3a76c6f6efe26e84d663cec985e2add058 SHA512 d1e6906e94fb8a42f605310a3a2e18fdc99f7557ac7605116c2fa328838f624ff70d7e7f716b1b841de78a5e35067f2f6866d8f36feaf6fd36f8b4c964bbbc0f
diff --git a/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild b/games-fps/quake4-demo/quake4-demo-1.0-r2.ebuild
index 23bbec74432d..a576d70253bb 100644
--- a/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild
+++ b/games-fps/quake4-demo/quake4-demo-1.0-r2.ebuild
@@ -20,20 +20,14 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="dedicated"
 RESTRICT="strip"
 
-# QUAKE4 NEEDS s3tc support, which can be obtained for OSS drivers via
-# media-libs/libtxc_dxtn and is built into the proprietary drivers.
-# depend optionally on them but elog too, in case a user has both
-# proprietary and OSS drivers installed and sees the segfault.
-
 RDEPEND="sys-libs/glibc
 	sys-libs/libstdc++-v3:5
 	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
 	dedicated? ( app-misc/screen )
 	!dedicated? (
 		|| (
-			>=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)]
+			virtual/opengl[abi_x86_32(-)]
 			x11-drivers/nvidia-drivers
-			>=x11-drivers/ati-drivers-8.8.25-r1
 		)
 		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
@@ -76,11 +70,6 @@ pkg_postinst() {
 		elog "To play the game run:"
 		elog " quake4-demo"
 		echo
-		elog "If you get a segmentation fault or an error regarding"
-		elog "'GL_EXT_texture_compression_s3tc', you can obtain the"
-		elog "necessary support for your mesa drivers by installing"
-		elog "media-libs/libtxc_dxtn (for abi_x86_32 if multilib)."
-		echo
 	fi
 	elog "To start the gameserver, run:"
 	elog " quake4-demo-ded"
diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest
index dd860cbd1bb4..acb14e0c2e47 100644
--- a/games-fps/xonotic/Manifest
+++ b/games-fps/xonotic/Manifest
@@ -1,3 +1,3 @@
 DIST xonotic-0.8.2.zip 991045679 BLAKE2B 3005473da954492bb7387f9e0e13c2415e638877fa8b83e14872f3b04ed0fc21b82e18f51aa6c68e8bf02d09d4a73f290cbcaebdfa8c0a12ceb6582309baee8a SHA512 0787fcf326827ae0292e5917c7ff2c7fd79947209d4b62e7f83b8b828bec15b575da304e0631f9f163c9b0bd93bed13616e142398ff08cbdaaea890a939dfca5
-EBUILD xonotic-0.8.2.ebuild 2517 BLAKE2B 99d32ebedd391d073be82e4fe3677fe87d8108cc05ebf4ab7c6538aa49579cb7b92542d1945374e2c1896f22790fb8c7dacd99acbf9ad9a6238041edc9586afa SHA512 c4a5d77d19c1570e4c6dd84100f2a2878ce09d7a747a5ec0741c3098c1b05307db94e92d918824a2f1a7cd4bceae6250e71020d672b7b1b79894459eaf2a57af
+EBUILD xonotic-0.8.2.ebuild 2385 BLAKE2B 3e720a90506f1a68fbef2741576ce53ef564e2cc7c74258e8b2bd05fd150d04ba5cbebb247d0fd3685743590157090ac8c1ea92edaf9dca9f2aa3bddadbcd43e SHA512 93f0a3183dba3b907e3b156e54dfdb5a66b33948de26eb3c0341cb33b15283ab840edf9b364df0832d39371b5ac564d50f3c47702701bed48adceb2a3e318b4e
 MISC metadata.xml 351 BLAKE2B a5005814468014cf93d7f807b7f1c5d9252aecf20584267cdef61547d109727230f14c3f21297e202c4876e0534fac7d5ab86022c3741d582115c04b1bcf18f9 SHA512 14665ca256c368cbf80a08aaff18c005a25a4197eae82b559e934fbe6a3b17ef6f1fbd323621e38af5725f3e61ff750c72bb8fe650fb76eeed818070d411e3f6
diff --git a/games-fps/xonotic/xonotic-0.8.2.ebuild b/games-fps/xonotic/xonotic-0.8.2.ebuild
index 5041c1379a73..2ad7334b4487 100644
--- a/games-fps/xonotic/xonotic-0.8.2.ebuild
+++ b/games-fps/xonotic/xonotic-0.8.2.ebuild
@@ -111,8 +111,3 @@ src_install() {
 	insinto "/usr/share/${PN}"
 	doins -r key_0.d0pk server data
 }
-
-pkg_postinst() {
-	elog "If you are using opensource drivers you should consider installing: "
-	elog "    media-libs/libtxc_dxtn"
-}