eclass fixes

(Portage version: 2.0.51-r15)

61 files changed, 99 insertions, 234 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
diff --git a/xfce-extra/exo/Manifest b/xfce-extra/exo/Manifest
index 72b086453156..f693a3d21896 100644
--- a/xfce-extra/exo/Manifest
+++ b/xfce-extra/exo/Manifest
@@ -1,4 +1,2 @@
-MD5 c2e66d1531a96115bb0d93d1e1357dfd exo-0.2.0-r1.ebuild 452
-MD5 96411568f611fdc9cd85c17b715ee885 ChangeLog 604
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 cd9fe14daf7aebfe8aa21324ad587563 exo-0.2.0-r1.ebuild 482
 MD5 ff443b2ff08285d00d134f52370c49c0 files/digest-exo-0.2.0-r1 62
diff --git a/xfce-extra/exo/exo-0.2.0-r1.ebuild b/xfce-extra/exo/exo-0.2.0-r1.ebuild
index e47aa6155be0..d5febb317ec6 100644
--- a/xfce-extra/exo/exo-0.2.0-r1.ebuild
+++ b/xfce-extra/exo/exo-0.2.0-r1.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-extra/exo/exo-0.2.0-r1.ebuild,v 1.2 2005/01/10 18:08:42 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.2.0-r1.ebuild,v 1.3 2005/02/01 17:38:29 bcowan Exp $
 
 DESCRIPTION="Extension library for Xfce"
 HOMEPAGE="http://www.os-cillation.com/"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 
-XRDEPEND=">=x11-libs/gtk+-2.4*
-	>=sys-apps/dbus-0.22"
+RDEPEND=">=x11-libs/gtk+-2.4*
+	>=sys-apps/dbus-0.22
+	>=xfce-base/libxfce4mcs-4.2.0"
 MY_P="${PN/t/T}-${PV}"
 BZIPPED=1
 GOODIES=1
diff --git a/xfce-extra/terminal/Manifest b/xfce-extra/terminal/Manifest
index f7e7242521db..c1f3b267c89c 100644
--- a/xfce-extra/terminal/Manifest
+++ b/xfce-extra/terminal/Manifest
@@ -1,4 +1,2 @@
-MD5 d28daba2b58809dbcf681ecc81030c0e terminal-0.2.2-r1.ebuild 497
-MD5 aff9a6ead0f9788486686e2ec016a2f3 ChangeLog 776
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 87fd42f365c34c789a678f4b7ded5e93 terminal-0.2.2-r1.ebuild 527
 MD5 d70719558b669d516582f062bf02d7c9 files/digest-terminal-0.2.2-r1 67
diff --git a/xfce-extra/terminal/terminal-0.2.2-r1.ebuild b/xfce-extra/terminal/terminal-0.2.2-r1.ebuild
index 5569b4b5f63d..85716bd76d5d 100644
--- a/xfce-extra/terminal/terminal-0.2.2-r1.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.2-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.2-r1.ebuild,v 1.2 2005/01/10 18:08:42 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.2-r1.ebuild,v 1.3 2005/02/01 17:38:29 bcowan Exp $
 
 DESCRIPTION="Terminal with close ties to xfce"
 HOMEPAGE="http://www.os-cillation.com/"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 
-XRDEPEND=">=x11-libs/gtk+-2.4*
+RDEPEND=">=x11-libs/gtk+-2.4*
 	>=xfce-extra/exo-0.2.0-r1
-	>=x11-libs/vte-0.11.11"
+	>=x11-libs/vte-0.11.11
+	>=xfce-base/libxfce4mcs-4.2.0"
 MY_P="${PN/t/T}-${PV}"
 BZIPPED=1
 GOODIES=1
diff --git a/xfce-extra/xfcalendar/Manifest b/xfce-extra/xfcalendar/Manifest
index c4c779d3ab7a..b6ceaf3bbcaa 100644
--- a/xfce-extra/xfcalendar/Manifest
+++ b/xfce-extra/xfcalendar/Manifest
@@ -1,6 +1,2 @@
-MD5 7ba7bc0e303b9a861b8c53689d2212e7 xfcalendar-0.1.9.ebuild 909
-MD5 0b017cf2fedf3a6831a87beeef17cb4f xfcalendar-4.2.0.ebuild 350
-MD5 b14c2a9ef9a8d916f57bcfbdf4aefe78 ChangeLog 3842
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 3d32c35a893af6e0a6a859974e561d41 files/digest-xfcalendar-0.1.9 68
+MD5 c93080bf704298c9ad691a71b50e9c23 xfcalendar-4.2.0.ebuild 388
 MD5 690835d5453daf3b97361abad49bc24f files/digest-xfcalendar-4.2.0 69
diff --git a/xfce-extra/xfcalendar/xfcalendar-4.2.0.ebuild b/xfce-extra/xfcalendar/xfcalendar-4.2.0.ebuild
index 3aba4feb8dac..39813188ae52 100644
--- a/xfce-extra/xfcalendar/xfcalendar-4.2.0.ebuild
+++ b/xfce-extra/xfcalendar/xfcalendar-4.2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfcalendar/xfcalendar-4.2.0.ebuild,v 1.5 2005/01/31 15:52:11 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfcalendar/xfcalendar-4.2.0.ebuild,v 1.6 2005/02/01 17:38:29 bcowan Exp $
 
 DESCRIPTION="Xfce4 calendar"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
-
+RDEPEND="~xfce-base/xfce4-panel-${PV}"
 inherit xfce4
diff --git a/xfce-extra/xfce4-appfinder/Manifest b/xfce-extra/xfce4-appfinder/Manifest
index f149bae5de9b..ccb32529ccf6 100644
--- a/xfce-extra/xfce4-appfinder/Manifest
+++ b/xfce-extra/xfce4-appfinder/Manifest
@@ -1,4 +1,2 @@
-MD5 0029cb1c8a4c0842d5006ecddab36f3e xfce4-appfinder-4.2.0.ebuild 370
-MD5 f0ac3ef39089820dd6d5ecf65f474379 ChangeLog 1775
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+MD5 099acd898550a28bcaf8a3afd66306c0 xfce4-appfinder-4.2.0.ebuild 409
 MD5 d7d11e06640cff428e402ceac7f7a9fe files/digest-xfce4-appfinder-4.2.0 74
diff --git a/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.0.ebuild b/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.0.ebuild
index 7116eed81a6f..1cb8cae85fd9 100644
--- a/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.0.ebuild
+++ b/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.0.ebuild,v 1.5 2005/01/31 15:35:23 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-appfinder/xfce4-appfinder-4.2.0.ebuild,v 1.6 2005/02/01 17:38:29 bcowan Exp $
 
 DESCRIPTION="Xfce 4 application finder"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
+RDEPEND="~xfce-base/libxfce4mcs-${PV}"
 
 inherit xfce4
\ No newline at end of file
diff --git a/xfce-extra/xfce4-artwork/Manifest b/xfce-extra/xfce4-artwork/Manifest
index 10f506dafa2a..bac080ae8430 100644
--- a/xfce-extra/xfce4-artwork/Manifest
+++ b/xfce-extra/xfce4-artwork/Manifest
@@ -1,6 +1,2 @@
 MD5 a91b72a34825e56db5345e3c394f6417 xfce4-artwork-0.0.4-r1.ebuild 415
-MD5 3578439cc708a39ac9558ad32add07b3 xfce4-artwork-0.0.4.ebuild 660
-MD5 48e15f9310d88de2a2164862f5e1a9c1 ChangeLog 863
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 MD5 b27fc1ce5215fa1c9b94d1ed2355109a files/digest-xfce4-artwork-0.0.4-r1 72
-MD5 b27fc1ce5215fa1c9b94d1ed2355109a files/digest-xfce4-artwork-0.0.4 72
diff --git a/xfce-extra/xfce4-battery/Manifest b/xfce-extra/xfce4-battery/Manifest
index a5a1f40ac9aa..27a863c8b6c3 100644
--- a/xfce-extra/xfce4-battery/Manifest
+++ b/xfce-extra/xfce4-battery/Manifest
@@ -1,6 +1,2 @@
 MD5 5d60df3cc09228da4724792f7bba3b6b xfce4-battery-0.2.0-r1.ebuild 397
-MD5 e0a8f03873577175d40617a6f7255741 ChangeLog 1574
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 2ca25226a7ce94cce521eb4b821c194e xfce4-battery-0.2.0.ebuild 722
 MD5 62b116cba4726ccaafa617391576b91e files/digest-xfce4-battery-0.2.0-r1 78
-MD5 62b116cba4726ccaafa617391576b91e files/digest-xfce4-battery-0.2.0 78
diff --git a/xfce-extra/xfce4-clipman/Manifest b/xfce-extra/xfce4-clipman/Manifest
index ba213c8a9a20..6aa08ee9a07a 100644
--- a/xfce-extra/xfce4-clipman/Manifest
+++ b/xfce-extra/xfce4-clipman/Manifest
@@ -1,8 +1,2 @@
-MD5 d4f5089b31d08367aa512ff28d976d61 xfce4-clipman-0.4.0.ebuild 713
-MD5 ca1964444fe086fbab434d75ca37112d xfce4-clipman-0.4.1.ebuild 732
 MD5 1b939e01e76c000663fa37fc8ff55d1d xfce4-clipman-0.4.1-r1.ebuild 387
-MD5 af6f0e125a80aa8611acd912d1eafeb6 ChangeLog 1375
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 MD5 51113de7354dc7d05f71d664c4d741d1 files/digest-xfce4-clipman-0.4.1-r1 78
-MD5 88a72aa0ab787502fb4fdeb793355c74 files/digest-xfce4-clipman-0.4.0 78
-MD5 51113de7354dc7d05f71d664c4d741d1 files/digest-xfce4-clipman-0.4.1 78
diff --git a/xfce-extra/xfce4-cpugraph/Manifest b/xfce-extra/xfce4-cpugraph/Manifest
index e1065b225c04..29588f9636e0 100644
--- a/xfce-extra/xfce4-cpugraph/Manifest
+++ b/xfce-extra/xfce4-cpugraph/Manifest
@@ -1,6 +1,2 @@
 MD5 52152dcf1857a2997edbf429a2e4c657 xfce4-cpugraph-0.2.2-r1.ebuild 424
-MD5 eb155bd856665a2fa131e3bdd20af6d2 xfce4-cpugraph-0.2.2.ebuild 742
-MD5 09b233366a0948cd20791f1ed1be2e7f ChangeLog 690
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 9b6fb4bdabdf4cfa391fe2f12e90af09 files/digest-xfce4-cpugraph-0.2.2 79
 MD5 9b6fb4bdabdf4cfa391fe2f12e90af09 files/digest-xfce4-cpugraph-0.2.2-r1 79
diff --git a/xfce-extra/xfce4-icon-theme/Manifest b/xfce-extra/xfce4-icon-theme/Manifest
index c36559bff66c..6a47750649ac 100644
--- a/xfce-extra/xfce4-icon-theme/Manifest
+++ b/xfce-extra/xfce4-icon-theme/Manifest
@@ -1,4 +1,2 @@
 MD5 7bfffc04365effd56f6e34b8cd3875e8 xfce4-icon-theme-4.2.0.ebuild 365
-MD5 daa58504babefc8b15452c2e131cd481 ChangeLog 1719
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 MD5 395f217d637cc3bb8d1d3ef81244d0ff files/digest-xfce4-icon-theme-4.2.0 76
diff --git a/xfce-extra/xfce4-iconbox/Manifest b/xfce-extra/xfce4-iconbox/Manifest
index 7022323f51cb..34ce6465f844 100644
--- a/xfce-extra/xfce4-iconbox/Manifest
+++ b/xfce-extra/xfce4-iconbox/Manifest
@@ -1,6 +1,2 @@
-MD5 76f1b431be30dd4a8a5e811bcf7f7a82 xfce4-iconbox-4.2.0.ebuild 356
-MD5 930a93dd1a5fc36f5e859a2d2fd886ad xfce4-iconbox-4.0.6.ebuild 841
-MD5 714630abf24bffca27cd38e1864c1ba1 ChangeLog 5756
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 68ea90dcca1e6c0b4b14af49f5232865 files/digest-xfce4-iconbox-4.0.6 71
+MD5 d4dcc184d1494c5d4578dd0f431a1fd6 xfce4-iconbox-4.2.0.ebuild 395
 MD5 b3d9957586020c5efecd0607e3491765 files/digest-xfce4-iconbox-4.2.0 72
diff --git a/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.0.ebuild b/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.0.ebuild
index 269a26a888e2..d436cca67a26 100644
--- a/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.0.ebuild
+++ b/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.0.ebuild,v 1.5 2005/01/31 15:38:15 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.2.0.ebuild,v 1.6 2005/02/01 17:38:29 bcowan Exp $
 
 DESCRIPTION="Xfce 4 icon box"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
+RDEPEND="~xfce-base/xfce4-panel-${PV}"
 
 inherit xfce4
\ No newline at end of file
diff --git a/xfce-extra/xfce4-minicmd/Manifest b/xfce-extra/xfce4-minicmd/Manifest
index def3c3670279..3c32647bd101 100644
--- a/xfce-extra/xfce4-minicmd/Manifest
+++ b/xfce-extra/xfce4-minicmd/Manifest
@@ -1,6 +1,2 @@
-MD5 14ae83256036e8668761bd23b9755603 xfce4-minicmd-0.2.0.ebuild 719
 MD5 311eabc8bb228ad58bbb489a7a0e53b3 xfce4-minicmd-0.3.0-r1.ebuild 382
-MD5 b72a7e526ef50dba8c11a65569b641b0 ChangeLog 1851
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 ad7bafe1be6b5607e06a5174e7913b99 files/digest-xfce4-minicmd-0.2.0 78
 MD5 0087842189b5cc0731ef9cdad52307df files/digest-xfce4-minicmd-0.3.0-r1 78
diff --git a/xfce-extra/xfce4-mixer/Manifest b/xfce-extra/xfce4-mixer/Manifest
index 0025487e7e82..97ea2406e9d7 100644
--- a/xfce-extra/xfce4-mixer/Manifest
+++ b/xfce-extra/xfce4-mixer/Manifest
@@ -1,6 +1,2 @@
-MD5 633d591e10475b3a6583df4dc94fac0d xfce4-mixer-4.2.0.ebuild 490
-MD5 cfbbc04e8619d62785adea5e2f0b9436 xfce4-mixer-4.0.6.ebuild 905
-MD5 85320d51cbe5f146c5fc1349beb5666b ChangeLog 5343
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 853ed031d35e53c619d8bc437fde21d0 files/digest-xfce4-mixer-4.0.6 69
+MD5 6dc1e30f4dc7c15efd6114327812b26b xfce4-mixer-4.2.0.ebuild 490
 MD5 f32bac4edcf73b43bd142fbe9a66045c files/digest-xfce4-mixer-4.2.0 70
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.0.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.0.ebuild
index 779386a88fa5..95fa8a5633cf 100644
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.0.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.0.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.0.ebuild,v 1.5 2005/01/31 15:40:20 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.2.0.ebuild,v 1.6 2005/02/01 17:38:29 bcowan Exp $
 
 DESCRIPTION="Xfce 4 mixer panel plugin"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="alsa"
 
 BZIPPED=1
-XRDEPEND="alsa? ( media-libs/alsa-lib )
-	>=xfce-base/xfce4-panel-${PV}"
+RDEPEND="~xfce-base/xfce4-panel-${PV}
+	alsa? ( media-libs/alsa-lib )"
+
 use alsa && XFCE_CONFIG="--with-sound=alsa"
 
 inherit xfce4
\ No newline at end of file
diff --git a/xfce-extra/xfce4-netload/Manifest b/xfce-extra/xfce4-netload/Manifest
index 41bdef4d6b02..ade42d0393c6 100644
--- a/xfce-extra/xfce4-netload/Manifest
+++ b/xfce-extra/xfce4-netload/Manifest
@@ -1,10 +1,2 @@
 MD5 8f54d6957d9762702d1a54c5bd2b863a xfce4-netload-0.2.4.ebuild 388
-MD5 0224c87896f3e6f6a038f882cde32ec1 xfce4-netload-0.2.3-r1.ebuild 396
-MD5 d7a4b1a0b530884bc66a11f5ca6b139d xfce4-netload-0.2.3.ebuild 735
-MD5 cb48ff018074c5b7e6d5046f57caf79b ChangeLog 2358
-MD5 413bbd37387b4bd3dfbc0fe3a8b67181 xfce4-netload-0.2.2.ebuild 727
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 d2470816e607bf5bceabe2df4ff303b7 files/digest-xfce4-netload-0.2.2 78
-MD5 19335b87c54a1cf33825330c46903f87 files/digest-xfce4-netload-0.2.3 78
 MD5 2c91dfa041ede312bf559f62213dffdc files/digest-xfce4-netload-0.2.4 78
-MD5 19335b87c54a1cf33825330c46903f87 files/digest-xfce4-netload-0.2.3-r1 78
diff --git a/xfce-extra/xfce4-notes/Manifest b/xfce-extra/xfce4-notes/Manifest
index 83b2ed80c0c3..b829ada9228f 100644
--- a/xfce-extra/xfce4-notes/Manifest
+++ b/xfce-extra/xfce4-notes/Manifest
@@ -1,8 +1,2 @@
-MD5 578b4dd3e2e0088728d6af4786848473 xfce4-notes-0.9.7.ebuild 719
-MD5 a36e511c5370989f0283b67fbc889d7b xfce4-notes-0.9.7-r1.ebuild 384
-MD5 5d2b71191abcd81942ce7fb35707263a ChangeLog 998
 MD5 9913b8c8164c7909a3238003ee096ff4 xfce4-notes-0.10.0.ebuild 378
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 6b41a6e0f0f511c726ef91eb894a79cd files/digest-xfce4-notes-0.9.7 76
-MD5 6b41a6e0f0f511c726ef91eb894a79cd files/digest-xfce4-notes-0.9.7-r1 76
 MD5 ac9ea5633311f8effbd11a24724d9cb4 files/digest-xfce4-notes-0.10.0 77
diff --git a/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.0.ebuild b/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.0.ebuild
index e518a51fa274..acceb257478e 100644
--- a/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.0.ebuild
+++ b/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.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-extra/xfce4-sensors/xfce4-sensors-0.3.0.ebuild,v 1.2 2005/01/10 18:08:42 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors/xfce4-sensors-0.3.0.ebuild,v 1.3 2005/02/01 17:38:29 bcowan Exp $
 
 DESCRIPTION="Xfce4 panel lm-sensors plugin"
 KEYWORDS="~amd64 ~x86"
 
 GOODIES_PLUGIN=1
-XRDEPEND="sys-apps/lm-sensors"
+RDEPEND="sys-apps/lm-sensors"
 
 inherit xfce4
\ No newline at end of file
diff --git a/xfce-extra/xfce4-showdesktop/Manifest b/xfce-extra/xfce4-showdesktop/Manifest
index 3bbdc8180b76..9e76b5b6869a 100644
--- a/xfce-extra/xfce4-showdesktop/Manifest
+++ b/xfce-extra/xfce4-showdesktop/Manifest
@@ -1,8 +1,2 @@
 MD5 2516ba9508fba335ff77f8e3f8451931 xfce4-showdesktop-0.4.0-r1.ebuild 429
-MD5 d6b6ede7f5c8a39c5fb7a78266cf68f7 xfce4-showdesktop-0.3.0.ebuild 740
-MD5 a591863127dab21392f064e5cb3de814 xfce4-showdesktop-0.4.0.ebuild 747
-MD5 ae99fd17b25d9565efd3749d2f33a775 ChangeLog 2297
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 44a536ceee4dc07cb0a8ab04d1b7ce57 files/digest-xfce4-showdesktop-0.3.0 82
-MD5 357a04cf01b83e869c015c8be2e161ca files/digest-xfce4-showdesktop-0.4.0 82
 MD5 357a04cf01b83e869c015c8be2e161ca files/digest-xfce4-showdesktop-0.4.0-r1 82
diff --git a/xfce-extra/xfce4-systemload/Manifest b/xfce-extra/xfce4-systemload/Manifest
index 05213e8d6073..424456c0d7e8 100644
--- a/xfce-extra/xfce4-systemload/Manifest
+++ b/xfce-extra/xfce4-systemload/Manifest
@@ -1,8 +1,2 @@
 MD5 9cbd8c098806e5dddd49092537c372b3 xfce4-systemload-0.3.6.ebuild 378
-MD5 541ab726829411251e0411d71647b83c xfce4-systemload-0.3.4-r1.ebuild 386
-MD5 984539656e6016618f50ee74cf766210 ChangeLog 2235
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 6053f70e611b747597a6dd2f0f8bb016 xfce4-systemload-0.3.4.ebuild 718
-MD5 640f6545d16ee55ffa3a3809d0031a89 files/digest-xfce4-systemload-0.3.4-r1 81
-MD5 640f6545d16ee55ffa3a3809d0031a89 files/digest-xfce4-systemload-0.3.4 81
 MD5 dfcfaa61f1dcb4d4cb35472a00634f72 files/digest-xfce4-systemload-0.3.6 81
diff --git a/xfce-extra/xfce4-systray/Manifest b/xfce-extra/xfce4-systray/Manifest
index fcdf7ae0b3d8..56a51e09349e 100644
--- a/xfce-extra/xfce4-systray/Manifest
+++ b/xfce-extra/xfce4-systray/Manifest
@@ -1,6 +1,2 @@
-MD5 a0e21c42131e6cbd32163a7caf2424a1 xfce4-systray-4.2.0.ebuild 400
-MD5 51d08ab5c96bfe33da5c521f4f941954 xfce4-systray-4.0.6.ebuild 878
-MD5 591d443a4c1a3c51233ca4c2aabc204e ChangeLog 5750
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 f4e5b4968d8a9aa9bf0990bc82674656 files/digest-xfce4-systray-4.0.6 71
+MD5 b22a03bbf6181569775400464769ad36 xfce4-systray-4.2.0.ebuild 399
 MD5 e85fda8f975f52b28b8a6db70e898b21 files/digest-xfce4-systray-4.2.0 72
diff --git a/xfce-extra/xfce4-systray/xfce4-systray-4.2.0.ebuild b/xfce-extra/xfce4-systray/xfce4-systray-4.2.0.ebuild
index dc353b1a2bc9..d87e84f43af9 100644
--- a/xfce-extra/xfce4-systray/xfce4-systray-4.2.0.ebuild
+++ b/xfce-extra/xfce4-systray/xfce4-systray-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-extra/xfce4-systray/xfce4-systray-4.2.0.ebuild,v 1.5 2005/01/31 15:44:02 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systray/xfce4-systray-4.2.0.ebuild,v 1.6 2005/02/01 17:38:30 bcowan Exp $
 
 DESCRIPTION="Xfce 4 system tray"
 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-extra/xfce4-taskbar/Manifest b/xfce-extra/xfce4-taskbar/Manifest
index ff030add8140..18dbfd82763d 100644
--- a/xfce-extra/xfce4-taskbar/Manifest
+++ b/xfce-extra/xfce4-taskbar/Manifest
@@ -1,6 +1,2 @@
-MD5 0e276c7c3e6550579d99b341ef15f7ab xfce4-taskbar-0.2.2.ebuild 721
 MD5 7a3d74d02af45b144c28dc7861f2852f xfce4-taskbar-0.2.2-r1.ebuild 378
-MD5 47cb7741f054006c3b7ebfa2939ad38e ChangeLog 825
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 78a9b99c33be4401990751c6d16d70db files/digest-xfce4-taskbar-0.2.2 78
 MD5 78a9b99c33be4401990751c6d16d70db files/digest-xfce4-taskbar-0.2.2-r1 78
diff --git a/xfce-extra/xfce4-toys/Manifest b/xfce-extra/xfce4-toys/Manifest
index 99265111ef3a..37441a3dc923 100644
--- a/xfce-extra/xfce4-toys/Manifest
+++ b/xfce-extra/xfce4-toys/Manifest
@@ -1,6 +1,2 @@
-MD5 412c606c6c466ed7c2323d801b89221c xfce4-toys-4.2.0.ebuild 400
-MD5 a916c951b966b29f3a8e572f360e2e35 xfce4-toys-4.0.6.ebuild 743
-MD5 f5725e2b7b4952df0a700fa3afb34194 ChangeLog 5530
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 53c9bc3e92ba9c706f2f1a32a973055d files/digest-xfce4-toys-4.0.6 68
+MD5 5cfe540610a89d7f32ba9078a6d4223d xfce4-toys-4.2.0.ebuild 398
 MD5 131e81a8722058445d9e6dadf6629d58 files/digest-xfce4-toys-4.2.0 69
diff --git a/xfce-extra/xfce4-toys/xfce4-toys-4.2.0.ebuild b/xfce-extra/xfce4-toys/xfce4-toys-4.2.0.ebuild
index fda7a5170ee2..c703081e9f4e 100644
--- a/xfce-extra/xfce4-toys/xfce4-toys-4.2.0.ebuild
+++ b/xfce-extra/xfce4-toys/xfce4-toys-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-extra/xfce4-toys/xfce4-toys-4.2.0.ebuild,v 1.5 2005/01/31 15:45:29 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-toys/xfce4-toys-4.2.0.ebuild,v 1.6 2005/02/01 17:38:30 bcowan Exp $
 
 DESCRIPTION="Xfce 4 panel toys plugin"
 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-extra/xfce4-trigger-launcher/Manifest b/xfce-extra/xfce4-trigger-launcher/Manifest
index 61d8f33be283..cfaddfbf7e95 100644
--- a/xfce-extra/xfce4-trigger-launcher/Manifest
+++ b/xfce-extra/xfce4-trigger-launcher/Manifest
@@ -1,6 +1,2 @@
-MD5 32edbe95cfebd03ec956dd47faa66cf7 xfce4-trigger-launcher-4.2.0.ebuild 436
-MD5 e14fe28f67b682e0dadecb2a4d8f6d24 xfce4-trigger-launcher-4.0.6.ebuild 773
-MD5 6297792e8cba9c04bf3e8b5e3b18701f ChangeLog 6238
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 5e744c64c31b97a93c8f52706f3dedfd files/digest-xfce4-trigger-launcher-4.0.6 80
+MD5 849257f71e6a98efbd98cab4ad3c4b1f xfce4-trigger-launcher-4.2.0.ebuild 434
 MD5 422105a6b699ce15a9f3525b48fe4645 files/digest-xfce4-trigger-launcher-4.2.0 81
diff --git a/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.0.ebuild b/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.0.ebuild
index 7e207d707733..a8cc475b6004 100644
--- a/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.0.ebuild
+++ b/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-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-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.0.ebuild,v 1.5 2005/01/31 15:46:12 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.2.0.ebuild,v 1.6 2005/02/01 17:38:30 bcowan Exp $
 
 DESCRIPTION="Xfce 4 trigger launcher panel plugin"
 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-extra/xfce4-windowlist/Manifest b/xfce-extra/xfce4-windowlist/Manifest
index 30abd9b37009..107dbf66dfbd 100644
--- a/xfce-extra/xfce4-windowlist/Manifest
+++ b/xfce-extra/xfce4-windowlist/Manifest
@@ -1,6 +1,2 @@
-MD5 95b3e3898ff198885b8c8f97522d0eb7 ChangeLog 723
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 MD5 d3dba2ddd81aa29a85e1356eeb161415 xfce4-windowlist-0.1.0-r1.ebuild 421
-MD5 6f6561b5d46c9f8ab60c03a2cf2e6552 xfce4-windowlist-0.1.0.ebuild 739
-MD5 ede2fb1d0a92f8c2aa944bb0134a181a files/digest-xfce4-windowlist-0.1.0 81
 MD5 ede2fb1d0a92f8c2aa944bb0134a181a files/digest-xfce4-windowlist-0.1.0-r1 81
diff --git a/xfce-extra/xfwm4-themes/Manifest b/xfce-extra/xfwm4-themes/Manifest
index 69713c19dada..18619b7efa1d 100644
--- a/xfce-extra/xfwm4-themes/Manifest
+++ b/xfce-extra/xfwm4-themes/Manifest
@@ -1,6 +1,2 @@
-MD5 be33178c8a933721e4bbf796c6487af3 xfwm4-themes-4.2.0.ebuild 402
-MD5 1ac6cd5881ddea6f0c94ffde321c9427 xfwm4-themes-4.0.6.ebuild 749
-MD5 ca699b803366abe377e19e607af85791 ChangeLog 5317
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 94f03e5cc6d8a4acfa777856df167e00 files/digest-xfwm4-themes-4.0.6 70
+MD5 a3d6a812ae0170284579df6eb9a04792 xfwm4-themes-4.2.0.ebuild 400
 MD5 1ef688fa46fc9d1b4f496e89180b0d00 files/digest-xfwm4-themes-4.2.0 71
diff --git a/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.0.ebuild b/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.0.ebuild
index 51d958306a39..1cf18a178cf2 100644
--- a/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.0.ebuild
+++ b/xfce-extra/xfwm4-themes/xfwm4-themes-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-extra/xfwm4-themes/xfwm4-themes-4.2.0.ebuild,v 1.5 2005/01/31 15:48:16 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/xfwm4-themes-4.2.0.ebuild,v 1.6 2005/02/01 17:38:30 bcowan Exp $
 
 DESCRIPTION="Xfce 4 window manager themes"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 
 BZIPPED=1
-XRDEPEND=">=xfce-base/xfwm4-${PV}"
+RDEPEND="~xfce-base/xfwm4-${PV}"
 
 inherit xfce4
\ No newline at end of file