The USE=dri check is handled in x-modular.eclass now so it's not duplicated everywhere.

Package-Manager: portage-2.1.6_rc1/cvs/Linux 2.6.28-rc6 x86_64

50 files changed, 132 insertions, 288 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 2e3c395941b4..2b8dae468871 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-ati
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.67 2008/07/17 18:46:34 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.68 2008/11/26 23:18:29 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-ati-6.6.3.ebuild, xf86-video-ati-6.7.197.ebuild,
+  xf86-video-ati-6.8.0.ebuild, xf86-video-ati-6.8.0-r1.ebuild,
+  xf86-video-ati-6.9.0.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
   17 Jul 2008; Markus Rothe <corsair@gentoo.org>
   xf86-video-ati-6.8.0-r1.ebuild:
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild
index a91c1b96976f..bae2b0c6d69b 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild,v 1.10 2006/10/21 14:42:41 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.3.ebuild,v 1.11 2008/11/26 23:18:29 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -26,9 +26,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.197.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.197.ebuild
index 91316a7d9fc2..9bccb61716b3 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.197.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.197.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.197.ebuild,v 1.1 2007/12/24 18:45:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.197.ebuild,v 1.2 2008/11/26 23:18:29 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -27,9 +27,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild
index 3bf1703b5720..36a25338c24b 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild,v 1.6 2008/08/19 19:34:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0-r1.ebuild,v 1.7 2008/11/26 23:18:29 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -39,9 +39,3 @@ PATCHES="
 	${FILESDIR}/${PV}/0008-RS6xx-fix-DDC-on-DDIA-output-usually-HDMI-port.patch
 	${FILESDIR}/${PV}/0134-Disable-the-setting-of-HARDWARE_CURSOR_BIT_ORDER_MSB.patch
 	"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0.ebuild
index f00cf02295d6..e29fe14fcfee 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0.ebuild,v 1.2 2008/04/10 07:36:24 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.8.0.ebuild,v 1.3 2008/11/26 23:18:29 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -39,9 +39,3 @@ PATCHES="
 	${FILESDIR}/${PV}/0008-RS6xx-fix-DDC-on-DDIA-output-usually-HDMI-port.patch
 	${FILESDIR}/${PV}/0134-Disable-the-setting-of-HARDWARE_CURSOR_BIT_ORDER_MSB.patch
 	"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.9.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.9.0.ebuild
index 73bb20fb0b25..cb73044b2d99 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.9.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.9.0.ebuild,v 1.1 2008/06/27 05:20:55 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.9.0.ebuild,v 1.2 2008/11/26 23:18:29 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -29,12 +29,6 @@ CONFIGURE_OPTIONS="$(use_enable dri)"
 
 PATCHES=""
 
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
-
 pkg_postinst() {
 	x-modular_pkg_postinst
 
diff --git a/x11-drivers/xf86-video-glint/ChangeLog b/x11-drivers/xf86-video-glint/ChangeLog
index d9e617ed509b..59d70b9d91da 100644
--- a/x11-drivers/xf86-video-glint/ChangeLog
+++ b/x11-drivers/xf86-video-glint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-glint
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/ChangeLog,v 1.29 2008/07/05 06:32:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/ChangeLog,v 1.30 2008/11/26 23:20:27 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-glint-1.1.1.ebuild, xf86-video-glint-1.2.0.ebuild,
+  xf86-video-glint-1.2.1.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
 *xf86-video-glint-1.2.1 (05 Jul 2008)
 
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.1.1.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.1.1.ebuild
index d2cdaaa216f2..cb9a7774cd8f 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.1.1.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.1.1.ebuild,v 1.7 2006/10/13 23:15:48 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.1.1.ebuild,v 1.8 2008/11/26 23:20:27 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -24,9 +24,3 @@ DEPEND="${RDEPEND}
 			x11-proto/glproto )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.0.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.0.ebuild
index 192339fe53fa..a91854f9de35 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.0.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.0.ebuild,v 1.1 2008/03/31 06:11:27 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.0.ebuild,v 1.2 2008/11/26 23:20:27 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -25,9 +25,3 @@ DEPEND="${RDEPEND}
 			x11-proto/glproto )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.1.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.1.ebuild
index cc0e51738b0f..756cfbc8ec05 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.1.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.1.ebuild,v 1.1 2008/07/05 06:32:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.1.ebuild,v 1.2 2008/11/26 23:20:27 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -25,9 +25,3 @@ DEPEND="${RDEPEND}
 			x11-proto/glproto )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 5d8504414b3c..abbde35ca809 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.7 2008/11/17 11:00:35 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.8 2008/11/26 23:26:27 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-intel-1.6.5.ebuild, xf86-video-intel-1.7.4.ebuild,
+  xf86-video-intel-2.1.1.ebuild, xf86-video-intel-2.2.1.ebuild,
+  xf86-video-intel-2.3.2.ebuild, xf86-video-intel-2.4.2-r3.ebuild,
+  xf86-video-intel-2.4.3.ebuild, xf86-video-intel-2.5.0.ebuild,
+  xf86-video-intel-2.5.1.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
   17 Nov 2008; Rémi Cardona <remi@gentoo.org>
   -xf86-video-intel-2.2.0.90.ebuild, -xf86-video-intel-2.4.2-r2.ebuild,
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild
index 5e829972c8ae..813eea38c348 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild,v 1.2 2008/10/22 15:17:16 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild,v 1.3 2008/11/26 23:26:27 dberkholz Exp $
 
 inherit x-modular
 
@@ -26,9 +26,3 @@ DEPEND="${RDEPEND}
 CONFIGURE_OPTIONS="$(use_enable dri)"
 
 PATCHES=("${FILESDIR}/${PV}-fix_no_dri.patch")
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild
index 5e2621dbb80b..ace3e0cd1707 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild,v 1.2 2008/10/22 15:17:16 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild,v 1.3 2008/11/26 23:26:27 dberkholz Exp $
 
 inherit x-modular
 
@@ -26,9 +26,3 @@ DEPEND="${RDEPEND}
 			x11-libs/libX11 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.1.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.1.1.ebuild
index c0a50f3c85d6..39784d65fbd0 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.1.1.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.1.1.ebuild,v 1.2 2008/10/22 15:17:16 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.1.1.ebuild,v 1.3 2008/11/26 23:26:27 dberkholz Exp $
 
 inherit x-modular eutils
 
@@ -25,9 +25,3 @@ DEPEND="${RDEPEND}
 
 PATCHES=("${FILESDIR}/${PV}-fix_build_without_dri.patch")
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.1.ebuild
index 33d274b41f5d..73332a054a3c 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.1.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.1.ebuild,v 1.3 2008/10/28 17:19:35 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.1.ebuild,v 1.4 2008/11/26 23:26:27 dberkholz Exp $
 
 SNAPSHOT="yes"
 
@@ -27,9 +27,3 @@ DEPEND="${RDEPEND}
 
 PATCHES=("${FILESDIR}/${PV}-0001-fixup-pciaccess-version-detect.patch")
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.3.2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.3.2.ebuild
index 4989e7ddb52d..7d8eb9abd035 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.3.2.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.3.2.ebuild,v 1.2 2008/10/22 15:17:16 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.3.2.ebuild,v 1.3 2008/11/26 23:26:27 dberkholz Exp $
 
 SNAPSHOT="yes"
 
@@ -28,9 +28,3 @@ DEPEND="${RDEPEND}
 CONFIGURE_OPTIONS="$(use_enable dri)"
 
 PATCHES=("${FILESDIR}/${PV}-0001-intel-fix-drm-check.patch")
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild
index 4940f9a8752b..6eb3b867b4e5 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild,v 1.2 2008/10/22 15:17:16 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild,v 1.3 2008/11/26 23:26:27 dberkholz Exp $
 
 SNAPSHOT="yes"
 
@@ -32,9 +32,3 @@ PATCHES=(
 "${FILESDIR}/${PV}-0002-Disable-render-standby.patch"
 "${FILESDIR}/${PV}-0003-never-enable-DRI_MM-on-this-branch.patch"
 )
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild
index f30a9646d9fb..9006148042b8 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild,v 1.1 2008/11/17 10:57:54 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild,v 1.2 2008/11/26 23:26:27 dberkholz Exp $
 
 SNAPSHOT="yes"
 
@@ -30,9 +30,3 @@ CONFIGURE_OPTIONS="$(use_enable dri)"
 PATCHES=(
 "${FILESDIR}/${PV}-0001-never-enable-DRI_MM-on-this-branch.patch"
 )
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild
index 0d7b60838f98..113cadbf2205 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild,v 1.1 2008/10/28 13:52:40 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.0.ebuild,v 1.2 2008/11/26 23:26:27 dberkholz Exp $
 
 SNAPSHOT="yes"
 
@@ -34,8 +34,3 @@ PATCHES=(
 "${FILESDIR}/${PV}-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch"
 )
 
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild
index 4cf7eda2469e..b9361a8a808d 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild,v 1.1 2008/11/17 10:57:54 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1.ebuild,v 1.2 2008/11/26 23:26:27 dberkholz Exp $
 
 SNAPSHOT="yes"
 
@@ -30,9 +30,3 @@ CONFIGURE_OPTIONS="$(use_enable dri) --disable-symlinks"
 PATCHES=(
 "${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch"
 )
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-mach64/ChangeLog b/x11-drivers/xf86-video-mach64/ChangeLog
index b3864520c0c4..b7340e094465 100644
--- a/x11-drivers/xf86-video-mach64/ChangeLog
+++ b/x11-drivers/xf86-video-mach64/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-mach64
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/ChangeLog,v 1.2 2008/10/17 17:39:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/ChangeLog,v 1.3 2008/11/26 23:19:11 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-mach64-6.8.0.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
   17 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>; -files/ati.xinf,
   +files/mach64.xinf:
diff --git a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild
index fa156b90e108..734bc4e61abf 100644
--- a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild
+++ b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild,v 1.1 2008/06/27 05:17:28 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild,v 1.2 2008/11/26 23:19:11 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -30,9 +30,3 @@ DEPEND="${RDEPEND}
 CONFIGURE_OPTIONS="$(use_enable dri)"
 
 PATCHES=""
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-mga/ChangeLog b/x11-drivers/xf86-video-mga/ChangeLog
index 52da33f08edb..447d1a6c465f 100644
--- a/x11-drivers/xf86-video-mga/ChangeLog
+++ b/x11-drivers/xf86-video-mga/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-mga
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/ChangeLog,v 1.65 2008/07/05 06:32:43 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/ChangeLog,v 1.66 2008/11/26 23:24:50 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-mga-1.4.6.1.ebuild, xf86-video-mga-1.4.8.ebuild,
+  xf86-video-mga-1.4.9.ebuild, xf86-video-mga-1.9.100.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
 *xf86-video-mga-1.4.9 (05 Jul 2008)
 
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.6.1.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.6.1.ebuild
index 60d67f541b3d..6c361b43901e 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.6.1.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.6.1.ebuild,v 1.9 2007/08/07 12:54:16 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.6.1.ebuild,v 1.10 2008/11/26 23:24:50 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -24,9 +24,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.8.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.8.ebuild
index 639aa514bce9..f2c08230ce4b 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.8.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.8.ebuild,v 1.1 2008/01/30 23:59:41 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.8.ebuild,v 1.2 2008/11/26 23:24:50 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -24,9 +24,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild
index 2e8cc0e7db4b..d379ab331f0e 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild,v 1.1 2008/07/05 06:32:43 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild,v 1.2 2008/11/26 23:24:50 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -24,9 +24,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.9.100.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.9.100.ebuild
index 66735c1adf1f..faecaa8fd44a 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.9.100.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.9.100.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.9.100.ebuild,v 1.1 2007/11/07 09:11:07 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.9.100.ebuild,v 1.2 2008/11/26 23:24:50 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -24,9 +24,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-openchrome/ChangeLog b/x11-drivers/xf86-video-openchrome/ChangeLog
index 1a529613b34a..feaa665b3f86 100644
--- a/x11-drivers/xf86-video-openchrome/ChangeLog
+++ b/x11-drivers/xf86-video-openchrome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-openchrome
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.14 2008/10/29 22:20:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.15 2008/11/26 23:22:29 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-openchrome-0.2.902.ebuild,
+  xf86-video-openchrome-0.2.903.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
   29 Oct 2008; Markus Meier <maekke@gentoo.org>
   xf86-video-openchrome-0.2.903.ebuild:
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.902.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.902.ebuild
index 6d5d604c2b78..1d9c9b52761f 100644
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.902.ebuild
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.902.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.902.ebuild,v 1.4 2008/10/05 17:14:30 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.902.ebuild,v 1.5 2008/11/26 23:22:29 dberkholz Exp $
 
 XDPVER="-1"
 IUSE="debug dri"
@@ -33,12 +33,6 @@ CONFIGURE_OPTIONS="
 	"
 DOCS="ChangeLog NEWS README"
 
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with the 'dri' USE flag."
-	fi
-}
-
 pkg_postinst() {
 	elog "Supported chipsets:"
 	elog ""
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.903.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.903.ebuild
index b04d4ddd5495..72db40bd367f 100644
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.903.ebuild
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.903.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.903.ebuild,v 1.3 2008/10/29 22:20:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.903.ebuild,v 1.4 2008/11/26 23:22:29 dberkholz Exp $
 
 XDPVER="-1"
 IUSE="debug dri"
@@ -33,12 +33,6 @@ CONFIGURE_OPTIONS="
 	"
 DOCS="ChangeLog NEWS README"
 
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with the 'dri' USE flag."
-	fi
-}
-
 pkg_postinst() {
 	elog "Supported chipsets:"
 	elog ""
diff --git a/x11-drivers/xf86-video-r128/ChangeLog b/x11-drivers/xf86-video-r128/ChangeLog
index 7bf5837bbf66..84a3dbfc54ba 100644
--- a/x11-drivers/xf86-video-r128/ChangeLog
+++ b/x11-drivers/xf86-video-r128/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-r128
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/ChangeLog,v 1.1 2008/06/27 05:14:29 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/ChangeLog,v 1.2 2008/11/26 23:20:56 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-r128-6.8.0.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
 *xf86-video-r128-6.8.0 (27 Jun 2008)
 
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild
index d3782a0eed3c..560be79056c1 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild,v 1.1 2008/06/27 05:14:29 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild,v 1.2 2008/11/26 23:20:56 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -30,9 +30,3 @@ DEPEND="${RDEPEND}
 CONFIGURE_OPTIONS="$(use_enable dri)"
 
 PATCHES=""
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-savage/ChangeLog b/x11-drivers/xf86-video-savage/ChangeLog
index ba94a325aea3..2f81decd9856 100644
--- a/x11-drivers/xf86-video-savage/ChangeLog
+++ b/x11-drivers/xf86-video-savage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-savage
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.40 2008/06/06 21:52:52 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.41 2008/11/26 23:23:12 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-savage-2.1.2-r1.ebuild, xf86-video-savage-2.1.3.ebuild,
+  xf86-video-savage-2.2.1.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
 *xf86-video-savage-2.2.1 (06 Jun 2008)
 
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild
index ee9c7fdec4db..432f7cb7f060 100644
--- a/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild,v 1.8 2007/08/25 13:54:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild,v 1.9 2008/11/26 23:23:12 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -25,12 +25,6 @@ CONFIGURE_OPTIONS="$(use_enable dri)"
 
 PATCHES="${FILESDIR}/${PV}-fix-respawn-crash.patch"
 
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
-
 pkg_postinst() {
 	x-modular_pkg_postinst
 	# (#149567)
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.3.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.3.ebuild
index 30df21d87900..1f04b1d5af61 100644
--- a/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.3.ebuild
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.3.ebuild,v 1.1 2007/09/08 08:18:22 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.3.ebuild,v 1.2 2008/11/26 23:23:12 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -23,9 +23,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild
index 8b26d13d1e77..9ff671587fcf 100644
--- a/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild,v 1.1 2008/06/06 21:52:52 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild,v 1.2 2008/11/26 23:23:12 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -23,9 +23,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-sis/ChangeLog b/x11-drivers/xf86-video-sis/ChangeLog
index e36256aab3ed..685961be08b7 100644
--- a/x11-drivers/xf86-video-sis/ChangeLog
+++ b/x11-drivers/xf86-video-sis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-sis
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/ChangeLog,v 1.33 2008/08/17 16:25:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/ChangeLog,v 1.34 2008/11/26 23:24:00 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-sis-0.9.1-r1.ebuild, xf86-video-sis-0.9.3.ebuild,
+  xf86-video-sis-0.9.4.ebuild, xf86-video-sis-0.10.0.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
   17 Aug 2008; Markus Meier <maekke@gentoo.org> xf86-video-sis-0.9.4.ebuild:
   x86 stable, bug #232046
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild
index 2b72b4d48c22..6070f0c1992a 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild,v 1.1 2008/06/10 06:51:20 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild,v 1.2 2008/11/26 23:24:00 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -26,9 +26,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild
index 700611bd6bee..d9c041fede3b 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild,v 1.5 2006/10/13 23:15:49 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild,v 1.6 2008/11/26 23:24:00 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -27,9 +27,3 @@ DEPEND="${RDEPEND}
 CONFIGURE_OPTIONS="$(use_enable dri)"
 
 PATCHES="${FILESDIR}/${PN}-assert.patch"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild
index fdbfb47f2405..212fe9e262c8 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild,v 1.6 2008/08/19 19:34:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild,v 1.7 2008/11/26 23:24:00 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -26,9 +26,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild
index 51c8a132c5fc..ac74b81f1b6f 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild,v 1.3 2008/08/19 19:34:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild,v 1.4 2008/11/26 23:24:00 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -26,9 +26,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-sunffb/ChangeLog b/x11-drivers/xf86-video-sunffb/ChangeLog
index 0e46c9ec169b..ed2ea2ec15c7 100644
--- a/x11-drivers/xf86-video-sunffb/ChangeLog
+++ b/x11-drivers/xf86-video-sunffb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-sunffb
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunffb/ChangeLog,v 1.20 2008/09/06 07:30:56 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunffb/ChangeLog,v 1.21 2008/11/26 23:21:29 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-sunffb-1.1.0.ebuild, xf86-video-sunffb-1.2.0.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
 *xf86-video-sunffb-1.2.0 (06 Sep 2008)
 
diff --git a/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.1.0.ebuild b/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.1.0.ebuild
index 4b9c4e1708a2..d85f9de43bab 100644
--- a/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.1.0.ebuild
+++ b/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.1.0.ebuild,v 1.3 2006/10/11 00:27:01 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.1.0.ebuild,v 1.4 2008/11/26 23:21:29 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -21,9 +21,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.0.ebuild b/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.0.ebuild
index b68848e824c2..b3bac5b38f59 100644
--- a/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.0.ebuild
+++ b/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.0.ebuild,v 1.1 2008/09/06 07:30:56 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.0.ebuild,v 1.2 2008/11/26 23:21:29 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -21,9 +21,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-tdfx/ChangeLog b/x11-drivers/xf86-video-tdfx/ChangeLog
index ecd63468a812..1e46b50fd6a4 100644
--- a/x11-drivers/xf86-video-tdfx/ChangeLog
+++ b/x11-drivers/xf86-video-tdfx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-tdfx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/ChangeLog,v 1.39 2008/03/29 19:37:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/ChangeLog,v 1.40 2008/11/26 23:19:45 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-tdfx-1.3.0.ebuild, xf86-video-tdfx-1.4.0.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
 *xf86-video-tdfx-1.4.0 (29 Mar 2008)
 
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.3.0.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.3.0.ebuild
index a69578f52c1c..4fbac873416c 100644
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.3.0.ebuild
+++ b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.3.0.ebuild,v 1.8 2007/08/07 12:55:49 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.3.0.ebuild,v 1.9 2008/11/26 23:19:45 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -22,9 +22,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.0.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.0.ebuild
index 73672aecbb36..dc98cfb60464 100644
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.0.ebuild
+++ b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.0.ebuild,v 1.1 2008/03/29 19:37:39 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.0.ebuild,v 1.2 2008/11/26 23:19:45 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -23,9 +23,3 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-via/ChangeLog b/x11-drivers/xf86-video-via/ChangeLog
index ac4e6a888042..7cc1adb5ec02 100644
--- a/x11-drivers/xf86-video-via/ChangeLog
+++ b/x11-drivers/xf86-video-via/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-via
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-via/ChangeLog,v 1.35 2008/02/24 02:43:14 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-via/ChangeLog,v 1.36 2008/11/26 23:16:38 dberkholz Exp $
+
+  26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-via-0.2.1-r1.ebuild, xf86-video-via-0.2.2.ebuild:
+  The USE=dri check is handled in x-modular.eclass now so it's not
+  duplicated everywhere.
 
   24 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
   Update my email.
diff --git a/x11-drivers/xf86-video-via/xf86-video-via-0.2.1-r1.ebuild b/x11-drivers/xf86-video-via/xf86-video-via-0.2.1-r1.ebuild
index 5e51d5ccf47a..b3bfb8b496ce 100644
--- a/x11-drivers/xf86-video-via/xf86-video-via-0.2.1-r1.ebuild
+++ b/x11-drivers/xf86-video-via/xf86-video-via-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-via/xf86-video-via-0.2.1-r1.ebuild,v 1.7 2006/11/15 14:30:09 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-via/xf86-video-via-0.2.1-r1.ebuild,v 1.8 2008/11/26 23:16:38 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -25,9 +25,3 @@ DEPEND="${RDEPEND}
 
 PATCHES="${FILESDIR}/missing-assert.patch"
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-via/xf86-video-via-0.2.2.ebuild b/x11-drivers/xf86-video-via/xf86-video-via-0.2.2.ebuild
index 574ea87a7047..b1aa9bb56b64 100644
--- a/x11-drivers/xf86-video-via/xf86-video-via-0.2.2.ebuild
+++ b/x11-drivers/xf86-video-via/xf86-video-via-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-via/xf86-video-via-0.2.2.ebuild,v 1.6 2008/08/19 19:32:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-via/xf86-video-via-0.2.2.ebuild,v 1.7 2008/11/26 23:16:38 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -25,9 +25,3 @@ DEPEND="${RDEPEND}
 		x11-libs/libX11 )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}