eclass fixes

(Portage version: 2.0.51-r15)

28 files changed, 61 insertions, 109 deletions

diff --git a/xfce-base/libxfce4mcs/Manifest b/xfce-base/libxfce4mcs/Manifest
index 26c3f37007c3..fcee4b63faf5 100644
--- a/xfce-base/libxfce4mcs/Manifest
+++ b/xfce-base/libxfce4mcs/Manifest
@@ -1,6 +1,2 @@
-MD5 c8455bbb0e49198516c5684386f6d186 libxfce4mcs-4.2.0.ebuild 447
-MD5 c436d628fc82c3fc6f1cc226da497cac libxfce4mcs-4.0.6.ebuild 912
-MD5 bbcf1c0697bacc5a0c3b30108020285c ChangeLog 5985
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 011f46410944ac6aa6c44d92b888069e files/digest-libxfce4mcs-4.0.6 69
+MD5 712179db5e692796583f7a1a093ca3a4 libxfce4mcs-4.2.0.ebuild 444
 MD5 a16968bec2b75db41f497feb10c7430f files/digest-libxfce4mcs-4.2.0 70
diff --git a/xfce-base/libxfce4mcs/libxfce4mcs-4.2.0.ebuild b/xfce-base/libxfce4mcs/libxfce4mcs-4.2.0.ebuild
index 88eaf29a5f55..71176837dccf 100644
--- a/xfce-base/libxfce4mcs/libxfce4mcs-4.2.0.ebuild
+++ b/xfce-base/libxfce4mcs/libxfce4mcs-4.2.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/libxfce4mcs-4.2.0.ebuild,v 1.5 2005/01/31 15:28:08 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/libxfce4mcs-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Libraries for Xfce 4"
 LICENSE="LGPL-2"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
-XRDEPEND=">=xfce-base/libxfce4util-${PV}
-	>=xfce-base/libxfcegui4-${PV}"
+RDEPEND="~xfce-base/libxfce4util-${PV}
+	~xfce-base/libxfcegui4-${PV}"
 
 inherit xfce4
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 29c55f7ce5b9..231c56df5b6a 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,6 +1,2 @@
-MD5 48c5f1a5b0f2b9e6399d01ace7228faa libxfce4util-4.2.0.ebuild 404
-MD5 78ec411ad9c5255b2b32d8acb68806fa libxfce4util-4.0.6.ebuild 732
-MD5 34d31416ab9b59c810c157bebab03ae0 ChangeLog 5660
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 71f8db52c0e0da0e1ee4a70c35c0edd6 files/digest-libxfce4util-4.0.6 70
+MD5 23910cd552119b38dd1ce9c915e77834 libxfce4util-4.2.0.ebuild 403
 MD5 767623de028b6ecae2141c3c5d2478c0 files/digest-libxfce4util-4.2.0 71
diff --git a/xfce-base/libxfce4util/libxfce4util-4.2.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.2.0.ebuild
index c61125fd277f..6903a6f8f363 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.2.0.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.2.0.ebuild,v 1.5 2005/01/31 15:25:38 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Libraries for Xfce 4"
 LICENSE="LGPL-2"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
-XRDEPEND="dev-util/gtk-doc"
+RDEPEND="dev-util/gtk-doc"
 
 inherit xfce4
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
index 663b09b7abb7..ee2fbff5e24e 100644
--- a/xfce-base/libxfcegui4/Manifest
+++ b/xfce-base/libxfcegui4/Manifest
@@ -1,6 +1,2 @@
-MD5 221d562328cb8a300ad995706f5b976d libxfcegui4-4.2.0.ebuild 468
-MD5 846b4d926377f6ca5f271e125b35b394 libxfcegui4-4.0.6.ebuild 945
-MD5 44a51e0546707c7039782b09e0efd00f ChangeLog 5494
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 022f596f0e15b93b536481bfbb826b86 files/digest-libxfcegui4-4.0.6 69
+MD5 84645a033dc97497776c708a1674f4b7 libxfcegui4-4.2.0.ebuild 466
 MD5 ed38cfbda6391873939d9e0943cca030 files/digest-libxfcegui4-4.2.0 70
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.2.0.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.2.0.ebuild
index 3d8352f6841a..00fd876ebb8a 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.2.0.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.2.0.ebuild,v 1.5 2005/01/31 15:26:41 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Libraries for Xfce 4"
 LICENSE="LGPL-2"
@@ -8,7 +8,7 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="xinerama"
 
 BZIPPED=1
-XRDEPEND=">=xfce-base/libxfce4util-${PV}"
+RDEPEND="~xfce-base/libxfce4util-${PV}"
 XFCE_CONFIG="$(use_enable xinerama)"
 
 inherit xfce4
\ No newline at end of file
diff --git a/xfce-base/xfce-mcs-manager/Manifest b/xfce-base/xfce-mcs-manager/Manifest
index c015bc979de3..2a12fee43996 100644
--- a/xfce-base/xfce-mcs-manager/Manifest
+++ b/xfce-base/xfce-mcs-manager/Manifest
@@ -1,6 +1,2 @@
-MD5 5d51fee3b44682fbe78d10c84b07d295 xfce-mcs-manager-4.2.0.ebuild 423
-MD5 96a1cb9ca6e0059b96d7a390b79c6a5e xfce-mcs-manager-4.0.6.ebuild 834
-MD5 eaac5a9192c4af1e4e8e22ad7756ffc6 ChangeLog 5938
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 d69958702a86fd719be9ef272c56278f files/digest-xfce-mcs-manager-4.0.6 74
+MD5 73359668fbaf6d10460b2b40634f5a10 xfce-mcs-manager-4.2.0.ebuild 421
 MD5 86cdb84a3d6532edb298680997d3bb5f files/digest-xfce-mcs-manager-4.2.0 75
diff --git a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.2.0.ebuild b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.2.0.ebuild
index 17217dec025d..e1bd713a18f7 100644
--- a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.2.0.ebuild
+++ b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.2.0.ebuild,v 1.5 2005/01/31 15:24:11 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce 4 mcs manager"
 LICENSE="LGPL-2"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
-XRDEPEND=">=xfce-base/libxfce4mcs-${PV}"
+RDEPEND="~xfce-base/libxfce4mcs-${PV}"
 
 inherit xfce4
diff --git a/xfce-base/xfce-mcs-plugins/Manifest b/xfce-base/xfce-mcs-plugins/Manifest
index 811d45f160c8..c4ea1ffffa4f 100644
--- a/xfce-base/xfce-mcs-plugins/Manifest
+++ b/xfce-base/xfce-mcs-plugins/Manifest
@@ -1,6 +1,2 @@
-MD5 23d3239a45dd89fa29ea5fe062c420c3 xfce-mcs-plugins-4.2.0.ebuild 440
-MD5 e2b8cf31d0fa1ee5f84e08c2443027fe xfce-mcs-plugins-4.0.6.ebuild 1021
-MD5 eb15af7b665ed93ac824fd1fe93b9850 ChangeLog 5967
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 f85bc8af9024d5781c6fc0fba97cfc56 files/digest-xfce-mcs-plugins-4.0.6 74
+MD5 3c0e3ab7c78f8e5bf7c3d532b846bbab xfce-mcs-plugins-4.2.0.ebuild 484
 MD5 339e1397b86af7c9acd5ffe7b578d030 files/digest-xfce-mcs-plugins-4.2.0 75
diff --git a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.2.0.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.2.0.ebuild
index 19025b7c8f46..7fec19735d06 100644
--- a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.2.0.ebuild
+++ b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.2.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.2.0.ebuild,v 1.5 2005/01/31 15:30:01 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce4 mcs plugins"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
+RDEPEND="~xfce-base/xfce-mcs-manager-${PV}"
 XFCE_CONFIG="--enable-xf86misc --enable-xkb --enable-randr --enable-xf86vm"
 
 inherit xfce4
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 48f33de4f172..dc4607b7e8fd 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -1,6 +1,2 @@
-MD5 7ce6db821097944da0c17478e340e316 xfce-utils-4.2.0.ebuild 462
-MD5 f8b0d28fca91cd41dcfd71d9569003b8 xfce-utils-4.0.6.ebuild 1092
-MD5 12e2787b27cd29ecbad300e024790397 ChangeLog 5467
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 36cfb57721de1080726f288c17acd532 files/digest-xfce-utils-4.0.6 68
+MD5 a6f6f81118f88db7c361f039774ef7b3 xfce-utils-4.2.0.ebuild 496
 MD5 55d9e3f0f93fe625260dc740c557f6a3 files/digest-xfce-utils-4.2.0 69
diff --git a/xfce-base/xfce-utils/xfce-utils-4.2.0.ebuild b/xfce-base/xfce-utils/xfce-utils-4.2.0.ebuild
index d0556a61e946..ffe87dd5db4e 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.2.0.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.2.0.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 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.2.0.ebuild,v 1.5 2005/01/31 15:30:50 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce 4 utilities"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="gtkhtml"
 
 BZIPPED=1
-XRDEPEND="gtkhtml? ( gnome-extra/libgtkhtml )"
+RDEPEND="~xfce-base/xfce-mcs-manager-${PV}
+	gtkhtml? ( gnome-extra/libgtkhtml )"
 XFCE_CONFIG="$(use_enable gtkhtml) --enable-gdm"
 
 inherit xfce4
diff --git a/xfce-base/xfce4-extras/Manifest b/xfce-base/xfce4-extras/Manifest
index 7ac7405875a7..ca74ab954cb3 100644
--- a/xfce-base/xfce4-extras/Manifest
+++ b/xfce-base/xfce4-extras/Manifest
@@ -1,4 +1,2 @@
-MD5 bfbecb5f47e8ca83b6860aa275d8847a xfce4-extras-4.2.0.ebuild 840
-MD5 b20afdf4144625a6e88c4c49cb8ce80b ChangeLog 894
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 09ab4e7bd68ae3f4583ee7abed814d3a xfce4-extras-4.2.0.ebuild 838
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xfce4-extras-4.2.0 0
diff --git a/xfce-base/xfce4-extras/xfce4-extras-4.2.0.ebuild b/xfce-base/xfce4-extras/xfce4-extras-4.2.0.ebuild
index f598fbdb4058..39564048b0cd 100644
--- a/xfce-base/xfce4-extras/xfce4-extras-4.2.0.ebuild
+++ b/xfce-base/xfce4-extras/xfce4-extras-4.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-extras/xfce4-extras-4.2.0.ebuild,v 1.3 2005/01/31 15:49:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-extras/xfce4-extras-4.2.0.ebuild,v 1.4 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce 4 extras ebuild"
 LICENSE="GPL-2 BSD LGPL-2"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
-XRDEPEND=">=xfce-base/xfce4-${PV}
+RDEPEND="~xfce-base/xfce4-${PV}
 	>=xfce-extra/xfce4-showdesktop-0.4.0-r1
 	>=xfce-extra/xfce4-battery-0.2.0-r1
 	>=xfce-extra/xfce4-systemload-0.3.4-r1
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 2527b55875b9..88c230c2c0ca 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,6 +1,2 @@
-MD5 0b3203fa0e552f018eff63f1ed7f9754 xfce4-panel-4.2.0.ebuild 379
-MD5 70bd999b4d2ce83c0a4ad79ca6aee96b xfce4-panel-4.0.6.ebuild 1029
-MD5 ddc501b214194c1d7cf4f0f133f3edcc ChangeLog 5758
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 c2f0fe4a313f5e1c0dab8da34ca6f6ee files/digest-xfce4-panel-4.0.6 70
+MD5 95aff9f3620fd21c0a6bca4a300fb388 xfce4-panel-4.2.0.ebuild 393
 MD5 358a0fd3744634c5f3e111b59e467e1d files/digest-xfce4-panel-4.2.0 70
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.2.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.2.0.ebuild
index 58b0313a20c8..988dd16a58f1 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.2.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.2.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.2.0.ebuild,v 1.5 2005/01/31 15:28:55 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce 4 panel"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
-XRDEPEND="gnome-base/librsvg"
+RDEPEND="~xfce-base/xfce-mcs-plugins-${PV}"
 
 inherit xfce4
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index eee85950dee5..9627684a2f76 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,4 +1,2 @@
-MD5 f860d8188f8e745a5c417d3352b89fe7 xfce4-session-4.2.0.ebuild 416
-MD5 bbb5ac5f73ad113be1de650b925c9c0e ChangeLog 1870
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 59e6205fb1ea495a00cd646f4b12d669 xfce4-session-4.2.0.ebuild 415
 MD5 32defc006cf28633d77740e60c7d8653 files/digest-xfce4-session-4.2.0 73
diff --git a/xfce-base/xfce4-session/xfce4-session-4.2.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.2.0.ebuild
index beb78b064af2..3ef939503ade 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.2.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.2.0.ebuild,v 1.5 2005/01/31 15:32:46 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce 4 session manager"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
-XRDEPEND="=xfce-base/xfce-utils-${PV}"
+RDEPEND="~xfce-base/xfce-utils-${PV}"
 SINGLE_MAKE=1
 
 inherit xfce4
diff --git a/xfce-base/xfce4/Manifest b/xfce-base/xfce4/Manifest
index cfa641ce0870..be7834f3418c 100644
--- a/xfce-base/xfce4/Manifest
+++ b/xfce-base/xfce4/Manifest
@@ -1,6 +1,2 @@
-MD5 328760e2861f3896d94968ca4a55c0ef xfce4-4.2.0.ebuild 1207
-MD5 f6a4286490ba3f2fd8cd1d0ceb16f703 xfce4-4.0.6.ebuild 1033
-MD5 e90ab004b7889c54e89b15fbad9560a2 ChangeLog 5383
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xfce4-4.0.6 0
+MD5 d37c554d9e9d05d6bdcc0099f7261371 xfce4-4.2.0.ebuild 1189
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xfce4-4.2.0 0
diff --git a/xfce-base/xfce4/xfce4-4.2.0.ebuild b/xfce-base/xfce4/xfce4-4.2.0.ebuild
index 2022a0f6f78e..8685c992b20d 100644
--- a/xfce-base/xfce4/xfce4-4.2.0.ebuild
+++ b/xfce-base/xfce4/xfce4-4.2.0.ebuild
@@ -1,28 +1,28 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.2.0.ebuild,v 1.6 2005/01/31 15:34:02 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.2.0.ebuild,v 1.7 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce 4 base ebuild"
 LICENSE="GPL-2 BSD LGPL-2"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
-XRDEPEND=">=xfce-base/xfce-mcs-plugins-${PV}
-	>=xfce-base/xfce4-panel-${PV}
-	>=xfce-base/xfwm4-${PV}
-	>=xfce-base/xfce-utils-${PV}
-	>=xfce-base/xfdesktop-${PV}
-	>=xfce-base/xfce4-session-${PV}
-	>=xfce-base/xfprint-${PV}
-	>=xfce-extra/xfce4-iconbox-${PV}
-	>=xfce-extra/xfce4-systray-${PV}
-	>=xfce-extra/xfce4-toys-${PV}
-	>=xfce-extra/xfce4-trigger-launcher-${PV}
-	>=xfce-extra/xfwm4-themes-${PV}
-	>=xfce-extra/xfcalendar-${PV}
-	>=xfce-extra/xfce4-appfinder-${PV}
-	>=xfce-extra/xfce4-icon-theme-${PV}
-	>=xfce-base/xffm-${PV}
-	>=xfce-extra/xfce4-mixer-${PV}
+RDEPEND="~xfce-base/xfce-mcs-plugins-${PV}
+	~xfce-base/xfce4-panel-${PV}
+	~xfce-base/xfwm4-${PV}
+	~xfce-base/xfce-utils-${PV}
+	~xfce-base/xfdesktop-${PV}
+	~xfce-base/xfce4-session-${PV}
+	~xfce-base/xfprint-${PV}
+	~xfce-extra/xfce4-iconbox-${PV}
+	~xfce-extra/xfce4-systray-${PV}
+	~xfce-extra/xfce4-toys-${PV}
+	~xfce-extra/xfce4-trigger-launcher-${PV}
+	~xfce-extra/xfwm4-themes-${PV}
+	~xfce-extra/xfcalendar-${PV}
+	~xfce-extra/xfce4-appfinder-${PV}
+	~xfce-extra/xfce4-icon-theme-${PV}
+	~xfce-base/xffm-${PV}
+	~xfce-extra/xfce4-mixer-${PV}
 	!xfce-base/xfce4-base"
 XFCE_META=1
 
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 1dc550467865..1fb1ff1f3bec 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,6 +1,2 @@
-MD5 83b33cfbcbfb68e72682e6537fe38b30 xfdesktop-4.2.0.ebuild 395
-MD5 0dd913780ddfb5b20e9e7e5c2155393f xfdesktop-4.0.6.ebuild 971
-MD5 af7c1e312215d3e7ddf518493e3afb62 ChangeLog 5461
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 5a42f394e1b742861d369baced86b7b2 files/digest-xfdesktop-4.0.6 68
+MD5 104375c1c7449cb43e4a67ac3e07c6cd xfdesktop-4.2.0.ebuild 393
 MD5 052b500a074aceabbdf0c51b1c50c312 files/digest-xfdesktop-4.2.0 69
diff --git a/xfce-base/xfdesktop/xfdesktop-4.2.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.2.0.ebuild
index 3e4da69d2e19..ea4013b1b1fe 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.2.0.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.2.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.2.0.ebuild,v 1.5 2005/01/31 15:31:36 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce 4 desktop manager"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
-XRDEPEND=">=xfce-base/xfce4-panel-${PV}"
+RDEPEND="~xfce-base/xfce4-panel-${PV}"
 
 inherit xfce4
\ No newline at end of file
diff --git a/xfce-base/xffm/Manifest b/xfce-base/xffm/Manifest
index 8c3b5447a054..36217b9861ed 100644
--- a/xfce-base/xffm/Manifest
+++ b/xfce-base/xffm/Manifest
@@ -1,6 +1,2 @@
-MD5 b8c67a844698243f9578db12a11c003e xffm-4.2.0.ebuild 403
-MD5 66940130499c8a5195000f169844a854 xffm-4.0.6.ebuild 1125
-MD5 45d38dd61518de9573913c3c8a250c64 ChangeLog 5145
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 e9150083279d46fe00ba1017f6b6c621 files/digest-xffm-4.0.6 63
+MD5 e9bb411de6030868c17e576730820ad6 xffm-4.2.0.ebuild 402
 MD5 8dd59d0caf5b08c7efe41811486876f5 files/digest-xffm-4.2.0 64
diff --git a/xfce-base/xffm/xffm-4.2.0.ebuild b/xfce-base/xffm/xffm-4.2.0.ebuild
index dedec490ef77..1f9c5b54f87e 100644
--- a/xfce-base/xffm/xffm-4.2.0.ebuild
+++ b/xfce-base/xffm/xffm-4.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xffm/xffm-4.2.0.ebuild,v 1.5 2005/01/31 15:32:21 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xffm/xffm-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce 4 file manager"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
-XRDEPEND="samba? ( net-fs/samba )"
+RDEPEND="samba? ( net-fs/samba )"
 XFCE_CONFIG="--enable-all"
 
 inherit xfce4
\ No newline at end of file
diff --git a/xfce-base/xfprint/Manifest b/xfce-base/xfprint/Manifest
index ada163c80c97..8d3efda8a0e0 100644
--- a/xfce-base/xfprint/Manifest
+++ b/xfce-base/xfprint/Manifest
@@ -1,6 +1,2 @@
-MD5 d0b042fa1fa338afd319420baecd9df4 ChangeLog 5459
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 8d029707d8e36ec16dd2cdb010dad74f xfprint-4.2.0.ebuild 418
-MD5 c5e633980b389a259d57c0a926cef043 xfprint-4.0.6.ebuild 882
-MD5 f27d66febf1deb61d2b218235e551b00 files/digest-xfprint-4.0.6 65
+MD5 c3901eb9643c4c73a4b2120415c5b53a xfprint-4.2.0.ebuild 447
 MD5 941c8e0d6e288f87db2d9bb24b4ec3df files/digest-xfprint-4.2.0 66
diff --git a/xfce-base/xfprint/xfprint-4.2.0.ebuild b/xfce-base/xfprint/xfprint-4.2.0.ebuild
index 2680208e3104..87e72ad0e5c0 100644
--- a/xfce-base/xfprint/xfprint-4.2.0.ebuild
+++ b/xfce-base/xfprint/xfprint-4.2.0.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.2.0.ebuild,v 1.5 2005/01/31 15:33:02 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce 4 print manager panel plugin"
 LICENSE="BSD"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
-XRDEPEND="app-text/a2ps
+RDEPEND="~xfce-base/xfce4-panel-${PV}
+	app-text/a2ps
 	app-text/psutils"
 
 inherit xfce4
\ No newline at end of file
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 8dfcdd9b16ff..3ee15bc4f109 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,6 +1,2 @@
-MD5 39ece2ab9b7b978e84ca8c446a02c561 xfwm4-4.2.0.ebuild 394
-MD5 1bbf410049f4bef5540b0258adb0b64e xfwm4-4.0.6.ebuild 1005
-MD5 05dd744e3acb697086bba8bbdab66c53 ChangeLog 5429
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 6f4435fee2dcec61a3cca0459b98839c files/digest-xfwm4-4.0.6 63
+MD5 4df860becf4803cf5705104a78f58e6b xfwm4-4.2.0.ebuild 438
 MD5 4ce546f7744abe18cc8da66391eb5fc5 files/digest-xfwm4-4.2.0 64
diff --git a/xfce-base/xfwm4/xfwm4-4.2.0.ebuild b/xfce-base/xfwm4/xfwm4-4.2.0.ebuild
index b46f36d5ae2a..555251f8e192 100644
--- a/xfce-base/xfwm4/xfwm4-4.2.0.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.2.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.2.0.ebuild,v 1.5 2005/01/31 15:33:48 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.2.0.ebuild,v 1.6 2005/02/01 17:41:21 bcowan Exp $
 
 DESCRIPTION="Xfce 4 window manager"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
+RDEPEND="~xfce-base/xfce-mcs-manager-${PV}"
 XFCE_CONFIG="--enable-randr --enable-compositor"
 
 inherit xfce4
\ No newline at end of file