Move use_ functions out of global scope.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

18 files changed, 91 insertions, 42 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index bc9c48cee1cd..5baf063724a7 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.21 2009/04/15 15:50:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.22 2009/05/04 16:50:13 ssuominen Exp $
+
+  04 May 2009; Samuli Suominen <ssuominen@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.3.ebuild,
+  xf86-video-intel-2.5.1-r1.ebuild, xf86-video-intel-2.6.1.ebuild,
+  xf86-video-intel-2.6.3.ebuild, xf86-video-intel-2.6.3-r1.ebuild:
+  Move use_ functions out of global scope.
 
   15 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-intel-2.6.3-r1.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 cfbfda58a6e7..b86271406ea0 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-2009 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.4 2009/03/13 15:36:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild,v 1.5 2009/05/04 16:50:13 ssuominen Exp $
 
 inherit x-modular
 
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2
 			x11-libs/libX11 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
 PATCHES=("${FILESDIR}/${PV}-fix_no_dri.patch")
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
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 e951952ec71c..9fbeb8120e55 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-2009 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.4 2009/03/13 15:36:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild,v 1.5 2009/05/04 16:50:13 ssuominen Exp $
 
 inherit x-modular
 
@@ -25,4 +25,6 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2.2
 			x11-libs/libX11 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
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 9fdaf1aad5fd..40edbbb1098b 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-2009 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.4 2009/03/13 15:36:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.1.1.ebuild,v 1.5 2009/05/04 16:50:13 ssuominen Exp $
 
 inherit x-modular eutils
 
@@ -24,4 +24,7 @@ DEPEND="${RDEPEND}
 			x11-libs/libX11 )"
 
 PATCHES=("${FILESDIR}/${PV}-fix_build_without_dri.patch")
-CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
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 46cc05caae91..8f3f55290bd7 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-2009 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.5 2009/03/13 15:36:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.1.ebuild,v 1.6 2009/05/04 16:50:13 ssuominen Exp $
 
 SNAPSHOT="yes"
 
@@ -26,4 +26,7 @@ DEPEND="${RDEPEND}
 			x11-libs/libX11 )"
 
 PATCHES=("${FILESDIR}/${PV}-0001-fixup-pciaccess-version-detect.patch")
-CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
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 3e660c89bfa0..30cc180e9fe3 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-2009 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.4 2009/03/13 15:36:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.3.2.ebuild,v 1.5 2009/05/04 16:50:13 ssuominen Exp $
 
 SNAPSHOT="yes"
 
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2.2
 			x11-libs/libX11 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
 PATCHES=("${FILESDIR}/${PV}-0001-intel-fix-drm-check.patch")
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
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 b0425e34f6ae..4f93279c8872 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-2009 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.3 2009/03/13 15:36:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.3.ebuild,v 1.4 2009/05/04 16:50:13 ssuominen Exp $
 
 SNAPSHOT="yes"
 
@@ -25,8 +25,10 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2.2
 			x11-libs/libX11 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
 PATCHES=(
 "${FILESDIR}/${PV}-0001-never-enable-DRI_MM-on-this-branch.patch"
 )
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild
index 17e82575aad9..13f55f031d73 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r1.ebuild,v 1.3 2009/03/13 15:36:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.5.1-r1.ebuild,v 1.4 2009/05/04 16:50:13 ssuominen Exp $
 
 SNAPSHOT="yes"
 
@@ -25,9 +25,11 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2.4.0
 			x11-libs/libX11 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
 PATCHES=(
 "${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch"
 "${FILESDIR}/${PV}-0002-include-X11-Xmd.h-to-define-CARD16-needed-by-edid.patch"
 )
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.1.ebuild
index 970691181282..8e58ca23005d 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.1.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.6.1.ebuild,v 1.3 2009/03/13 15:36:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.1.ebuild,v 1.4 2009/05/04 16:50:13 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -27,8 +27,10 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2.4.3
 			x11-libs/libX11 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
 PATCHES=(
 "${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch"
 )
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild
index 9d3d3d70c24c..d172142d5794 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.6.3-r1.ebuild,v 1.4 2009/04/15 15:50:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild,v 1.5 2009/05/04 16:50:13 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -27,9 +27,11 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2.4.5
 			x11-libs/libX11 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
 PATCHES=(
 "${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch"
 "${FILESDIR}/${PV}-0002-Fix-Xv-crash-with-overlay-video.patch"
 )
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3.ebuild
index 6ed03bdc18d3..cb8059ae8ea0 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.6.3.ebuild,v 1.2 2009/03/13 15:36:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3.ebuild,v 1.3 2009/05/04 16:50:13 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -27,8 +27,10 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2.4.5
 			x11-libs/libX11 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
 PATCHES=(
 "${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch"
 )
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
diff --git a/x11-drivers/xf86-video-mach64/ChangeLog b/x11-drivers/xf86-video-mach64/ChangeLog
index 9dddfb8dda7e..7d639ca976dc 100644
--- a/x11-drivers/xf86-video-mach64/ChangeLog
+++ b/x11-drivers/xf86-video-mach64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-mach64
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/ChangeLog,v 1.8 2009/04/15 15:53:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/ChangeLog,v 1.9 2009/05/04 16:54:37 ssuominen Exp $
+
+  04 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xf86-video-mach64-6.8.0.ebuild:
+  Move use_ functions out of global scope.
 
   15 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-mach64-6.8.0.ebuild:
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 45d59ad26f4b..3ceee5326c18 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-2009 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.7 2009/04/15 15:53:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.0.ebuild,v 1.8 2009/05/04 16:54:37 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 			x11-proto/xf86driproto
 			>=x11-libs/libdrm-2 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
 PATCHES=""
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
diff --git a/x11-drivers/xf86-video-mga/ChangeLog b/x11-drivers/xf86-video-mga/ChangeLog
index 96890a6edcad..9a1843e0a860 100644
--- a/x11-drivers/xf86-video-mga/ChangeLog
+++ b/x11-drivers/xf86-video-mga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-mga
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/ChangeLog,v 1.73 2009/04/15 15:44:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/ChangeLog,v 1.74 2009/05/04 16:52:31 ssuominen Exp $
+
+  04 May 2009; Samuli Suominen <ssuominen@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:
+  Move use_ functions out of global scope.
 
   15 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-mga-1.4.9.ebuild:
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 b4f09b9ed079..f3e2cac64e25 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-2009 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.11 2009/03/13 15:37:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.6.1.ebuild,v 1.12 2009/05/04 16:52:31 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -23,4 +23,6 @@ DEPEND="${RDEPEND}
 			x11-proto/glproto
 			>=x11-libs/libdrm-2 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
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 42339a8b8d9c..1db46bdca718 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-2009 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.3 2009/03/13 15:37:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.8.ebuild,v 1.4 2009/05/04 16:52:31 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -23,4 +23,6 @@ DEPEND="${RDEPEND}
 			x11-proto/glproto
 			>=x11-libs/libdrm-2 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
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 610a273bd45a..4b28b88b14c5 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-2009 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.9 2009/04/15 15:44:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.9.ebuild,v 1.10 2009/05/04 16:52:31 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -23,4 +23,6 @@ DEPEND="${RDEPEND}
 			x11-proto/glproto
 			>=x11-libs/libdrm-2 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
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 faecaa8fd44a..c3ba275e8189 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/11/26 23:24:50 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.9.100.ebuild,v 1.3 2009/05/04 16:52:31 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -23,4 +23,6 @@ DEPEND="${RDEPEND}
 			x11-proto/glproto
 			>=x11-libs/libdrm-2 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}