Raise x11-base/xorg-server compatibility (bug #539378 by bwcknr).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 28 insertions, 23 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index a7e9844f94ee..8d0795d9195b 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.607 2015/02/06 11:22:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.608 2015/02/09 07:35:58 jer Exp $
+
+  09 Feb 2015; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-304.125.ebuild,
+  nvidia-drivers-331.113.ebuild, nvidia-drivers-340.76.ebuild,
+  nvidia-drivers-343.36.ebuild, nvidia-drivers-346.35.ebuild:
+  Raise x11-base/xorg-server compatibility (bug #539378 by bwcknr).
 
   06 Feb 2015; Jeroen Roovers <jer@gentoo.org> -nvidia-drivers-340.65.ebuild,
   nvidia-drivers-340.76.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 14c709f07056..b8bb646de6e9 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -46,19 +46,19 @@ DIST NVIDIA-Linux-x86_64-343.36.run 73775989 SHA256 2285efa2c0e6675d8724e47a0940
 DIST NVIDIA-Linux-x86_64-346.35.run 73462796 SHA256 8625acbbc7a2abdda436a5cb9d06f2a7f5913b16e0a35ac4f9f106853a94d086 SHA512 dab2ce5a722a93e83822cb83db6d3ef612274a6e3236b0ff34f081630cc00f76be5a0a1637b85dda2ca289336e44b6586afc82a228cb5de8ca1105d6bd4f4750 WHIRLPOOL f5255f714ff9f14edb26246826c810de05de1d6bcaeaf30f52294313aa1f68fbd432ddbddf576757cee711e19e4b7d2f14fb30f8975c9e2686395fb31998f413
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 EBUILD nvidia-drivers-173.14.39.ebuild 16632 SHA256 816e5f5c38044481c7e0492b77ad15c7dd0e55aef64029af11ef18dbcab12ee2 SHA512 c568bfc2d749eedd2395d11cc47dce72aa1779a7b7af3e85814a63e1f647f5f43f6f26a4d5bd28ba0a4a5bf6f467eca72d93f66f4e60f1d17649e1740af171e5 WHIRLPOOL e871f44354d095f01b500ed9ed51b27d1d912bdf2c46219f931b85c0d560d997648dc24550012f07c47278802d0afc0cabe0f5c94b1197071026815c1c81d913
-EBUILD nvidia-drivers-304.125.ebuild 12588 SHA256 13484db725390aa6699d3e15171096e96db758eb4d0ef367908cb343f56e30e7 SHA512 bcfda9a5fa72b731c0333c853895de9f38f7b54757a40de30c41f70b9a05c96cb2c6b3f94618d900a88925fac14ae597b5859ef16b4dfbc104c0f9d31b1ce0ce WHIRLPOOL f481973a500372b96fb2c74d5e85f5964f1fbf09eda6ae09f4b198760d489b1dc0101e68e5803d4e18ad5d55a85d73044eac489dc4359f20860431283a7d6acd
-EBUILD nvidia-drivers-331.113.ebuild 13178 SHA256 7fbf58ab9807fa32f51146a55fe7797c6b436cb213c0a8569e9d41f648794fd6 SHA512 a621b36b369c5f0892b619830d80b37dfc37022e7c1eeacbcb5a0688642a706e60f222eb06543810c9f4ee33f0bea4554c0007dfa28e5191afe1169b137f8699 WHIRLPOOL 94a1d982d95fcb29a96b79e9286adf9811153d85739f4234df63b485adf95004bb492982882ad27ee9de120924d2c859a0b20dee7ddec0bfdf2be24ff6d5712c
-EBUILD nvidia-drivers-340.76.ebuild 13647 SHA256 feda9dbf6f872dfaf37ea2afec873569165a18b48a34963b814bd8d7fd1e0f0b SHA512 6a4571178ccf345095ecc451fc7d1564fd6f71b1316d42d981d6c68d630631cc5189fa424d14aef30ef319bf276fbfa1a215b1bad4f188c8368cf776c6c29fed WHIRLPOOL 7086458dc4ba19e9cd168393ee498c213132d0d91d634870487762038ab8530f2df0997e967e009999fff6265f106b768525a79054a6e11cb1c38734afbcd96e
-EBUILD nvidia-drivers-343.36.ebuild 13647 SHA256 b72012084b2e6c0253bddab27b701ace083ca736b364722a588e3e8528ebea95 SHA512 97a07c2baa233353f9eb44d3d170b4107893dc3b0504f351c8a096edd982b40bb1afc8a9570acfb2ae063b99d7c513e5ab7cecee7bbf9822569f366bae406b69 WHIRLPOOL ed7bb1de3cb537ff810ec78976f74c4d793e534ad92dd530ab16c6803d701b604397d85f355519a95137a5bd06d5ac1f10435606fb71e7e47a93dbbf1eee3b69
-EBUILD nvidia-drivers-346.35.ebuild 13960 SHA256 44a71d762774986383d329d9ab67327318da5bbe8ded526cf496cb284a68328e SHA512 86d200860c8d3ca9d2f5ece77d744d22524d326cf8a33ac992c1db056b3b3e08c366c07ce92fa5e079957654cb3814efb5143f81b6e791ba845d5986874863a4 WHIRLPOOL d17b168953a61273d498d239e79ed50ff657a15d39f05493a4eb5e99b1055beff9d4c540566de40345fc048569672fe1e8f939d9f67c975edc69f01304dca7cb
+EBUILD nvidia-drivers-304.125.ebuild 12588 SHA256 da6cb54de465424062184aa98c9048f2211d474e97259555b96b3199df26c786 SHA512 ac25a105f1127cddf444f2d4c72b8c8f1414d14d3d973d69b3375942ab905b173378007c5cee751f32095da8e7fe8ae2055f8d1f2fa59329d69808a5daa24060 WHIRLPOOL 7a01b9c4e1bb1f827f8eb7006c6616dcbbc96e18e85cfa59492890b12f31e56b9e481f67a3d2344b5cf2a6e6599847706892cf97da2bca4ca0790439b7c1b10b
+EBUILD nvidia-drivers-331.113.ebuild 13178 SHA256 1610b0ba59132c8813935f63da4741b527f31cdc306fd14d7d56c4aa25e34670 SHA512 efb19805b682e65ac6464fbc81f4630b634134523dcf20898ab01dacb157582ccb7ff65de9efc33bf916d74e0f2886aa9657a74437a700098d728dafc9fb0315 WHIRLPOOL d071df2525039819cd029b0c497f6c29d812339c0a144c51575ebf8bcb73c84cfda7b57b21587e537c92f979f9267aeca31887e33ddc74dbb3e45e8d06814f08
+EBUILD nvidia-drivers-340.76.ebuild 13647 SHA256 0eac9536ebc483085b9c1b4e665fdb5f24c9e65f295eac855cf1f9e525e60ba3 SHA512 ba503b1523035a6e6bf2305f28018c691e43b917855422aa8e83745ac5c4af3f69fc5124d16ffc033b804d89fd569122656dcc254b138e4cd791e5da0c82ff7e WHIRLPOOL ef3562e68ec7114dfb22b8ecb61ce7cad9c5941ef474163c130d1de975c4c2c6e7535a8d4ae83c74ac81f5bf1af6dee3b434ae0e18acf5fd45ed8f19cda8c4ce
+EBUILD nvidia-drivers-343.36.ebuild 13647 SHA256 f22ce9cd8d93d259e5860296b8e0e70bf6d9a06e58a79897208379fc0396ae17 SHA512 f739f65afba9a67e3914b50cf5ca1a8c1bec99d6ce7f94ab81d8ba4f703cd5bd4cf99a480f8b70d4a8152a06141d5c2eaa2642820d0b0845cda1210d9161d81e WHIRLPOOL 33d875b678077b9f301a34297099664d6dc7e13bb34a3cd92ea15dd03a8cfda70be20abb4727d855e93a87321c967ee760c71f3e868a69d82d1da8e8ff83c462
+EBUILD nvidia-drivers-346.35.ebuild 13960 SHA256 416ebb115c9b56c5b52cbbf4de7ea36306517cb04299c1f399975dd6c7d493b7 SHA512 16d1851e07fc2342921e28e5770b23b51cae38a97849727881af94007795d01115fbf6c64f7cf65e378fb73ee757a9efcfc5d6a9538cad2683f5696fb8130634 WHIRLPOOL 2559c0fe04697d56925e76cccdae51cec14e1d191fef236c7b2c5cc23b5b5d6bbf38b0ae2d076baec7efc8040f990148c7fdc1ad863cd85ccf06cb13844ab538
 EBUILD nvidia-drivers-96.43.23.ebuild 14868 SHA256 ba078fff7872b5534d4624ed05eae459f8b6e4d6600d86853135795c10e5f301 SHA512 1b6d419371640940f7fd3d36936ecaa886a5100f5511ad3d239d470c69c1308125581f85d88c45e7df230dce61330dcf06ebfdeedd704e5ed2ccfcc1caf9d5ca WHIRLPOOL cd0d3b0991317ecd849874cc505a3ba837189c9a145be35c5b9b6b7e9c45f57f5de8cc91869575388c10b617f2bbdfa47661b5c18f17fb8ba49d13911e22d056
-MISC ChangeLog 17319 SHA256 026aef3333a192ff225ccad20993b3646fc4a59f77903c0a8746947d668585f2 SHA512 20b968a42506a803335071db501a2547b07c4e1b8bcd488315284ee3fa5e3d5534316f5a9a81e88acd1ce354597a71f72fab9634070bdea2c4c874dc4183399d WHIRLPOOL 3147ea05c1e29958db0e40e17cd923fadc17f049eecd621ff41a247bc7f9ff32720cc10bba80d73f0878c51926f5b46e14bfc5714ce78636bed727501eff05cd
+MISC ChangeLog 17591 SHA256 233ab0f7bbe7da31206dace7f145718a5b627572abfca92b85f598995e3dfa85 SHA512 6bd9d452efda079901f1caf24d076b38da10fe95555405f1776953f826454529bda0e9954bc4ce182c391b4069e10533576241dec33955174d13896b2f03399b WHIRLPOOL ff786188e96fb7619eb4d87fd89927ca5d21c0798c58181ef48c5a88249e54cf43fb5e1aa5852c5cd3ed0ec6aef59ea8c30e69135ecec7f009926f70eee421b2
 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba
 MISC metadata.xml 739 SHA256 f455845cee6b0247e229d7635f300565411d8e5f7462c8833a4ecad2a4ddf343 SHA512 f1a87a421415e988f96a597247eefd24285bb9709b81ff446e2056bf9ea99c170216c92b43605cdd0e238697989031bc72f8aa104231b1e36fc2338677312bda WHIRLPOOL 95199a2e4e10954ce93daddb0802e608fb4425ae73e57cea61882960ec4916b556b7ef7a87b315a2c6687e98c603e049003948f7388a9a8f8cf8714a16ba6734
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTUo/YACgkQVWmRsqeSphOFYgCfeuW4qmYNxz5++gwdUWcZuRng
-Z3oAnjqPh4gPdDfCabfAZXhdy/YQ6C8l
-=K0ho
+iEYEAREIAAYFAlTYY2EACgkQVWmRsqeSphMxdACeOpxaxa4N+W6O9FlJB9x7d1vL
+uiEAn092lIEDRc4QktnlMZ8Rl/XmDssY
+=VDTP
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
index 764b5dd7a62c..bc13b283b33b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild,v 1.3 2014/12/12 09:45:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild,v 1.4 2015/02/09 07:35:58 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
@@ -51,7 +51,7 @@ RDEPEND="${COMMON}
 		x11-libs/pangox-compat
 	)
 	X? (
-		<x11-base/xorg-server-1.16.99:=
+		<x11-base/xorg-server-1.17.99:=
 		x11-libs/libXvMC
 		multilib? (
 			|| (
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
index 0884291530fd..31ab2e868261 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild,v 1.2 2014/12/12 09:45:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild,v 1.3 2015/02/09 07:35:58 jer Exp $
 
 EAPI=5
 
@@ -54,7 +54,7 @@ RDEPEND="
 		x11-libs/pango[X]
 	)
 	X? (
-		<x11-base/xorg-server-1.16.99:=
+		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
 			|| (
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
index 17a0058249ca..fa7e784f3be3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild,v 1.2 2015/02/06 11:22:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild,v 1.3 2015/02/09 07:35:58 jer Exp $
 
 EAPI=5
 
@@ -54,7 +54,7 @@ RDEPEND="
 		x11-libs/pango[X]
 	)
 	X? (
-		<x11-base/xorg-server-1.16.99:=
+		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
 			|| (
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
index d2ad40a571a8..d49c336482a8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild,v 1.2 2014/12/12 09:45:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild,v 1.3 2015/02/09 07:35:58 jer Exp $
 
 EAPI=5
 
@@ -54,7 +54,7 @@ RDEPEND="
 		x11-libs/pango[X]
 	)
 	X? (
-		<x11-base/xorg-server-1.16.99:=
+		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
 			|| (
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild
index b1fb36fdd402..79bb00ae166f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild,v 1.3 2015/01/31 11:32:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild,v 1.4 2015/02/09 07:35:58 jer Exp $
 
 EAPI=5
 
@@ -59,7 +59,7 @@ RDEPEND="
 		x11-libs/pango[X]
 	)
 	X? (
-		<x11-base/xorg-server-1.16.99:=
+		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
 			|| (