Use xfconf.eclass.

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

3 files changed, 31 insertions, 27 deletions

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index b6802d374142..ed653aa4d7d7 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.142 2009/07/27 17:46:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.143 2009/08/02 08:34:24 ssuominen Exp $
+
+  02 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xfce-utils-4.6.1.ebuild:
+  Use xfconf.eclass.
 
   27 Jul 2009; nixnut <nixnut@gentoo.org> xfce-utils-4.6.1.ebuild:
   ppc stable #265587
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 44c1d5d12aca..9403044bad39 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -3,6 +3,6 @@ AUX xfce-utils-4.4.2-nolisten-tcp.patch 812 RMD160 4101835fad4f3c0cd2ccde22bcf19
 DIST xfce-utils-4.4.3.tar.bz2 644408 RMD160 62c337cdd40aebe58abca4689a444ab3b5b3e1e6 SHA1 71290af79f63bb2511d27b0313ec4cd7bc4a81b4 SHA256 919a3e1fc825bf22615821b66f65d30d5d2b3d7c44a37a54febb512d4e102c08
 DIST xfce-utils-4.6.1.tar.bz2 614143 RMD160 4446c3882716e841c00e398df62b9d54046b9d26 SHA1 0bdb5b6e494f15372d8c0826ac93baca476c9f16 SHA256 8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
 EBUILD xfce-utils-4.4.3.ebuild 1190 RMD160 db8490a74b52108c9075564076eab9595db234d6 SHA1 35468e8859e87d6be0a29fb92b4161e447e3dada SHA256 9e88b66b469a3d4ee818731222633fb1fa0edfd7a53d72e7ee25e7d08459eaf5
-EBUILD xfce-utils-4.6.1.ebuild 1275 RMD160 05ee6a40f2c59f3aa1587f15d839cb77d8150e00 SHA1 957b58ffe468f81dcfa6d25e00c88523f50b3a67 SHA256 64709104f8bdeca1450e0c00339b331f8e977a17d5526aabfa44378db0bbf101
-MISC ChangeLog 17854 RMD160 afe43b46def2b9d23e9b6c0a121d8772255aad32 SHA1 9b2058e745c96678287b1627f5d38424e79a79a6 SHA256 04f0e387b6fadc06d62a0d585e94e1d2c0e011ae461fb85e7bd112e6e9db06b7
+EBUILD xfce-utils-4.6.1.ebuild 1355 RMD160 3f60f4ea87237f1794cc457bfe8782269d1dd034 SHA1 3cea0120cb2b3a10a98508c9b1a84738f9b2c89f SHA256 78e5297092d8f64bc205fa08a2dda7a4b2c165a101b90ef6f1be1d64a036f823
+MISC ChangeLog 17960 RMD160 3f87a4dc77827d935ac7acea86445a42a481a5dd SHA1 ab0e2800442da2b32d4ca568f66cae8cecb7fb47 SHA256 5b5035d77b7de2964774a71267fbb336d1348b57ff315c495edc038c9b1c772f
 MISC metadata.xml 218 RMD160 e064747a2c888959d939ed09a70c242d905c89ea SHA1 8ff18a8acc37d299a3cc7b30663ca3eb0f91032e SHA256 c47df69ae42900828c5afb0aa77ee6f9ddca55a79b3326f69a0bbf8119f3d5df
diff --git a/xfce-base/xfce-utils/xfce-utils-4.6.1.ebuild b/xfce-base/xfce-utils/xfce-utils-4.6.1.ebuild
index 9464103817ce..2143f40436ec 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.6.1.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.6.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.6.1.ebuild,v 1.9 2009/07/27 17:46:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.6.1.ebuild,v 1.10 2009/08/02 08:34:24 ssuominen Exp $
 
-EAPI="1"
+EAPI=2
+inherit xfconf
 
-inherit xfce4
-
-xfce4_core
-
-DESCRIPTION="Collection of utils"
+DESCRIPTION="Collection of utils for Xfce4"
 HOMEPAGE="http://www.xfce.org/projects/xfce-utils/"
+
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="dbus debug +lock"
 
@@ -17,36 +17,36 @@ RDEPEND="x11-apps/xrdb
 	x11-libs/libX11
 	>=dev-libs/glib-2.6:2
 	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
-	>=xfce-base/xfconf-${XFCE_VERSION}
-	dbus? ( dev-libs/dbus-glib )
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/xfconf-4.6
+	dbus? ( >=dev-libs/dbus-glib-0.70 )
 	lock? ( || ( x11-misc/xscreensaver
 		gnome-extra/gnome-screensaver
 		x11-misc/xlockmore ) )"
 DEPEND="${RDEPEND}
-	dev-util/intltool"
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
 
 pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable dbus) --with-vendor-info=Gentoo"
+	XFCONF="--disable-dependency-tracking
+		$(use_enable dbus)
+		$(use_enable debug)
+		--with-vendor-info=Gentoo"
+	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
 src_install() {
-	xfce4_src_install
-
+	xfconf_src_install
 	insinto /usr/share/xfce4
-	doins "${FILESDIR}/Gentoo"
-
-	dodir /etc/X11/Sessions
-	echo startxfce4 > "${D}/etc/X11/Sessions/Xfce4"
-	fperms 755 /etc/X11/Sessions/Xfce4
+	doins "${FILESDIR}"/Gentoo || die "doins failed"
+	echo startxfce4 > "${T}"/Xfce4
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/Xfce4 || die "doexe failed"
 }
 
 pkg_postinst() {
-	elog
 	elog "Run Xfce4 from your favourite Display Manager by using"
 	elog "XSESSION=\"Xfce4\" in /etc/rc.conf"
-	elog
 }
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"