Actually block xorg-server, rather than depending on an older version.

(Portage version: 2.1_rc3-r5)

20 files changed, 59 insertions, 39 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 9749f06bab0c..955830e92c10 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.40 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.41 2006/06/03 06:06:54 joshuabaergen Exp $
+
+  03 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.14.13-r3.ebuild,
+  ati-drivers-8.14.13-r4.ebuild, ati-drivers-8.14.13-r5.ebuild,
+  ati-drivers-8.16.20.ebuild, ati-drivers-8.16.20-r1.ebuild,
+  ati-drivers-8.18.6.ebuild, ati-drivers-8.18.6-r1.ebuild,
+  ati-drivers-8.18.8.ebuild, ati-drivers-8.18.8-r1.ebuild,
+  ati-drivers-8.18.8-r2.ebuild, ati-drivers-8.19.10.ebuild,
+  ati-drivers-8.20.8.ebuild, ati-drivers-8.21.7.ebuild,
+  ati-drivers-8.21.7-r1.ebuild, ati-drivers-8.22.5.ebuild,
+  ati-drivers-8.23.7.ebuild, ati-drivers-8.24.8.ebuild,
+  ati-drivers-8.25.18.ebuild:
+  Actually block xorg-server, rather than depending on an older version.
 
   03 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.14.13-r3.ebuild,
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild
index b642782bc784..47c1cfa8047b 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.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-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild,v 1.4 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild,v 1.5 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="-* amd64 x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 >=x11-base/opengl-update-2.1_pre1
 	 || ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild
index 9f25e00c64af..8d238cc72c3e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.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-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild,v 1.5 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild,v 1.6 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl dlloader"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="-* amd64 x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 >=x11-base/opengl-update-2.1_pre1
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r4.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r4.ebuild
index 371d843c4978..6ef460cc13eb 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r4.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-drivers/ati-drivers/ati-drivers-8.14.13-r4.ebuild,v 1.2 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.14.13-r4.ebuild,v 1.3 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl dlloader"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r5.ebuild
index 753f6486d379..0f0dc6c421a1 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r5.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-drivers/ati-drivers/ati-drivers-8.14.13-r5.ebuild,v 1.3 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.14.13-r5.ebuild,v 1.4 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl dlloader"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.16.20-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.16.20-r1.ebuild
index 8804d9004228..2e657e933caf 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.16.20-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.16.20-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-drivers/ati-drivers/ati-drivers-8.16.20-r1.ebuild,v 1.3 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.16.20-r1.ebuild,v 1.4 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="-*" #~amd64 ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.16.20.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.16.20.ebuild
index 0102377cebcd..20bb23b27ce2 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.16.20.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.16.20.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-drivers/ati-drivers/ati-drivers-8.16.20.ebuild,v 1.2 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.16.20.ebuild,v 1.3 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="-*" #~amd64 ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.18.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.18.6-r1.ebuild
index 8bf0667b0269..d47f36a2428d 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.18.6-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.18.6-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-drivers/ati-drivers/ati-drivers-8.18.6-r1.ebuild,v 1.3 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.18.6-r1.ebuild,v 1.4 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.18.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.18.6.ebuild
index d28425ddedc6..75ee6681272c 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.18.6.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.18.6.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-drivers/ati-drivers/ati-drivers-8.18.6.ebuild,v 1.3 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.18.6.ebuild,v 1.4 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.18.8-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.18.8-r1.ebuild
index 8b82c89499c2..257ff0499027 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.18.8-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.18.8-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-drivers/ati-drivers/ati-drivers-8.18.8-r1.ebuild,v 1.3 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.18.8-r1.ebuild,v 1.4 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.18.8-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.18.8-r2.ebuild
index a8c34a61872f..728596d688be 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.18.8-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.18.8-r2.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-drivers/ati-drivers/ati-drivers-8.18.8-r2.ebuild,v 1.4 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.18.8-r2.ebuild,v 1.5 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="amd64"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 >=x11-base/opengl-update-2.1_pre1
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.18.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.18.8.ebuild
index 7bd40c6cc5b7..bab72cdefa23 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.18.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.18.8.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-drivers/ati-drivers/ati-drivers-8.18.8.ebuild,v 1.3 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.18.8.ebuild,v 1.4 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
index d4f164b3396c..30fc4bbc34fe 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.19.10.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-drivers/ati-drivers/ati-drivers-8.19.10.ebuild,v 1.11 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild,v 1.12 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -15,7 +15,7 @@ LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 <x11-base/xorg-x11-7.1_rc0
+	 !>x11-base/xorg-x11-7.1_rc0
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild
index c507818512c5..3164652b64f9 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.20.8.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-drivers/ati-drivers/ati-drivers-8.20.8.ebuild,v 1.8 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.20.8.ebuild,v 1.9 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -14,7 +14,8 @@ SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
 LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="|| ( <x11-base/xorg-server-1.0.99 <=virtual/x11-6.9 )
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild
index e39dc53b6f04..5ba4dd91ee56 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.21.7-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-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild,v 1.4 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild,v 1.5 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -14,7 +14,8 @@ SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
 LICENSE="ATI"
 KEYWORDS="~amd64 x86"
 
-RDEPEND="|| ( <x11-base/xorg-server-1.0.99 <=virtual/x11-6.9 )
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
 	 >=x11-base/opengl-update-2.1_pre1
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild
index bcf370076f12..1d5371f21ba7 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.21.7.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-drivers/ati-drivers/ati-drivers-8.21.7.ebuild,v 1.6 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild,v 1.7 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -14,7 +14,8 @@ SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
 LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="|| ( <x11-base/xorg-server-1.0.99 <=virtual/x11-6.9 )
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild
index fe46d0769bd3..261e72cfd974 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.22.5.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-drivers/ati-drivers/ati-drivers-8.22.5.ebuild,v 1.5 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild,v 1.6 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -14,7 +14,8 @@ SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
 LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="|| ( <x11-base/xorg-server-1.0.99 <=virtual/x11-6.9 )
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild
index fe9ec3ace899..0e0fdde20793 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.23.7.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-drivers/ati-drivers/ati-drivers-8.23.7.ebuild,v 1.7 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild,v 1.8 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -14,7 +14,8 @@ SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
 LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="|| ( <x11-base/xorg-server-1.0.99 <=virtual/x11-6.9 )
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.24.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.24.8.ebuild
index f985f49233d0..b9d99b7f924f 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.24.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.24.8.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-drivers/ati-drivers/ati-drivers-8.24.8.ebuild,v 1.5 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.24.8.ebuild,v 1.6 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -14,7 +14,8 @@ SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-x86.run )
 LICENSE="ATI"
 KEYWORDS="-* ~amd64 ~x86"
 
-RDEPEND="|| ( <x11-base/xorg-server-1.0.99 <=virtual/x11-6.9 )
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild
index 75cbd36a9176..98fbe03d58f4 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.25.18.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-drivers/ati-drivers/ati-drivers-8.25.18.ebuild,v 1.3 2006/06/03 05:29:33 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild,v 1.4 2006/06/03 06:06:54 joshuabaergen Exp $
 
 IUSE="opengl"
 
@@ -14,7 +14,8 @@ SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-x86.run )
 LICENSE="ATI"
 KEYWORDS="-* ~amd64 ~x86"
 
-RDEPEND="|| ( <x11-base/xorg-server-1.0.99 <=virtual/x11-6.9 )
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"