Overhaul

46 files changed, 274 insertions, 239 deletions

diff --git a/eclass/xfce4.eclass b/eclass/xfce4.eclass
index dbbe3ba..eec6f7f 100644
--- a/eclass/xfce4.eclass
+++ b/eclass/xfce4.eclass
@@ -10,12 +10,8 @@
 # This eclass provides functions to install Xfce4 packages with a
 # minimum of duplication in ebuilds
 
-inherit fdo-mime gnome2-utils libtool
+inherit autotools fdo-mime git gnome2-utils libtool
 [ -n ${XFCE4_PATCHES} ] && inherit eutils
-if [ ${PV} = 9999 ]; then
-	inherit autotools
-	inherit git
-fi
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,14 +19,8 @@ SLOT="0"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-[ ${PV} = 9999 -a -z "${XFCE_VERSION}" ] && XFCE_VERSION="4.6.0"
-[ -z ${XFCE_VERSION} ] && XFCE_VERSION=${PV}
-[ -z ${THUNAR_VERSION} ] && THUNAR_VERSION="0.9"
-
-if [ ${PV} = 9999 ]; then
-	[ ${PN} != xfce4-dev-tools ] && DEPEND+="
-		>=dev-util/xfce4-dev-tools-${XFCE_VERSION}"
-fi
+[ ${PN} != xfce4-dev-tools ] && DEPEND+="
+	>=dev-util/xfce4-dev-tools-9999"
 
 
 # @FUNCTION: xfce4_apps
@@ -42,11 +32,7 @@ xfce4_uri() {
 	[ -z ${COMPRESS} ] && COMPRESS=".tar.bz2"
 	S="${WORKDIR}/${MY_P}"
 
-	if [ ${PV} = 9999 ]; then
-		EGIT_REPO_URI="git://git.xfce.org/${XFCE_CAT}/${MY_PN:-${PN}}"
-	else
-		SRC_URI="mirror://xfce/${XFCE_CAT}/${XFCE_VERSION}/${MY_PN:-${PN}}/${MY_P}${COMPRESS}"
-	fi
+	EGIT_REPO_URI="git://git.xfce.org/${XFCE_CAT}/${MY_PN:-${PN}}"
 }
 
 # @FUNCTION: xfce4_apps
@@ -96,8 +82,8 @@ xfce4_panel_plugin() {
 	XFCE_CAT="panel-plugins"
 	xfce4_uri
 	[ -z ${HOMEPAGE} ] && HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/${MY_PN}"
-	RDEPEND="${RDEPEND} >=xfce-base/xfce4-panel-${XFCE_VERSION}"
-	DEPEND="${DEPEND} >=xfce-base/xfce4-panel-${XFCE_VERSION}"
+	RDEPEND="${RDEPEND} >=xfce-base/xfce4-panel-9999"
+	DEPEND="${DEPEND} >=xfce-base/xfce4-panel-9999"
 }
 
 # @FUNCTION: xfce4_thunar_plugin
@@ -108,8 +94,8 @@ xfce4_thunar_plugin() {
 	XFCE_CAT="thunar-plugins"
 	xfce4_uri
 	[ -z ${HOMEPAGE} ] && HOMEPAGE="http://thunar.xfce.org/plugins.html"
-	RDEPEND="${RDEPEND} >=xfce-base/thunar-${THUNAR_VERSION}"
-	DEPEND="${DEPEND} >=xfce-base/thunar-${THUNAR_VERSION}"
+	RDEPEND="${RDEPEND} >=xfce-base/thunar-9999"
+	DEPEND="${DEPEND} >=xfce-base/thunar-9999"
 }
 
 # @FUNCTION: xfce4_core
@@ -133,12 +119,8 @@ xfce4_single_make() {
 # @DESCRIPTION:
 # Unpack depending on the source and run src_prepare on EAPI < 2
 xfce4_src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		XFCE_CONFIG+=" --enable-maintainer-mode --disable-dependency-tracking"
-		git_src_unpack
-	else
-		unpack ${A}
-	fi
+	XFCE_CONFIG+=" --enable-maintainer-mode"
+	git_src_unpack
 	cd "${S}"
 	
 	[ "${EAPI}" -le 1 ] && xfce4_src_prepare
@@ -150,37 +132,32 @@ xfce4_src_unpack() {
 # configure.ac
 # Run elibtoolize to fix libraries on BSD
 xfce4_src_prepare() {
-	if [ ${PV} = 9999 ]; then
-		local revision
-		revision=$(git show --pretty=format:%ci | head -n 1 | \
-		awk '{ gsub("-", "", $1); print $1"-"; }')
-		revision+=$(git rev-parse HEAD | cut -c1-8)
-
-		local linguas
-		[ -d po ] && linguas=`cd po 2>/dev/null && ls *.po 2>/dev/null | awk 'BEGIN { FS="."; ORS=" " } { print $1 }'`
-		[ -n "${XFCE4_PATCHES}" ] && epatch ${XFCE4_PATCHES}
-		if [ -f configure.??.in ]; then
-			[ -f configure.ac.in ] && configure=configure.ac.in
-			[ -f configure.in.in ] && configure=configure.in.in
-			sed -i -e "s/@LINGUAS@/${linguas}/g" ${configure}
-			sed -i -e "s/@REVISION@/${revision}/g" ${configure}
-			cp ${configure} ${configure/.in}
-		fi
-		if [ -f configure.?? ]; then
-			[ -f configure.ac ] && configure=configure.ac
-			[ -f configure.in ] && configure=configure.in
-			[ ${PN} != xfce4-dev-tools ] && AT_M4DIR="/usr/share/xfce4/dev-tools/m4macros"
-			[ -n "${WANT_GTKDOCIZE}" ] && gtkdocize --copy
-			if [ -d po ]; then
-				grep -Eqs "^(AC|IT)_PROG_INTLTOOL" ${configure} \
-				&& intltoolize --automake --copy --force \
-				|| glib-gettextize --copy --force >/dev/null
-			fi
-			eautoreconf
+	local revision
+	revision=$(git show --pretty=format:%ci | head -n 1 | \
+	awk '{ gsub("-", "", $1); print $1"-"; }')
+	revision+=$(git rev-parse HEAD | cut -c1-8)
+
+	local linguas
+	[ -d po ] && linguas=`cd po 2>/dev/null && ls *.po 2>/dev/null | awk 'BEGIN { FS="."; ORS=" " } { print $1 }'`
+	[ -n "${XFCE4_PATCHES}" ] && epatch ${XFCE4_PATCHES}
+	if [ -f configure.??.in ]; then
+		[ -f configure.ac.in ] && configure=configure.ac.in
+		[ -f configure.in.in ] && configure=configure.in.in
+		sed -i -e "s/@LINGUAS@/${linguas}/g" ${configure}
+		sed -i -e "s/@REVISION@/${revision}/g" ${configure}
+		cp ${configure} ${configure/.in}
+	fi
+	if [ -f configure.?? ]; then
+		[ -f configure.ac ] && configure=configure.ac
+		[ -f configure.in ] && configure=configure.in
+		[ ${PN} != xfce4-dev-tools ] && AT_M4DIR="/usr/share/xfce4/dev-tools/m4macros"
+		[ -n "${WANT_GTKDOCIZE}" ] && gtkdocize --copy
+		if [ -d po ]; then
+			grep -Eqs "^(AC|IT)_PROG_INTLTOOL" ${configure} \
+			&& intltoolize --automake --copy --force \
+			|| glib-gettextize --copy --force >/dev/null
 		fi
-	else
-		[ -n "${XFCE4_PATCHES}" ] && epatch ${XFCE4_PATCHES}
-		elibtoolize
+		eautoreconf
 	fi
 }
 
diff --git a/x11-themes/gtk-engines-xfce/Manifest b/x11-themes/gtk-engines-xfce/Manifest
index d9dfb0f..1c5befe 100644
--- a/x11-themes/gtk-engines-xfce/Manifest
+++ b/x11-themes/gtk-engines-xfce/Manifest
@@ -1,2 +1,2 @@
-EBUILD gtk-engines-xfce-9999.ebuild 428 RMD160 8acedd29a804b52279b04acb4e884b3c7149d227 SHA1 d233f7f9a5d1595250f4d4bf401b84abcfa38e89 SHA256 b26a967a38baced40fc1080b466235435a54811e207a2e86888cd170718ada61
+EBUILD gtk-engines-xfce-9999.ebuild 590 RMD160 5ec27d4dba594ef9a4c5d97806a058b0891d299b SHA1 1fa9c3456ebd728f1a78a3ec351f8dc2b7660add SHA256 b72fafeac83af03224f2274ac8e4c423288d4d14d2503129f84cb6eed894bab0
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-9999.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-9999.ebuild
index 528fde1..383cb6c 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-9999.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-9999.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-MY_PN="gtk-xfce-engine"
-
+EAPI=2
+MY_PN=gtk-xfce-engine
 inherit xfce4
 
 xfce4_core
 
 DESCRIPTION="GTK+ Xfce4 theme engine"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=dev-libs/glib-2.6:2
-	x11-libs/cairo
-	x11-libs/pango"
+RDEPEND=">=x11-libs/gtk+-2.12:2"
 
-DOCS="AUTHORS ChangeLog NEWS README"
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	XFCONF="--disable-dependency-tracking"
+}
diff --git a/x11-themes/xfce4-icon-theme/Manifest b/x11-themes/xfce4-icon-theme/Manifest
index 2b085dd..1ebeeda 100644
--- a/x11-themes/xfce4-icon-theme/Manifest
+++ b/x11-themes/xfce4-icon-theme/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-icon-theme-9999.ebuild 394 RMD160 2fa310ab93d8dd9691c7c8363847653db418cc8c SHA1 7ca55aaf4db86503f8c9698180b3994cac18aa55 SHA256 377d2df0164e5e7fa755b9c8fc1fd9bc607554dfab8a332fb4bd32ea970b90bc
+EBUILD xfce4-icon-theme-9999.ebuild 441 RMD160 987286b5020f5e17cca74a049f87ce5766f98b0e SHA1 3a8ade60139f45aad59e2fe12a62378cc0f21a16 SHA256 3983eb32a48da42891b68eaf85019c40de6e52448b151c52f949046b7984c195
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/x11-themes/xfce4-icon-theme/xfce4-icon-theme-9999.ebuild b/x11-themes/xfce4-icon-theme/xfce4-icon-theme-9999.ebuild
index 1f5a11e..ae1240e 100644
--- a/x11-themes/xfce4-icon-theme/xfce4-icon-theme-9999.ebuild
+++ b/x11-themes/xfce4-icon-theme/xfce4-icon-theme-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,12 +6,10 @@ inherit xfce4
 
 xfce4_art
 
-DESCRIPTION="Icon theme"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+DESCRIPTION="Default icon theme for Xfce4, called Rodent."
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="binchecks strip"
 
 RDEPEND="x11-themes/hicolor-icon-theme"
 DEPEND="dev-util/intltool"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/x11-themes/xfwm4-themes/Manifest b/x11-themes/xfwm4-themes/Manifest
index f5f8510..7ec43b5 100644
--- a/x11-themes/xfwm4-themes/Manifest
+++ b/x11-themes/xfwm4-themes/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfwm4-themes-9999.ebuild 382 RMD160 b67c6f9777bed29c92c8f9b0513128876e5654ae SHA1 90dc3c74716050fa83b81bb217989e09ca0a4d3b SHA256 a0d626e5e2c1728c25a01dd9d960736c88e743837e10664f44abb031748bc1ce
+EBUILD xfwm4-themes-9999.ebuild 505 RMD160 9705c44433d87344e6a6c9cf1b7627c293eb1058 SHA1 9a36b070aa3f055db3b9e1484d7aeff33145ae20 SHA256 dce4f3cfb1dcd9e48d12bb1b8cb4bcf8124021926e9693b9b08c6245a93c4ef1
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/x11-themes/xfwm4-themes/xfwm4-themes-9999.ebuild b/x11-themes/xfwm4-themes/xfwm4-themes-9999.ebuild
index 4c10c1b..415858d 100644
--- a/x11-themes/xfwm4-themes/xfwm4-themes-9999.ebuild
+++ b/x11-themes/xfwm4-themes/xfwm4-themes-9999.ebuild
@@ -1,16 +1,23 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
 inherit xfce4
 
-xfce4_art
+DESCRIPTION="Xfce4 window manager themes"
+HOMEPAGE="http://www.xfce.org/"
 
-DESCRIPTION="Window manager themes"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
-RESTRICT="binchecks strip"
 
-RDEPEND=">=xfce-base/xfwm4-${XFCE_VERSION}"
+RDEPEND=">=xfce-base/xfwm4-${PV}"
+DEPEND=""
+
+RESTRICT="binchecks strip"
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog README TODO"
+}
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 5113887..ad6204d 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,2 +1,2 @@
-EBUILD exo-9999.ebuild 1353 RMD160 7a70a7e326e473fb913c3f68dfdcb19307dd8683 SHA1 c608ad1a0f0fdbc4d9e3756c3305aad2fe22fc42 SHA256 f01c669bad5b29c0e71d89561352180189ed8be9d03d21591ce938dd2d0f41b3
+EBUILD exo-9999.ebuild 1385 RMD160 f043f8cd28759393751b98a60b0af6581959d540 SHA1 61b3ab45cb177485aaa98b506059cb58033a3ed9 SHA256 501dfae986f96fc99e2f2a3c3e550af9bdb889a2ce43594d45b1e0570d856fce
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/exo/exo-9999.ebuild b/xfce-base/exo/exo-9999.ebuild
index c6e2114..821b4ef 100644
--- a/xfce-base/exo/exo-9999.ebuild
+++ b/xfce-base/exo/exo-9999.ebuild
@@ -26,7 +26,8 @@ DEPEND="${RDEPEND}
 WANT_GTKDOCIZE="yes"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-static
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		--disable-static
 		$(use_enable libnotify notifications)
 		$(use_enable hal)
 		$(use_enable python)
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index b514240..1b6a66a 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1 +1,2 @@
-EBUILD garcon-9999.ebuild 676 RMD160 c342d1a7c59b236faa3750621a022929ea4745df SHA1 24c18987863773601ccc197e34d4c060e7262fce SHA256 7d0cc5e8d0d03b1abade83a1305bb90d3edb4307bbb8e59aa09604abe1b37566
+EBUILD garcon-9999.ebuild 698 RMD160 8fd14c8622572dbadb0b9ac91ee376818f7a50d6 SHA1 89f22f54d6258e22fdecf35d93a3fd9076f0d911 SHA256 b46e85886b48f05da12e31ee55d40ab07217f5f0c5b5d16c37def22abe426578
+MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-base/garcon/garcon-9999.ebuild b/xfce-base/garcon/garcon-9999.ebuild
index e634e80..b8bfb26 100644
--- a/xfce-base/garcon/garcon-9999.ebuild
+++ b/xfce-base/garcon/garcon-9999.ebuild
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}
 WANT_GTKDOCIZE="yes"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-static
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		--disable-static
 		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
 	DOCS="AUTHORS HACKING NEWS README STATUS TODO"
 }
diff --git a/xfce-base/libxfce4menu/Manifest b/xfce-base/libxfce4menu/Manifest
index 59cd98f..40d87ec 100644
--- a/xfce-base/libxfce4menu/Manifest
+++ b/xfce-base/libxfce4menu/Manifest
@@ -1,2 +1,2 @@
-EBUILD libxfce4menu-9999.ebuild 771 RMD160 41fc11a968e5554e1f11ada90ee94936af0ee948 SHA1 8995a947b8c9499b8e4c3d0b93616fec8bd86b5c SHA256 aa31285ee2d7f2b258c92997877d2c3f3e7a7e98d1b291de00c1d6e0c63cf977
+EBUILD libxfce4menu-9999.ebuild 803 RMD160 452ebc4b2ddabaffbf5b446729e96a8aa8bc1cc7 SHA1 735795ac97adb1ec0692f810d7478f3b60e37760 SHA256 4b2f00e5733576bc2886c043b874313c7e5c17f38e53d22e8c5a17fe0567de36
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/libxfce4menu/libxfce4menu-9999.ebuild b/xfce-base/libxfce4menu/libxfce4menu-9999.ebuild
index f48d3f1..f0b93c8 100644
--- a/xfce-base/libxfce4menu/libxfce4menu-9999.ebuild
+++ b/xfce-base/libxfce4menu/libxfce4menu-9999.ebuild
@@ -23,7 +23,8 @@ DEPEND="${RDEPEND}
 WANT_GTKDOCIZE="yes"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-static
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		--disable-static
 		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
 	DOCS="AUTHORS HACKING NEWS README STATUS THANKS TODO"
 }
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index e0ff94d..7a475c1 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,2 +1,2 @@
-EBUILD libxfce4ui-9999.ebuild 926 RMD160 dbfe01ceb7d8dcdf054af3de059a14d7ce452097 SHA1 b8a124cb1f13425126880caf3cae5e492f9ec4a3 SHA256 634218ff98e9f1ba9c6ffd5d276768d3eb93888c05430439514ac45ffe2082c0
+EBUILD libxfce4ui-9999.ebuild 958 RMD160 dee853c31778b1a5b0407b04f4a000fd1b7fb084 SHA1 3762297af79bebb3a894536817e4a65cb4c0da20 SHA256 85916f4aba54c7cceff14002e4dc1de844b5f193f1c72a77468c477ec71e5958
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild b/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild
index fa2e0f0..8ab419d 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild
@@ -31,7 +31,8 @@ DEPEND="${RDEPEND}
 WANT_GTKDOCIZE="yes"
 
 pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable glade gladeui)
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		$(use_enable glade gladeui)
 		--enable-keyboard-library
 		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
 	DOCS="AUTHORS NEWS README THANKS TODO"
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 65715f8..1d251a2 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,2 +1,2 @@
-EBUILD libxfce4util-9999.ebuild 704 RMD160 61146cfe5a9c3cac1d6890e471c2d3f2626011a2 SHA1 e7c6a1e02064da76fbdd809109403effb1e8e566 SHA256 79fa33006f6db2068e433ff6ee42b7b04ae2823eb568d01d5a830e2b237a4d7f
+EBUILD libxfce4util-9999.ebuild 726 RMD160 a8deafd5c0ca3a88a989719a66d6c10a24daae83 SHA1 695430d9d412ecfb7228dff2cfcfb5fa2be36556 SHA256 fe9405e7213ba6c6b55fdb61dd8b324722fd182134ebe79ec544af9de1c7b51b
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/libxfce4util/libxfce4util-9999.ebuild b/xfce-base/libxfce4util/libxfce4util-9999.ebuild
index 4a270c5..fd90274 100644
--- a/xfce-base/libxfce4util/libxfce4util-9999.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-9999.ebuild
@@ -21,7 +21,8 @@ DEPEND="${RDEPEND}
 WANT_GTKDOCIZE="yes"
 
 pkg_setup() {
-	XFCE_CONFIG=" --disable-static
+	XFCE_CONFIG=" --disable-dependency-tracking
+		--disable-static
 		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
-	DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
+	DOCS="AUTHORS NEWS README THANKS TODO"
 }
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
index 77fcb94..273332c 100644
--- a/xfce-base/libxfcegui4/Manifest
+++ b/xfce-base/libxfcegui4/Manifest
@@ -1,2 +1,2 @@
-EBUILD libxfcegui4-9999.ebuild 941 RMD160 14668e2b531ce1eb529a21cd01ea13a7bbf5be6f SHA1 146117dbe534df2587db0a0010c9447309d04df2 SHA256 b5029c195778f7930daf23069251377a6822f271a533a481f4320775768c59df
+EBUILD libxfcegui4-9999.ebuild 973 RMD160 f19616b691aa4a2c649502fc1dfc6e2bc5351270 SHA1 9ede5dbf0198f89e7927df827cc5d9633055b5a8 SHA256 372033df16f9a65f5b6aa69500f88a4afb8d720f3458d3943f7434a9a2fa964e
 MISC metadata.xml 227 RMD160 2023b4e67c56314acd3e483bedff0de00e864131 SHA1 4372778b73dbf21ec8030f1574123dd938c83563 SHA256 82c293b5d834b607586f75cfa8b1420259298d748a19edfea3eaaabfe211b8d1
diff --git a/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild b/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild
index 5bdd2e1..5b2755a 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild
@@ -29,7 +29,8 @@ DEPEND="${RDEPEND}
 WANT_GTKDOCIZE="yes"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-static
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		--disable-static
 		$(use_enable glade gladeui)
 		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
 	DOCS="AUTHORS NEWS README TODO"
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 845042e..05d7dc5 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,2 +1,2 @@
-EBUILD thunar-9999.ebuild 1616 RMD160 69749c77bc2987cf7174a523f7a687c459ebd6f1 SHA1 9eead733c877bd78e99e7dd50fefd4dd21ada973 SHA256 d2ecc64ca4cec31f83b177cb6abd6709fad6511aa26924ec07921260b3cd28e8
+EBUILD thunar-9999.ebuild 1648 RMD160 bdd87c44492171058a02675567ec09220e3c4fb8 SHA1 17714a1564e0a7ecda5f63b26851510446ea873b SHA256 c1660dcaf691fd1349365eda347c46cab69888949d1047a8ef5b88ecba5f2d7e
 MISC metadata.xml 234 RMD160 5cf371faf236f472c7d98a92d7103c5a96c4d95a SHA1 f028da2a6c812a70d5a6c159a450899a5c8f29a2 SHA256 acb3aa4d6a184bbefb0ae06cbb0ed0416ecd1b87d01cae543365cfc0e330d8cb
diff --git a/xfce-base/thunar/thunar-9999.ebuild b/xfce-base/thunar/thunar-9999.ebuild
index 097d1d2..4439c2f 100644
--- a/xfce-base/thunar/thunar-9999.ebuild
+++ b/xfce-base/thunar/thunar-9999.ebuild
@@ -38,7 +38,8 @@ DEPEND="${COMMON_DEPEND}
 WANT_GTKDOCIZE="yes"
 
 pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable dbus)
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		$(use_enable dbus)
 		$(use_enable exif)
 		$(use_enable pcre)
 		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
diff --git a/xfce-base/tumbler/Manifest b/xfce-base/tumbler/Manifest
new file mode 100644
index 0000000..05e154f
--- /dev/null
+++ b/xfce-base/tumbler/Manifest
@@ -0,0 +1,2 @@
+EBUILD tumbler-9999.ebuild 695 RMD160 44de1e47f2aabe2e44ac5a6d0e5fbe5ac94364fc SHA1 1d6bdc930b2d8b0b0a45b5d74c0d3c356bcbda8c SHA256 c3b9400cb0cc09f9b1cd3bdb1f01564c7a3ba1e463a36510832765551b8e904c
+MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/tumbler/metadata.xml b/xfce-base/tumbler/metadata.xml
index 826e2ca..826e2ca 100644
--- a/xfce-extra/tumbler/metadata.xml
+++ b/xfce-base/tumbler/metadata.xml
diff --git a/xfce-base/tumbler/tumbler-9999.ebuild b/xfce-base/tumbler/tumbler-9999.ebuild
new file mode 100644
index 0000000..f5861fb
--- /dev/null
+++ b/xfce-base/tumbler/tumbler-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit xfce4
+
+xfce4_apps
+
+DESCRIPTION="A D-Bus service for applications to request thumbnails"
+HOMEPAGE="http://www.xfce.org/"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=dev-libs/dbus-glib-0.72
+	>=sys-apps/dbus-1
+	>=media-libs/libpng-1.2
+	>=x11-libs/gtk+-2.14:2
+	media-libs/freetype:2"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc
+	dev-util/intltool"
+
+WANT_GTKDOCIZE="yes"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	XFCONF="--disable-dependency-tracking
+		--disable-static
+		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
+}
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 716531a..25c4ebe 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -1,3 +1,3 @@
 AUX Gentoo 644 RMD160 29853c59779a2eb685aa4082bf5c312588fbe633 SHA1 01f2135774ead9534fb374cfbeb7eb123d9aff55 SHA256 1ddff80be5707ff8eb888d8f41d9cd0df5c7e0e1bd84c28ed962b4c71028efc1
-EBUILD xfce-utils-9999.ebuild 1255 RMD160 0a5129f8ce0f57541dd3d7008e484d429bcafa94 SHA1 22d87ee7b7e591db17c14736e7a63e871788cf6b SHA256 16c4a96a5c499dd051ca4572723d004d786462818e8301a5ce001a14a6028d8f
+EBUILD xfce-utils-9999.ebuild 1286 RMD160 fd86b1023c8d0af2757893f4d803d49650b79f00 SHA1 60c9142a220ff5d8198ca140c299c30617fd3b6e SHA256 8cccbaa2f778b4f64d65b5167d3f04222003c930833fbbdac1a03eff40c50bc2
 MISC metadata.xml 218 RMD160 e064747a2c888959d939ed09a70c242d905c89ea SHA1 8ff18a8acc37d299a3cc7b30663ca3eb0f91032e SHA256 c47df69ae42900828c5afb0aa77ee6f9ddca55a79b3326f69a0bbf8119f3d5df
diff --git a/xfce-base/xfce-utils/xfce-utils-9999.ebuild b/xfce-base/xfce-utils/xfce-utils-9999.ebuild
index e904f6a..1a968d5 100644
--- a/xfce-base/xfce-utils/xfce-utils-9999.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-9999.ebuild
@@ -17,7 +17,7 @@ RDEPEND="x11-apps/xrdb
 	>=dev-libs/glib-2.6:2
 	>=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/libxfce4ui-4.7
 	>=xfce-base/xfconf-4.6
 	dbus? ( >=dev-libs/dbus-glib-0.70 )
 	lock? ( || ( x11-misc/xscreensaver
@@ -27,7 +27,8 @@ DEPEND="${RDEPEND}
 	dev-util/intltool"
 
 pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable dbus)
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		$(use_enable dbus)
 		--with-vendor-info=Gentoo
 		--with-xsession-prefix=${EPREFIX}/usr"
 	DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index ed45da3..bb34474 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-panel-9999.ebuild 951 RMD160 a82b570051d24917aeeb5315993a45ada1f05dac SHA1 842e18e8ce139328402f444d6a327923c33dca8a SHA256 3bfcce62fbe5a78faefc19d92786b18b91dc21b6bb0410c14c685d1340c3a3ef
+EBUILD xfce4-panel-9999.ebuild 983 RMD160 6ea1bd413f2c2be8fbce96022bce71a09f8fae8f SHA1 ea707bf7470bc0737da02ed91abfe4101f1ca7c8 SHA256 7b58486787ec24a670f43ece07660f5eb3a0530ae6df4bbdebc7fe4840784b84
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild b/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild
index 9b737a9..eb102a1 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild
@@ -31,7 +31,8 @@ DEPEND="${RDEPEND}
 WANT_GTKDOCIZE="yes"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --docdir=${EPREFIX}/usr/share/doc/${PF}
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		--docdir=${EPREFIX}/usr/share/doc/${PF}
 		--disable-static
 		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
 	DOCS="AUTHORS NEWS THANKS"
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 80ae190..70b6ac9 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-session-9999.ebuild 1898 RMD160 3f4c31168e7bcac1c3c733ac40290ddae2b45821 SHA1 7076a06fb645305343b213d6c1662088f7b2ec6d SHA256 3e34ebe551b95f646cb66ed43efc1bb716488d0126a0ee2c973cb93322980a5d
+EBUILD xfce4-session-9999.ebuild 1930 RMD160 f432685aaaa97f70f612d536dfa0139b2257bcdb SHA1 1e8123184a9acb0594a7ffaa42c07761c609b8e0 SHA256 301b6d693a41001490a24a615a8adec79cb4ca501677678918d4161bf48ae3c5
 MISC metadata.xml 488 RMD160 13303c4a4e3376b4d4c4286fd2cad2bf4f372111 SHA1 4672cdd944c35c440a7b1fce52f55a916f4a94c9 SHA256 34d037edfd9edf3652e1b1c1dde95cc22459a2304c7e2e2c124e0895b55bbcfe
diff --git a/xfce-base/xfce4-session/xfce4-session-9999.ebuild b/xfce-base/xfce4-session/xfce4-session-9999.ebuild
index 77c4352..a555d39 100644
--- a/xfce-base/xfce4-session/xfce4-session-9999.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-9999.ebuild
@@ -30,7 +30,8 @@ DEPEND="${RDEPEND}
 	dev-util/intltool"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-hal
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		--disable-hal
 		--enable-panel-plugin
 		$(use_enable consolekit)
 		$(use_enable gnome)
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 3f82cad..3d4634c 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-settings-9999.ebuild 1140 RMD160 324cab45c6cd000e351e531f3f32d10f6af7ad44 SHA1 bafab88ab4fde3c1f95a2eb3fe701e2ff2fd1e42 SHA256 2fb18af8d889d217241336a848c43cd965f6c816e06d84b3c9cd667a785046f1
+EBUILD xfce4-settings-9999.ebuild 1172 RMD160 6e82e4709f1e74529ccad2fcbd83e3a0e0eacdd1 SHA1 bb83083c31807f9cde220632d062183d211e9574 SHA256 b9a0ddbce607ba763968844e467cc3f62cd9139a18d8ed466005717b5592354b
 MISC metadata.xml 363 RMD160 2f66508d394f9cc14654775f3a0b117bc10d3ef5 SHA1 8a3e6715e41535ea04377624a621c9ada60fd5ff SHA256 2442135d806e37420f1904d5b32e8b7afe94ed212307d25667f363db06c558e3
diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
index 4f8e3e7..f9fc73f 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-static
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		--disable-static
 		$(use_enable libnotify)
 		$(use_enable keyboard libxklavier)
 		$(use_enable sound sound-settings)"
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 7167835..93130c6 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfconf-9999.ebuild 569 RMD160 b840a85f6b780afd7c02aec397fcc15e4445446e SHA1 60569a8694f527091b863664e228fc0e1b46df42 SHA256 bb056d80dba8287629fbfcc0a9d6b7239d851b502f9c0cd89efd4582a71ec4ca
+EBUILD xfconf-9999.ebuild 1307 RMD160 5f2e45826f6f747eb831ae957f2ba7684a414ce1 SHA1 eb29073ffdb0c0402ec5357aa5d605b0ccf72a77 SHA256 0e9ed9059d317c45bc9b31cfd422429a4950161ee4589b0b3ae9ea18e155cfb1
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/xfconf/xfconf-9999.ebuild b/xfce-base/xfconf/xfconf-9999.ebuild
index 132ef12..9c1e799 100644
--- a/xfce-base/xfconf/xfconf-9999.ebuild
+++ b/xfce-base/xfconf/xfconf-9999.ebuild
@@ -1,27 +1,54 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-
+EAPI=3
 inherit xfce4
 
 xfce4_core
 
 DESCRIPTION="Xfce configuration daemon and utilities"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-solaris"
+IUSE="debug -perl profile"
 
 RDEPEND=">=dev-libs/dbus-glib-0.72
 	>=dev-libs/glib-2.12:2
-	>=xfce-base/libxfce4util-${XFCE_VERSION}"
+	>=xfce-base/libxfce4util-4.6
+	perl? ( dev-perl/glib-perl )"
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc"
+	dev-lang/perl
+	dev-util/gtk-doc
+	perl? ( dev-perl/extutils-depends
+		dev-perl/extutils-pkgconfig )"
 
 WANT_GTKDOCIZE="yes"
 
 pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable doc gtk-doc)"
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		--enable-maintainer-mode
+		--disable-static
+		--with-perl-options=INSTALLDIRS=vendor
+		$(use_enable perl perl-bindings)
+		--disable-gtk-doc
+		--disable-gtk-doc-html
+		--disable-gtk-doc-pdf
+		$(use_enable debug checks)
+		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
+
+	use profile && XFCE_CONFIG+=" --enable-profiling"
+
+	DOCS="AUTHORS NEWS README TODO"
+}
+
+src_compile() {
+	emake OTHERLDFLAGS="${LDFLAGS}" || die
 }
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
+src_install() {
+	xfce4_src_install
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -delete
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete
+	fi
+}
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 7051730..be5e869 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,2 +1,3 @@
-EBUILD xfdesktop-9999.ebuild 1802 RMD160 7f2858322f423e73c24760d80c3b96913e1efa9f SHA1 02ddef07f175dddcf8f70b545ac95448daf3d33d SHA256 285ce36ef5a363c325ceb906de085e195db607662126d447f39ddb2e5ddf6ef9
+DIST gentoo-minimal-1280x1024.jpg 103489 RMD160 9d736c236c29c39836910337c6b9b62e0d217c08 SHA1 0ef26494879e6e4f4e66f9111ebfc1080423217b SHA256 6134b6eea65e6c8e996cfaab07d30050d66207a518d589bc9115f8342255c57b
+EBUILD xfdesktop-9999.ebuild 2157 RMD160 22e46ab37f413ce6e5bf288b681075b70b39f841 SHA1 7d05be8ac16d18499ad84a0aa1af3b9f003ea97a SHA256 662895d8d53df7d46131aff65d33ac36a055121f347c219b3123bc38f29941ba
 MISC metadata.xml 351 RMD160 4401cf2e2c9cc9f166bdff78a1e15612e784ad1d SHA1 dc6b0946171dda265a9b13871899a9a8e071f6db SHA256 f2a98defe794e66d32ba0f9041a7b0afb7209345974f114ee2b8454dbe4bc6e9
diff --git a/xfce-base/xfdesktop/xfdesktop-9999.ebuild b/xfce-base/xfdesktop/xfdesktop-9999.ebuild
index ba8af3c..dcd0698 100644
--- a/xfce-base/xfdesktop/xfdesktop-9999.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-9999.ebuild
@@ -1,58 +1,73 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-
-inherit eutils xfce4
+EAPI=2
+inherit xfce4
 
 xfce4_core
 
-DESCRIPTION="Desktop manager"
+DESCRIPTION="Desktop manager for Xfce4"
 HOMEPAGE="http://www.xfce.org/projects/xfdesktop"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc +file-icons +menu-plugin"
+SRC_URI="branding? ( http://www.gentoo.org/images/backgrounds/gentoo-minimal-1280x1024.jpg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+branding debug doc thunar"
 
 LINGUAS="be ca cs da de el es et eu fi fr he hu it ja ko nb_NO nl pa pl pt_BR ro ru sk sv tr uk vi zh_CN zh_TW"
 
-RDEPEND="x11-libs/libX11
+for X in ${LINGUAS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="gnome-base/libglade
+	x11-libs/libX11
 	x11-libs/libSM
 	>=x11-libs/libwnck-2.12
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfce4ui-${XFCE_VERSION}
-	>=xfce-base/libxfce4menu-${XFCE_VERSION}
-	>=xfce-base/xfconf-${XFCE_VERSION}
-	file-icons? ( xfce-extra/thunar-vfs
-		>=xfce-base/exo-0.3.100 dev-libs/dbus-glib )
-	menu-plugin? ( >=xfce-base/xfce4-panel-${XFCE_VERSION} )"
+	>=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.14:2
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfce4ui-4.7
+	>=xfce-base/libxfce4menu-4.6
+	>=xfce-base/xfconf-4.6
+	branding? ( >=x11-libs/gtk+-2.10:2[jpeg] )
+	thunar? ( >=xfce-base/thunar-1
+		>=xfce-base/exo-0.3.100
+		dev-libs/dbus-glib )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	doc? ( dev-libs/libxslt )"
 
-for X in ${LINGUAS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/xfce-registered-categories.xml
-	/etc/xdg/xfce4/desktop/menu.xml"
-
 pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable doc xsltproc) $(use_enable menu-plugin panel-plugin)"
+	XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/menu.xml
+		/etc/xdg/xfce4/desktop/xfce-registered-categories.xml"
+	# TODO: fix USE=thunar
+	XFCE_CONFIG+=" --disable-dependency-tracking
+		--disable-static
+		$(use_enable thunar file-icons)
+		$(use_enable thunar thunarx)
+		$(use_enable thunar exo)
+		$(use_enable thunar desktop-menu)
+		$(use_enable doc xsltproc)"
+	DOCS="AUTHORS ChangeLog NEWS TODO README"
+}
 
-	if use file-icons; then
-		XFCE_CONFIG+=" --enable-thunarx --enable-file-icons --enable-exo
-		--enable-desktop-icons"
-	else
-		XFCE_CONFIG+=" --disable-thunarx --disable-file-icons --disable-exo
-		--disable-desktop-icons"
+src_prepare() {
+	if use branding; then
+		sed -i -e "s:xfce-stripes.png:gentoo-minimal-1280x1024.jpg:" \
+			common/xfdesktop-common.h || die "sed failed"
 	fi
+	xfce4_src_prepare
 }
 
 src_install() {
 	xfce4_src_install
 
+	if use branding; then
+		insinto /usr/share/xfce4/backdrops
+		doins "${DISTDIR}"/gentoo-minimal-1280x1024.jpg || die "doins failed"
+	fi
+
 	local config lang
 	for config in ${XFCE_LOCALIZED_CONFIGS}; do
 		for lang in ${LINGUAS}; do
@@ -63,5 +78,3 @@ src_install() {
 		done
 	done
 }
-
-DOCS="AUTHORS ChangeLog HACKING NEWS TODO README"
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 7cd739c..1798d8d 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfwm4-9999.ebuild 1734 RMD160 697a63bafc8dff03e5f45c7ddea95931397fd32d SHA1 4162bfd20aa1e6fd127b2909c1afd6ed3e137fac SHA256 d482d9db74341dd6232697cf0baca67a75af418542f0d9776c74ee6b76e3fa81
+EBUILD xfwm4-9999.ebuild 1153 RMD160 d2b3ee4749531102298847aa3a9dc53bf09d55a8 SHA1 c0b63009db3943c88b6c668a8bba8572614b6dd5 SHA256 0a475ab7c966567e662dd898cc8fb6ab3243bb6d864a46a3d541ab9f4b3336d2
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/xfwm4/xfwm4-9999.ebuild b/xfce-base/xfwm4/xfwm4-9999.ebuild
index 7e77f49..5e4f435 100644
--- a/xfce-base/xfwm4/xfwm4-9999.ebuild
+++ b/xfce-base/xfwm4/xfwm4-9999.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-
+EAPI=2
 inherit xfce4
 
 xfce4_core
 
-DESCRIPTION="Window manager"
+DESCRIPTION="Window manager for Xfce4"
 HOMEPAGE="http://www.xfce.org/projects/xfwm4/"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="debug nls startup-notification +xcomposite"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug startup-notification +xcomposite"
 
 RDEPEND=">=dev-libs/glib-2.10:2
+	>=dev-libs/dbus-glib-0.72
 	>=x11-libs/gtk+-2.10:2
 	x11-libs/libICE
 	x11-libs/libSM
@@ -25,10 +25,9 @@ RDEPEND=">=dev-libs/glib-2.10:2
 	x11-libs/libXpm
 	x11-libs/pango
 	>=x11-libs/libwnck-2.12
-	xfce-base/exo
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
-	>=xfce-base/xfconf-${XFCE_VERSION}
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfce4ui-4.7
+	>=xfce-base/xfconf-4.6
 	startup-notification? ( x11-libs/startup-notification )
 	xcomposite? ( x11-libs/libXcomposite
 		x11-libs/libXdamage
@@ -37,22 +36,10 @@ DEPEND="${RDEPEND}
 	dev-util/intltool"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --enable-xsync --enable-render --enable-randr
-	$(use_enable xcomposite compositor) $(use_enable nls)"
+	XFCE_CONFIG+="--disable-dependency-tracking
+		--enable-xsync
+		--enable-render
+		--enable-randr
+		$(use_enable xcomposite compositor)"
+	DOCS="AUTHORS ChangeLog COMPOSITOR NEWS NOTES README TODO"
 }
-
-src_unpack() {
-	xfce4_src_unpack
-
-	echo "mcs-plugin/margins.c" >> "${S}"/po/POTFILES.skip
-	echo "mcs-plugin/wmtweaks_plugin.c" >> "${S}"/po/POTFILES.skip
-	echo "mcs-plugin/workspaces.c" >> "${S}"/po/POTFILES.skip
-	echo "mcs-plugin/workspaces_plugin.c" >> "${S}"/po/POTFILES.skip
-	echo "mcs-plugin/xfce-wm-settings.desktop.in" >> "${S}"/po/POTFILES.skip
-	echo "mcs-plugin/xfce-wmtweaks-settings.desktop.in" >> "${S}"/po/POTFILES.skip
-	echo "mcs-plugin/xfce-workspaces-settings.desktop.in" >> "${S}"/po/POTFILES.skip
-	echo "mcs-plugin/xfwm4_plugin.c" >> "${S}"/po/POTFILES.skip
-	echo "mcs-plugin/xfwm4_shortcuteditor.c" >> "${S}"/po/POTFILES.skip
-}
-
-DOCS="AUTHORS ChangeLog COMPOSITOR NEWS README TODO"
diff --git a/xfce-extra/thunar-vfs/Manifest b/xfce-extra/thunar-vfs/Manifest
index a840a6f..9b933e4 100644
--- a/xfce-extra/thunar-vfs/Manifest
+++ b/xfce-extra/thunar-vfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD thunar-vfs-9999.ebuild 1370 RMD160 0749b67541786116e69ff157f8ed506c9a7abdd1 SHA1 f5943b0e25eceaa647af34483e53f8e0d2af9925 SHA256 4b90ae2bcc26d97c2ff225acb9b6c6f637474c4f58aa11047f450a099ce672e6
+EBUILD thunar-vfs-9999.ebuild 1387 RMD160 b36be3f9c5b9d05ec07530b6bae360ffdb1e8a42 SHA1 0e572ab91e07db363faeaeab3b585e2d90c63c15 SHA256 40da80cf62945e1477e62d83f33a72571f35eab5a45da1349d4774c16c255ff3
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild b/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild
index bee766a..de330a4 100644
--- a/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild
+++ b/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild
@@ -38,12 +38,12 @@ WANT_GTKDOCIZE="yes"
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
-	XFCE_CONFIG="--enable-maintainer-mode
+	XFCE_CONFIG+=" --disable-dependency-tracking
 		$(use_enable dbus)
 		$(use_enable gnome gnome-thumbnailers)
 		$(use_enable doc xsltproc)
 		$(use_enable debug)
-		--with-html-dir=/usr/share/doc/${PF}/html"
+		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
 
 	if use hal; then
 		XFCE_CONFIG+=" --enable-dbus --with-volume-manager=hal"
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
deleted file mode 100644
index 2d97e6f..0000000
--- a/xfce-extra/tumbler/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD tumbler-9999.ebuild 451 RMD160 14eb6896654dcfc158f2bbfd8dbe8085d3f8634a SHA1 0255713876bf68b317e72ca2e13e23b5cb09aea5 SHA256 31554b518a852a3172fdbc6e15d16875cc62f9383823dee0ffe2a35f53512377
-MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/tumbler/tumbler-9999.ebuild b/xfce-extra/tumbler/tumbler-9999.ebuild
deleted file mode 100644
index c60e9b5..0000000
--- a/xfce-extra/tumbler/tumbler-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-inherit xfce4
-
-xfce4_apps
-
-DESCRIPTION="Application finder"
-HOMEPAGE="http://git.xfce.org/apps/tumbler/tree/"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	dev-libs/dbus-glib"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/intltool"
-
-WANT_GTKDOCIZE="yes"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/xfce-extra/xfce4-appfinder/Manifest b/xfce-extra/xfce4-appfinder/Manifest
index 4e760e2..2e678ef 100644
--- a/xfce-extra/xfce4-appfinder/Manifest
+++ b/xfce-extra/xfce4-appfinder/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-appfinder-9999.ebuild 693 RMD160 b1c59298972eb42d0ea0a4f9728aca1d7f999b11 SHA1 b3e5f7807473b3eaf6e74f366bdb83981cbc71f3 SHA256 c0e4c26f658f27ae574b2c3adb8eac93db9adaada65e908239c27e72a97b0477
+EBUILD xfce4-appfinder-9999.ebuild 761 RMD160 e25ddfe0d1c3cdb0087ce6a40845bbaed3be11d6 SHA1 96f58562e0f5670dd9ef13e97c717ffbd0ed6727 SHA256 00677019d4c86d3ae4948313c0e954883317b6059fbf43fec2a7c359b68fbd2b
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild b/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
index 8b64561..17e17d0 100644
--- a/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
+++ b/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
@@ -1,30 +1,29 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-
+EAPI=2
 inherit xfce4
 
 xfce4_core
 
 DESCRIPTION="Application finder"
 HOMEPAGE="http://www.xfce.org/projects/xfce4-appfinder"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
-RDEPEND=">=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.6:2
-	xfce-base/garcon
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfce4ui-${XFCE_VERSION}
-	>=xfce-base/thunar-${XFCE_VERSION}"
+RDEPEND=">=dev-libs/glib-2.12:2
+	>=x11-libs/gtk+-2.10:2
+	>=xfce-base/libxfce4menu-4.6
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/xfconf-4.6
+	|| ( <xfce-base/thunar-1.1.0 xfce-extra/thunar-vfs )"
 DEPEND="${RDEPEND}
 	dev-util/intltool"
 
-src_unpack() {
-	xfce4_src_unpack
-	echo "src/appfinder.c" >> "${S}"/po/POTFILES.in
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	XFCONF="--disable-dependency-tracking"
 }
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/xfce-extra/xfce4-mixer/Manifest b/xfce-extra/xfce4-mixer/Manifest
index 1c5f45f..00de2d4 100644
--- a/xfce-extra/xfce4-mixer/Manifest
+++ b/xfce-extra/xfce4-mixer/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-mixer-9999.ebuild 799 RMD160 1347d2446af782da1efaab85cc001b2dd5a56dfe SHA1 79384c562c14c13dd6447685a24fcd675c34b88b SHA256 c50751110fc453a6dd8de17720413cbdaf4127c1c13f5207021add69f059238b
+EBUILD xfce4-mixer-9999.ebuild 874 RMD160 ed224692b5f1a913a077157895f95b559658e900 SHA1 c9049bca0a208843893ebca5f924e25980589497 SHA256 8e651e630bed9db4d89ffb4af071b6f7691fffb77415009853c535a4ceb18894
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild
index f2efe57..4a3d64d 100644
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-
+EAPI=2
 inherit xfce4
 
 xfce4_apps
 
 DESCRIPTION="Volume control application using gstreamer"
 HOMEPAGE="http://www.xfce.org/projects/xfce4-mixer"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="alsa debug oss"
 
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=media-libs/gst-plugins-base-0.10.2
+COMMON_DEPEND=">=dev-libs/glib-2.12:2
+	>=media-libs/gst-plugins-base-0.10.14
 	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
-	>=xfce-base/xfce4-panel-${XFCE_VERSION}
-	>=xfce-base/xfconf-${XFCE_VERSION}
-	alsa? ( media-plugins/gst-plugins-alsa )
-	oss? ( media-plugins/gst-plugins-oss )"
-DEPEND="${RDEPEND}
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/xfce4-panel-4.6
+	>=xfce-base/xfconf-4.6"
+RDEPEND="${COMMON_DEPEND}
+	alsa? ( >=media-plugins/gst-plugins-alsa-0.10 )
+	oss? ( >=media-plugins/gst-plugins-oss-0.10 )"
+DEPEND="${COMMON_DEPEND}
 	dev-util/intltool"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	XFCONF="--disable-dependency-tracking"
+}