EAPI3 plus cleanup

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

11 files changed, 79 insertions, 53 deletions

diff --git a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
index bfcef20ff603..78f5ea5cae55 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
+++ b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild,v 1.2 2010/08/05 23:13:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild,v 1.3 2011/02/04 17:54:20 ssuominen Exp $
 
+EAPI=3
 EAUTORECONF=yes
 EINTLTOOLIZE=yes
-EAPI=2
 inherit xfconf
 
 DESCRIPTION="Panel plugin for monitoring cellular modems - GPRS/UMTS(3G)/HSDPA(3.5G)"
@@ -19,10 +19,10 @@ IUSE="debug"
 RDEPEND=">=xfce-base/xfce4-panel-4.3.20
 	>=xfce-base/libxfcegui4-4.3.20
 	sys-apps/pciutils[zlib]
-	=virtual/libusb-0*"
+	virtual/libusb:0"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
+	dev-util/intltool
+	dev-util/pkgconfig"
 
 pkg_setup() {
 	PATCHES=(
@@ -30,8 +30,11 @@ pkg_setup() {
 		"${FILESDIR}"/${P}-link_for_xfce_warn.patch
 		)
 
-	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
+	XFCONF=(
+		--disable-dependency-tracking
+		$(use_enable debug)
+		)
+
 	DOCS="AUTHORS ChangeLog README"
 }
 
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild
index 9dd6386a76ed..bf35f6e34a7e 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild,v 1.7 2010/04/14 17:44:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.1.3.ebuild,v 1.8 2011/02/04 17:58:22 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 EAUTORECONF=yes
 inherit xfconf
 
@@ -31,7 +31,9 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
+	XFCONF=(
+		--disable-dependency-tracking
+		$(use_enable debug)
+		)
 	PATCHES=( "${FILESDIR}/${PN}-1.1.1-exo.patch" )
 }
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-0.0.1.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-0.0.1.ebuild
index f01197ef05eb..8586d20d55e2 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-0.0.1.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-0.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-0.0.1.ebuild,v 1.2 2009/08/24 09:37:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-0.0.1.ebuild,v 1.3 2011/02/04 17:59:43 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 inherit xfconf
 
 DESCRIPTION="A panel plugin for showing information about cpufreq settings"
@@ -26,7 +26,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P/cpuf/cpu-f}
 
 pkg_setup() {
-	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
+	XFCONF=(
+		--disable-dependency-tracking
+		$(use_enable debug)
+		)
 	DOCS="AUTHORS ChangeLog README"
 }
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild
index 55f6ab01b3be..cb51fa0a4c3b 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild,v 1.3 2010/08/07 13:50:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.2.0.ebuild,v 1.4 2011/02/04 17:55:51 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 EAUTORECONF=yes
 inherit xfconf
 
@@ -23,7 +23,11 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${P}-link_to_libxfcegui4.patch )
-	XFCONF="--disable-dependency-tracking
-		$(xfconf_use_debug)"
+
+	XFCONF=(
+		--disable-dependency-tracking
+		$(xfconf_use_debug)
+		)
+
 	DOCS="AUTHORS ChangeLog NEWS README"
 }
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-0.4.2.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-0.4.2.ebuild
index dd33107687d2..827782f9787c 100644
--- a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-0.4.2.ebuild
+++ b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-0.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-0.4.2.ebuild,v 1.2 2009/10/08 17:34:46 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-0.4.2.ebuild,v 1.3 2011/02/04 17:56:20 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 inherit xfconf
 
 DESCRIPTION="Filesystem guard panel plugin"
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
-	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
+	XFCONF=(
+		--disable-dependency-tracking
+		$(use_enable debug)
+		)
 }
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.2.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.2.ebuild
index a6b363b712e6..51337a9ec12e 100644
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.2.ebuild
+++ b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.2.ebuild,v 1.3 2010/08/08 12:57:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.2.ebuild,v 1.4 2011/02/04 17:55:16 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 EAUTORECONF=yes
 inherit xfconf
 
@@ -18,12 +18,16 @@ IUSE="debug"
 RDEPEND=">=xfce-base/libxfcegui4-4.3.22
 	>=xfce-base/xfce4-panel-4.3.22"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
+	dev-util/intltool
+	dev-util/pkgconfig"
 
 pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${P}-link_to_libxfcegui4.patch )
-	XFCONF="--disable-dependency-tracking
-		$(xfconf_use_debug)"
+
+	XFCONF=(
+		--disable-dependency-tracking
+		$(xfconf_use_debug)
+		)
+
 	DOCS="AUTHORS ChangeLog README"
 }
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild
index 43ae78fb794f..f36c595e91ee 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild,v 1.3 2010/08/07 12:33:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild,v 1.4 2011/02/04 17:57:00 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 EAUTORECONF=yes
 inherit xfconf
 
@@ -28,9 +28,13 @@ pkg_setup() {
 		"${FILESDIR}"/${P}-no-ssl.patch
 		"${FILESDIR}"/${P}-link_to_libxfcegui4.patch
 		)
-	XFCONF="--disable-dependency-tracking
+
+	XFCONF=(
+		--disable-dependency-tracking
 		$(use_enable ssl)
 		$(use_enable ipv6)
-		$(xfconf_use_debug)"
+		$(xfconf_use_debug)
+		)
+
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
diff --git a/xfce-extra/xfce4-mpc-plugin/Manifest b/xfce-extra/xfce4-mpc-plugin/Manifest
index d5e9ad552444..a85fd6aab649 100644
--- a/xfce-extra/xfce4-mpc-plugin/Manifest
+++ b/xfce-extra/xfce4-mpc-plugin/Manifest
@@ -1,7 +1,7 @@
 AUX xfce4-mpc-plugin-0.3.5-exo_and_libxfcegui4.patch 970 RMD160 e931f8e1e4f04ca110b294ac1ad9b0a00af7b43e SHA1 6e82c514a2d80cbd0110702d4ae828d5811abaf6 SHA256 d34fcd77aa80845c7af182a02a9999a419a0a4299a4ec812170b859c762ce4cb
 DIST xfce4-mpc-plugin-0.3.5.tar.bz2 107366 RMD160 d469b909f63dc0b32ac0865e5c43d37451f661eb SHA1 3c1f60b762ea2de80014f95f44441f686018e0e5 SHA256 5f986d089b1f1d19a30aacb0e7dd95866662977290a5bde2360572cd02d6dddb
 DIST xfce4-mpc-plugin-0.3.6.tar.bz2 108945 RMD160 d1be026027aeefa42b44e9c2982ba2ec3925746b SHA1 6d2243b562289d656c7d1b09b492fc2b340c3250 SHA256 71de41e6dc055522ba9d74697b26ecd7884bb91aea2b70a9da338df4fee877e7
-EBUILD xfce4-mpc-plugin-0.3.5.ebuild 903 RMD160 51bcc7bf56fa1620eeac6f752a0dee2e5d21bc57 SHA1 7f8405ca7e3f449201c2ad3099d7dae42b7dd81d SHA256 e799df62dfd93f9df7f6bc931e7837b25bd4fc651ce51296517bcb1a88f2b5ca
+EBUILD xfce4-mpc-plugin-0.3.5.ebuild 903 RMD160 f7bcb869f911790826aebf9e4ec4f4105b5bb51f SHA1 da7f71a65311685fda514d2cc7808ce1b3ae5701 SHA256 bf9686bf1713161da546875a01154d7114bc87814bf7c6fbbc97c01cdc32be18
 EBUILD xfce4-mpc-plugin-0.3.6.ebuild 874 RMD160 2824ca47d3c4c4884b29c92b619d4dcbe59dccaf SHA1 26d62bf600cbc72283e61fbcee8341fce4aa9daf SHA256 5ea737daf3e12a25b85f4a5b9a69967689f7d60d2ec051ce69c6785beb757c19
 MISC ChangeLog 1741 RMD160 ea8fef8a5b8b0a4d21a922dae52e6b0479ff193f SHA1 d970178d048c2ab59bc849e62a8e156e884a4d93 SHA256 612287434a22b9102bd3f4c684fef0b01b4f4bd5e588bfe6690784294c72a2c9
 MISC metadata.xml 303 RMD160 766676e31e2b35a5b7b141b880732e1f77357b40 SHA1 18901caa7d7cefebfac0541894cb7535e2d2a903 SHA256 0125ccd39ba1cf3fa1a712da026895ea2888e2fe512e98ef84bb219aa8414032
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.6.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.6.ebuild
index d1ba09ec9c86..6cc25934b776 100644
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.6.ebuild
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.6.ebuild,v 1.8 2010/08/29 18:05:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.7.6.ebuild,v 1.9 2011/02/04 17:57:38 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 inherit xfconf
 
 DESCRIPTION="Xfce4 panel sticky notes plugin"
@@ -27,7 +27,10 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
-	XFCONF="--disable-dependency-tracking
+
+	XFCONF=(
+		--disable-dependency-tracking
 		--disable-static
-		$(xfconf_use_debug)"
+		$(xfconf_use_debug)
+		)
 }
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
index f037385e78fb..27e1795f1e2d 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
+++ b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild,v 1.8 2010/08/29 18:06:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild,v 1.9 2011/02/04 17:59:06 ssuominen Exp $
 
+EAPI=3
 EAUTORECONF=yes
 EINTLTOOLIZE=yes
-EAPI=2
 inherit xfconf
 
 DESCRIPTION="Xfce4 panel quicklauncher plugin"
@@ -24,9 +24,11 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog TODO"
-	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
-	PATCHES=( "${FILESDIR}/${P}-X-XFCE-Module-Path.patch" )
+	XFCONF=(
+		--disable-dependency-tracking
+		$(use_enable debug)
+		)
+	PATCHES=( "${FILESDIR}"/${P}-X-XFCE-Module-Path.patch )
 }
 
 src_prepare() {
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index ac727b36337d..27f1d6285498 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -2,7 +2,7 @@ AUX xfce4-systemload-plugin-0.4.2-fix-tooltip-gtk2.12.patch 893 RMD160 82629579b
 AUX xfce4-systemload-plugin-0.4.2-libtool.patch 320 RMD160 e7b9281e27cd03d1fb0c3ec7aa5c458a0cb590ba SHA1 7ca21f3a9c7fe8407bb68f8b243a4c838b85bc58 SHA256 5be268498ebaefedfca1542ec7a89b23c14ea78e4bcf4e0e4afcf3367b4b56f6
 DIST xfce4-systemload-plugin-0.4.2.tar.bz2 184575 RMD160 228ad33b12a6a1151be6d079bd4c5a18fd50ba76 SHA1 517cc051633cc6f28147d5adeaf5db56219dddfb SHA256 0ca193fd7a21403566b452e42951e5ab816dcc69cfcca816b245da00f41ffc55
 DIST xfce4-systemload-plugin-1.0.0.tar.bz2 305892 RMD160 bfa33ca532d53f4e540423760cccb9ff9546eb05 SHA1 2268823be8248538a340a214804dba66d27fdfd4 SHA256 4a2ffe49572105e301b5bf6666fff9e48126f1ef7e5fbed9f4b495fd48c192f9
-EBUILD xfce4-systemload-plugin-0.4.2-r1.ebuild 1218 RMD160 f23d9b9f14553ca9723f15c91178838e56918002 SHA1 56933b02f0f7a7970073ffa497429d2c1ae93490 SHA256 90660821117e1b33de54e88468b7ed5ff51fb1dba37bd89bf8723078987cce48
+EBUILD xfce4-systemload-plugin-0.4.2-r1.ebuild 1217 RMD160 1fde83927d80acb24f59e24f62f57ff3da6651be SHA1 8d8299fe0a8a5e7e19300137711adc7a2d386b1f SHA256 063bb3014d6f95bf1a96d490bd1bda6187e59d462344918b9f8056799d6450fb
 EBUILD xfce4-systemload-plugin-1.0.0.ebuild 956 RMD160 30f26737f7f814b654a18cfa28fa592ce13d46ee SHA1 81244c2f2dc959262870ab43f3d26e0ede0d3c6a SHA256 5020d9cd2e5d278abedb5f476093814368b505981a4062246a4e167e5bec9395
 MISC ChangeLog 1954 RMD160 cf873ceffcdb69660ccda40990aa191ffad6dd93 SHA1 a380b248bb1b90f3556fdb5704ddc2b6fbbcaf11 SHA256 cd6aca9665097b662878be47e0b290b0e4e0c2e6193f4990ed377e0309109d6c
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63