Drop virtual/x11 references.

(Portage version: 2.1.3_rc8)

10 files changed, 67 insertions, 176 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 49d8a3c815a0..acd95f88acc1 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.80 2007/07/02 14:50:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.81 2007/07/22 02:31:53 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  ati-drivers-8.27.10-r1.ebuild, ati-drivers-8.28.8.ebuild,
+  ati-drivers-8.28.8-r1.ebuild, ati-drivers-8.29.6.ebuild,
+  ati-drivers-8.30.3.ebuild, ati-drivers-8.30.3-r1.ebuild,
+  ati-drivers-8.32.5.ebuild, ati-drivers-8.33.6.ebuild,
+  ati-drivers-8.33.6-r1.ebuild:
+  Drop virtual/x11 references.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   ati-drivers-8.27.10-r1.ebuild, ati-drivers-8.28.8.ebuild,
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
index 03d146341d45..cfa8d54649a1 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.27.10-r1.ebuild,v 1.8 2007/07/15 05:56:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.27.10-r1.ebuild,v 1.9 2007/07/22 02:31:53 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -15,11 +15,11 @@ SRC_URI="x86?	( ${ATI_URL}/ati-driver-installer-${PV}-x86.run )
 LICENSE="ATI"
 KEYWORDS="-* amd64 x86"
 
-RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+RDEPEND="x11-base/xorg-server
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
 	 acpi? (
-	 	|| ( x11-apps/xauth virtual/x11 )
+	 	x11-apps/xauth
 	 	sys-power/acpid
 	 )"
 
@@ -115,22 +115,9 @@ pkg_setup(){
 	fi
 
 	# Set up X11 implementation
-	if has_version "x11-base/xorg-server"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	elif has_version "<x11-base/xorg-x11-6.8.99"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	else
-		X11_IMPLEM_P="$(best_version virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	fi
+	X11_IMPLEM=xorg-x11
+	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
 	einfo "X11 implementation is ${X11_IMPLEM}."
 	choose_driver_paths
 }
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild
index 294e329a2413..18e1014da573 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.28.8-r1.ebuild,v 1.5 2007/07/15 05:56:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.28.8-r1.ebuild,v 1.6 2007/07/22 02:31:53 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -14,11 +14,11 @@ SRC_URI="${ATI_URL}/ati-driver-installer-${PV}.run"
 LICENSE="ATI"
 KEYWORDS="~amd64 x86"
 
-RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+RDEPEND="x11-base/xorg-server
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
 	 acpi? (
-	 	|| ( x11-apps/xauth virtual/x11 )
+	 	x11-apps/xauth
 	 	sys-power/acpid
 	 )"
 
@@ -116,22 +116,9 @@ pkg_setup(){
 	fi
 
 	# Set up X11 implementation
-	if has_version "x11-base/xorg-server"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	elif has_version "<x11-base/xorg-x11-6.8.99"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	else
-		X11_IMPLEM_P="$(best_version virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	fi
+	X11_IMPLEM=xorg-x11
+	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
 	einfo "X11 implementation is ${X11_IMPLEM}."
 	choose_driver_paths
 }
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
index 105448e78184..eca7bf8eca69 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.28.8.ebuild,v 1.6 2007/07/15 05:56:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.28.8.ebuild,v 1.7 2007/07/22 02:31:53 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -14,11 +14,11 @@ SRC_URI="${ATI_URL}/ati-driver-installer-${PV}.run"
 LICENSE="ATI"
 KEYWORDS="-* ~amd64 ~x86"
 
-RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+RDEPEND="x11-base/xorg-server
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
 	 acpi? (
-	 	|| ( x11-apps/xauth virtual/x11 )
+	 	x11-apps/xauth
 	 	sys-power/acpid
 	 )"
 
@@ -114,22 +114,9 @@ pkg_setup(){
 	fi
 
 	# Set up X11 implementation
-	if has_version "x11-base/xorg-server"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	elif has_version "<x11-base/xorg-x11-6.8.99"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	else
-		X11_IMPLEM_P="$(best_version virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	fi
+	X11_IMPLEM=xorg-x11
+	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
 	einfo "X11 implementation is ${X11_IMPLEM}."
 	choose_driver_paths
 }
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
index a9e1159f2749..5586e09ea8c5 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.29.6.ebuild,v 1.6 2007/07/15 05:56:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.29.6.ebuild,v 1.7 2007/07/22 02:31:53 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -14,12 +14,12 @@ SRC_URI="${ATI_URL}/ati-driver-installer-${PV}.run"
 LICENSE="ATI"
 KEYWORDS="-* ~amd64 ~x86"
 
-RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+RDEPEND="x11-base/xorg-server
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
 	 acpi? (
-	 	|| ( x11-apps/xauth virtual/x11 )
-	 	sys-power/acpid
+		x11-apps/xauth
+		sys-power/acpid
 	 )"
 
 DEPEND=">=virtual/linux-sources-2.4
@@ -114,22 +114,9 @@ pkg_setup(){
 	fi
 
 	# Set up X11 implementation
-	if has_version "x11-base/xorg-server"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	elif has_version "<x11-base/xorg-x11-6.8.99"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	else
-		X11_IMPLEM_P="$(best_version virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	fi
+	X11_IMPLEM=xorg-x11
+	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
 	einfo "X11 implementation is ${X11_IMPLEM}."
 	choose_driver_paths
 }
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
index d1d7a47f4977..8943e07a6d22 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.30.3-r1.ebuild,v 1.7 2007/07/15 05:56:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild,v 1.8 2007/07/22 02:31:53 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -14,12 +14,12 @@ SRC_URI="${ATI_URL}/ati-driver-installer-${PV}.run"
 LICENSE="ATI"
 KEYWORDS="-* ~amd64 ~x86"
 
-RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+RDEPEND="x11-base/xorg-server
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
 	 acpi? (
-	 	|| ( x11-apps/xauth virtual/x11 )
-	 	sys-power/acpid
+		x11-apps/xauth
+		sys-power/acpid
 	 )"
 
 DEPEND=">=virtual/linux-sources-2.4
@@ -98,22 +98,9 @@ pkg_setup(){
 	fi
 
 	# Set up X11 implementation
-	if has_version "x11-base/xorg-server"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	elif has_version "<x11-base/xorg-x11-6.8.99"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	else
-		X11_IMPLEM_P="$(best_version virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	fi
+	X11_IMPLEM=xorg-x11
+	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
 	einfo "X11 implementation is ${X11_IMPLEM}."
 	choose_driver_paths
 }
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
index 685877659917..dbfbb5679146 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.30.3.ebuild,v 1.5 2007/07/15 05:56:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.30.3.ebuild,v 1.6 2007/07/22 02:31:53 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -14,12 +14,12 @@ SRC_URI="${ATI_URL}/ati-driver-installer-${PV}.run"
 LICENSE="ATI"
 KEYWORDS="-* ~amd64 ~x86"
 
-RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+RDEPEND="x11-base/xorg-server
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
 	 acpi? (
-	 	|| ( x11-apps/xauth virtual/x11 )
-	 	sys-power/acpid
+		x11-apps/xauth
+		sys-power/acpid
 	 )"
 
 DEPEND=">=virtual/linux-sources-2.4
@@ -114,22 +114,9 @@ pkg_setup(){
 	fi
 
 	# Set up X11 implementation
-	if has_version "x11-base/xorg-server"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	elif has_version "<x11-base/xorg-x11-6.8.99"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	else
-		X11_IMPLEM_P="$(best_version virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	fi
+	X11_IMPLEM=xorg-x11
+	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
 	einfo "X11 implementation is ${X11_IMPLEM}."
 	choose_driver_paths
 }
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
index dee5d5f35ca1..54ad353ad93e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.32.5.ebuild,v 1.8 2007/07/15 05:56:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild,v 1.9 2007/07/22 02:31:53 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -14,12 +14,12 @@ SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run"
 LICENSE="ATI"
 KEYWORDS="-* amd64 x86"
 
-RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+RDEPEND="x11-base/xorg-server
 	 app-admin/eselect-opengl
 	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
 	 acpi? (
-	 	|| ( x11-apps/xauth virtual/x11 )
-	 	sys-power/acpid
+		x11-apps/xauth
+		sys-power/acpid
 	 )
 	 x11-libs/libXrandr"
 
@@ -99,22 +99,9 @@ pkg_setup() {
 	fi
 
 	# Set up X11 implementation
-	if has_version "x11-base/xorg-server"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	elif has_version "<x11-base/xorg-x11-6.8.99"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	else
-		X11_IMPLEM_P="$(best_version virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	fi
+	X11_IMPLEM=xorg-x11
+	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
 	einfo "X11 implementation is ${X11_IMPLEM}."
 	choose_driver_paths
 }
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
index d71a1db5d1a5..e334c6833fdd 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.33.6-r1.ebuild,v 1.4 2007/07/02 14:50:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild,v 1.5 2007/07/22 02:31:53 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -14,11 +14,11 @@ SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run"
 LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+RDEPEND="x11-base/xorg-server
 	app-admin/eselect-opengl
 	|| ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
 	acpi? (
-		|| ( x11-apps/xauth virtual/x11 )
+		x11-apps/xauth
 		sys-power/acpid
 	)"
 
@@ -104,22 +104,9 @@ pkg_setup() {
 	fi
 
 	# Set up X11 implementation
-	if has_version "x11-base/xorg-server"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	elif has_version "<x11-base/xorg-x11-6.8.99"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	else
-		X11_IMPLEM_P="$(best_version virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	fi
+	X11_IMPLEM=xorg-x11
+	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
 	einfo "X11 implementation is ${X11_IMPLEM}."
 	choose_driver_paths
 }
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild
index e6258d837bd6..b0c749b46076 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.33.6.ebuild,v 1.3 2007/07/02 14:50:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.33.6.ebuild,v 1.4 2007/07/22 02:31:53 dberkholz Exp $
 
 IUSE="acpi doc opengl"
 
@@ -14,11 +14,11 @@ SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run"
 LICENSE="ATI"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+RDEPEND="x11-base/xorg-server
 	app-admin/eselect-opengl
 	|| ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )
 	acpi? (
-		|| ( x11-apps/xauth virtual/x11 )
+		x11-apps/xauth
 		sys-power/acpid
 	)"
 
@@ -103,22 +103,9 @@ pkg_setup() {
 	fi
 
 	# Set up X11 implementation
-	if has_version "x11-base/xorg-server"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
-	elif has_version "<x11-base/xorg-x11-6.8.99"; then
-		X11_IMPLEM=xorg-x11
-		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
-		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	else
-		X11_IMPLEM_P="$(best_version virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
-		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
-	fi
+	X11_IMPLEM=xorg-x11
+	X11_IMPLEM_V="$(best_version x11-base/xorg-server)"
+	X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}"
 	einfo "X11 implementation is ${X11_IMPLEM}."
 	choose_driver_paths
 }