[gentoo-commits] proj/xfce:master commit in: xfce-base/thunar/

[Christoph Mende]

commit:     d79946df9433899e02397f6ac936fc2f361a783c
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 19:17:37 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 19:17:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/xfce.git;a=commit;h=d79946df

thunar: Updated

---
 xfce-base/thunar/metadata.xml       |    3 --
 xfce-base/thunar/thunar-9999.ebuild |   51 ++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/xfce-base/thunar/metadata.xml b/xfce-base/thunar/metadata.xml
index 3012d59..826e2ca 100644
--- a/xfce-base/thunar/metadata.xml
+++ b/xfce-base/thunar/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>xfce</herd>
-<use>
-	<flag name='trash-plugin'>Build Trash plug-in for panel</flag>
-</use>
 </pkgmetadata>

diff --git a/xfce-base/thunar/thunar-9999.ebuild b/xfce-base/thunar/thunar-9999.ebuild
index 4439c2f..e6c27d5 100644
--- a/xfce-base/thunar/thunar-9999.ebuild
+++ b/xfce-base/thunar/thunar-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,60 +8,61 @@ inherit virtualx xfce4
 
 xfce4_core
 
-DESCRIPTION="File manager for Xfce4"
-HOMEPAGE="http://thunar.xfce.org/"
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/thunar/ http://thunar.xfce.org/"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbus debug exif pcre startup-notification test +trash-plugin"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="dbus debug exif libnotify pcre startup-notification test +xfce_plugins_trash udev"
 
-COMMON_DEPEND=">=xfce-base/exo-0.5.1
+GVFS_DEPEND=">=gnome-base/gvfs-1.6.6-r1"
+COMMON_DEPEND=">=xfce-base/exo-0.6
 	>=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.14:2
-	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfce4ui-4.7.1
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfce4ui-4.8
 	>=dev-lang/perl-5.6
-	dbus? ( dev-libs/dbus-glib )
+	dbus? ( >=dev-libs/dbus-glib-0.88 )
 	exif? ( >=media-libs/libexif-0.6.19 )
+	libnotify? ( x11-libs/libnotify )
 	pcre? ( >=dev-libs/libpcre-6 )
 	startup-notification? ( x11-libs/startup-notification )
-	trash-plugin? ( dev-libs/dbus-glib
-		>=xfce-base/xfce4-panel-4.3.90 )"
+	udev? ( >=sys-fs/udev-145[extras] )
+	xfce_plugins_trash? ( >=dev-libs/dbus-glib-0.88
+	>=xfce-base/xfce4-panel-4.8 )"
 RDEPEND="${COMMON_DEPEND}
-	>=x11-misc/shared-mime-info-0.70
-	>=dev-util/desktop-file-utils-0.15"
+	x11-misc/shared-mime-info
+	dev-util/desktop-file-utils
+	dbus? ( ${GVFS_DEPEND} )
+	udev? ( ${GVFS_DEPEND}[gdu,udev] )
+	xfce_plugins_trash? ( ${GVFS_DEPEND} )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
-	dev-util/pkgconfig
+	dev-util/gtk-doc
 	sys-devel/gettext"
 
 WANT_GTKDOCIZE="yes"
 
 pkg_setup() {
 	XFCE_CONFIG+=" --disable-dependency-tracking
+		--docdir=${EPREFIX}/usr/share/doc/${PF}
 		$(use_enable dbus)
+		$(use_enable udev gudev)
+		$(use_enable libnotify notifications)
 		$(use_enable exif)
 		$(use_enable pcre)
 		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
 
-	if use trash-plugin; then
+	if use xfce_plugins_trash; then
 		XFCE_CONFIG+=" --enable-dbus"
 	else
 		XFCE_CONFIG+=" --disable-tpa-plugin"
 	fi
 
-	DOCS="AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO"
+	DOCS="AUTHORS FAQ HACKING NEWS README THANKS TODO"
 }
 
 src_test() {
 	Xemake check || die
 }
-
-pkg_postinst() {
-	xfce4_pkg_postinst
-
-	echo
-	elog "If you are seeing some odd dbus error, make sure your user is in the"
-	elog "plugdev group. See Gentoo bug #279077 for more info"
-	echo
-}