[gentoo-commits] proj/xfce:master commit in: xfce-base/garcon/, x11-themes/gtk-engines-xfce/, xfce-extra/tumbler/, ...

[Christoph Mende]

commit:     6e62429431018836e96c8ab833f984dd2df79f94
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 19:56:50 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 19:56:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=6e624294

New eclass: xfconf-live

---
 .../xfce4-dev-tools/xfce4-dev-tools-9999.ebuild    |    5 +-
 eclass/xfce4.eclass                                |  220 --------------------
 eclass/xfconf-live.eclass                          |   68 ++++++
 profiles/package.mask                              |   21 ++
 x11-terms/terminal/terminal-9999.ebuild            |   20 ++-
 .../gtk-engines-xfce/gtk-engines-xfce-9999.ebuild  |   14 +-
 .../xfce4-icon-theme/xfce4-icon-theme-9999.ebuild  |    9 +-
 x11-themes/xfwm4-themes/xfwm4-themes-9999.ebuild   |    5 +-
 xfce-base/exo/exo-9999.ebuild                      |   23 +-
 xfce-base/garcon/garcon-9999.ebuild                |   16 +-
 xfce-base/libxfce4ui/libxfce4ui-9999.ebuild        |   17 +-
 xfce-base/libxfce4util/libxfce4util-9999.ebuild    |   16 +-
 xfce-base/libxfcegui4/libxfcegui4-9999.ebuild      |   21 +-
 xfce-base/thunar/thunar-9999.ebuild                |   27 ++--
 xfce-base/xfce-utils/xfce-utils-9999.ebuild        |   26 ++-
 xfce-base/xfce4-panel/xfce4-panel-9999.ebuild      |   19 +-
 xfce-base/xfce4-session/xfce4-session-9999.ebuild  |   13 +-
 .../xfce4-settings/xfce4-settings-9999.ebuild      |   17 +-
 xfce-base/xfconf/xfconf-9999.ebuild                |   20 +-
 xfce-base/xfdesktop/xfdesktop-9999.ebuild          |   18 +-
 xfce-base/xfwm4/xfwm4-9999.ebuild                  |   17 +-
 xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild       |   17 +-
 xfce-extra/tumbler/tumbler-9999.ebuild             |   20 +-
 .../xfce4-appfinder/xfce4-appfinder-9999.ebuild    |   10 +-
 24 files changed, 274 insertions(+), 385 deletions(-)

diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-9999.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-9999.ebuild
index 6412576..7cc50b8 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-9999.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-9999.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit xfce4
-
-xfce4_core
+EAPI=3
+inherit xfconf-live
 
 DESCRIPTION="Xfce's build scripts and aclocal macros"
 HOMEPAGE="http://www.xfce.org/ http://foo-projects.org/~benny/projects/xfce4-dev-tools/"

diff --git a/eclass/xfce4.eclass b/eclass/xfce4.eclass
deleted file mode 100644
index cf8367c..0000000
--- a/eclass/xfce4.eclass
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: xfce4.eclass
-# @MAINTAINER: Christoph Mende <angelos@g.o>
-# Gentoo's Xfce Team <xfce@g.o>
-# @BLURB: functions to simplify Xfce4 package installation
-# @DESCRIPTION:
-# This eclass provides functions to install Xfce4 packages with a
-# minimum of duplication in ebuilds
-
-inherit autotools fdo-mime git gnome2-utils libtool
-[ -n ${XFCE4_PATCHES} ] && inherit eutils
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-[ ${PN} != xfce4-dev-tools ] && DEPEND+="
-	>=dev-util/xfce4-dev-tools-9999"
-
-
-# @FUNCTION: xfce4_apps
-# @DESCRIPTION:
-# Change SRC_URI (or EGIT_REPO_URI for live ebuilds)
-# Note: git ebuilds usually require XFCE_CAT (for example apps for xfce4-notifyd)
-xfce4_uri() {
-	[ -z ${MY_P} ] && MY_P=${MY_PN:-${PN}}-${MY_PV:-${PV}}
-	[ -z ${COMPRESS} ] && COMPRESS=".tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-
-	EGIT_REPO_URI="git://git.xfce.org/${XFCE_CAT}/${MY_PN:-${PN}}"
-}
-
-# @FUNCTION: xfce4_apps
-# @DESCRIPTION:
-# Call xfce4_uri and set HOMEPAGE
-# Note: git ebuilds usually require XFCE_CAT (for example apps for xfce4-notifyd)
-xfce4_apps() {
-	XFCE_CAT="apps"
-	xfce4_uri
-	[ -z ${HOMEPAGE} ] && HOMEPAGE="http://www.xfce.org/projects/"
-}
-
-# @FUNCTION: xfce4_libs
-# @DESCRIPTION:
-# Call xfce4_uri and set HOMEPAGE
-# Note: git ebuilds usually require XFCE_CAT (for example apps for xfce4-notifyd)
-xfce4_libs() {
-	XFCE_CAT="libs"
-	xfce4_uri
-}
-
-# @FUNCTION: xfce4_archive
-# @DESCRIPTION:
-# Call xfce4_uri and set HOMEPAGE
-# Note: git ebuilds usually require XFCE_CAT (for example apps for xfce4-notifyd)
-xfce4_archive() {
-	XFCE_CAT="archive"
-	xfce4_uri
-	[ -z ${HOMEPAGE} ] && HOMEPAGE="http://www.xfce.org/projects"
-}
-
-# @FUNCTION: xfce4_art
-# @DESCRIPTION:
-# Call xfce4_uri and set HOMEPAGE
-# Note: git ebuilds usually require XFCE_CAT (for example apps for xfce4-notifyd)
-xfce4_art() {
-	XFCE_CAT="art"
-	xfce4_uri
-	#[ -z ${HOMEPAGE} ] && HOMEPAGE="http://www.xfce.org/projects"
-}
-
-# @FUNCTION: xfce4_panel_plugin
-# @DESCRIPTION:
-# Call xfce4_uri and RDEPEND on xfce4-panel and set HOMEPAGE to the panel plugins homepage
-# Note: git ebuilds usually require XFCE_CAT (for example apps for xfce4-notifyd)
-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-9999"
-	DEPEND="${DEPEND} >=xfce-base/xfce4-panel-9999"
-}
-
-# @FUNCTION: xfce4_thunar_plugin
-# @DESCRIPTION:
-# Call xfce4_uri, RDEPEND on thunar and set HOMEPAGE to the thunar plugins homepage
-# Note: git ebuilds usually require XFCE_CAT (for example apps for xfce4-notifyd)
-xfce4_thunar_plugin() {
-	XFCE_CAT="thunar-plugins"
-	xfce4_uri
-	[ -z ${HOMEPAGE} ] && HOMEPAGE="http://thunar.xfce.org/plugins.html"
-	RDEPEND="${RDEPEND} >=xfce-base/thunar-9999"
-	DEPEND="${DEPEND} >=xfce-base/thunar-9999"
-}
-
-# @FUNCTION: xfce4_core
-# @DESCRIPTION:
-# Call xfce4_uri and set the HOMEPAGE to www.xfce.org
-# Note: git ebuilds usually require XFCE_CAT (for example apps for xfce4-notifyd)
-xfce4_core() {
-	XFCE_CAT="xfce"
-	xfce4_uri
-	[ -z ${HOMEPAGE} ] && HOMEPAGE="http://www.xfce.org/"
-}
-
-# @FUNCTION: xfce4_single_make
-# @DESCRIPTION:
-# Build with one job for broken parallel builds
-xfce4_single_make() {
-	JOBS="-j1"
-}
-
-# @FUNCTION: xfce4_src_unpack
-# @DESCRIPTION:
-# Unpack depending on the source and run src_prepare on EAPI < 2
-xfce4_src_unpack() {
-	XFCE_CONFIG+=" --enable-maintainer-mode"
-	git_src_unpack
-	cd "${S}"
-	
-	[ "${EAPI}" -le 1 ] && xfce4_src_prepare
-}
-
-# @FUNCTION: xfce4_src_prepare
-# @DESCRIPTION:
-# Patch autogen.sh in live ebuilds to inject the correct revision into
-# configure.ac
-# Run elibtoolize to fix libraries on BSD
-xfce4_src_prepare() {
-	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
-	fi
-}
-
-# @FUNCTION: xfce4_src_configure
-# @DESCRIPTION:
-# Package configuration
-# XFCE_CONFIG is used for additional econf/autogen.sh arguments
-# startup-notification and debug are automatically added when they are found in
-# IUSE
-xfce4_src_configure() {
-	has startup-notification ${IUSE} && \
-		XFCE_CONFIG+=" $(use_enable startup-notification)"
-
-	has debug ${IUSE} && XFCE_CONFIG+=" $(use_enable debug)"
-
-	econf ${XFCE_CONFIG}
-}
-
-# @FUNCTION: xfce4_src_compile
-# @DESCRIPTION:
-# Package compilation
-# Calls xfce4_src_configure for EAPI <= 1 and runs emake with ${JOBS}
-xfce4_src_compile() {
-	[ "${EAPI}" -le 1 ] && xfce4_src_configure
-	emake ${JOBS} || die "emake failed"
-}
-
-# @FUNCTION: xfce4_src_install
-# @DESCRIPTION:
-# Package installation
-# The content of $DOCS is installed via dodoc
-xfce4_src_install() {
-	[ -n "${DOCS}" ] && dodoc ${DOCS}
-
-	emake DESTDIR="${D}" "$@" install || die "emake install failed"
-}
-
-# @FUNCTION: xfce4_pkg_preinst
-# @DESCRIPTION:
-# Run gnome2_icon_savelist for the following gnome2_icon_cache_update
-xfce4_pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-# @FUNCTION: xfce4_pkg_postinst
-# @DESCRIPTION:
-# Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update
-xfce4_pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-# @FUNCTION: xfce4_pkg_postrm
-# @DESCRIPTION:
-# Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update
-xfce4_pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm

diff --git a/eclass/xfconf-live.eclass b/eclass/xfconf-live.eclass
new file mode 100644
index 0000000..da552af
--- /dev/null
+++ b/eclass/xfconf-live.eclass
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: xfconf-live.eclass
+# @MAINTAINER: Christoph Mende <angelos@g.o>
+# Gentoo's Xfce Team <xfce@g.o>
+# @BLURB: Default XFCE ebuild layout
+# @DESCRIPTION:
+# Default XFCE ebuild layout
+
+if [[ "${PN}" != "xfce4-dev-tools" ]]; then
+	EAUTORECONF="yes"
+fi
+
+inherit git xfconf
+
+SRC_URI=""
+EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}"
+EGIT_BOOTSTRAP="autogen.sh"
+export NOCONFIGURE="yes"
+
+if [[ "${GTKDOCIZE}" == "yes" ]]; then
+	_xfce4_gtkdocize="dev-util/gtk-doc"
+fi
+
+DEPEND+="
+	${_xfce4_gtkdocize}"
+
+unset _xfce4_gtkdocize
+
+EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
+
+# @FUNCTION: xfconf_src_prepare
+# @DESCRIPTION:
+# Patch autogen.sh in live ebuilds to inject the correct revision into
+# configure.ac
+xfconf-live_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
+	base_src_prepare
+	git_src_prepare
+	return
+}
+
+xfconf-live_src_unpack() {
+	git_src_unpack "$@"
+}
+
+xfconf-live_src_configure() {
+	XFCONF=( --enable-maintainer-mode ${XFCONF[@]} )
+	xfconf_src_configure "$@"
+}
+
+xfconf-live_src_install() {
+	xfconf_src_install "$@"
+}
+
+xfconf-live_pkg_preinst() {
+	xfconf_pkg_preinst "$@"
+}
+
+xfconf-live_pkg_postinst() {
+	xfconf_pkg_postinst "$@"
+}
+
+xfconf-live_pkg_postrm() {
+	xfconf_pkg_postrm "$@"
+}

diff --git a/profiles/package.mask b/profiles/package.mask
new file mode 100644
index 0000000..735e268
--- /dev/null
+++ b/profiles/package.mask
@@ -0,0 +1,21 @@
+~dev-util/xfce4-dev-tools-9999
+~x11-terms/terminal-9999
+~x11-themes/gtk-engines-xfce-9999
+~x11-themes/xfce4-icon-theme-9999
+~x11-themes/xfwm4-themes-9999
+~xfce-base/exo-9999
+~xfce-base/garcon-9999
+~xfce-base/libxfce4ui-9999
+~xfce-base/libxfce4util-9999
+~xfce-base/libxfcegui4-9999
+~xfce-base/thunar-9999
+~xfce-base/xfce-utils-9999
+~xfce-base/xfce4-panel-9999
+~xfce-base/xfce4-session-9999
+~xfce-base/xfce4-settings-9999
+~xfce-base/xfconf-9999
+~xfce-base/xfdesktop-9999
+~xfce-base/xfwm4-9999
+~xfce-extra/thunar-vfs-9999
+~xfce-extra/tumbler-9999
+~xfce-extra/xfce4-appfinder-9999

diff --git a/x11-terms/terminal/terminal-9999.ebuild b/x11-terms/terminal/terminal-9999.ebuild
index 7af9a9f..a8acdd0 100644
--- a/x11-terms/terminal/terminal-9999.ebuild
+++ b/x11-terms/terminal/terminal-9999.ebuild
@@ -3,12 +3,11 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_apps
+inherit xfconf-live
 
 DESCRIPTION="A terminal emulator for the Xfce desktop environment"
 HOMEPAGE="http://www.xfce.org/projects/terminal/"
+EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,12 +21,19 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	>=xfce-base/exo-0.3.4
 	dbus? ( >=dev-libs/dbus-glib-0.88 )"
 DEPEND="${RDEPEND}
-	dev-util/intltool"
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
-		--docdir=${EPREFIX}/usr/share/doc/${PF}
-		$(use_enable dbus)"
+	XFCONF=(
+		--disable-dependency-tracking
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable dbus)
+		$(xfconf_use_debug)
+		)
 
 	DOCS="AUTHORS HACKING NEWS README THANKS"
 }

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 5be8f17..f1b2e3f 100644
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-9999.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-9999.ebuild
@@ -4,9 +4,7 @@
 
 EAPI=3
 MY_PN=gtk-xfce-engine
-inherit xfce4
-
-xfce4_core
+inherit xfconf-live
 
 DESCRIPTION="Xfce's GTK+ engine and themes"
 HOMEPAGE="http://www.xfce.org/projects/"
@@ -21,8 +19,14 @@ RDEPEND=">=dev-libs/glib-2.18:2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+S=${WORKDIR}/${MY_PN}-${PV}
+
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
-		--disable-static"
+	XFCONF=(
+		--disable-dependency-tracking
+		--disable-static
+		$(xfconf_use_debug)
+		)
+
 	DOCS="AUTHORS NEWS README"
 }

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 45b3356..34d4512 100644
--- a/x11-themes/xfce4-icon-theme/xfce4-icon-theme-9999.ebuild
+++ b/x11-themes/xfce4-icon-theme/xfce4-icon-theme-9999.ebuild
@@ -3,12 +3,11 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_art
+inherit xfconf-live
 
 DESCRIPTION="Icon theme called Rodent"
 HOMEPAGE="http://www.xfce.org/"
+EGIT_REPO_URI="git://git.xfce.org/art/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,6 +16,8 @@ IUSE="minimal"
 
 RDEPEND="x11-themes/hicolor-icon-theme
 	!minimal? ( || ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme ) )"
-DEPEND="dev-util/intltool"
+DEPEND="dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
 
 RESTRICT="binchecks strip"

diff --git a/x11-themes/xfwm4-themes/xfwm4-themes-9999.ebuild b/x11-themes/xfwm4-themes/xfwm4-themes-9999.ebuild
index 5b82205..8e27aed 100644
--- a/x11-themes/xfwm4-themes/xfwm4-themes-9999.ebuild
+++ b/x11-themes/xfwm4-themes/xfwm4-themes-9999.ebuild
@@ -3,12 +3,11 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_art
+inherit xfconf-live
 
 DESCRIPTION="Xfce's window manager themes"
 HOMEPAGE="http://www.xfce.org/projects/xfwm4/"
+EGIT_REPO_URI="git://git.xfce.org/art/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"

diff --git a/xfce-base/exo/exo-9999.ebuild b/xfce-base/exo/exo-9999.ebuild
index 75c1d28..f4d666c 100644
--- a/xfce-base/exo/exo-9999.ebuild
+++ b/xfce-base/exo/exo-9999.ebuild
@@ -6,9 +6,9 @@ EAPI=3
 
 PYTHON_DEPEND="python? 2"
 
-inherit xfce4 python
+GTKDOCIZE="yes"
 
-xfce4_core
+inherit python xfconf-live
 
 DESCRIPTION="Extensions, widgets and framework library with session management support"
 HOMEPAGE="http://www.xfce.org/projects/exo/"
@@ -25,23 +25,24 @@ RDEPEND=">=dev-lang/perl-5.6
 	>=xfce-base/libxfce4util-4.8
 	python? ( >=dev-python/pygtk-2.4 )"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	dev-util/intltool
-	dev-util/gtk-doc
 	sys-devel/gettext"
 
-WANT_GTKDOCIZE="yes"
-
 pkg_setup() {
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
 	fi
 
-	XFCE_CONFIG+=" --disable-dependency-tracking
-		--docdir=${EPREFIX}/usr/share/doc/${PF}
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-dependency-tracking
 		--disable-static
 		$(use_enable python)
-		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
 
 	DOCS="AUTHORS HACKING NEWS README THANKS TODO"
 }
@@ -50,15 +51,15 @@ src_prepare() {
 	rm -f py-compile
 	ln -s $(type -P true) py-compile
 
-	xfce4_src_prepare
+	xfconf-live_src_prepare
 }
 
 pkg_postinst() {
-	xfce4_pkg_postinst
+	xfconf-live_pkg_postinst
 	use python && python_mod_optimize exo-0.6 pyexo.py
 }
 
 pkg_postrm() {
-	xfce4_pkg_postrm
+	xfconf-live_pkg_postrm
 	use python && python_mod_cleanup exo-0.6 pyexo.py
 }

diff --git a/xfce-base/garcon/garcon-9999.ebuild b/xfce-base/garcon/garcon-9999.ebuild
index 32e2dfc..c65b20b 100644
--- a/xfce-base/garcon/garcon-9999.ebuild
+++ b/xfce-base/garcon/garcon-9999.ebuild
@@ -3,9 +3,8 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+GTKDOCIZE="yes"
+inherit xfconf-live
 
 DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
 HOMEPAGE="http://www.xfce.org/projects/libraries/"
@@ -18,16 +17,17 @@ IUSE="debug"
 RDEPEND=">=dev-libs/glib-2.14:2
 	!<xfce-base/xfdesktop-4.7.0"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	dev-util/intltool
-	dev-util/gtk-doc
 	sys-devel/gettext"
 
-WANT_GTKDOCIZE="yes"
-
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
+	XFCONF=(
+		--disable-dependency-tracking
 		--disable-static
-		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
 
 	DOCS="AUTHORS HACKING NEWS README STATUS TODO"
 }

diff --git a/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild b/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild
index 947a4b3..4741d1a 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild
@@ -3,9 +3,8 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+GTKDOCIZE="yes"
+inherit xfconf-live
 
 DESCRIPTION="Xfce's unified widgets library"
 HOMEPAGE="http://www.xfce.org/projects/libraries/"
@@ -26,17 +25,19 @@ RDEPEND="x11-libs/libX11
 	startup-notification? ( x11-libs/startup-notification )
 	!!<xfce-base/libxfcegui4-4.7.0"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	dev-util/intltool
-	dev-util/gtk-doc
 	sys-devel/gettext
 	dev-lang/perl"
 
-WANT_GTKDOCIZE="yes"
-
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
+	XFCONF=(
+		--disable-dependency-tracking
+		$(use_enable startup-notification)
 		$(use_enable glade gladeui)
-		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
 
 	DOCS="AUTHORS NEWS README THANKS TODO"
 }

diff --git a/xfce-base/libxfce4util/libxfce4util-9999.ebuild b/xfce-base/libxfce4util/libxfce4util-9999.ebuild
index 5c960c3..8f94a1a 100644
--- a/xfce-base/libxfce4util/libxfce4util-9999.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-9999.ebuild
@@ -3,9 +3,8 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+GTKDOCIZE="yes"
+inherit xfconf-live
 
 DESCRIPTION="Xfce's basic utilities library"
 HOMEPAGE="http://www.xfce.org/projects/libraries/"
@@ -18,15 +17,16 @@ IUSE="debug"
 RDEPEND=">=dev-libs/glib-2.12:2"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	dev-util/gtk-doc
+	dev-util/pkgconfig
 	sys-devel/gettext"
 
-WANT_GTKDOCIZE="yes"
-
 pkg_setup() {
-	XFCE_CONFIG=" --disable-dependency-tracking
+	XFCONF=(
+		--disable-dependency-tracking
 		--disable-static
-		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
 
 	DOCS="AUTHORS NEWS README THANKS TODO"
 }

diff --git a/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild b/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild
index e1bc7c0..a328220 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild
@@ -3,9 +3,8 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+GTKDOCIZE="yes"
+inherit xfconf-live
 
 DESCRIPTION="Xfce's unified widgets library (deprecated: don't use this for future development)"
 HOMEPAGE="http://www.xfce.org/projects/libraries/"
@@ -24,16 +23,18 @@ RDEPEND="gnome-base/libglade
 	startup-notification? ( x11-libs/startup-notification )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	dev-util/gtk-doc
-	sys-devel/gettext"
-
-WANT_GTKDOCIZE="yes"
+	sys-devel/gettext
+	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
+	XFCONF=(
+		--disable-dependency-tracking
 		--disable-static
+		$(use_enable startup-notification)
 		$(use_enable glade gladeui)
-		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
 
-	DOCS="AUTHORS NEWS README TODO"
+	DOCS="AUTHORS NEWS"
 }

diff --git a/xfce-base/thunar/thunar-9999.ebuild b/xfce-base/thunar/thunar-9999.ebuild
index e6c27d5..1ccd36f 100644
--- a/xfce-base/thunar/thunar-9999.ebuild
+++ b/xfce-base/thunar/thunar-9999.ebuild
@@ -2,11 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
-
-inherit virtualx xfce4
-
-xfce4_core
+EAPI=4
+GTKDOCIZE="yes"
+inherit virtualx xfconf-live
 
 DESCRIPTION="File manager for the Xfce desktop environment"
 HOMEPAGE="http://www.xfce.org/projects/thunar/ http://thunar.xfce.org/"
@@ -30,7 +28,7 @@ COMMON_DEPEND=">=xfce-base/exo-0.6
 	startup-notification? ( x11-libs/startup-notification )
 	udev? ( >=sys-fs/udev-145[extras] )
 	xfce_plugins_trash? ( >=dev-libs/dbus-glib-0.88
-	>=xfce-base/xfce4-panel-4.8 )"
+		>=xfce-base/xfce4-panel-4.8 )"
 RDEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info
 	dev-util/desktop-file-utils
@@ -39,25 +37,28 @@ RDEPEND="${COMMON_DEPEND}
 	xfce_plugins_trash? ( ${GVFS_DEPEND} )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
-	dev-util/gtk-doc
+	dev-util/pkgconfig
 	sys-devel/gettext"
 
-WANT_GTKDOCIZE="yes"
+S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
-		--docdir=${EPREFIX}/usr/share/doc/${PF}
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable dbus)
+		$(use_enable startup-notification)
 		$(use_enable udev gudev)
 		$(use_enable libnotify notifications)
+		$(xfconf_use_debug)
 		$(use_enable exif)
 		$(use_enable pcre)
-		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
 
 	if use xfce_plugins_trash; then
-		XFCE_CONFIG+=" --enable-dbus"
+		XFCONF+=( --enable-dbus )
 	else
-		XFCE_CONFIG+=" --disable-tpa-plugin"
+		XFCONF+=( --disable-tpa-plugin )
 	fi
 
 	DOCS="AUTHORS FAQ HACKING NEWS README THANKS TODO"

diff --git a/xfce-base/xfce-utils/xfce-utils-9999.ebuild b/xfce-base/xfce-utils/xfce-utils-9999.ebuild
index 209a111..09fa3ed 100644
--- a/xfce-base/xfce-utils/xfce-utils-9999.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-9999.ebuild
@@ -3,9 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+inherit xfconf-live
 
 DESCRIPTION="Utilities for the Xfce desktop environment"
 HOMEPAGE="http://www.xfce.org/projects/xfce-utils/"
@@ -30,21 +28,25 @@ RDEPEND="${COMMON_DEPEND}
 		x11-misc/slock ) )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
+	dev-util/pkgconfig
 	sys-devel/gettext"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --docdir="${EPREFIX}"/usr/share/doc/${PF}
-	--disable-dependency-tracking
-	--disable-xfconf-migration
-	$(use_enable dbus)
-	--with-vendor-info=Gentoo
-	--with-xsession-prefix="${EPREFIX}"/usr"
-
-	DOCS="AUTHORS NEWS README"
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-dependency-tracking
+		--disable-xfconf-migration
+		$(use_enable dbus)
+		$(xfconf_use_debug)
+		--with-vendor-info=Gentoo
+		--with-xsession-prefix="${EPREFIX}"/usr
+		)
+
+	DOCS="AUTHORS NEWS"
 }
 
 src_install() {
-	xfce4_src_install
+	xfconf_src_install
 
 	rm -f "${ED}"/usr/share/applications/xfhelp4.desktop
 

diff --git a/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild b/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild
index 6c679cc..8d5ea7c 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild
@@ -3,9 +3,8 @@
 # $Header: $
 
 EAPI=4
-inherit xfce4
-
-xfce4_core
+GTKDOCIZE="yes"
+inherit xfconf-live
 
 DESCRIPTION="Panel for the Xfce desktop environment"
 HOMEPAGE="http://www.xfce.org/projects/xfce4-panel/"
@@ -29,16 +28,16 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-util/intltool
-	dev-util/gtk-doc
-	sys-devel/gettext"
-
-WANT_GTKDOCIZE="yes"
+	sys-devel/gettext
+	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
-		--docdir=${EPREFIX}/usr/share/doc/${PF}
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--disable-static
-		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
 
 	DOCS="AUTHORS NEWS THANKS"
 }

diff --git a/xfce-base/xfce4-session/xfce4-session-9999.ebuild b/xfce-base/xfce4-session/xfce4-session-9999.ebuild
index 1ae1bf9..b8f73ea 100644
--- a/xfce-base/xfce4-session/xfce4-session-9999.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-9999.ebuild
@@ -3,9 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+inherit xfconf-live
 
 DESCRIPTION="Xfce's session manager"
 HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
@@ -32,19 +30,22 @@ RDEPEND="${COMMON_DEPEND}
 	udev? ( sys-power/upower )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
+	dev-util/pkgconfig
 	sys-devel/gettext"
 
 pkg_setup() {
-	XFCE_CONFIG+="
-		--docdir=${EPREFIX}/usr/share/doc/${PF}
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--disable-dependency-tracking
 		--disable-static
 		$(use_enable xfce_plugins_logout panel-plugin)
 		$(use_enable gnome-keyring libgnome-keyring)
+		$(xfconf_use_debug)
 		--disable-hal
 		$(use_enable udev upower)
 		$(use_enable consolekit)
-		$(use_enable policykit polkit)"
+		$(use_enable policykit polkit)
+		)
 
 	DOCS="AUTHORS BUGS NEWS README TODO"
 }

diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
index a46dc95..f04d884 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
@@ -3,9 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+inherit xfconf-live
 
 DESCRIPTION="Configuration system for the Xfce desktop environment"
 HOMEPAGE="http://www.xfce.org/projects/xfce4-settings/"
@@ -27,20 +25,25 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	>=xfce-base/libxfce4ui-4.8
 	>=xfce-base/xfconf-4.8
 	>=xfce-base/exo-0.6
-	libcanberra? ( 	>=media-libs/libcanberra-0.25[sound] )
+	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
 	libnotify? ( >=x11-libs/libnotify-0.1.3 )
 	xklavier? ( >=x11-libs/libxklavier-0.3 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
+	dev-util/pkgconfig
 	sys-devel/gettext
 	>=x11-proto/inputproto-1.4
 	x11-proto/xproto"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
+	XFCONF=(
+		--disable-dependency-tracking
 		--disable-static
 		$(use_enable libnotify)
 		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)"
-	DOCS="AUTHORS NEWS README TODO"
+		$(use_enable libcanberra sound-settings)
+		$(xfconf_use_debug)
+		)
+
+	DOCS="AUTHORS NEWS TODO"
 }

diff --git a/xfce-base/xfconf/xfconf-9999.ebuild b/xfce-base/xfconf/xfconf-9999.ebuild
index 843c4e5..73bb03c 100644
--- a/xfce-base/xfconf/xfconf-9999.ebuild
+++ b/xfce-base/xfconf/xfconf-9999.ebuild
@@ -3,9 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+inherit xfconf-live
 
 DESCRIPTION="Xfce's configuration storage system"
 HOMEPAGE="http://www.xfce.org/projects/xfconf/"
@@ -20,24 +18,26 @@ RDEPEND=">=dev-libs/dbus-glib-0.72
 	>=xfce-base/libxfce4util-4.8
 	perl? ( dev-perl/glib-perl )"
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc
+	dev-util/pkgconfig
 	dev-util/intltool
 	sys-devel/gettext
 	perl? ( dev-perl/extutils-depends
 		dev-perl/extutils-pkgconfig )"
 
-WANT_GTKDOCIZE="yes"
+RESTRICT="test"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
-		--enable-maintainer-mode
+	XFCONF=(
+		--disable-dependency-tracking
 		--disable-static
 		$(use_enable perl perl-bindings)
+		$(xfconf_use_debug)
 		$(use_enable debug checks)
 		--with-perl-options=INSTALLDIRS=vendor
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html"
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
 
-	DOCS="AUTHORS NEWS README TODO"
+	DOCS="AUTHORS NEWS TODO"
 }
 
 src_compile() {
@@ -45,7 +45,7 @@ src_compile() {
 }
 
 src_install() {
-	xfce4_src_install
+	xfconf_src_install
 
 	if use perl; then
 		find "${ED}" -type f -name perllocal.pod -delete

diff --git a/xfce-base/xfdesktop/xfdesktop-9999.ebuild b/xfce-base/xfdesktop/xfdesktop-9999.ebuild
index f14145b..2d4095a 100644
--- a/xfce-base/xfdesktop/xfdesktop-9999.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-9999.ebuild
@@ -3,9 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+inherit xfconf-live
 
 DESCRIPTION="Desktop manager for the Xfce desktop environment"
 HOMEPAGE="http://www.xfce.org/projects/xfdesktop/"
@@ -26,20 +24,24 @@ RDEPEND="x11-libs/libX11
 	>=xfce-base/xfconf-4.8
 	libnotify? ( >=x11-libs/libnotify-0.4 )
 	thunar? ( >=xfce-base/exo-0.6
-	>=xfce-base/thunar-1.2
-	>=dev-libs/dbus-glib-0.88 )"
+		>=xfce-base/thunar-1.2
+		>=dev-libs/dbus-glib-0.88 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
+	dev-util/pkgconfig
 	sys-devel/gettext"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --docdir="${EPREFIX}"/usr/share/doc/${PF}
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--disable-dependency-tracking
 		--disable-static
 		$(use_enable thunar file-icons)
 		$(use_enable thunar thunarx)
 		$(use_enable thunar exo)
-		$(use_enable libnotify notifications)"
+		$(use_enable libnotify notifications)
+		$(xfconf_use_debug)
+		)
 
-	DOCS="AUTHORS ChangeLog NEWS TODO README"
+	DOCS="AUTHORS NEWS README TODO"
 }

diff --git a/xfce-base/xfwm4/xfwm4-9999.ebuild b/xfce-base/xfwm4/xfwm4-9999.ebuild
index 5839d5f..15487e0 100644
--- a/xfce-base/xfwm4/xfwm4-9999.ebuild
+++ b/xfce-base/xfwm4/xfwm4-9999.ebuild
@@ -3,17 +3,14 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+inherit xfconf-live
 
 DESCRIPTION="Window manager for the Xfce desktop environment"
 HOMEPAGE="http://www.xfce.org/projects/xfwm4/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+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
@@ -36,16 +33,20 @@ RDEPEND=">=dev-libs/glib-2.10:2
 		x11-libs/libXfixes )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
+	dev-util/pkgconfig
 	sys-devel/gettext"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --docdir="${EPREFIX}"/usr/share/doc/${PF}
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--disable-dependency-tracking
 		$(use_enable startup-notification)
 		--enable-xsync
 		--enable-render
 		--enable-randr
-		$(use_enable xcomposite compositor)"
+		$(use_enable xcomposite compositor)
+		$(xfconf_use_debug)
+		)
 
-	DOCS="AUTHORS COMPOSITOR NEWS NOTES README TODO"
+	DOCS="AUTHORS COMPOSITOR NEWS README TODO"
 }

diff --git a/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild b/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild
index 2ef8de5..8ed861e 100644
--- a/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild
+++ b/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild
@@ -3,9 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+inherit xfconf-live
 
 DESCRIPTION="Xfce's filesystem libraries (deprecated: don't use this for future development)"
 HOMEPAGE="http://git.xfce.org/xfce/thunar-vfs/"
@@ -28,25 +26,26 @@ RDEPEND=">=xfce-base/exo-0.6
 	startup-notification? ( >=x11-libs/startup-notification-0.4 )
 	!<xfce-base/thunar-1.1.0"
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc
+	dev-util/pkgconfig
 	dev-util/intltool
 	sys-devel/gettext
 	dev-lang/perl"
 
-WANT_GTKDOCIZE="yes"
-
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
+	XFCONF=(
+		--disable-dependency-tracking
 		$(use_enable dbus)
 		$(use_enable gnome gnome-thumbnailers)
 		$(use_enable startup-notification)
+		$(xfconf_use_debug)
 		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--with-volume-manager=none"
+		--with-volume-manager=none
+		)
 
 	DOCS="AUTHORS HACKING NEWS README TODO"
 }
 
 src_install() {
-	xfce4_src_install \
+	xfconf_src_install \
 		docdir="${EPREFIX}"/usr/share/doc/${PF}
 }

diff --git a/xfce-extra/tumbler/tumbler-9999.ebuild b/xfce-extra/tumbler/tumbler-9999.ebuild
index db476d5..d0cb1db 100644
--- a/xfce-extra/tumbler/tumbler-9999.ebuild
+++ b/xfce-extra/tumbler/tumbler-9999.ebuild
@@ -3,9 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+inherit xfconf-live
 
 DESCRIPTION="A thumbnail service for the filemanager of Xfce desktop environment"
 HOMEPAGE="http://www.xfce.org/projects/thunar/"
@@ -20,26 +18,26 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.88
 	media-libs/freetype:2
 	>=media-libs/libpng-1.4
 	>=sys-apps/dbus-1.4.1
-	|| ( x11-libs/gdk-pixbuf:2 ( <x11-libs/gtk+-2.22:2
-	>=x11-libs/gtk+-2.14:2 ) )
+	|| ( x11-libs/gdk-pixbuf:2 ( <x11-libs/gtk+-2.22:2 >=x11-libs/gtk+-2.14:2 ) )
 	ffmpeg? ( >=media-video/ffmpegthumbnailer-2 )
 	jpeg? ( virtual/jpeg )
 	pdf? ( >=app-text/poppler-0.12.4[cairo] )"
 RDEPEND="${COMMON_DEPEND}
 	>=xfce-base/thunar-1.2"
 DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/intltool"
-
-WANT_GTKDOCIZE="yes"
+	dev-util/intltool
+	dev-util/pkgconfig"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking
+	XFCONF=(
+		--disable-dependency-tracking
 		--disable-static
 		$(use_enable jpeg jpeg-thumbnailer)
 		$(use_enable ffmpeg ffmpeg-thumbnailer)
 		$(use_enable pdf poppler-thumbnailer)
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html"
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
 
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }

diff --git a/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild b/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
index a46fc4c..cfe5bdd 100644
--- a/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
+++ b/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
@@ -3,9 +3,7 @@
 # $Header: $
 
 EAPI=3
-inherit xfce4
-
-xfce4_core
+inherit xfconf-live
 
 DESCRIPTION="Application finder and launcher for the Xfce desktop environment"
 HOMEPAGE="http://www.xfce.org/projects/xfce4-appfinder/"
@@ -22,10 +20,14 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	>=xfce-base/garcon-0.1.2
 	>=xfce-base/xfconf-4.8"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	dev-util/intltool"
 
 pkg_setup() {
-	XFCE_CONFIG+=" --disable-dependency-tracking"
+	XFCONF=(
+		--disable-dependency-tracking
+		$(xfconf_use_debug)
+		)
 
 	DOCS="AUTHORS NEWS README TODO"
 }