New eclass: xfconf-live

6 files changed, 26 insertions, 27 deletions

diff --git a/xfce-extra/thunar-vfs/Manifest b/xfce-extra/thunar-vfs/Manifest
index f1c675c..0af938c 100644
--- a/xfce-extra/thunar-vfs/Manifest
+++ b/xfce-extra/thunar-vfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD thunar-vfs-9999.ebuild 1338 RMD160 030d7790ec828453bf581bce6022fed9f2acb9d5 SHA1 ab8d681cf804b492318196fa0a1b0869e5cd6a5f SHA256 ff257b6c139891f08f34d4f25d9b0bdcc9a105a1d69ab6e584c05738ffd6bc68
+EBUILD thunar-vfs-9999.ebuild 1334 RMD160 04c48d5cdfad09bbcc96b8d3af34624cc50a1217 SHA1 2211ac0543228c47a99cd0757d12efa5512fc48b SHA256 828aef8fd0febbcaab8ed1d07fdf70d24d1209802ccc78c5b0abdc24c6d8190a
 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 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/Manifest b/xfce-extra/tumbler/Manifest
index 308c335..4a67424 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,2 +1,2 @@
-EBUILD tumbler-9999.ebuild 1195 RMD160 eab3934536ecd3ea1a4c80c1cfa54c2164646dae SHA1 4d8f8afd3dd830b59b723b6640a14b29d140f804 SHA256 cd56643795daff9f8208223c2e7d669a7390be2243917486cf0ffa4e86fa58af
+EBUILD tumbler-9999.ebuild 1189 RMD160 da25c699c6360a2776c0fa3e8c3db580822748cd SHA1 7d2f138599edf14632e27b83cb6e520d064b4415 SHA256 12a3b474a8309e2f28871f06a6dd7d2d863b417d16ca3f22b3ab520d950d2419
 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
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/Manifest b/xfce-extra/xfce4-appfinder/Manifest
index f7e4595..bc2e766 100644
--- a/xfce-extra/xfce4-appfinder/Manifest
+++ b/xfce-extra/xfce4-appfinder/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-appfinder-9999.ebuild 772 RMD160 24f8454fc3fec8dda51a95927620815de49ebea7 SHA1 32dd3a43ad6cc43fd5675077e63c4306e8887899 SHA256 c060f34499b8056f950c4977ad714b9451f3e25e447e33a69235085530b64358
+EBUILD xfce4-appfinder-9999.ebuild 807 RMD160 a978d9f1e11bbdc53bb3cafd69e89454cae2f34b SHA1 76edf98ceca2c2e586267e214df7386368017ce2 SHA256 a51dec9bd61803098f00d10de62a6c4ab3059b4124f6126322c4287c73ceaed4
 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 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"
 }