Added blocker on x11-drivers/nvidia-drivers and x11-drivers/nvidia-legacy-drivers since they don't work on 1.1 yet.

Package-Manager: portage-2.1.1_pre2-r2

3 files changed, 27 insertions, 10 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 9a4187fea3aa..56c9653c8fe4 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.140 2006/07/01 16:36:17 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.141 2006/07/06 21:00:42 wolf31o2 Exp $
+
+  06 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xorg-server-1.1.0-r1.ebuild:
+  Added blocker on x11-drivers/nvidia-drivers and
+  x11-drivers/nvidia-legacy-drivers since they don't work on 1.1 yet.
 
   01 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   files/x11r7.0-setuid.diff, files/xorg-server-1.1.0-setuid.diff:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index c9b75cdb431e..cd6754a56fc9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.2-Xprint-xprintdir.patch 563 RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b SHA1 3565e1fc60e062d0e176e69be00afedf4b08bd0a SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1
 MD5 177828cd6b8ab3ce98f95bf2363d2036 files/1.0.2-Xprint-xprintdir.patch 563
 RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b files/1.0.2-Xprint-xprintdir.patch 563
@@ -79,14 +82,14 @@ EBUILD xorg-server-1.0.2-r7.ebuild 6183 RMD160 5d9960af2ca557e578ab99ef42cb57186
 MD5 d219f9a6633b6f76630a87466883aee8 xorg-server-1.0.2-r7.ebuild 6183
 RMD160 5d9960af2ca557e578ab99ef42cb57186e406e07 xorg-server-1.0.2-r7.ebuild 6183
 SHA256 ecc5c1ab8d1ecf0cbaf0239912450cf8bb2b0a741b6fadd92119e2bfce1cfd3a xorg-server-1.0.2-r7.ebuild 6183
-EBUILD xorg-server-1.1.0-r1.ebuild 23910 RMD160 e99791f4276740589d2218bd3b47af7177767015 SHA1 2239525995aa11cdc3225549d2aea895fa8d91c0 SHA256 736982e748a0fe2424aba24225e12ee9354c0d96b653c0a17eb2bf00504b674e
-MD5 8c8cf9b04f44070f8e22008313ffa95f xorg-server-1.1.0-r1.ebuild 23910
-RMD160 e99791f4276740589d2218bd3b47af7177767015 xorg-server-1.1.0-r1.ebuild 23910
-SHA256 736982e748a0fe2424aba24225e12ee9354c0d96b653c0a17eb2bf00504b674e xorg-server-1.1.0-r1.ebuild 23910
-MISC ChangeLog 29727 RMD160 6e3ebb5c3381b953fbea1083f2e3db59ddff257f SHA1 7ef75e2af98c2133b3cf5a7b0f19045f37fe79b3 SHA256 3e7848700abf91e1c37b083ea192779cee2e16f787ed1355fc7b43313eb8e2a5
-MD5 a45475b98133fda6988f3ce7c67c97a6 ChangeLog 29727
-RMD160 6e3ebb5c3381b953fbea1083f2e3db59ddff257f ChangeLog 29727
-SHA256 3e7848700abf91e1c37b083ea192779cee2e16f787ed1355fc7b43313eb8e2a5 ChangeLog 29727
+EBUILD xorg-server-1.1.0-r1.ebuild 23974 RMD160 0116594df6692e06979d9524b3b25c9ae83b7ce6 SHA1 be7df5441001264c30d99bd1375baa92e57ce0fa SHA256 390c8101ed86a9e88531b03575072dc6911d2ccfac8dac17a691f258335dfb4f
+MD5 80f84884c2e659060f04efef93925e70 xorg-server-1.1.0-r1.ebuild 23974
+RMD160 0116594df6692e06979d9524b3b25c9ae83b7ce6 xorg-server-1.1.0-r1.ebuild 23974
+SHA256 390c8101ed86a9e88531b03575072dc6911d2ccfac8dac17a691f258335dfb4f xorg-server-1.1.0-r1.ebuild 23974
+MISC ChangeLog 29928 RMD160 b4d0d895233ed6af7a113018e2384e498e138f81 SHA1 97a3316d55708ad691638e0d6cce66d9664b6824 SHA256 c46400bed25187258573535076ff1191bf5be48619567a69b3a1f0df45c3b276
+MD5 fdafc663f2527d3da93aa43297b13b45 ChangeLog 29928
+RMD160 b4d0d895233ed6af7a113018e2384e498e138f81 ChangeLog 29928
+SHA256 c46400bed25187258573535076ff1191bf5be48619567a69b3a1f0df45c3b276 ChangeLog 29928
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -100,3 +103,10 @@ SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/di
 MD5 0b4a5b66471e1dcc4176e5e3eac4e47f files/digest-xorg-server-1.1.0-r1 500
 RMD160 5b942d1403fee2bf47c380017eed89ad1bf6121c files/digest-xorg-server-1.1.0-r1 500
 SHA256 356da215b18f2bbfa4e1509d15d26e56ba0372f28390d3c1903375f6c2f7abae files/digest-xorg-server-1.1.0-r1 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFErXsWkT4lNIS36YERAn/oAKCr1E4nsf5hanpoBfMlGV2XlzMzvgCgqP7G
++RC6AApwtPSXOuZr4RDabjY=
+=kbg0
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
index 5e43039624ad..a6e36d64b37d 100644
--- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.10 2006/07/01 01:08:57 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.11 2006/07/06 21:00:42 wolf31o2 Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -145,6 +145,8 @@ RDEPEND="x11-libs/libXfont
 	x11-libs/liblbxutil
 	kdrive? ( sdl? ( media-libs/libsdl ) )
 	!media-video/nvidia-glx
+	!x11-drivers/nvidia-drivers
+	!x11-drivers/nvidia-legacy-drivers
 	!x11-drivers/ati-drivers"
 	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
 	# Xaw is dmx- and xorgcfg-dependent