Use xfconf.eclass.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 35 insertions, 34 deletions

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index b6b2ebedeaaa..f3ef5ec35e5d 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.77 2009/07/27 17:44:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.78 2009/08/02 10:37:41 ssuominen Exp $
+
+  02 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> thunar-1.0.1.ebuild:
+  Use xfconf.eclass.
 
   27 Jul 2009; nixnut <nixnut@gentoo.org> thunar-1.0.1.ebuild:
   ppc stable #265587
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index e9d89f3c4a10..3783ef887dc9 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -5,6 +5,6 @@ AUX thunar-0.9.0-missing-audio-cds-for-volman.patch 4220 RMD160 5fa9ff9156fca9df
 DIST Thunar-0.9.3.tar.bz2 6502363 RMD160 cc5c17a2841d5778e4832cc21e620ac351c9c57b SHA1 bb43fbe5ac3af1204517ed88da1cc3e87c5ec688 SHA256 8820d847d908ae96f9f27fae63ea7ebab91d3fc6c8e1a975157978f89c285e8d
 DIST Thunar-1.0.1.tar.bz2 8802672 RMD160 203690b9eb05ca8e5248bb026f98b8e3e6881f2c SHA1 2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064 SHA256 7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
 EBUILD thunar-0.9.3.ebuild 2064 RMD160 529b1d54ebb16444f6848a0e94f009eb79d95a5d SHA1 6b3cd6268d72cd1250a18f3ce5fe78b1852832e3 SHA256 ba82bbd1ea87528baa2cf80cd5306ac0a46a9cc1a7e5771b00a267fb603447c3
-EBUILD thunar-1.0.1.ebuild 1905 RMD160 b61a798c6d447980f238ddbe29c7130b2f2ea70f SHA1 6f216900c61eef3ab9e96b723db47a7b0e7934e0 SHA256 d9a71879b54a6aa7e30f007a26d20ee1cb24e2bc7aa7ba3cd908197a83ada60f
-MISC ChangeLog 10407 RMD160 c4ab035ede049b41c68407c1e3ce82e988281967 SHA1 0ac4373c01df74011c4f8e79bdf1438b93543752 SHA256 8b6b77fef80b5c26587fc60cfb1ded763b289e6584adbf5f37ed11a9fb7ed473
+EBUILD thunar-1.0.1.ebuild 1852 RMD160 d05d3772211305f45f3a8525afa80c4f2ffcdfb2 SHA1 b5e3781facea9bd57f4139d235e8860be3efc236 SHA256 2de64c30f6627ae290d0cd348d13990bfaf8cc0d0aa4771085a32d60f2e1ea4b
+MISC ChangeLog 10507 RMD160 1d2818372368a68610ccc337367730804746e6bd SHA1 f6c4d691e5e4b596f192d69292501700eb8e061e SHA256 fd9f70adf3061c65946fc1cea7b785ccc206e9577ee10200141790f459dda845
 MISC metadata.xml 234 RMD160 5cf371faf236f472c7d98a92d7103c5a96c4d95a SHA1 f028da2a6c812a70d5a6c159a450899a5c8f29a2 SHA256 acb3aa4d6a184bbefb0ae06cbb0ed0416ecd1b87d01cae543365cfc0e330d8cb
diff --git a/xfce-base/thunar/thunar-1.0.1.ebuild b/xfce-base/thunar/thunar-1.0.1.ebuild
index 671f7101f78d..0dbfa30ecf5a 100644
--- a/xfce-base/thunar/thunar-1.0.1.ebuild
+++ b/xfce-base/thunar/thunar-1.0.1.ebuild
@@ -1,20 +1,17 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.0.1.ebuild,v 1.10 2009/07/27 17:44:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.0.1.ebuild,v 1.11 2009/08/02 10:37:41 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
+MY_P=${P/t/T}
+inherit virtualx xfconf
 
-MY_PN=${PN/t/T}
-inherit virtualx xfce4
-
-XFCE_VERSION=4.6.1
-
-xfce4_core
-
-DESCRIPTION="File manager"
+DESCRIPTION="File manager for Xfce4"
 HOMEPAGE="http://thunar.xfce.org"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+
 LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="dbus debug doc exif gnome hal pcre startup-notification +trash-plugin"
 
 RDEPEND=">=dev-lang/perl-5.6
@@ -28,7 +25,7 @@ RDEPEND=">=dev-lang/perl-5.6
 	x11-libs/libSM
 	>=x11-misc/shared-mime-info-0.20
 	>=xfce-extra/exo-0.3.92[hal?]
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
+	>=xfce-base/libxfce4util-4.6
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( >=media-libs/libexif-0.6 )
 	hal? ( dev-libs/dbus-glib
@@ -37,36 +34,37 @@ RDEPEND=">=dev-lang/perl-5.6
 	pcre? ( >=dev-libs/libpcre-6 )
 	startup-notification? ( x11-libs/startup-notification )
 	trash-plugin? ( dev-libs/dbus-glib
-		>=xfce-base/xfce4-panel-${XFCE_VERSION} )"
+		>=xfce-base/xfce4-panel-4.6 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	doc? ( dev-util/gtk-doc )"
+	dev-util/pkgconfig
+	sys-devel/gettext
+	doc? ( dev-libs/libxslt )"
 
 pkg_setup() {
-	XFCE_CONFIG+="$(use_enable dbus) $(use_enable doc gtk-doc)
-	$(use_enable exif) $(use_enable gnome gnome-thumbnailers)
-	$(use_enable pcre)"
-
-	if use hal && ! use dbus; then
-		ewarn "USE hal detected, enabling dbus."
-	fi
+	XFCONF="--disable-dependency-tracking
+		$(use_enable dbus)
+		$(use_enable gnome gnome-thumbnailers)
+		$(use_enable startup-notification)
+		$(use_enable doc xsltproc)
+		$(use_enable exif)
+		$(use_enable pcre)
+		$(use_enable debug)"
 
 	if use hal; then
-		XFCE_CONFIG+=" --enable-dbus --with-volume-manager=hal"
+		XFCONF="${XFCONF} --enable-dbus --with-volume-manager=hal"
 	else
-		XFCE_CONFIG+=" --with-volume-manager=none"
+		XFCONF="${XFCONF} --with-volume-manager=none"
 	fi
 
-	if use trash-plugin && ! use dbus; then
-		XFCE_CONFIG+=" --enable-dbus"
-		ewarn "USE trash-plugin detected, enabling dbus."
+	if use trash-plugin; then
+		XFCONF="${XFCONF} --enable-dbus"
+	else
+		XFCONF="${XFCONF} --disable-tpa-plugin"
 	fi
-
-	use trash-plugin || XFCE_CONFIG+=" --disable-tpa-plugin"
+	DOCS="AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO"
 }
 
 src_test() {
-	Xemake check || die "emake check failed"
+	Xemake check || die "Xemake check failed"
 }
-
-DOCS="AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO"