Move use_ functions out of global scope.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

6 files changed, 27 insertions, 11 deletions

diff --git a/x11-drivers/xf86-video-sis/ChangeLog b/x11-drivers/xf86-video-sis/ChangeLog
index 5c41470fdbd3..8d9151afdb5a 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/ChangeLog,v 1.38 2009/04/05 22:05:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/ChangeLog,v 1.39 2009/05/04 16:32:44 ssuominen Exp $
+
+  04 May 2009; Samuli Suominen <ssuominen@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,
+  xf86-video-sis-0.10.1.ebuild:
+  Move use_ functions out of global scope.
 
   05 Apr 2009; Markus Meier <maekke@gentoo.org>
   xf86-video-sis-0.10.0.ebuild:
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 03c80a09075f..50497e212f53 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-2009 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.5 2009/04/05 22:05:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.0.ebuild,v 1.6 2009/05/04 16:32:44 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -25,4 +25,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-sis/xf86-video-sis-0.10.1.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild
index fa2b3ef97025..45ea5bc2ea4d 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.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-sis/xf86-video-sis-0.10.1.ebuild,v 1.2 2009/03/13 16:03:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.1.ebuild,v 1.3 2009/05/04 16:32:44 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -25,4 +25,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-sis/xf86-video-sis-0.9.1-r1.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild
index 43f8a35120e1..eef6db63d83d 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-2009 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.7 2009/03/13 16:03:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild,v 1.8 2009/05/04 16:32:44 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 	dri? ( x11-proto/xf86driproto
 			>=x11-libs/libdrm-2 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}
 
 PATCHES="${FILESDIR}/${PN}-assert.patch"
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 499319b89ebf..2ff14d5a9b1c 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-2009 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.8 2009/03/13 16:03:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.3.ebuild,v 1.9 2009/05/04 16:32:44 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -25,4 +25,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-sis/xf86-video-sis-0.9.4.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild
index c352782042af..90e4c9f2b83f 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-2009 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.5 2009/03/13 16:03:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.4.ebuild,v 1.6 2009/05/04 16:32:44 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -25,4 +25,6 @@ DEPEND="${RDEPEND}
 	dri? ( x11-proto/xf86driproto
 			>=x11-libs/libdrm-2 )"
 
-CONFIGURE_OPTIONS="$(use_enable dri)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}