Move use_enable out of global scope

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

8 files changed, 46 insertions, 23 deletions

diff --git a/xfce-base/xfce-mcs-plugins/ChangeLog b/xfce-base/xfce-mcs-plugins/ChangeLog
index 7f03a8b75185..5118771dda08 100644
--- a/xfce-base/xfce-mcs-plugins/ChangeLog
+++ b/xfce-base/xfce-mcs-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce-mcs-plugins
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.128 2008/12/22 17:05:26 angelos Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.129 2009/05/01 04:29:47 darkside Exp $
+
+  01 May 2009; Jeremy Olexa <darkside@gentoo.org>
+  xfce-mcs-plugins-4.4.3.ebuild:
+  Move use_enable out of global scope
 
   22 Dec 2008; Christoph Mende <angelos@gentoo.org>
   -files/xfce-mcs-plugins-4.4.2-fix-mouse-plugin.patch,
diff --git a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.3.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.3.ebuild
index 4f8711206dca..20311390fac4 100644
--- a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.3.ebuild
+++ b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.3.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/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.3.ebuild,v 1.6 2008/12/15 04:58:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.3.ebuild,v 1.7 2009/05/01 04:29:47 darkside Exp $
 
 EAPI=1
 
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xf86vidmodeproto"
 
-XFCE_CONFIG+=" --enable-xf86misc --enable-xkb --enable-xinput --enable-randr --enable-xf86vm"
-
 DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	XFCE_CONFIG+=" --enable-xf86misc --enable-xkb --enable-xinput --enable-randr --enable-xf86vm"
+}
diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index c6040bf4bc8b..483277c534c2 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.133 2009/04/21 04:25:16 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.134 2009/05/01 04:28:50 darkside Exp $
+
+  01 May 2009; Jeremy Olexa <darkside@gentoo.org> xfce-utils-4.4.3.ebuild:
+  Move use_enable out of global scope
 
 *xfce-utils-4.6.1 (21 Apr 2009)
 
diff --git a/xfce-base/xfce-utils/xfce-utils-4.4.3.ebuild b/xfce-base/xfce-utils/xfce-utils-4.4.3.ebuild
index 9d1c8e6c2071..057e9ef560a2 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.4.3.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.4.3.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/xfce-base/xfce-utils/xfce-utils-4.4.3.ebuild,v 1.6 2008/12/15 04:58:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.4.3.ebuild,v 1.7 2009/05/01 04:28:50 darkside Exp $
 
 EAPI=1
 
@@ -28,7 +28,12 @@ RDEPEND="x11-apps/xrdb
 		gnome-extra/gnome-screensaver
 		x11-misc/xlockmore ) )"
 
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable dbus) --enable-gdm --with-vendor-info=Gentoo"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	XFCE_CONFIG="${XFCE_CONFIG} $(use_enable dbus) --enable-gdm \
+		--with-vendor-info=Gentoo"
+}
 
 src_unpack() {
 	unpack ${A}
@@ -41,5 +46,3 @@ src_install() {
 	insinto /usr/share/xfce4
 	doins "${FILESDIR}"/Gentoo
 }
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 055ec6fcfbda..7a8d62e4fb8f 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.85 2009/04/28 01:14:04 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.86 2009/05/01 04:27:32 darkside Exp $
+
+  01 May 2009; Jeremy Olexa <darkside@gentoo.org>
+  xfce4-session-4.4.3.ebuild:
+  Move use_enable out of global scope
 
   28 Apr 2009; Jeremy Olexa <darkside@gentoo.org>
   xfce4-session-4.6.1.ebuild:
diff --git a/xfce-base/xfce4-session/xfce4-session-4.4.3.ebuild b/xfce-base/xfce4-session/xfce4-session-4.4.3.ebuild
index 4e27dc380bfb..c9566d158b81 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.4.3.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.4.3.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/xfce-base/xfce4-session/xfce4-session-4.4.3.ebuild,v 1.6 2008/12/15 05:02:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.4.3.ebuild,v 1.7 2009/05/01 04:27:32 darkside Exp $
 
 inherit xfce44
 
@@ -28,6 +28,8 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	dev-util/intltool"
 
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable gnome) $(use_enable dbus)"
-
 DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	XFCE_CONFIG="${XFCE_CONFIG} $(use_enable gnome) $(use_enable dbus)"
+}
diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index cf53f8c92bc4..28b9719f4b0b 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfwm4
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.128 2009/04/21 04:27:43 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.129 2009/05/01 04:23:30 darkside Exp $
+
+  01 May 2009; Jeremy Olexa <darkside@gentoo.org> xfwm4-4.4.3.ebuild:
+  Move use_enable out of global scope
 
 *xfwm4-4.6.1 (21 Apr 2009)
 
diff --git a/xfce-base/xfwm4/xfwm4-4.4.3.ebuild b/xfce-base/xfwm4/xfwm4-4.4.3.ebuild
index f5b1c767fbb4..41c108b8654c 100644
--- a/xfce-base/xfwm4/xfwm4-4.4.3.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.4.3.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/xfce-base/xfwm4/xfwm4-4.4.3.ebuild,v 1.6 2008/12/15 05:00:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.4.3.ebuild,v 1.7 2009/05/01 04:23:30 darkside Exp $
 
 EAPI=1
 
@@ -38,7 +38,9 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	dev-util/intltool"
 
-XFCE_CONFIG="${XFCE_CONFIG} --enable-xsync --enable-render --enable-randr \
-	$(use_enable xcomposite compositor)"
-
 DOCS="AUTHORS ChangeLog COMPOSITOR NEWS README TODO"
+
+pkg_setup() {
+	XFCE_CONFIG="${XFCE_CONFIG} --enable-xsync --enable-render --enable-randr \
+		$(use_enable xcomposite compositor)"
+}