EAPI4

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

19 files changed, 98 insertions, 148 deletions

diff --git a/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild b/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild
index b6e02433c0e1..db63d143828d 100644
--- a/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild
+++ b/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild,v 1.6 2011/03/21 22:23:59 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild,v 1.7 2011/05/19 21:37:37 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="A download manager that works exclusively with aria2"
@@ -16,7 +16,7 @@ IUSE=""
 
 COMMON_DEPEND=">=x11-libs/gtk+-2.12:2
 	dev-libs/libunique:1
-	>=xfce-base/libxfce4util-4.4
+	>=xfce-base/libxfce4util-4.8
 	>=net-libs/libsoup-2.26:2.4"
 RDEPEND="${COMMON_DEPEND}
 	>=net-misc/aria2-1.9.0[bittorrent,xmlrpc]
@@ -30,11 +30,7 @@ DEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${P}-syntax.patch )
-	XFCONF=(
-		--disable-dependency-tracking
-		)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
+	DOCS=( AUTHORS ChangeLog NEWS README )
 }
 
 src_prepare() {
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild
index d6d1284428b9..ad71206e7968 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild,v 1.6 2011/04/23 17:48:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.0.ebuild,v 1.7 2011/05/19 21:44:35 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="Thunar's archive plug-in"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug"
 
-RDEPEND=">=xfce-base/libxfce4util-4.6
+RDEPEND=">=xfce-base/libxfce4util-4.8
 	>=xfce-base/exo-0.6
 	>=xfce-base/thunar-1.2"
 DEPEND="${RDEPEND}
@@ -23,10 +23,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 pkg_setup() {
-	XFCONF=(
-		--disable-dependency-tracking
-		$(xfconf_use_debug)
-		)
-
-	DOCS="AUTHORS ChangeLog NEWS README THANKS"
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 }
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.ebuild
index 28a611f40960..9b0a1be2111f 100644
--- a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.ebuild
+++ b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.ebuild,v 1.3 2011/01/16 19:19:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.ebuild,v 1.4 2011/05/19 21:45:14 ssuominen Exp $
 
 # git clone -b thunarx-2 git://git.xfce.org/thunar-plugins/thunar-shares-plugin
 
-EAPI=3
+EAPI=4
 EAUTORECONF=yes
 inherit xfconf
 
@@ -26,10 +26,9 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	XFCONF=(
-		--disable-dependency-tracking
 		--disable-static
 		$(xfconf_use_debug)
 		)
 
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
 }
diff --git a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
index fcd3cd0ce6b2..3eb0c4a685ba 100644
--- a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
+++ b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild,v 1.1 2011/03/20 13:25:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild,v 1.2 2011/05/19 21:41:22 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="adds Subversion and GIT actions to the context menu of thunar"
@@ -28,11 +28,10 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	XFCONF=(
-		--disable-dependency-tracking
 		$(use_enable subversion)
 		$(use_enable git)
 		$(xfconf_use_debug)
 		)
 
-	DOCS="AUTHORS ChangeLog NEWS README"
+	DOCS=( AUTHORS ChangeLog NEWS README )
 }
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.6.0.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.6.0.ebuild
index 8f2edd011e4d..d2220910279d 100644
--- a/xfce-extra/thunar-volman/thunar-volman-0.6.0.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-0.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/thunar-volman-0.6.0.ebuild,v 1.6 2011/02/14 19:48:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/thunar-volman-0.6.0.ebuild,v 1.7 2011/05/19 21:41:59 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="Daemon that enforces volume-related policies"
@@ -31,10 +31,9 @@ DEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	XFCONF=(
-		--disable-dependency-tracking
 		$(use_enable libnotify notifications)
 		$(xfconf_use_debug)
 		)
 
-	DOCS="AUTHORS ChangeLog NEWS README THANKS"
+	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 }
diff --git a/xfce-extra/tumbler/tumbler-0.1.21.ebuild b/xfce-extra/tumbler/tumbler-0.1.21.ebuild
index 903e1d7e836c..366edafe0e53 100644
--- a/xfce-extra/tumbler/tumbler-0.1.21.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.1.21.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/tumbler/tumbler-0.1.21.ebuild,v 1.6 2011/04/26 17:48:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/tumbler/tumbler-0.1.21.ebuild,v 1.7 2011/05/19 21:35:54 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="A thumbnail service for the filemanager of Xfce desktop environment"
@@ -31,7 +31,6 @@ DEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	XFCONF=(
-		--disable-dependency-tracking
 		--disable-static
 		$(use_enable jpeg jpeg-thumbnailer)
 		$(use_enable ffmpeg ffmpeg-thumbnailer)
@@ -40,5 +39,5 @@ pkg_setup() {
 		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
 		)
 
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
 }
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild
index 9e00cfb009e6..5b72c3e4235d 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild
@@ -1,8 +1,8 @@
 # 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-1.0.0.ebuild,v 1.4 2011/03/22 20:49:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.0.0.ebuild,v 1.5 2011/05/19 21:29:58 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="A panel plugin for showing information about cpufreq settings"
@@ -15,18 +15,14 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=xfce-base/libxfce4util-4.3.90
-	>=xfce-base/libxfcegui4-4.3.90
-	>=xfce-base/xfce4-panel-4.3.90"
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
 pkg_setup() {
-	XFCONF=(
-		--disable-dependency-tracking
-		)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
+	DOCS=( AUTHORS ChangeLog NEWS README )
 }
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
index c4eaf653c907..4bcc5e7d2d0d 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild
@@ -1,8 +1,8 @@
 # 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.3.0.ebuild,v 1.7 2011/04/23 17:35:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.3.0.ebuild,v 1.8 2011/05/19 21:30:45 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="Xfce's disk usage and performance panel plugin"
@@ -14,17 +14,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug"
 
-RDEPEND=">=xfce-base/libxfcegui4-4.3.90
-	>=xfce-base/xfce4-panel-4.3.90"
+RDEPEND=">=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
 pkg_setup() {
-	XFCONF=(
-		--disable-dependency-tracking
-		$(xfconf_use_debug)
-		)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog NEWS 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 f36c595e91ee..540b9435cdca 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-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.4 2011/02/04 17:57:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild,v 1.5 2011/05/19 21:42:34 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 EAUTORECONF=yes
 inherit xfconf
 
@@ -15,9 +15,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug ipv6 ssl"
 
-RDEPEND=">=xfce-base/libxfce4util-4.2
-	>=xfce-base/libxfcegui4-4.2
-	>=xfce-base/xfce4-panel-4.3.20
+RDEPEND=">=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8
 	ssl? ( >=net-libs/gnutls-1.2 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -30,11 +30,10 @@ pkg_setup() {
 		)
 
 	XFCONF=(
-		--disable-dependency-tracking
 		$(use_enable ssl)
 		$(use_enable ipv6)
 		$(xfconf_use_debug)
 		)
 
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
 }
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild
index 265b2bd76008..3181078e2d38 100644
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild,v 1.15 2011/02/14 20:31:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.2.0.ebuild,v 1.16 2011/05/19 21:34:05 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 EAUTORECONF=yes
 inherit xfconf
 
@@ -16,24 +16,17 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~
 IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=xfce-base/libxfce4util-4.3.90.2
-	>=xfce-base/libxfcegui4-4.3.90.2
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfcegui4-4.8
 	xfce-extra/thunar-vfs
-	>=xfce-base/exo-0.3.1.1
-	>=xfce-base/xfce4-panel-4.5.92"
+	>=xfce-base/exo-0.6
+	>=xfce-base/xfce4-panel-4.8"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
 pkg_setup() {
-	if has_version ">=xfce-base/exo-0.5"; then
-		PATCHES=( "${FILESDIR}"/${P}-exo.patch )
-	fi
-
-	XFCONF=(
-		--disable-dependency-tracking
-		$(xfconf_use_debug)
-		)
-
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	PATCHES=( "${FILESDIR}"/${P}-exo.patch )
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
 }
diff --git a/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild b/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild
index 19ac241a15f4..0d644ca09939 100644
--- a/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild
+++ b/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild,v 1.4 2011/03/02 19:12:12 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild,v 1.5 2011/05/19 21:32:12 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="Audacious and MPD panel plugins"
@@ -14,9 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audacious mpd"
 
-RDEPEND=">=xfce-base/libxfcegui4-4.2
-	>=xfce-base/xfce4-panel-4.3.20
-	>=xfce-base/libxfce4util-4.3
+RDEPEND=">=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8
+	>=xfce-base/libxfce4util-4.8
 	>=x11-libs/pango-1.8
 	>=x11-libs/gtk+-2.4:2
 	mpd? ( >=media-libs/libmpd-0.12 )
@@ -30,18 +30,17 @@ pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${P}-undeclared_XfceRc.patch )
 
 	XFCONF=(
-		--disable-dependency-tracking
 		--disable-static
 		--disable-xmms
 		$(use_enable audacious)
 		$(use_enable mpd)
 		)
 
-	DOCS="AUTHORS ChangeLog README README.developers"
+	DOCS=( AUTHORS ChangeLog README README.developers )
 }
 
 src_prepare() {
-	xfconf_src_prepare
 	echo panel-plugin/mpc.c >> po/POTFILES.skip
 	echo panel-plugin/popupmenu.c >> po/POTFILES.skip
+	xfconf_src_prepare
 }
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild
index 00aa2bd1cfa4..750f4273933a 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild,v 1.5 2011/03/22 20:57:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild,v 1.6 2011/05/19 21:40:13 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 EAUTORECONF=yes
 inherit flag-o-matic xfconf
 
@@ -19,7 +19,7 @@ RDEPEND=">=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfce4util-4.4
 	>=xfce-base/libxfcegui4-4.4
 	>=xfce-base/xfce4-panel-4.4
-	libnotify? ( >=x11-libs/libnotify-0.4 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
 	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0 )
 	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )"
 DEPEND="${RDEPEND}
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	has_version ">=x11-libs/libnotify-0.7" && append-cppflags -DHAVE_LIBNOTIFY_07
+	append-cppflags -DHAVE_LIBNOTIFY_07
 
 	PATCHES=(
 		"${FILESDIR}"/${P}-missing_includedir.patch
@@ -37,7 +37,6 @@ pkg_setup() {
 	)
 
 	XFCONF=(
-		--disable-dependency-tracking
 		--disable-static
 		$(use_enable hddtemp)
 		$(use_enable hddtemp netcat)
@@ -55,7 +54,7 @@ pkg_setup() {
 			)
 	fi
 
-	DOCS="AUTHORS ChangeLog NEWS NOTES README TODO"
+	DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
 }
 
 src_prepare() {
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild
index 55d45da293a3..167ae7815465 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild
+++ b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild,v 1.3 2011/01/29 16:07:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.2.ebuild,v 1.4 2011/05/19 21:40:54 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 EAUTORECONF=yes
 inherit xfconf
 
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug"
 
-COMMON_DEPEND=">=xfce-base/libxfcegui4-4.2
-	>=xfce-base/xfce4-panel-4.3.20"
+COMMON_DEPEND=">=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8"
 RDEPEND="${COMMON_DEPEND}
 	xfce-base/xfce-utils"
 DEPEND="${COMMON_DEPEND}
@@ -27,12 +27,11 @@ pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${P}-xfce48.patch )
 
 	XFCONF=(
-		--disable-dependency-tracking
 		--disable-static
 		$(xfconf_use_debug)
 		)
 
-	DOCS="AUTHORS ChangeLog README"
+	DOCS=( AUTHORS ChangeLog README )
 }
 
 src_prepare() {
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild
index 103b4b79d182..5b7016657136 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild,v 1.7 2011/04/23 17:42:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild,v 1.8 2011/05/19 21:43:22 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="System load plug-in for Xfce panel"
@@ -15,17 +15,14 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~
 IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=xfce-base/xfce4-panel-4.3.99.1
-	>=xfce-base/libxfcegui4-4.3.99.1
-	>=xfce-base/libxfce4util-4.3.99.1"
+	>=xfce-base/xfce4-panel-4.8
+	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/libxfce4util-4.8"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
 pkg_setup() {
-	XFCONF=(
-		--disable-dependency-tracking
-		$(xfconf_use_debug)
-		)
-	DOCS="AUTHORS ChangeLog NEWS README"
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog NEWS README )
 }
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0.ebuild
index 3e6543105d3a..81aa1f6317d7 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0.ebuild,v 1.9 2011/03/21 22:41:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.0.ebuild,v 1.10 2011/05/19 21:43:59 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="Task Manager"
@@ -23,10 +23,9 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	XFCONF=(
-		--disable-dependency-tracking
 		--enable-wnck
 		$(xfconf_use_debug)
 		)
 
-	DOCS="AUTHORS ChangeLog NEWS README THANKS"
+	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 }
diff --git a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.0.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.0.ebuild
index 6d5e21ba8131..690f0c71676e 100644
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.0.ebuild
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.0.ebuild,v 1.8 2011/04/23 17:44:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.0.ebuild,v 1.9 2011/05/19 21:32:55 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="A panel plug-in to take periodical breaks from the computer"
@@ -15,19 +15,13 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.8:2
-	>=xfce-base/xfce4-panel-4.3.99.2
-	>=xfce-base/libxfce4util-4.3.99.2
-	>=xfce-base/libxfcegui4-4.3.99.2"
+	>=xfce-base/xfce4-panel-4.8
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfcegui4-4.8"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
 pkg_setup() {
-	# $(xfconf_use_debug) removed because this package is still using
-	# libxfcegui4.  restore when ported to libxfce4ui.
-	XFCONF=(
-		--disable-dependency-tracking
-		)
-
-	DOCS="AUTHORS ChangeLog NEWS README THANKS"
+	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 }
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild
index d4fe199dafb6..544777d9284b 100644
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild,v 1.3 2011/01/29 07:21:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-0.6.1.ebuild,v 1.4 2011/05/19 21:34:50 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="A simple timer plug-in for the Xfce desktop environment"
@@ -14,19 +14,14 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=xfce-base/xfce4-panel-4.3.20
-	>=xfce-base/libxfcegui4-4.2
-	>=xfce-base/libxfce4util-4.3"
+RDEPEND=">=xfce-base/xfce4-panel-4.8
+	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/libxfce4util-4.8"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
 pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${P}-segfault_with_48_panel.patch )
-
-	XFCONF=(
-		--disable-dependency-tracking
-		)
-
-	DOCS="AUTHORS ChangeLog README TODO"
+	DOCS=( AUTHORS ChangeLog README TODO )
 }
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4.ebuild
index 8c86aa638f54..d899f7796cc2 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4.ebuild,v 1.1 2011/02/03 22:30:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.7.4.ebuild,v 1.2 2011/05/19 21:45:53 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit xfconf
 
 DESCRIPTION="A weather plug-in for the Xfce desktop environment"
@@ -15,19 +15,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=xfce-base/libxfce4util-4.3.90.2
-	>=xfce-base/libxfcegui4-4.3.90.2
-	>=xfce-base/xfce4-panel-4.3.99.1
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfcegui4-4.8
+	>=xfce-base/xfce4-panel-4.8
 	>=dev-libs/libxml2-2.4"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCONF=(
-		--disable-dependency-tracking
-		$(xfconf_use_debug)
-		)
-
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
 }
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index cd8e51eb30b5..97d3fdaf7f52 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 DIST xfce4-xkb-plugin-0.5.4.0.tar.bz2 770012 RMD160 bcf1b5b7a98069f79053411f03a2554acf18155b SHA1 ed341dc3ff42b791a04962397c8414a3be061877 SHA256 6f1c508ffcc0409b3c75673772009474d0b7feeb0be9558f6af20c177f34cde7
 DIST xfce4-xkb-plugin-0.5.4.0_p20110501.tar.xz 1888304 RMD160 b94fa27cc7677fe97b7d46d041964420886dad45 SHA1 572ca03c998af971ca077861f4e36510002aa87b SHA256 0d71d6800132254a699df78462acf6450340dc2aaf08201dce3b7037a23e0144
-EBUILD xfce4-xkb-plugin-0.5.4.0.ebuild 1021 RMD160 4d85b0335393362043f03dcf22056f8662b8bb2d SHA1 1f3da85d0efb1ca8e656b488239e7ac51933a3c7 SHA256 b7e3a20c5dcc4bd897516bff1b261197b6bb0df4fb33a311b00b4cadadaf5a90
+EBUILD xfce4-xkb-plugin-0.5.4.0.ebuild 1023 RMD160 d4e3bf461f6f8d49978293dc0e36f68639355821 SHA1 2bb4aea1f7a4500a6e7cbaf318a46df1694c7878 SHA256 560426d4f6690c512966a60d5bc9a3c84862084ca3016ae99404f4f21131409a
 EBUILD xfce4-xkb-plugin-0.5.4.0_p20110501.ebuild 1132 RMD160 bc11b4cc037b448f7d2189b1e9d58a9fe96279be SHA1 8bf3b685ff049ed316b62690bc83673a8ef6f9b5 SHA256 cd5399ef73bd8c337b379b637d34a07ce6e606646f5ce9ed1bef80a1b7fb30f8
 MISC ChangeLog 4022 RMD160 1392e1bc47d6fa6c8da766fd6713df2c4aa7aeca SHA1 73020740cf0a065e99973fe4edec971448374835 SHA256 3a69ba483082a0c03cf7b6116ca1b0d5e3abba93a937e1ecdee34a9b3f1c2c27
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk29Q4kACgkQXkR9YqOcLPG4ZQEApwfjIxPXonMcY/pq9cWTI6sH
-NYpGIZ1K1nsJrwUpxUUA/AoEWo6GE/J7tBd7m7kEkPEomFVHeK8ibtmRwggNx/lN
-=6GwH
+iF4EAREIAAYFAk3Vj6kACgkQXkR9YqOcLPEv4wEAgAdMyLXaDQMUoP2Ga1CPvS6e
+5yViTkTphgmPJbwylEsA/0QoyHSHrei1B9bO+yB1QC0jb9rvYUuRt/aIjuTrAriZ
+=Iu98
 -----END PGP SIGNATURE-----