Adjust dbus dep.

Package-Manager: portage-2.1.2-r7

4 files changed, 63 insertions, 5 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 07fcb161ab81..badd6bd9eb6c 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.79 2007/02/03 01:24:39 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.80 2007/02/04 17:31:10 drac Exp $
+
+*xfdesktop-4.4.0-r1 (04 Feb 2007)
+
+  04 Feb 2007; Samuli Suominen <drac@gentoo.org> +xfdesktop-4.4.0-r1.ebuild:
+  Adjust dbus dep, and move checks inside a function.
 
   03 Feb 2007; Joshua Nichols <nichoj@gentoo.org>
   -xfdesktop-4.3.99.2.ebuild, -xfdesktop-4.3.99.2-r1.ebuild:
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 6fc5c902ef91..a5fa34871724 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -4,14 +4,18 @@ EBUILD xfdesktop-4.2.3.ebuild 536 RMD160 3cbc0bde908999faf2cd23462272d6e3679167f
 MD5 562a292f1add2002fb6e90aa725bb577 xfdesktop-4.2.3.ebuild 536
 RMD160 3cbc0bde908999faf2cd23462272d6e3679167f4 xfdesktop-4.2.3.ebuild 536
 SHA256 59737fecf5b51541b24e2df491b9bed5c4fa262bc883884e81f5bd7993bc6f92 xfdesktop-4.2.3.ebuild 536
+EBUILD xfdesktop-4.4.0-r1.ebuild 1341 RMD160 4a1b4e5cf8b4a5e276a90fe846f0c8465499fe95 SHA1 68058f638e716965bbdbb5d7bf8451514cc06c25 SHA256 3b8fa1c326506d4149f8ed1763334730b832398ecee04314ff943a77c11eb0e0
+MD5 b20521ae0780c7b55433e20b48769847 xfdesktop-4.4.0-r1.ebuild 1341
+RMD160 4a1b4e5cf8b4a5e276a90fe846f0c8465499fe95 xfdesktop-4.4.0-r1.ebuild 1341
+SHA256 3b8fa1c326506d4149f8ed1763334730b832398ecee04314ff943a77c11eb0e0 xfdesktop-4.4.0-r1.ebuild 1341
 EBUILD xfdesktop-4.4.0.ebuild 1291 RMD160 c1b3992cf1f9c81ac24be9518a396a076a1ce716 SHA1 b61bb6016a00558ef7545ee52ffe68d75b7e81ee SHA256 89af01c61546322bcded9519f44db455af57646cf100e16c08215bafdfd5ec19
 MD5 3fdc668da1678a19ac406f6a3c482f51 xfdesktop-4.4.0.ebuild 1291
 RMD160 c1b3992cf1f9c81ac24be9518a396a076a1ce716 xfdesktop-4.4.0.ebuild 1291
 SHA256 89af01c61546322bcded9519f44db455af57646cf100e16c08215bafdfd5ec19 xfdesktop-4.4.0.ebuild 1291
-MISC ChangeLog 9732 RMD160 fd98506be7020629a0c3ea3c3e362039aac0e2c1 SHA1 30c3682238dbe518ad2f7e80e34354fa3c782ec1 SHA256 fac06b135fdf61ce42a041b1146fc3753a4d8f32be63935f9c6c8964d4c74493
-MD5 4d3746c5cffe402a0a8af0fa74a449b6 ChangeLog 9732
-RMD160 fd98506be7020629a0c3ea3c3e362039aac0e2c1 ChangeLog 9732
-SHA256 fac06b135fdf61ce42a041b1146fc3753a4d8f32be63935f9c6c8964d4c74493 ChangeLog 9732
+MISC ChangeLog 9897 RMD160 7669d1742297ae214899a730cee9ea32eacd37b3 SHA1 c49be470a9ff028a58adac8f44dbf2001f1597e6 SHA256 fadd86d9990192f77efee5ee92db736ad164fe760915761517adf62634725207
+MD5 ac070b188d973ef4a6a85379104b84db ChangeLog 9897
+RMD160 7669d1742297ae214899a730cee9ea32eacd37b3 ChangeLog 9897
+SHA256 fadd86d9990192f77efee5ee92db736ad164fe760915761517adf62634725207 ChangeLog 9897
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -22,3 +26,6 @@ SHA256 0abc1a60e474611597ea185162b39f17032fc3b807b228ac58972ec4b10b4c3f files/di
 MD5 db027821b7e60e49379b3973b26fb969 files/digest-xfdesktop-4.4.0 253
 RMD160 4a58b0833a20674e9b5c1d148477eac92ca561e7 files/digest-xfdesktop-4.4.0 253
 SHA256 4d72ecec4468ad413db51f9e36be65a2430535ef756ce08e6b54eb4a54b72391 files/digest-xfdesktop-4.4.0 253
+MD5 db027821b7e60e49379b3973b26fb969 files/digest-xfdesktop-4.4.0-r1 253
+RMD160 4a58b0833a20674e9b5c1d148477eac92ca561e7 files/digest-xfdesktop-4.4.0-r1 253
+SHA256 4d72ecec4468ad413db51f9e36be65a2430535ef756ce08e6b54eb4a54b72391 files/digest-xfdesktop-4.4.0-r1 253
diff --git a/xfce-base/xfdesktop/files/digest-xfdesktop-4.4.0-r1 b/xfce-base/xfdesktop/files/digest-xfdesktop-4.4.0-r1
new file mode 100644
index 000000000000..44433ff4fca8
--- /dev/null
+++ b/xfce-base/xfdesktop/files/digest-xfdesktop-4.4.0-r1
@@ -0,0 +1,3 @@
+MD5 a1c93d228924b5daf151f698114021d3 xfdesktop-4.4.0.tar.bz2 3150198
+RMD160 edeef28d1a0ac374e6fe11d8da83563a3e1dabb8 xfdesktop-4.4.0.tar.bz2 3150198
+SHA256 f6837480d87b61827e25d47ed1ca92565f975a8dff89ab950aefb1fb392fd34b xfdesktop-4.4.0.tar.bz2 3150198
diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.0-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..7a52c179a0f4
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.4.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.0-r1.ebuild,v 1.1 2007/02/04 17:31:10 drac Exp $
+
+inherit xfce44
+
+xfce44
+
+DESCRIPTION="Desktop manager"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc plugins thunar-vfs"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libSM
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	gnome-base/librsvg
+	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+	plugins? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )
+	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
+	thunar-vfs? ( || ( dev-libs/dbus-glib <sys-apps/dbus-1 )
+		>=xfce-base/thunar-${THUNAR_MASTER_VERSION}
+		>=xfce-extra/exo-0.3.2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable plugins panel-plugin) \
+	$(use_enable doc xsltproc) --enable-desktop-icons"
+
+pkg_setup() {
+	if use thunar-vfs; then
+		XFCE_CONFIG="${XFCE_CONFIG} --enable-thunarx --enable-file-icons --enable-exo"
+	else
+		XFCE_CONFIG="${XFCE_CONFIG} --disable-thunarx --disable-file-icons --disable-exo"
+	fi
+}
+
+DOCS="AUTHORS ChangeLog NEWS TODO README"
+
+xfce44_core_package