Remove pkgconfig from $RDEPEND and license fixes.

31 files changed, 93 insertions, 77 deletions

diff --git a/xfce-base/libxfce4mcs/libxfce4mcs-4.0.0.ebuild b/xfce-base/libxfce4mcs/libxfce4mcs-4.0.0.ebuild
index 3ff7dc2e4716..ef722673425d 100644
--- a/xfce-base/libxfce4mcs/libxfce4mcs-4.0.0.ebuild
+++ b/xfce-base/libxfce4mcs/libxfce4mcs-4.0.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-base/libxfce4mcs/libxfce4mcs-4.0.0.ebuild,v 1.7 2004/03/16 04:13:51 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/libxfce4mcs-4.0.0.ebuild,v 1.8 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="X"
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="ia64 x86 ~ppc ~alpha ~sparc amd64 hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfce4mcs/libxfce4mcs-4.0.1.ebuild b/xfce-base/libxfce4mcs/libxfce4mcs-4.0.1.ebuild
index 420ebb75a281..37b81f3d123d 100644
--- a/xfce-base/libxfce4mcs/libxfce4mcs-4.0.1.ebuild
+++ b/xfce-base/libxfce4mcs/libxfce4mcs-4.0.1.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-base/libxfce4mcs/libxfce4mcs-4.0.1.ebuild,v 1.7 2004/03/15 20:45:34 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/libxfce4mcs-4.0.1.ebuild,v 1.8 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="X"
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="~ia64 x86 ppc ~alpha sparc ~amd64 hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfce4mcs/libxfce4mcs-4.0.2.ebuild b/xfce-base/libxfce4mcs/libxfce4mcs-4.0.2.ebuild
index 72bc61a83e17..721e44a2e3d7 100644
--- a/xfce-base/libxfce4mcs/libxfce4mcs-4.0.2.ebuild
+++ b/xfce-base/libxfce4mcs/libxfce4mcs-4.0.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-base/libxfce4mcs/libxfce4mcs-4.0.2.ebuild,v 1.3 2004/03/16 04:13:51 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/libxfce4mcs-4.0.2.ebuild,v 1.4 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="X"
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64 ~hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfce4mcs/libxfce4mcs-4.0.3.ebuild b/xfce-base/libxfce4mcs/libxfce4mcs-4.0.3.ebuild
index e7537616dffa..549d73023e6f 100644
--- a/xfce-base/libxfce4mcs/libxfce4mcs-4.0.3.ebuild
+++ b/xfce-base/libxfce4mcs/libxfce4mcs-4.0.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-base/libxfce4mcs/libxfce4mcs-4.0.3.ebuild,v 1.5 2004/03/09 23:43:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/libxfce4mcs-4.0.3.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="X"
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="ia64 x86 ~ppc alpha sparc ~amd64 ~hppa ~mips"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfce4mcs/libxfce4mcs-4.0.4.ebuild b/xfce-base/libxfce4mcs/libxfce4mcs-4.0.4.ebuild
index 6233daa3486d..df30a552b1f8 100644
--- a/xfce-base/libxfce4mcs/libxfce4mcs-4.0.4.ebuild
+++ b/xfce-base/libxfce4mcs/libxfce4mcs-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-base/libxfce4mcs/libxfce4mcs-4.0.4.ebuild,v 1.3 2004/03/17 00:30:25 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/libxfce4mcs-4.0.4.ebuild,v 1.4 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="X"
 S=${WORKDIR}/${P}
@@ -10,14 +10,15 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-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}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_compile() {
 	local myconf
diff --git a/xfce-base/libxfce4util/libxfce4util-4.0.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.0.0.ebuild
index 77346d94511f..6c214c27336b 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.0.0.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.0.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-base/libxfce4util/libxfce4util-4.0.0.ebuild,v 1.5 2003/11/16 01:14:22 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.0.0.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="ia64 x86 ~ppc ~alpha ~sparc amd64 hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfce4util/libxfce4util-4.0.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.0.1.ebuild
index d5ec07acdac1..15fa7cb83b74 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.0.1.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.0.1.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-base/libxfce4util/libxfce4util-4.0.1.ebuild,v 1.5 2004/01/16 21:16:07 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.0.1.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="~ia64 x86 ppc ~alpha sparc ~amd64 hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfce4util/libxfce4util-4.0.2.ebuild b/xfce-base/libxfce4util/libxfce4util-4.0.2.ebuild
index 30e309dfc87c..b52a32df6ba6 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.0.2.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.0.2.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-base/libxfce4util/libxfce4util-4.0.2.ebuild,v 1.1 2003/12/24 05:56:36 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.0.2.ebuild,v 1.2 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64 ~hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfce4util/libxfce4util-4.0.3.ebuild b/xfce-base/libxfce4util/libxfce4util-4.0.3.ebuild
index 1845098117d3..a1cf09ce21b7 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.0.3.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.0.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-base/libxfce4util/libxfce4util-4.0.3.ebuild,v 1.5 2004/03/09 23:43:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.0.3.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="ia64 x86 ~ppc alpha sparc ~amd64 ~hppa ~mips"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfce4util/libxfce4util-4.0.4.ebuild b/xfce-base/libxfce4util/libxfce4util-4.0.4.ebuild
index 0efbaf362782..7eac3b2dd833 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.0.4.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-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-base/libxfce4util/libxfce4util-4.0.4.ebuild,v 1.4 2004/03/17 00:35:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.0.4.ebuild,v 1.5 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,12 +10,13 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 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"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.0.0.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.0.0.ebuild
index 042943d936da..83d403fb2549 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.0.0.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.0.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-base/libxfcegui4/libxfcegui4-4.0.0.ebuild,v 1.5 2003/11/16 01:15:42 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.0.0.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="xinerama X"
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="ia64 x86 ~ppc ~alpha ~sparc amd64 hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.0.1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.0.1.ebuild
index 14be7e4e82fe..d6f6a8001590 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.0.1.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.0.1.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-base/libxfcegui4/libxfcegui4-4.0.1.ebuild,v 1.5 2004/01/16 21:16:07 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.0.1.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="xinerama X"
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="~ia64 x86 ppc ~alpha sparc ~amd64 hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.0.2.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.0.2.ebuild
index 7381e4916ab5..6b5da4941ed6 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.0.2.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.0.2.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-base/libxfcegui4/libxfcegui4-4.0.2.ebuild,v 1.1 2003/12/24 05:57:50 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.0.2.ebuild,v 1.2 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="xinerama X"
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64 ~hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.0.3.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.0.3.ebuild
index 403bdd7f8251..6597a4a65a70 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.0.3.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.0.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-base/libxfcegui4/libxfcegui4-4.0.3.ebuild,v 1.5 2004/03/10 07:18:47 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.0.3.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="xinerama X"
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="ia64 x86 ~ppc alpha sparc ~amd64 ~hppa ~mips"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.0.4.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.0.4.ebuild
index 7be9d6f0761d..6b35d33a180d 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.0.4.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-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-base/libxfcegui4/libxfcegui4-4.0.4.ebuild,v 1.4 2004/03/17 00:28:28 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.0.4.ebuild,v 1.5 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="xinerama X"
 S=${WORKDIR}/${P}
@@ -10,13 +10,14 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-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}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_compile() {
 	local myconf
diff --git a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.0.ebuild b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.0.ebuild
index 29d958e47090..d7af81852254 100644
--- a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.0.ebuild
+++ b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.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-base/xfce-mcs-manager/xfce-mcs-manager-4.0.0.ebuild,v 1.5 2003/11/16 01:20:38 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.0.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="ia64 x86 ~ppc ~alpha ~sparc amd64 hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.1.ebuild b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.1.ebuild
index 39b63a490069..15699b1ea2a6 100644
--- a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.1.ebuild
+++ b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.1.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-base/xfce-mcs-manager/xfce-mcs-manager-4.0.1.ebuild,v 1.5 2004/01/16 21:16:07 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.1.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="~ia64 x86 ppc ~alpha sparc ~amd64 hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.2.ebuild b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.2.ebuild
index 3dc2c5d6a1ec..e070287bd3f5 100644
--- a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.2.ebuild
+++ b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.2.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-base/xfce-mcs-manager/xfce-mcs-manager-4.0.2.ebuild,v 1.1 2003/12/24 05:59:10 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.2.ebuild,v 1.2 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64 ~hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.3.ebuild b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.3.ebuild
index 2c75f5c48364..229658dd3f34 100644
--- a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.3.ebuild
+++ b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.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-base/xfce-mcs-manager/xfce-mcs-manager-4.0.3.ebuild,v 1.5 2004/03/09 23:44:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.3.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 KEYWORDS="ia64 x86 ~ppc alpha sparc ~amd64 ~hppa ~mips"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.4.ebuild b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.4.ebuild
index b7a54cabd5db..7bfc0477116e 100644
--- a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.4.ebuild
+++ b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-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-base/xfce-mcs-manager/xfce-mcs-manager-4.0.4.ebuild,v 1.3 2004/03/17 00:31:54 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.0.4.ebuild,v 1.4 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,15 +10,16 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-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}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die
diff --git a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.0.4.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.0.4.ebuild
index 8c06efc541a7..fa73ee527a83 100644
--- a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.0.4.ebuild
+++ b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-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-base/xfce-mcs-plugins/xfce-mcs-plugins-4.0.4.ebuild,v 1.3 2004/03/17 00:33:42 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.0.4.ebuild,v 1.4 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="X"
 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_compile() {
 	local myconf
diff --git a/xfce-base/xfce-utils/xfce-utils-4.0.4.ebuild b/xfce-base/xfce-utils/xfce-utils-4.0.4.ebuild
index 032273ca9a62..7bde649b1fd7 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.0.4.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-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-base/xfce-utils/xfce-utils-4.0.4.ebuild,v 1.3 2004/03/17 00:38:28 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.0.4.ebuild,v 1.4 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="X gtkhtml gnome"
 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_compile() {
 	local myconf
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.0.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.0.4.ebuild
index a2c108ecb77d..555bbebd9aac 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.0.4.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-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-base/xfce4-panel/xfce4-panel-4.0.4.ebuild,v 1.3 2004/03/17 00:42:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.0.4.ebuild,v 1.4 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="X"
 S=${WORKDIR}/${P}
@@ -13,8 +13,7 @@ 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
 	gnome-base/librsvg
 	=xfce-base/libxfce4util-${PV}
@@ -22,6 +21,8 @@ DEPEND=">=x11-libs/gtk+-2.0.6
 	=xfce-base/libxfce4mcs-${PV}
 	=xfce-base/xfce-mcs-manager-${PV}
 	x11-libs/startup-notification"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_compile() {
 	local myconf
diff --git a/xfce-base/xfdesktop/xfdesktop-4.0.4.ebuild b/xfce-base/xfdesktop/xfdesktop-4.0.4.ebuild
index 9fb937b805ee..ca20abe4a0d3 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.0.4.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-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-base/xfdesktop/xfdesktop-4.0.4.ebuild,v 1.3 2004/03/17 00:55:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.0.4.ebuild,v 1.4 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="X"
 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_compile() {
 	local myconf
diff --git a/xfce-base/xffm/xffm-4.0.4.ebuild b/xfce-base/xffm/xffm-4.0.4.ebuild
index aedeec27bc1b..8435e31b5246 100644
--- a/xfce-base/xffm/xffm-4.0.4.ebuild
+++ b/xfce-base/xffm/xffm-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-base/xffm/xffm-4.0.4.ebuild,v 1.3 2004/03/17 00:26:36 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xffm/xffm-4.0.4.ebuild,v 1.4 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="samba"
 S=${WORKDIR}/${P}
@@ -21,7 +21,13 @@ DEPEND=">=x11-libs/gtk+-2.0.6
 	=xfce-base/libxfce4mcs-${PV}
 	=xfce-base/xfce-mcs-manager-${PV}
 	>=dev-libs/dbh-1.0.14"
-RDEPEND="samba? ( net-fs/samba )
+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}
+	samba? ( net-fs/samba )
 	>=dev-libs/dbh-1.0.14"
 
 src_compile() {
diff --git a/xfce-base/xfprint/xfprint-4.0.0.ebuild b/xfce-base/xfprint/xfprint-4.0.0.ebuild
index 900b30b6d636..6d5b42fb4750 100644
--- a/xfce-base/xfprint/xfprint-4.0.0.ebuild
+++ b/xfce-base/xfprint/xfprint-4.0.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-base/xfprint/xfprint-4.0.0.ebuild,v 1.6 2003/11/16 01:45:32 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.0.0.ebuild,v 1.7 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="ia64 x86 ~ppc ~alpha ~sparc amd64 hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/xfprint/xfprint-4.0.1.ebuild b/xfce-base/xfprint/xfprint-4.0.1.ebuild
index 9740481e1bad..8733adda93cd 100644
--- a/xfce-base/xfprint/xfprint-4.0.1.ebuild
+++ b/xfce-base/xfprint/xfprint-4.0.1.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-base/xfprint/xfprint-4.0.1.ebuild,v 1.5 2004/01/16 21:16:07 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.0.1.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="~ia64 x86 ppc ~alpha sparc ~amd64 hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/xfprint/xfprint-4.0.2.ebuild b/xfce-base/xfprint/xfprint-4.0.2.ebuild
index a3c9415585f4..920c8cbfac51 100644
--- a/xfce-base/xfprint/xfprint-4.0.2.ebuild
+++ b/xfce-base/xfprint/xfprint-4.0.2.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-base/xfprint/xfprint-4.0.2.ebuild,v 1.1 2003/12/24 06:08:19 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.0.2.ebuild,v 1.2 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="~ia64 ~x86 ~ppc ~alpha ~sparc ~amd64 ~hppa"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/xfprint/xfprint-4.0.3.ebuild b/xfce-base/xfprint/xfprint-4.0.3.ebuild
index 420dd4fb2474..cc6f63e04bbf 100644
--- a/xfce-base/xfprint/xfprint-4.0.3.ebuild
+++ b/xfce-base/xfprint/xfprint-4.0.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-base/xfprint/xfprint-4.0.3.ebuild,v 1.5 2004/03/09 23:48:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.0.3.ebuild,v 1.6 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 KEYWORDS="ia64 x86 ~ppc alpha sparc ~amd64 ~hppa ~mips"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
diff --git a/xfce-base/xfprint/xfprint-4.0.4.ebuild b/xfce-base/xfprint/xfprint-4.0.4.ebuild
index f466c48259d7..b653b22bf9ef 100644
--- a/xfce-base/xfprint/xfprint-4.0.4.ebuild
+++ b/xfce-base/xfprint/xfprint-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-base/xfprint/xfprint-4.0.4.ebuild,v 1.3 2004/03/17 00:36:59 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.0.4.ebuild,v 1.4 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -10,11 +10,10 @@ HOMEPAGE="http://www.xfce.org/"
 SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="BSD"
 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
 	app-text/a2ps
 	app-text/psutils
@@ -22,6 +21,8 @@ DEPEND=">=x11-libs/gtk+-2.0.6
 	=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-base/xfwm4/xfwm4-4.0.4.ebuild b/xfce-base/xfwm4/xfwm4-4.0.4.ebuild
index 5217af86b561..62d1997e66fc 100644
--- a/xfce-base/xfwm4/xfwm4-4.0.4.ebuild
+++ b/xfce-base/xfwm4/xfwm4-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-base/xfwm4/xfwm4-4.0.4.ebuild,v 1.3 2004/03/17 00:40:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.0.4.ebuild,v 1.4 2004/04/05 01:19:06 bcowan Exp $
 
 IUSE="X"
 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}
 	x11-libs/startup-notification"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_compile() {
 	local myconf