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

(Portage version: 2.1.6_rc1/cvs/Linux 2.6.28-rc6 x86_64)

10 files changed, 19 insertions, 63 deletions

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
-}