Move use_ functions out of global scope.

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

9 files changed, 54 insertions, 26 deletions

diff --git a/x11-drivers/xf86-video-openchrome/ChangeLog b/x11-drivers/xf86-video-openchrome/ChangeLog
index feaa665b3f86..7b6540d12107 100644
--- a/x11-drivers/xf86-video-openchrome/ChangeLog
+++ b/x11-drivers/xf86-video-openchrome/ChangeLog
@@ -1,6 +1,11 @@
 # 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.15 2008/11/26 23:22:29 dberkholz Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.16 2009/05/04 16:40:33 ssuominen Exp $
+
+  04 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xf86-video-openchrome-0.2.902.ebuild,
+  xf86-video-openchrome-0.2.903.ebuild:
+  Move use_ functions out of global scope.
 
   26 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   xf86-video-openchrome-0.2.902.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 1d9c9b52761f..dd91bc07b49d 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
+# 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-openchrome/xf86-video-openchrome-0.2.902.ebuild,v 1.5 2008/11/26 23:22:29 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.902.ebuild,v 1.6 2009/05/04 16:40:33 ssuominen Exp $
 
 XDPVER="-1"
 IUSE="debug dri"
@@ -27,12 +27,15 @@ DEPEND="${RDEPEND}
 		x11-proto/glproto
 	)"
 
-CONFIGURE_OPTIONS="
-	$(use_enable debug)
-	$(use_enable debug xv-debug)
-	"
 DOCS="ChangeLog NEWS README"
 
+pkg_setup() {
+	CONFIGURE_OPTIONS="
+		$(use_enable debug)
+		$(use_enable debug xv-debug)
+		"
+}
+
 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 72db40bd367f..48ab0db70165 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
+# 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-openchrome/xf86-video-openchrome-0.2.903.ebuild,v 1.4 2008/11/26 23:22:29 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.903.ebuild,v 1.5 2009/05/04 16:40:33 ssuominen Exp $
 
 XDPVER="-1"
 IUSE="debug dri"
@@ -27,12 +27,15 @@ DEPEND="${RDEPEND}
 		x11-proto/glproto
 	)"
 
-CONFIGURE_OPTIONS="
-	$(use_enable debug)
-	$(use_enable debug xv-debug)
-	"
 DOCS="ChangeLog NEWS README"
 
+pkg_setup() {
+	CONFIGURE_OPTIONS="
+		$(use_enable debug)
+		$(use_enable debug xv-debug)
+		"
+}
+
 pkg_postinst() {
 	elog "Supported chipsets:"
 	elog ""
diff --git a/x11-drivers/xf86-video-r128/ChangeLog b/x11-drivers/xf86-video-r128/ChangeLog
index e989095244fa..736b3e43b9f3 100644
--- a/x11-drivers/xf86-video-r128/ChangeLog
+++ b/x11-drivers/xf86-video-r128/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/xf86-video-r128
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/ChangeLog,v 1.9 2009/04/15 15:55:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/ChangeLog,v 1.10 2009/05/04 16:45:07 ssuominen Exp $
+
+  04 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xf86-video-r128-6.8.0.ebuild:
+  Move use_ functions out of global scope.
 
   15 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-r128-6.8.0.ebuild:
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 70fb35cb9e38..0872e18dd05a 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-2009 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.9 2009/04/15 15:55:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.0.ebuild,v 1.10 2009/05/04 16:45:07 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-savage/ChangeLog b/x11-drivers/xf86-video-savage/ChangeLog
index d04810842b43..d53bef5810ab 100644
--- a/x11-drivers/xf86-video-savage/ChangeLog
+++ b/x11-drivers/xf86-video-savage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-savage
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.47 2009/04/15 15:45:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.48 2009/05/04 16:43:30 ssuominen Exp $
+
+  04 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xf86-video-savage-2.1.2-r1.ebuild, xf86-video-savage-2.1.3.ebuild,
+  xf86-video-savage-2.2.1.ebuild:
+  Move use_ functions out of global scope.
 
   15 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   xf86-video-savage-2.2.1.ebuild:
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 a5355edcc80c..f19d0472692c 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-2009 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.10 2009/03/13 16:00:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild,v 1.11 2009/05/04 16:43:30 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -21,10 +21,12 @@ DEPEND="${RDEPEND}
 	dri? ( x11-proto/xf86driproto
 			>=x11-libs/libdrm-2 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
 PATCHES="${FILESDIR}/${PV}-fix-respawn-crash.patch"
 
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
+
 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 1e6845b30ca4..79546bee1a36 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-2009 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.3 2009/03/13 16:00:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.3.ebuild,v 1.4 2009/05/04 16:43:30 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -22,4 +22,6 @@ DEPEND="${RDEPEND}
 	dri? ( x11-proto/xf86driproto
 			>=x11-libs/libdrm-2 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
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 0983d34e628e..1974aec55135 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-2009 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.8 2009/04/15 15:45:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.2.1.ebuild,v 1.9 2009/05/04 16:43:30 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -22,4 +22,6 @@ DEPEND="${RDEPEND}
 	dri? ( x11-proto/xf86driproto
 			>=x11-libs/libdrm-2 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}