Remove pkgconfig from $RDEPEND and license fixes.

24 files changed, 100 insertions, 76 deletions

diff --git a/xfce-extra/xfcalendar/xfcalendar-0.1.6.ebuild b/xfce-extra/xfcalendar/xfcalendar-0.1.6.ebuild
index 7d1d70f97950..0d40b2990662 100644
--- a/xfce-extra/xfcalendar/xfcalendar-0.1.6.ebuild
+++ b/xfce-extra/xfcalendar/xfcalendar-0.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfcalendar/xfcalendar-0.1.6.ebuild,v 1.3 2004/03/17 01:08:15 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfcalendar/xfcalendar-0.1.6.ebuild,v 1.4 2004/04/05 01:48:53 bcowan Exp $
 
 S=${WORKDIR}/${P}
 
@@ -12,15 +12,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha sparc ~amd64 ~hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	>=xfce-base/xfce4-base-4.0.3
 	>=xfce-base/libxfce4util-4.0.3
 	>=xfce-base/libxfcegui4-4.0.3
 	>=xfce-base/libxfce4mcs-4.0.3
-	>=xfce-base/xfce-mcs-manager-4.0.3"
-RDEPEND=">=dev-libs/dbh-1.0.14"
+	>=xfce-base/xfce-mcs-manager-4.0.3
+	>=dev-libs/dbh-1.0.14"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4.ebuild b/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4.ebuild
index fb22d9cc15c8..0f57e4f1d033 100644
--- a/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4.ebuild
+++ b/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4.ebuild,v 1.4 2003/10/16 14:24:52 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-artwork/xfce4-artwork-0.0.4.ebuild,v 1.5 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -13,10 +13,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="ia64 x86 ~ppc ~alpha ~sparc amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-battery/xfce4-battery-0.2.0.ebuild b/xfce-extra/xfce4-battery/xfce4-battery-0.2.0.ebuild
index 3e6ca3322f4f..e020dc41ac3b 100644
--- a/xfce-extra/xfce4-battery/xfce4-battery-0.2.0.ebuild
+++ b/xfce-extra/xfce4-battery/xfce4-battery-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/xfce4-battery-0.2.0.ebuild,v 1.6 2004/03/10 16:15:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-battery/xfce4-battery-0.2.0.ebuild,v 1.7 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="ia64 x86 ppc alpha sparc ~amd64 hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.0.ebuild b/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.0.ebuild
index 1d0c55ba7167..a4b0adaba026 100644
--- a/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.0.ebuild
+++ b/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.0.ebuild,v 1.2 2004/03/01 15:59:54 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-clipman/xfce4-clipman-0.4.0.ebuild,v 1.3 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha ~sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.0.ebuild b/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.0.ebuild
index f74de41bb93e..04d8789174a6 100644
--- a/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.0.ebuild
+++ b/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.0.ebuild,v 1.3 2004/03/09 16:07:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-datetime/xfce4-datetime-0.3.0.ebuild,v 1.4 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.4.1.ebuild b/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.4.1.ebuild
index f8752106e49a..ae8a3b957623 100644
--- a/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.4.1.ebuild
+++ b/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.4.1.ebuild,v 1.2 2004/03/01 15:59:54 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-diskperf/xfce4-diskperf-1.4.1.ebuild,v 1.3 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha ~sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0.ebuild b/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0.ebuild
index a5323884e3be..ecaeecfbdf26 100644
--- a/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0.ebuild
+++ b/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0.ebuild,v 1.1 2004/03/19 03:48:36 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-fsguard/xfce4-fsguard-0.2.0.ebuild,v 1.2 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -12,12 +12,13 @@ SRC_URI="http://download.berlios.de/xfce-goodies/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64"
+KEYWORDS="~ia64 x86 ~ppc ~alpha ~sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.0.4.ebuild b/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.0.4.ebuild
index d5ae91ff8044..c5561e076d76 100644
--- a/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.0.4.ebuild
+++ b/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.0.4.ebuild,v 1.3 2004/03/17 00:51:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-iconbox/xfce4-iconbox-4.0.4.ebuild,v 1.4 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -13,13 +13,14 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha sparc ~amd64 ~hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	=xfce-base/libxfce4util-${PV}
 	=xfce-base/libxfcegui4-${PV}
 	=xfce-base/libxfce4mcs-${PV}
 	=xfce-base/xfce-mcs-manager-${PV}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-menueditor/xfce4-menueditor-1.05.ebuild b/xfce-extra/xfce4-menueditor/xfce4-menueditor-1.05.ebuild
index a935062b4be3..d6e2793d6308 100644
--- a/xfce-extra/xfce4-menueditor/xfce4-menueditor-1.05.ebuild
+++ b/xfce-extra/xfce4-menueditor/xfce4-menueditor-1.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-menueditor/xfce4-menueditor-1.05.ebuild,v 1.1 2004/02/11 06:01:04 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-menueditor/xfce4-menueditor-1.05.ebuild,v 1.2 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${PN}
@@ -11,12 +11,13 @@ SRC_URI="http://users.skynet.be/p0llux/files/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64"
+KEYWORDS="~ia64 x86 ~ppc ~alpha ~sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_compile() {
 	econf \
diff --git a/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.2.0.ebuild b/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.2.0.ebuild
index 8140b1090470..e0d8e4bb3df3 100644
--- a/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.2.0.ebuild
+++ b/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.2.0.ebuild,v 1.8 2004/03/09 23:51:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-minicmd/xfce4-minicmd-0.2.0.ebuild,v 1.9 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="ia64 x86 ppc alpha sparc amd64 hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.0.4.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.0.4.ebuild
index 4cfe6baf803e..743fcafa43cc 100644
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.0.4.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.0.4.ebuild,v 1.3 2004/03/17 00:46:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.0.4.ebuild,v 1.4 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE="alsa"
 S=${WORKDIR}/${P}
@@ -13,11 +13,12 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha sparc ~amd64 ~hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	alsa? ( media-libs/alsa-lib )
 	=xfce-base/xfce4-base-${PV}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_compile() {
 	local myconf
diff --git a/xfce-extra/xfce4-netload/xfce4-netload-0.2.2.ebuild b/xfce-extra/xfce4-netload/xfce4-netload-0.2.2.ebuild
index 604a27ce0fd9..747a05e46255 100644
--- a/xfce-extra/xfce4-netload/xfce4-netload-0.2.2.ebuild
+++ b/xfce-extra/xfce4-netload/xfce4-netload-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload/xfce4-netload-0.2.2.ebuild,v 1.6 2004/03/09 23:52:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload/xfce4-netload-0.2.2.ebuild,v 1.7 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="ia64 x86 ppc alpha sparc ~amd64 hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-notes/xfce4-notes-0.9.7.ebuild b/xfce-extra/xfce4-notes/xfce4-notes-0.9.7.ebuild
index 58e1f7393755..10a6ce47b2d8 100644
--- a/xfce-extra/xfce4-notes/xfce4-notes-0.9.7.ebuild
+++ b/xfce-extra/xfce4-notes/xfce4-notes-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes/xfce4-notes-0.9.7.ebuild,v 1.2 2004/03/01 15:59:54 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-notes/xfce4-notes-0.9.7.ebuild,v 1.3 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha ~sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.3.0.ebuild b/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.3.0.ebuild
index fda7079cf6d8..5bf0ebb01dc9 100644
--- a/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.3.0.ebuild
+++ b/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.3.0.ebuild,v 1.6 2004/03/09 23:53:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-showdesktop/xfce4-showdesktop-0.3.0.ebuild,v 1.7 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="ia64 x86 ~ppc alpha sparc ~amd64 ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4.ebuild b/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4.ebuild
index cac9ebd5bfeb..7dcb07c3cdc1 100644
--- a/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4.ebuild
+++ b/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4.ebuild,v 1.5 2004/03/09 23:54:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload/xfce4-systemload-0.3.4.ebuild,v 1.6 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="ia64 x86 ~ppc alpha sparc ~amd64 ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-systray/xfce4-systray-4.0.4.ebuild b/xfce-extra/xfce4-systray/xfce4-systray-4.0.4.ebuild
index 592b1af4f7f9..a36aae8562d4 100644
--- a/xfce-extra/xfce4-systray/xfce4-systray-4.0.4.ebuild
+++ b/xfce-extra/xfce4-systray/xfce4-systray-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systray/xfce4-systray-4.0.4.ebuild,v 1.3 2004/03/17 00:48:25 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systray/xfce4-systray-4.0.4.ebuild,v 1.4 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -13,14 +13,15 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha sparc ~amd64 ~hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	=xfce-base/libxfce4util-${PV}
 	=xfce-base/libxfcegui4-${PV}
 	=xfce-base/libxfce4mcs-${PV}
 	=xfce-base/xfce-mcs-manager-${PV}
 	=xfce-base/xfce4-panel-${PV}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-themes/xfce4-themes-4.0.4.ebuild b/xfce-extra/xfce4-themes/xfce4-themes-4.0.4.ebuild
index e70eafbe1185..873bb7b6ad65 100644
--- a/xfce-extra/xfce4-themes/xfce4-themes-4.0.4.ebuild
+++ b/xfce-extra/xfce4-themes/xfce4-themes-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-themes/xfce4-themes-4.0.4.ebuild,v 1.3 2004/03/17 00:52:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-themes/xfce4-themes-4.0.4.ebuild,v 1.4 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -13,10 +13,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha sparc ~amd64 ~hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	>=xfce-base/xfce4-base-${PV}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-toys/xfce4-toys-4.0.4.ebuild b/xfce-extra/xfce4-toys/xfce4-toys-4.0.4.ebuild
index 09380de825b3..7d4d423c840c 100644
--- a/xfce-extra/xfce4-toys/xfce4-toys-4.0.4.ebuild
+++ b/xfce-extra/xfce4-toys/xfce4-toys-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-toys/xfce4-toys-4.0.4.ebuild,v 1.3 2004/03/17 00:45:12 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-toys/xfce4-toys-4.0.4.ebuild,v 1.4 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -13,10 +13,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ia64 x86 ~ppc ~alpha sparc ~amd64 ~hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	=xfce-base/xfce4-base-${PV}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.0.4.ebuild b/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.0.4.ebuild
index ad820f81ab15..d8ffd408b48d 100644
--- a/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.0.4.ebuild
+++ b/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.0.4.ebuild,v 1.3 2004/03/17 00:49:52 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-trigger-launcher/xfce4-trigger-launcher-4.0.4.ebuild,v 1.4 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -13,10 +13,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha sparc ~amd64 ~hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	=xfce-base/xfce4-base-${PV}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-weather/xfce4-weather-0.3.0.ebuild b/xfce-extra/xfce4-weather/xfce4-weather-0.3.0.ebuild
index 6686c2d4762a..0a3955efd15d 100644
--- a/xfce-extra/xfce4-weather/xfce4-weather-0.3.0.ebuild
+++ b/xfce-extra/xfce4-weather/xfce4-weather-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/xfce4-weather-0.3.0.ebuild,v 1.1 2004/03/03 03:54:43 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/xfce4-weather-0.3.0.ebuild,v 1.2 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3.ebuild b/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3.ebuild
index 0f0a07cc84d9..96a70306c33a 100644
--- a/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3.ebuild
+++ b/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3.ebuild,v 1.2 2004/03/14 07:33:29 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms-controller/xfce4-xmms-controller-1.4.3.ebuild,v 1.3 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
diff --git a/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1.ebuild b/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1.ebuild
index 97d9cb974ed9..c506e6bd3417 100644
--- a/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1.ebuild
+++ b/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1.ebuild,v 1.1 2003/12/07 19:44:10 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xmms/xfce4-xmms-0.1.1.ebuild,v 1.2 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 MY_P="${PN}-plugin-${PV}"
@@ -14,10 +14,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	xfce-base/xfce4-base"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xffm-icons/xffm-icons-4.0.4.ebuild b/xfce-extra/xffm-icons/xffm-icons-4.0.4.ebuild
index a14075d05f37..c74976e0f0d9 100644
--- a/xfce-extra/xffm-icons/xffm-icons-4.0.4.ebuild
+++ b/xfce-extra/xffm-icons/xffm-icons-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xffm-icons/xffm-icons-4.0.4.ebuild,v 1.3 2004/03/17 00:54:10 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xffm-icons/xffm-icons-4.0.4.ebuild,v 1.4 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -13,10 +13,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha sparc ~amd64 ~hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	>=xfce-base/xffm-${PV}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-extra/xfwm4-themes/xfwm4-themes-4.0.4.ebuild b/xfce-extra/xfwm4-themes/xfwm4-themes-4.0.4.ebuild
index 0068e6af6e4e..ace042ce88f4 100644
--- a/xfce-extra/xfwm4-themes/xfwm4-themes-4.0.4.ebuild
+++ b/xfce-extra/xfwm4-themes/xfwm4-themes-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/xfwm4-themes-4.0.4.ebuild,v 1.3 2004/03/17 00:43:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfwm4-themes/xfwm4-themes-4.0.4.ebuild,v 1.4 2004/04/05 01:48:53 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -13,10 +13,11 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ia64 x86 ~ppc ~alpha sparc ~amd64 ~hppa ~mips"
 
-DEPEND=">=x11-libs/gtk+-2.0.6
-	dev-util/pkgconfig
+RDEPEND=">=x11-libs/gtk+-2.0.6
 	dev-libs/libxml2
 	>=xfce-base/xfwm4-${PV}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die