Xfce builds for new eclass and modular Xorg.

Package-Manager: portage-1.589-cvs

55 files changed, 434 insertions, 105 deletions

diff --git a/xfce-base/libxfce4mcs/ChangeLog b/xfce-base/libxfce4mcs/ChangeLog
index 42e83755f5c0..b78fd9920345 100644
--- a/xfce-base/libxfce4mcs/ChangeLog
+++ b/xfce-base/libxfce4mcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/libxfce4mcs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/ChangeLog,v 1.58 2005/07/12 12:42:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/ChangeLog,v 1.59 2005/10/06 06:19:06 bcowan Exp $
+
+*libxfce4mcs-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +libxfce4mcs-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org> libxfce4mcs-4.2.2.ebuild:
   stable on amd64
diff --git a/xfce-base/libxfce4mcs/Manifest b/xfce-base/libxfce4mcs/Manifest
index 2c48fe3b14e0..c74533a34037 100644
--- a/xfce-base/libxfce4mcs/Manifest
+++ b/xfce-base/libxfce4mcs/Manifest
@@ -1,6 +1,2 @@
-MD5 7583c3d3dd2e5a8a115a280d93ea8b84 libxfce4mcs-4.2.1.ebuild 439
-MD5 6ef8bc1d0db9b10375dc20a39c3753f3 libxfce4mcs-4.2.2.ebuild 429
-MD5 daaf8cb15e1c48d41dabffea6050992e ChangeLog 7055
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 039b1dd6ff838607023a3b25944c1158 files/digest-libxfce4mcs-4.2.1 69
-MD5 9a54e5597f04ba2e82ea3f0845f8e9ee files/digest-libxfce4mcs-4.2.2 69
+MD5 c89fe1b199b35d14c35795b30c9fc3d6 libxfce4mcs-4.2.2-r1.ebuild 445
+MD5 9a54e5597f04ba2e82ea3f0845f8e9ee files/digest-libxfce4mcs-4.2.2-r1 69
diff --git a/xfce-base/libxfce4mcs/files/digest-libxfce4mcs-4.2.2-r1 b/xfce-base/libxfce4mcs/files/digest-libxfce4mcs-4.2.2-r1
new file mode 100644
index 000000000000..45d4a02f3b14
--- /dev/null
+++ b/xfce-base/libxfce4mcs/files/digest-libxfce4mcs-4.2.2-r1
@@ -0,0 +1 @@
+MD5 06c3d8ea6826d9a2fbcc1da6b86f1361 libxfce4mcs-4.2.2.tar.gz 372951
diff --git a/xfce-base/libxfce4mcs/libxfce4mcs-4.2.2-r1.ebuild b/xfce-base/libxfce4mcs/libxfce4mcs-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..f162f52675bf
--- /dev/null
+++ b/xfce-base/libxfce4mcs/libxfce4mcs-4.2.2-r1.ebuild
@@ -0,0 +1,22 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:19:06 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Libraries for Xfce 4"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM )
+	virtual/x11 )
+	~xfce-base/libxfce4util-${PV}
+	~xfce-base/libxfcegui4-${PV}"
+DEPEND="${RDEPEND}
+	|| ( ( x11-libs/libXt
+	x11-proto.xproto )
+	virtual/x11 )"
+
+core_package
\ No newline at end of file
diff --git a/xfce-base/libxfce4util/ChangeLog b/xfce-base/libxfce4util/ChangeLog
index 4b8f04ccabf4..654bdd12c46e 100644
--- a/xfce-base/libxfce4util/ChangeLog
+++ b/xfce-base/libxfce4util/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/libxfce4util
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/ChangeLog,v 1.54 2005/07/12 12:40:34 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/ChangeLog,v 1.55 2005/10/06 06:21:02 bcowan Exp $
+
+*libxfce4util-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +libxfce4util-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org> libxfce4util-4.2.2.ebuild:
   stable on amd64
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index c4b2683876ba..dcf66c87b857 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,6 +1,2 @@
-MD5 4d45df6153838e901e43184d9c5f74e4 libxfce4util-4.2.1.ebuild 457
-MD5 3c7e9e0b1bda5eedf402463fbcdc0aee libxfce4util-4.2.2.ebuild 447
-MD5 3f57ffc159744424f72eecb49661a11b ChangeLog 6650
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 7a2ecefbbf17776cce73f7c0c1edeb02 files/digest-libxfce4util-4.2.1 70
-MD5 e6bb8f4efa04dca3652c70612e73c1fe files/digest-libxfce4util-4.2.2 70
+MD5 82d0d9e763a145c456838feaaf22a03a libxfce4util-4.2.2-r1.ebuild 461
+MD5 e6bb8f4efa04dca3652c70612e73c1fe files/digest-libxfce4util-4.2.2-r1 70
diff --git a/xfce-base/libxfce4util/files/digest-libxfce4util-4.2.2-r1 b/xfce-base/libxfce4util/files/digest-libxfce4util-4.2.2-r1
new file mode 100644
index 000000000000..d5b6b63c2343
--- /dev/null
+++ b/xfce-base/libxfce4util/files/digest-libxfce4util-4.2.2-r1
@@ -0,0 +1 @@
+MD5 5f27635aa0ba5e40ffaf3031b530b36b libxfce4util-4.2.2.tar.gz 458244
diff --git a/xfce-base/libxfce4util/libxfce4util-4.2.2-r1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..1bda78fcbdfa
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.2.2-r1.ebuild
@@ -0,0 +1,15 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:21:02 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Libraries for Xfce 4"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="doc? ( dev-util/gtk-doc )"
+
+XFCE_CONFIG="`use_enable doc gtk-doc`"
+core_package
\ No newline at end of file
diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog
index 35bc3870ea90..4c898b6492be 100644
--- a/xfce-base/libxfcegui4/ChangeLog
+++ b/xfce-base/libxfcegui4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/libxfcegui4
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.55 2005/10/06 04:32:04 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.56 2005/10/06 06:23:02 bcowan Exp $
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> libxfcegui4-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
 *libxfcegui4-4.2.2-r1 (06 Oct 2005)
 
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
index 67a99ff6c316..7f0462789bd8 100644
--- a/xfce-base/libxfcegui4/Manifest
+++ b/xfce-base/libxfcegui4/Manifest
@@ -1,9 +1,2 @@
-MD5 f9541110f45bde9828d1dd4dff54b2f4 libxfcegui4-4.2.2-r1.ebuild 509
-MD5 4c0aa9e2cb3327324da76d4c3aee9bce libxfcegui4-4.2.1.ebuild 419
-MD5 674151939399a94988edf7d8d0e32d85 ChangeLog 6841
-MD5 71b5bf09ddc03cca09d1d0f43b426559 libxfcegui4-4.2.2.ebuild 407
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 d07a25a965ca8315611ea916b2d60f3d files/digest-libxfcegui4-4.2.1 69
-MD5 daed0f9e9ebfcfd09728f348e74eb1b2 files/digest-libxfcegui4-4.2.2 69
-MD5 a1dfdce2e330255275e6bc6aa4a640f4 files/taskbar-gtk-2.8.patch 875
+MD5 c6035efedac3ec1b9c2339fbd4128454 libxfcegui4-4.2.2-r1.ebuild 413
 MD5 daed0f9e9ebfcfd09728f348e74eb1b2 files/digest-libxfcegui4-4.2.2-r1 69
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild
index 8bab9155960a..98fa743a5eb5 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild
@@ -1,15 +1,24 @@
 # 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.2-r1.ebuild,v 1.1 2005/10/06 04:32:04 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild,v 1.2 2005/10/06 06:23:02 bcowan Exp $
+
+inherit xfce42 eutils
 
 DESCRIPTION="Libraries for Xfce 4"
 LICENSE="LGPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
 
-RDEPEND="~xfce-base/libxfce4util-${PV}"
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM )
+	virtual/x11 )
+	~xfce-base/libxfce4util-${PV}"
+DEPEND="${RDEPEND}
+	|| ( ( x11-libs/libXt
+	x11-proto/xproto )
+	virtual/x11 )"
 
-inherit xfce4 eutils
+core_package
 
 src_unpack() {
 	unpack ${A}
diff --git a/xfce-base/xfce-mcs-manager/ChangeLog b/xfce-base/xfce-mcs-manager/ChangeLog
index ed5afee03aa5..b3659b382b6d 100644
--- a/xfce-base/xfce-mcs-manager/ChangeLog
+++ b/xfce-base/xfce-mcs-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce-mcs-manager
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/ChangeLog,v 1.54 2005/07/12 12:44:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-manager/ChangeLog,v 1.55 2005/10/06 06:24:56 bcowan Exp $
+
+*xfce-mcs-manager-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce-mcs-manager-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org>
   xfce-mcs-manager-4.2.2.ebuild:
diff --git a/xfce-base/xfce-mcs-manager/Manifest b/xfce-base/xfce-mcs-manager/Manifest
index 76c312573e63..aa02b95a876e 100644
--- a/xfce-base/xfce-mcs-manager/Manifest
+++ b/xfce-base/xfce-mcs-manager/Manifest
@@ -1,6 +1,2 @@
-MD5 f76927a257537559bdfeefc304cd979f xfce-mcs-manager-4.2.1.ebuild 416
-MD5 3e940ebfaaee1dab650813e07a2c9e28 xfce-mcs-manager-4.2.2.ebuild 406
-MD5 62a19150d11859d03a1789aebdc6b995 ChangeLog 6982
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 9cf685c1a7049e32d13f8e38a4825c0c files/digest-xfce-mcs-manager-4.2.1 74
-MD5 4592f602a0965dfb63ab6616aafe0df6 files/digest-xfce-mcs-manager-4.2.2 74
+MD5 03d8fad2f6bffa0ebefe42ced7f68522 xfce-mcs-manager-4.2.2-r1.ebuild 420
+MD5 4592f602a0965dfb63ab6616aafe0df6 files/digest-xfce-mcs-manager-4.2.2-r1 74
diff --git a/xfce-base/xfce-mcs-manager/files/digest-xfce-mcs-manager-4.2.2-r1 b/xfce-base/xfce-mcs-manager/files/digest-xfce-mcs-manager-4.2.2-r1
new file mode 100644
index 000000000000..7dbe8d3f3c2f
--- /dev/null
+++ b/xfce-base/xfce-mcs-manager/files/digest-xfce-mcs-manager-4.2.2-r1
@@ -0,0 +1 @@
+MD5 9f6cdb3f11fc57a458fe7c91540181c9 xfce-mcs-manager-4.2.2.tar.gz 642964
diff --git a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.2.2-r1.ebuild b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..5fddf575f5a8
--- /dev/null
+++ b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.2.2-r1.ebuild
@@ -0,0 +1,17 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:24:56 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Xfce 4 mcs manager"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11 )
+	virtual/x11 )
+	~xfce-base/libxfce4mcs-${PV}"
+
+core_package
\ No newline at end of file
diff --git a/xfce-base/xfce-mcs-plugins/ChangeLog b/xfce-base/xfce-mcs-plugins/ChangeLog
index 63f6f2080da1..472e137405c3 100644
--- a/xfce-base/xfce-mcs-plugins/ChangeLog
+++ b/xfce-base/xfce-mcs-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce-mcs-plugins
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.54 2005/07/12 12:44:45 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-mcs-plugins/ChangeLog,v 1.55 2005/10/06 06:26:51 bcowan Exp $
+
+*xfce-mcs-plugins-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce-mcs-plugins-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org>
   xfce-mcs-plugins-4.2.2.ebuild:
diff --git a/xfce-base/xfce-mcs-plugins/Manifest b/xfce-base/xfce-mcs-plugins/Manifest
index a434c3e2ad7a..2efa23ac74f2 100644
--- a/xfce-base/xfce-mcs-plugins/Manifest
+++ b/xfce-base/xfce-mcs-plugins/Manifest
@@ -1,6 +1,2 @@
-MD5 7a2c62be7503504520f6a47342fcb6d8 xfce-mcs-plugins-4.2.1.ebuild 479
-MD5 31785b5bc50f581c889745deceb9299a xfce-mcs-plugins-4.2.2.ebuild 469
-MD5 4e696cbf43df1a62791f828a6e1e228c ChangeLog 7011
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 103c43e0a9b46b65ec2f821e01c208ea files/digest-xfce-mcs-plugins-4.2.1 74
-MD5 aa32d9ca701ecd219eb4e66f1d6bde0a files/digest-xfce-mcs-plugins-4.2.2 74
+MD5 b730164ec6f6af9ce0caa27bf8af5cc1 xfce-mcs-plugins-4.2.2-r1.ebuild 483
+MD5 aa32d9ca701ecd219eb4e66f1d6bde0a files/digest-xfce-mcs-plugins-4.2.2-r1 74
diff --git a/xfce-base/xfce-mcs-plugins/files/digest-xfce-mcs-plugins-4.2.2-r1 b/xfce-base/xfce-mcs-plugins/files/digest-xfce-mcs-plugins-4.2.2-r1
new file mode 100644
index 000000000000..364c7b3b6269
--- /dev/null
+++ b/xfce-base/xfce-mcs-plugins/files/digest-xfce-mcs-plugins-4.2.2-r1
@@ -0,0 +1 @@
+MD5 6e23972a2a0b3b3e7852bfc68dc0eeb8 xfce-mcs-plugins-4.2.2.tar.gz 857474
diff --git a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.2.2-r1.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..4b54c7592e5b
--- /dev/null
+++ b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.2.2-r1.ebuild
@@ -0,0 +1,26 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:26:51 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Xfce4 mcs plugins"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm )
+	virtual/x11 )
+	~xfce-base/xfce-mcs-manager-${PV}"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-libs/libXt )
+	virtual/x11 )"
+
+XFCE_CONFIG="--enable-xf86misc --enable-xkb --enable-randr --enable-xf86vm"
+core_package
\ No newline at end of file
diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index af13c4dd4e51..4cf58da11339 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.54 2005/07/12 12:45:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.55 2005/10/06 06:28:57 bcowan Exp $
+
+*xfce-utils-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce-utils-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfce-utils-4.2.2.ebuild:
   stable on amd64
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 5f200baa1aa0..111d1d4429b1 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -1,6 +1,2 @@
-MD5 b0b31e0e562323e175be9e35b8055165 xfce-utils-4.2.1.ebuild 491
-MD5 0abd7468c0d89ec3ab063e35f8938ccc xfce-utils-4.2.2.ebuild 481
-MD5 ec21e3e6e05060e212d618da01a4e013 ChangeLog 6435
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 1769451c4836775c50d544c89d652a2f files/digest-xfce-utils-4.2.1 68
-MD5 aa9d857dda85eef063aa95799c7d4e3e files/digest-xfce-utils-4.2.2 69
+MD5 935fc459b760735e43d1c9b865cfb178 xfce-utils-4.2.2-r1.ebuild 495
+MD5 aa9d857dda85eef063aa95799c7d4e3e files/digest-xfce-utils-4.2.2-r1 69
diff --git a/xfce-base/xfce-utils/files/digest-xfce-utils-4.2.2-r1 b/xfce-base/xfce-utils/files/digest-xfce-utils-4.2.2-r1
new file mode 100644
index 000000000000..064a2d7f1292
--- /dev/null
+++ b/xfce-base/xfce-utils/files/digest-xfce-utils-4.2.2-r1
@@ -0,0 +1 @@
+MD5 585e1fd48dee70c50271ac478e8adcd0 xfce-utils-4.2.2.tar.gz 1031911
diff --git a/xfce-base/xfce-utils/xfce-utils-4.2.2-r1.ebuild b/xfce-base/xfce-utils/xfce-utils-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..a47ae2f69bbc
--- /dev/null
+++ b/xfce-base/xfce-utils/xfce-utils-4.2.2-r1.ebuild
@@ -0,0 +1,21 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:28:57 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Xfce 4 utilities"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtkhtml"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM )
+	virtual/x11 )
+	~xfce-base/xfce-mcs-manager-${PV}
+	gtkhtml? ( gnome-extra/libgtkhtml )"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
+
+XFCE_CONFIG="$(use_enable gtkhtml) --enable-gdm"
+core_package
\ No newline at end of file
diff --git a/xfce-base/xfce4-extras/ChangeLog b/xfce-base/xfce4-extras/ChangeLog
index c9ba15b72874..c2b8d5f23947 100644
--- a/xfce-base/xfce4-extras/ChangeLog
+++ b/xfce-base/xfce4-extras/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce4-extras
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-extras/ChangeLog,v 1.13 2005/08/23 22:32:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-extras/ChangeLog,v 1.14 2005/10/06 06:32:48 bcowan Exp $
+
+*xfce4-extras-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-extras-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org> xfce4-extras-4.2.2.ebuild:
   stable on ia64
diff --git a/xfce-base/xfce4-extras/Manifest b/xfce-base/xfce4-extras/Manifest
index 933a89a4b62d..626b297179bb 100644
--- a/xfce-base/xfce4-extras/Manifest
+++ b/xfce-base/xfce4-extras/Manifest
@@ -1,6 +1,2 @@
-MD5 351b17107c196e0933a176f7a399a7ea xfce4-extras-4.2.2.ebuild 837
-MD5 4b6d6b311d6e959600383389c9de0dcc xfce4-extras-4.2.1.ebuild 842
-MD5 b07a2cc1f9d25219b2c2f557f134ffc9 ChangeLog 1793
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xfce4-extras-4.2.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xfce4-extras-4.2.2 0
+MD5 c12057a5f4e3428309208fafa140d3b0 xfce4-extras-4.2.2-r1.ebuild 842
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xfce4-extras-4.2.2-r1 0
diff --git a/xfce-base/xfce4-extras/files/digest-xfce4-extras-4.2.2-r1 b/xfce-base/xfce4-extras/files/digest-xfce4-extras-4.2.2-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/xfce-base/xfce4-extras/files/digest-xfce4-extras-4.2.2-r1
diff --git a/xfce-base/xfce4-extras/xfce4-extras-4.2.2-r1.ebuild b/xfce-base/xfce4-extras/xfce4-extras-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..178661a2f9a3
--- /dev/null
+++ b/xfce-base/xfce4-extras/xfce4-extras-4.2.2-r1.ebuild
@@ -0,0 +1,23 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:32:48 bcowan Exp $
+
+DESCRIPTION="Xfce 4 extras ebuild"
+HOMEPAGE="http://www.xfce.org/"
+LICENSE="GPL-2 BSD LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+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
+	>=xfce-extra/xfce4-minicmd-0.3.0-r1
+	>=xfce-extra/xfce4-netload-0.2.3-r1
+	>=xfce-extra/xfce4-artwork-0.0.4-r1
+	>=xfce-extra/xfce4-clipman-0.4.1-r1
+	>=xfce-extra/xfce4-cpugraph-0.2.2-r1
+	>=xfce-extra/xfce4-notes-0.9.7-r1
+	>=xfce-extra/xfce4-taskbar-0.2.2-r1
+	>=xfce-extra/xfce4-windowlist-0.1.0-r1"
diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index aedb7584c140..1e0731221db5 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce4-panel
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.56 2005/07/12 12:42:05 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.57 2005/10/06 06:34:37 bcowan Exp $
+
+*xfce4-panel-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-panel-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfce4-panel-4.2.2.ebuild:
   stable on amd64
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 57ad57bab3c0..d8a6551ca495 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,6 +1,2 @@
-MD5 fe929cfeaa54ea6244cf3815beb234ae xfce4-panel-4.2.1.1.ebuild 415
-MD5 e55e6f7af14b76922a5f29b9d862e2e5 xfce4-panel-4.2.2.ebuild 378
-MD5 bfe1c57789b4d3a3b7c1f4e66e14e1b8 ChangeLog 6890
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 a527ebb4eb261ae3006d7804f3e9254d files/digest-xfce4-panel-4.2.2 70
-MD5 853ce8fb1c4e5be3a458a582f8b6f4fa files/digest-xfce4-panel-4.2.1.1 71
+MD5 5d77ad52be3f3e6b1e0f56230f134995 xfce4-panel-4.2.2-r1.ebuild 393
+MD5 a527ebb4eb261ae3006d7804f3e9254d files/digest-xfce4-panel-4.2.2-r1 70
diff --git a/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.2.2-r1 b/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.2.2-r1
new file mode 100644
index 000000000000..cb7a00022285
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.2.2-r1
@@ -0,0 +1 @@
+MD5 50699e6c8e4a79f0a4f962e12559c9d0 xfce4-panel-4.2.2.tar.gz 1184587
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.2.2-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..1b5d7dbb0572
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.2.2-r1.ebuild
@@ -0,0 +1,20 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:34:37 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Xfce 4 panel"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM )
+	virtual/x11 )
+	~xfce-base/xfce-mcs-plugins-${PV}"
+DEPEND="${RDEPEND}
+	|| ( ( x11-libs/libXt
+	x11-proto/xproto )
+	virtual/x11 )"
+
+core_package
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index eb7be2710d97..5218ca098709 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.22 2005/07/12 12:40:38 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.23 2005/10/06 06:36:32 bcowan Exp $
+
+*xfce4-session-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org>
+  +xfce4-session-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfce4-session-4.2.2.ebuild:
   stable on amd64
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 2d3e896c0c9c..f3792118baaf 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,6 +1,2 @@
-MD5 f9cb380a8a350737e7afda39570e1150 xfce4-session-4.2.2.ebuild 400
-MD5 6e646b96523740637e5530caf1475de1 xfce4-session-4.2.1.ebuild 410
-MD5 fc1f25e20c64b4fce4e4905d9a1c360f ChangeLog 2873
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 109df59e49b0b80e4d6162c6e5c05134 files/digest-xfce4-session-4.2.1 72
-MD5 106aee433474affbdf9da61d4781861a files/digest-xfce4-session-4.2.2 72
+MD5 798ce2f7e89aef2eddd1bb37a9d7a5d9 xfce4-session-4.2.2-r1.ebuild 413
+MD5 106aee433474affbdf9da61d4781861a files/digest-xfce4-session-4.2.2-r1 72
diff --git a/xfce-base/xfce4-session/files/digest-xfce4-session-4.2.2-r1 b/xfce-base/xfce4-session/files/digest-xfce4-session-4.2.2-r1
new file mode 100644
index 000000000000..0c00bb27b6ce
--- /dev/null
+++ b/xfce-base/xfce4-session/files/digest-xfce4-session-4.2.2-r1
@@ -0,0 +1 @@
+MD5 4d2f36ab0d4fa4b62a80b762c127d3aa xfce4-session-4.2.2.tar.gz 1499674
diff --git a/xfce-base/xfce4-session/xfce4-session-4.2.2-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..35626f2b9e27
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.2.2-r1.ebuild
@@ -0,0 +1,21 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:36:32 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Xfce 4 session manager"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM )
+	virtual/x11 )
+	~xfce-base/xfce-utils-${PV}"
+DEPEND="${RDEPEND}
+	|| ( ( x11-libs/libXt
+	x11-proto/xproto )
+	virtual/x11 )"
+
+core_package
+single_make
diff --git a/xfce-base/xfce4/ChangeLog b/xfce-base/xfce4/ChangeLog
index 0e0c35ee4437..b68abfc95460 100644
--- a/xfce-base/xfce4/ChangeLog
+++ b/xfce-base/xfce4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce4
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.56 2005/07/22 03:11:18 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.57 2005/10/06 06:30:57 bcowan Exp $
+
+*xfce4-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfce4-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   22 Jul 2005; Brad Cowan <bcowan@gentoo.org> xfce4-4.2.2.ebuild:
   Add back session script for bug #72762.
diff --git a/xfce-base/xfce4/Manifest b/xfce-base/xfce4/Manifest
index 732f7d370b85..2bffabc08a43 100644
--- a/xfce-base/xfce4/Manifest
+++ b/xfce-base/xfce4/Manifest
@@ -1,6 +1,2 @@
-MD5 2d8310a1fc1d9a3c7c35aa06b6f363fc xfce4-4.2.1.1.ebuild 1189
-MD5 a6dc69bce708d542ac0f02033de3f80a xfce4-4.2.2.ebuild 1306
-MD5 f59ee10fd49462aac89c7b6cb3022759 ChangeLog 6540
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xfce4-4.2.2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xfce4-4.2.1.1 0
+MD5 3d44abffa8216e1f75fa0be28016d051 xfce4-4.2.2-r1.ebuild 1311
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xfce4-4.2.2-r1 0
diff --git a/xfce-base/xfce4/files/digest-xfce4-4.2.2-r1 b/xfce-base/xfce4/files/digest-xfce4-4.2.2-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/xfce-base/xfce4/files/digest-xfce4-4.2.2-r1
diff --git a/xfce-base/xfce4/xfce4-4.2.2-r1.ebuild b/xfce-base/xfce4/xfce4-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..12410c790ea1
--- /dev/null
+++ b/xfce-base/xfce4/xfce4-4.2.2-r1.ebuild
@@ -0,0 +1,44 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:30:57 bcowan Exp $
+
+DESCRIPTION="Xfce 4 base ebuild"
+HOMEPAGE="http://www.xfce.org/"
+LICENSE="GPL-2 BSD LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+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"
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo startxfce4 > ${D}/etc/X11/Sessions/Xfce-4
+	fperms 755 /etc/X11/Sessions/Xfce-4
+}
+
+pkg_postinst() {
+	einfo
+	ewarn "As of Xfce 4.2 xfce-base/xfce4-base is deprecated, please remove it."
+	einfo
+	einfo "For extra functionality please emerge xfce-base/xfce4-extras."
+	einfo "To start Xfce the default script is startxfce4."
+	einfo
+}
diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index edd50aa0d314..385201811f27 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.55 2005/07/12 12:42:21 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.56 2005/10/06 06:38:17 bcowan Exp $
+
+*xfdesktop-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfdesktop-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfdesktop-4.2.2.ebuild:
   stable on amd64
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 90f285831e10..1718a2b050dd 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,6 +1,2 @@
-MD5 5b1e4188fb5367dd1a3cb35b856efe36 xfdesktop-4.2.1.ebuild 392
-MD5 1c457ab3aa4cdd6357f4cd0af2f79e69 ChangeLog 6526
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 eb65a40d7f627a9f2f1cb7c6671dcf7c xfdesktop-4.2.2.ebuild 379
-MD5 0221c41a8f6129158a6601fb55c4b278 files/digest-xfdesktop-4.2.1 68
-MD5 8ce305caf352d642269cf9e81e838735 files/digest-xfdesktop-4.2.2 68
+MD5 b9c32838f2c399acbbfd79e4842812fa xfdesktop-4.2.2-r1.ebuild 393
+MD5 8ce305caf352d642269cf9e81e838735 files/digest-xfdesktop-4.2.2-r1 68
diff --git a/xfce-base/xfdesktop/files/digest-xfdesktop-4.2.2-r1 b/xfce-base/xfdesktop/files/digest-xfdesktop-4.2.2-r1
new file mode 100644
index 000000000000..fca839bb3752
--- /dev/null
+++ b/xfce-base/xfdesktop/files/digest-xfdesktop-4.2.2-r1
@@ -0,0 +1 @@
+MD5 746641ae286994c0f42d7c4f58a90716 xfdesktop-4.2.2.tar.gz 2945698
diff --git a/xfce-base/xfdesktop/xfdesktop-4.2.2-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..882858908f4e
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.2.2-r1.ebuild
@@ -0,0 +1,18 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:38:17 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Xfce 4 desktop manager"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM )
+	virtual/x11 )
+	~xfce-base/xfce4-panel-${PV}"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
+
+core_package
\ No newline at end of file
diff --git a/xfce-base/xffm/ChangeLog b/xfce-base/xffm/ChangeLog
index edde32f44bb0..b25a3179d1ab 100644
--- a/xfce-base/xffm/ChangeLog
+++ b/xfce-base/xffm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xffm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xffm/ChangeLog,v 1.55 2005/07/12 12:45:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xffm/ChangeLog,v 1.56 2005/10/06 06:40:19 bcowan Exp $
+
+*xffm-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xffm-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org> xffm-4.2.2.ebuild:
   stable on amd64
diff --git a/xfce-base/xffm/Manifest b/xfce-base/xffm/Manifest
index 93308a57fb4e..1da6858c4dfd 100644
--- a/xfce-base/xffm/Manifest
+++ b/xfce-base/xffm/Manifest
@@ -1,7 +1,2 @@
-MD5 c509eda743e94cc2e501d9cd6841bb63 xffm-4.2.1.ebuild 531
-MD5 21a8287c4ded43880c34cb46aed8ca2c xffm-4.2.2.ebuild 524
-MD5 98d8a0ce2019f46655db7d9585d615d0 ChangeLog 6192
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 db40ffdfcb4c71dd7883c97dbea254d4 files/xffm-4.2.1-gcc4.patch 855
-MD5 17d63062c07dc2d9b26b9e0fbcc4c5db files/digest-xffm-4.2.1 63
-MD5 0b27bca27a4a9346415ea2f3cfa8ec5b files/digest-xffm-4.2.2 63
+MD5 7b1f933ff64a31ea9fa4cedb7cac575c xffm-4.2.2-r1.ebuild 450
+MD5 0b27bca27a4a9346415ea2f3cfa8ec5b files/digest-xffm-4.2.2-r1 63
diff --git a/xfce-base/xffm/files/digest-xffm-4.2.2-r1 b/xfce-base/xffm/files/digest-xffm-4.2.2-r1
new file mode 100644
index 000000000000..b3ee5dee96ba
--- /dev/null
+++ b/xfce-base/xffm/files/digest-xffm-4.2.2-r1
@@ -0,0 +1 @@
+MD5 5eb5ede5b2bfac564c26d96ee06a3241 xffm-4.2.2.tar.gz 4393723
diff --git a/xfce-base/xffm/xffm-4.2.2-r1.ebuild b/xfce-base/xffm/xffm-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..5c2598316bcf
--- /dev/null
+++ b/xfce-base/xffm/xffm-4.2.2-r1.ebuild
@@ -0,0 +1,23 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:40:19 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Xfce 4 file manager"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="samba"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM )
+	virtual/x11 )
+	~xfce-base/xfce-mcs-manager-${PV}
+	samba? ( net-fs/samba )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-libs/libXt
+	x11-proto/xproto )
+	virtual/x11 )"
+
+XFCE_CONFIG="--enable-all"
+core_package
\ No newline at end of file
diff --git a/xfce-base/xfprint/ChangeLog b/xfce-base/xfprint/ChangeLog
index 84f580cd86fb..01814201b772 100644
--- a/xfce-base/xfprint/ChangeLog
+++ b/xfce-base/xfprint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfprint
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.55 2005/07/12 12:45:29 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.56 2005/10/06 06:42:04 bcowan Exp $
+
+*xfprint-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfprint-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfprint-4.2.2.ebuild:
   stable on amd64
diff --git a/xfce-base/xfprint/Manifest b/xfce-base/xfprint/Manifest
index 4668a202023a..cde26a85c57e 100644
--- a/xfce-base/xfprint/Manifest
+++ b/xfce-base/xfprint/Manifest
@@ -1,6 +1,2 @@
-MD5 d70503e91eab97c90d511af02285e579 xfprint-4.2.2.ebuild 433
-MD5 6af0235a577815460d6bdaea94110ad2 xfprint-4.2.1.ebuild 446
-MD5 06dfa2712cc31911e10ec8ad247d4807 ChangeLog 6496
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 e14e67d33b928cfcc3be483f8e2547c8 files/digest-xfprint-4.2.1 65
-MD5 1f1fb819d071d1344ba00d62d36dcf1d files/digest-xfprint-4.2.2 65
+MD5 68867b81c2e90bfdeb65b8b487532527 xfprint-4.2.2-r1.ebuild 447
+MD5 1f1fb819d071d1344ba00d62d36dcf1d files/digest-xfprint-4.2.2-r1 65
diff --git a/xfce-base/xfprint/files/digest-xfprint-4.2.2-r1 b/xfce-base/xfprint/files/digest-xfprint-4.2.2-r1
new file mode 100644
index 000000000000..74145f2029e6
--- /dev/null
+++ b/xfce-base/xfprint/files/digest-xfprint-4.2.2-r1
@@ -0,0 +1 @@
+MD5 033cc5a89b781bd13491d39ac7b351ba xfprint-4.2.2.tar.gz 960769
diff --git a/xfce-base/xfprint/xfprint-4.2.2-r1.ebuild b/xfce-base/xfprint/xfprint-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..fa6ecfefbe82
--- /dev/null
+++ b/xfce-base/xfprint/xfprint-4.2.2-r1.ebuild
@@ -0,0 +1,19 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:42:04 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Xfce 4 print manager panel plugin"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM )
+	virtual/x11 )
+	~xfce-base/xfce4-panel-${PV}
+	app-text/a2ps
+	app-text/psutils"
+
+core_package
\ No newline at end of file
diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index 6962a52872ef..665af182c9b1 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfwm4
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.56 2005/07/12 12:44:59 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.57 2005/10/06 06:44:05 bcowan Exp $
+
+*xfwm4-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +xfwm4-4.2.2-r1.ebuild:
+  Xfce builds for new eclass and modular Xorg.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org> xfwm4-4.2.2.ebuild:
   stable on amd64
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 9a22e1b2b731..162d4bf54ab1 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,6 +1,2 @@
-MD5 25a63b62d347f1267e9db113d8edafcb xfwm4-4.2.2.ebuild 424
-MD5 eb0a3773150331bf96f0f3568a034136 xfwm4-4.2.1.ebuild 433
-MD5 d0c5900a472e5c078eb1ff70a9cb2ee0 ChangeLog 6334
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 f433bed794a0723e01fefebc6f76c00b files/digest-xfwm4-4.2.1 64
-MD5 f726c307cf362f000682fb4954c9b52d files/digest-xfwm4-4.2.2 64
+MD5 255caf693655b7cdaf62f80ebf2ddf23 xfwm4-4.2.2-r1.ebuild 438
+MD5 f726c307cf362f000682fb4954c9b52d files/digest-xfwm4-4.2.2-r1 64
diff --git a/xfce-base/xfwm4/files/digest-xfwm4-4.2.2-r1 b/xfce-base/xfwm4/files/digest-xfwm4-4.2.2-r1
new file mode 100644
index 000000000000..f1209290e510
--- /dev/null
+++ b/xfce-base/xfwm4/files/digest-xfwm4-4.2.2-r1
@@ -0,0 +1 @@
+MD5 e4c91c59da7d1bdc6141cde3263ea6f9 xfwm4-4.2.2.tar.gz 1560702
diff --git a/xfce-base/xfwm4/xfwm4-4.2.2-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..330727d414e2
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.2.2-r1.ebuild
@@ -0,0 +1,29 @@
+# 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.2-r1.ebuild,v 1.1 2005/10/06 06:44:05 bcowan Exp $
+
+inherit xfce42
+
+DESCRIPTION="Xfce 4 window manager"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpm )
+	virtual/x11 )
+	~xfce-base/xfce-mcs-manager-${PV}"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xproto
+	x11-proto/extproto
+	x11-libs/libXt )
+	virtual/x11 )"
+
+XFCE_CONFIG="--enable-randr --enable-compositor"
+core_package
\ No newline at end of file