Rename libxfcegui4 to libxfce4ui

51 files changed, 48 insertions, 105 deletions

diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
index 7e873d5..c7846cd 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfburn-9999.ebuild 868 RMD160 13f748211738351ef5046e79503343df01a49713 SHA1 5a525cd7844ac1ba340da6cf89680e9640222782 SHA256 7ded3cbcbb999c6911e04cc48d7aef15d5080360aca9cf2594e81af7952b49a2
+EBUILD xfburn-9999.ebuild 867 RMD160 0bc19ee3f7125e969a148ad3a1209711fa96a16a SHA1 5390a721dd00b06ea61a910914ea9cd3f250c37d SHA256 890abc5bfb29e348c8cdba242deb274fdb7d01659c59a1c2ce585b414a8adf51
 MISC metadata.xml 244 RMD160 12c5d9cc4bf4ac11904a2ac67a1dc5317b21c940 SHA1 341081a79f570112e2ac0bc0feefc369505396b2 SHA256 79e3e34001e21fc1a7866ec42b167d80927f7757a01f614dc24261ffed4db87d
diff --git a/app-cdr/xfburn/xfburn-9999.ebuild b/app-cdr/xfburn/xfburn-9999.ebuild
index dfeed9b..48bc923 100644
--- a/app-cdr/xfburn/xfburn-9999.ebuild
+++ b/app-cdr/xfburn/xfburn-9999.ebuild
@@ -18,7 +18,7 @@ IUSE="+dbus debug gstreamer hal +xfce"
 RDEPEND=">=dev-libs/libburn-0.4.2
 	>=dev-libs/libisofs-0.6.2
 	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/exo-0.3
 	xfce? ( >=xfce-base/thunar-${XFCE_VERSION} )
 	dbus? ( dev-libs/dbus-glib )
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 4f8e99c..332dac5 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,3 +1,2 @@
-EBUILD mousepad-9999.ebuild 519 RMD160 59c91b559f76e5cfc207b31b30a3fe229d76b7e4 SHA1 942f124aae90eb9d909aa4f7f5e34a2a7bcaf12b SHA256 ee633bfa0c7b8f8a455c912366538805c3855775a2060d349307967554bf3554
-MISC ChangeLog 205 RMD160 d58119cce1d1a04276a81ddbdf786efa59d71c79 SHA1 0042dcd7a0f3d7124198cf86ef823adb686b5528 SHA256 c38d2cd9437e0f4c2809d1ce8e463bbfbc97f9634ca1a9da640667160bd387bf
+EBUILD mousepad-9999.ebuild 518 RMD160 cc5ff16fe8e3a91f3f282ad55812e94355d4e251 SHA1 3163dd604e2722680f617737f51648a69e246ee4 SHA256 5f61385e56bb040d15cb00f580b8661113b2f106df0bcda29a83c95552b2e276
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/app-editors/mousepad/mousepad-9999.ebuild b/app-editors/mousepad/mousepad-9999.ebuild
index 73e5ac1..3b4427b 100644
--- a/app-editors/mousepad/mousepad-9999.ebuild
+++ b/app-editors/mousepad/mousepad-9999.ebuild
@@ -15,7 +15,7 @@ IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.6:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}"
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}"
 DEPEND="${RDEPEND}
 	dev-util/intltool"
 
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index d85a9ad..0e2a2d8 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,3 +1,2 @@
-EBUILD orage-9999.ebuild 1012 RMD160 722d708e373b63e83760b60a3ac4deaaccf9c36d SHA1 9df02cc0548c7bcd76bc90189e0553cc49b63a33 SHA256 d3df85d7a12dc4997216b7dc356e2b03b0e6bfec6e9dd84034564c7d1a65fba9
-MISC ChangeLog 1330 RMD160 eef4789a6a09425102b539e496c1906335ea6642 SHA1 50183742711ff92eabab790ab558340399d42920 SHA256 b5b6ffe4396cdc1c5902690085c9ba109156605095e0ebf02a33eb506ef003fd
+EBUILD orage-9999.ebuild 1011 RMD160 47fb271e0b2652cceb6396f409f067fd1f0a5412 SHA1 f0554c494eeed9c6e27338f71e76bb8a0a14795a SHA256 3bfcb10ef344f3c969657996dc5954d89b37ab49cd4b7d88438b9cb318127b6b
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/app-office/orage/orage-9999.ebuild b/app-office/orage/orage-9999.ebuild
index 90ffa4f..8be16b3 100644
--- a/app-office/orage/orage-9999.ebuild
+++ b/app-office/orage/orage-9999.ebuild
@@ -17,7 +17,7 @@ IUSE="berkdb dbus debug libnotify"
 RDEPEND=">=dev-libs/glib-2.6:2
 	>=x11-libs/gtk+-2.6:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/xfce4-panel-${XFCE_VERSION}
 	berkdb? ( >=sys-libs/db-4 )
 	libnotify? ( x11-libs/libnotify )
diff --git a/app-text/xfbib/Manifest b/app-text/xfbib/Manifest
index ae29583..11cd64a 100644
--- a/app-text/xfbib/Manifest
+++ b/app-text/xfbib/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfbib-9999.ebuild 425 RMD160 fd16cbbbe7a669f47ab134d3083dad47b41e9755 SHA1 f4a04e1ad07b03915502b1c93ab0cf83bbdd958e SHA256 e37ddf00a1ce34804551331518ec012cf92074d1be5bb620d4ff893e06b6d43e
-MISC ChangeLog 386 RMD160 c3b191a26ab17d240e540337ed3476a6608f7b3c SHA1 5ba6150d433c94e9ea479e59f06119f8513e46f6 SHA256 a0b3d64f12d2a2a418584800cd57478c52810ae26026f98acd99121ea80b9713
+EBUILD xfbib-9999.ebuild 424 RMD160 58f2f58c3dd3a8e0d801b480b7c519bff9a86e78 SHA1 f388f3f69856398877ce037711f3ce369d67e5ae SHA256 be6ced7fdf8eea816f34f342d259040fc8f3aa14b94ce4f97d3c3a131269dfc0
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/app-text/xfbib/xfbib-9999.ebuild b/app-text/xfbib/xfbib-9999.ebuild
index 6790936..7319c26 100644
--- a/app-text/xfbib/xfbib-9999.ebuild
+++ b/app-text/xfbib/xfbib-9999.ebuild
@@ -14,7 +14,7 @@ IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.12.0:2
 	>=x11-libs/gtk+-2.10.0:2
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/libxfce4util-${XFCE_VERSION}"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 0e00706..7f35430 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,3 +1,2 @@
-EBUILD ristretto-9999.ebuild 906 RMD160 d31bd7a7791f2f99c4f789ed023f231be1283a63 SHA1 bafe10e4299c8075270a41e7e63288a3682850a6 SHA256 28937adc619225bbcedf2d0ea73e1f3c9439e8a548fad86e971ea505f2f4f7bd
-MISC ChangeLog 1660 RMD160 cb1433f0ee3cf7e52d9564b0c1e3cfb71fe2f7e2 SHA1 e32313700c585a37a4d47051455d37e3a3c3fac2 SHA256 35f7a703ea77b0a6b55cebda97a4cf06ac0da88145ae018d91ef531f0f342cc3
+EBUILD ristretto-9999.ebuild 905 RMD160 96f206f0e2f32259f61fa72b6c891986c6ef9e74 SHA1 10aacc0290767ccefafb6a11cfbc6646df9c1b17 SHA256 bba8b115cb3ea3181f20ddee09c1e56fbfafd6d9b467852ae19135e1882ad1aa
 MISC metadata.xml 241 RMD160 8274414165a5ef273221964ac5f0c2a611d9bedb SHA1 9f95785d90786251fd4c9b0d0e3393bcea168fb6 SHA256 d1762f65f6370ddc6a26722d6ca0d3b8c1a5a8ba09d06bcbb209037abf5695d4
diff --git a/media-gfx/ristretto/ristretto-9999.ebuild b/media-gfx/ristretto/ristretto-9999.ebuild
index 9ac17d6..58a0d07 100644
--- a/media-gfx/ristretto/ristretto-9999.ebuild
+++ b/media-gfx/ristretto/ristretto-9999.ebuild
@@ -19,7 +19,7 @@ RDEPEND=">=x11-libs/gtk+-2.10:2
 	media-libs/libexif
 	sys-apps/dbus
 	>=xfce-base/thunar-${THUNAR_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
 	xfce? ( >=xfce-base/xfconf-${XFCE_VERSION} )"
 DEPEND="${RDEPEND}
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
index dcd458d..dd4dfe0 100644
--- a/media-sound/xfmpc/Manifest
+++ b/media-sound/xfmpc/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfmpc-9999.ebuild 617 RMD160 9e933dfe2893c5529ae345b4e761b488703eac0c SHA1 42a0ff4e0776de34f9afab6d9473c607b873cd99 SHA256 d5e1514b337a3f9f187c548c5e56c54e23113db272a0fc3939bd8a4901754f69
+EBUILD xfmpc-9999.ebuild 616 RMD160 f2c74d34c1ccb211bb8c4ecfa36364ab90aac736 SHA1 d22259d00604b6e5389d6b71472aac68b353a95c SHA256 0b98baa2f336b780acf58524570be8838d26b5342b2c22e69c2edb558170ca02
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/media-sound/xfmpc/xfmpc-9999.ebuild b/media-sound/xfmpc/xfmpc-9999.ebuild
index b0a232f..7786228 100644
--- a/media-sound/xfmpc/xfmpc-9999.ebuild
+++ b/media-sound/xfmpc/xfmpc-9999.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND=">=media-libs/libmpd-0.15
 	>=dev-libs/glib-2.14:2
 	>=x11-libs/gtk+-2.12:2
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/libxfce4util-${XFCE_VERSION}"
 DEPEND="${RDEPEND}
 	dev-util/intltool"
diff --git a/net-print/xfprint/Manifest b/net-print/xfprint/Manifest
index 9d378bb..a8e32e4 100644
--- a/net-print/xfprint/Manifest
+++ b/net-print/xfprint/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfprint-9999.ebuild 1035 RMD160 e82465e3f7fecfd52ca0ac2623b60b25ada6b231 SHA1 ff6999eef60bf3b5d5795278d9436e1a87c71b9f SHA256 9e80e8f023ad3628a0faa1f582c9790d0efd92ec863ca99366fc1a800891c4a7
-MISC ChangeLog 1175 RMD160 5b84ff48e24bb35e8696403ccc02915e95fa92ab SHA1 0b3d0048c5a71b08b3194a9cae68692d08d94d59 SHA256 8dc2d877cdb06eede8813a2992c34c985551b8dc7c3096815a866a3b4b068fcd
+EBUILD xfprint-9999.ebuild 1034 RMD160 70c2ca75a5d48ae23371142dbda77a64cb703c84 SHA1 b6eced8dcafb300b73e77d161168d7e3995e858d SHA256 455fb53ea30b50dacefdd34ace86cd0a1c62c679a977c663442523ab17cc1583
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/net-print/xfprint/xfprint-9999.ebuild b/net-print/xfprint/xfprint-9999.ebuild
index d3f374f..aa29d0e 100644
--- a/net-print/xfprint/xfprint-9999.ebuild
+++ b/net-print/xfprint/xfprint-9999.ebuild
@@ -17,7 +17,7 @@ RDEPEND="app-text/a2ps
 	>=dev-libs/glib-2.6:2
 	>=x11-libs/gtk+-2.6:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/xfconf-${XFCE_VERSION}
 	cups? ( net-print/cups )
 	!cups? ( net-print/lprng )"
diff --git a/profiles/package.mask b/profiles/package.mask
index 77d9411..edc37ef 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -20,7 +20,7 @@
 =x11-themes/xfwm4-themes-9999
 =xfce-base/libxfce4menu-9999
 =xfce-base/libxfce4util-9999
-=xfce-base/libxfcegui4-9999
+=xfce-base/libxfce4ui-9999
 =xfce-base/thunar-9999
 =xfce-base/xfce-utils-9999
 =xfce-base/xfce4-9999
diff --git a/x11-misc/xfce4-notifyd/Manifest b/x11-misc/xfce4-notifyd/Manifest
index 7b63200..f45f14c 100644
--- a/x11-misc/xfce4-notifyd/Manifest
+++ b/x11-misc/xfce4-notifyd/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfce4-notifyd-9999.ebuild 669 RMD160 10d1f29736ea0d9dd7eb2fefe116b4c87e33b98d SHA1 5760779eda1993810db243057c1abbca84f41383 SHA256 e89ae67831c56f0612623dbb350cacad35c6c9265e177908de7658b2d8c92344
-MISC ChangeLog 1008 RMD160 bbb8044dfcb4d397b4816191a21c824b220513e2 SHA1 3e44b458cfc025d53e15449bd8d8ac944096cb74 SHA256 25c2591c434bd9637afe7a26251b372d30e7561a1231830ed4e25fc52ae150df
+EBUILD xfce4-notifyd-9999.ebuild 668 RMD160 0ca6e0e0d0c07560883ef9278d8c90fe1f618550 SHA1 806ab516e5d056f1e805e3df0833785a1e69eec3 SHA256 5c6c1330bdb9e6a453494ee186e1a82ec734404a4a5a7063911266d21430dab4
 MISC metadata.xml 247 RMD160 319fb586335b2ad6e2b964c0b7db75faf0f0c5ad SHA1 aa6033cb7144df97f9a64fc1a617c35f38e866cc SHA256 0c4015d2e1cbfcb1d35b37e74b3b60e3761c8252b02f702b34ad189c2cbed507
diff --git a/x11-misc/xfce4-notifyd/xfce4-notifyd-9999.ebuild b/x11-misc/xfce4-notifyd/xfce4-notifyd-9999.ebuild
index d2f94f5..a1f4bab 100644
--- a/x11-misc/xfce4-notifyd/xfce4-notifyd-9999.ebuild
+++ b/x11-misc/xfce4-notifyd/xfce4-notifyd-9999.ebuild
@@ -17,7 +17,7 @@ RDEPEND="dev-libs/dbus-glib
 	gnome-base/libglade
 	>=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/xfconf-${XFCE_VERSION}
 	libsexy? ( x11-libs/libsexy )"
 DEPEND="${RDEPEND}
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
deleted file mode 100644
index 6b13a7e..0000000
--- a/xfce-base/libxfcegui4/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD libxfcegui4-9999.ebuild 771 RMD160 b70b611637664d0ad2139a03d5153d19db853123 SHA1 ff25ea91ff22a71a05f3486821055c9a6998e907 SHA256 d66b919d2d6cdad7568914cb6e91071f7a1f5b50579e34cf871095c0234ef376
-MISC ChangeLog 859 RMD160 745ff5b7f04311ededba2ce84689708acc429cd7 SHA1 38238027885e22807193c5140aa9cae6689638df SHA256 714be654692dbb87970032ed865b7b6c3cc738e45770bf3eceec2a4075f74ea7
-MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild b/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild
deleted file mode 100644
index f9be078..0000000
--- a/xfce-base/libxfcegui4/libxfcegui4-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-inherit xfce4
-
-xfce4_core
-
-DESCRIPTION="Unified widgets library"
-HOMEPAGE="http://www.xfce.org/projects/libraries"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc startup-notification"
-
-RDEPEND="gnome-base/libglade
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.6:2
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/xfconf-${XFCE_VERSION}
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	doc? ( dev-util/gtk-doc )"
-
-WANT_GTKDOCIZE="yes"
-
-pkg_setup() {
-	XFCE_CONFIG+=" $(use_enable doc gtk-doc)"
-}
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/xfce-base/libxfcegui4/metadata.xml b/xfce-base/libxfcegui4/metadata.xml
deleted file mode 100644
index 826e2ca..0000000
--- a/xfce-base/libxfcegui4/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>xfce</herd>
-</pkgmetadata>
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index bdeabaf..daf3005 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -1,4 +1,3 @@
 AUX Gentoo 644 RMD160 29853c59779a2eb685aa4082bf5c312588fbe633 SHA1 01f2135774ead9534fb374cfbeb7eb123d9aff55 SHA256 1ddff80be5707ff8eb888d8f41d9cd0df5c7e0e1bd84c28ed962b4c71028efc1
-EBUILD xfce-utils-9999.ebuild 1176 RMD160 1f11e4fc04d753750c44a6849e49b4544329af55 SHA1 cb03b4274a205a19624b1afaf0f453b87b6b8d05 SHA256 e7f2b21f4baefc3ae7f88dd821d7c0bf1fe19947b60770767a0ff04704fb688c
-MISC ChangeLog 1694 RMD160 badaaf6932d17b13f93687c4e6a8dde8f08d5bd3 SHA1 00e983e5a2d7ef49e6ce83e236f1e6417d584fea SHA256 5fa53376a288fb21279c2f7201bc5c801cdbb732c88c5d853bbbc994672f226a
+EBUILD xfce-utils-9999.ebuild 1175 RMD160 e3d481237fe7c188f6fc2b909ed2066cd0dc9494 SHA1 8ff6ca6e00de38b41ee9faf0c06cfdbeaa4f308f SHA256 ed82e26ee00d75e3da370eea26f730755183b35f70960e539130e0613e9c80a6
 MISC metadata.xml 218 RMD160 e064747a2c888959d939ed09a70c242d905c89ea SHA1 8ff18a8acc37d299a3cc7b30663ca3eb0f91032e SHA256 c47df69ae42900828c5afb0aa77ee6f9ddca55a79b3326f69a0bbf8119f3d5df
diff --git a/xfce-base/xfce-utils/xfce-utils-9999.ebuild b/xfce-base/xfce-utils/xfce-utils-9999.ebuild
index bb5655a..af1ceb4 100644
--- a/xfce-base/xfce-utils/xfce-utils-9999.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-9999.ebuild
@@ -18,7 +18,7 @@ RDEPEND="x11-apps/xrdb
 	>=dev-libs/glib-2.6:2
 	>=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/xfconf-${XFCE_VERSION}
 	dbus? ( dev-libs/dbus-glib )
 	lock? ( || ( x11-misc/xscreensaver
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 49d41b7..b85d8b3 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-panel-9999.ebuild 847 RMD160 0d495267b19541a37a351d991541c9c549dcdd70 SHA1 957a972d4c79d4bd19f48becead42256293efd9a SHA256 7bcace710b967d82d9150fe03295ac7cadb881b4ad3046bb7cccb36e6cde971d
+EBUILD xfce4-panel-9999.ebuild 846 RMD160 04d63a3152e9c52b381bde31ff727129f8249d4e SHA1 beeac660cb298ad31a5bf9a7279a351d2291b779 SHA256 f122ad2d8bb6ba08a30ac725d9c171994d69fa77c04ab76acbfaa425ba5d48d5
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild b/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild
index 5bb8dd8..29002b5 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-9999.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.8:2
 	>=x11-libs/gtk+-2.8:2
 	>=x11-libs/libwnck-2.12
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/exo-0.3.92
 	startup-notification? ( x11-libs/startup-notification )"
 DEPEND="${RDEPEND}
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 7ac297d..58661d7 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfce4-session-9999.ebuild 826 RMD160 b3ac946f1f2604a64e1a3c2e2223bb570d84b0b9 SHA1 5120265de9a94a99b59a5f7d10ecdae1ea1cb92c SHA256 3912d2cfb1e53562d9789c8a507611e8c247d8b06e22e3a49508a2401659f613
-MISC ChangeLog 987 RMD160 2b0b9189ee8c9ddd0f2aee8e88d13bf8137c2c7e SHA1 e644ed62ec576e614cbcfb8dd4f077488a557132 SHA256 1618753f91a81744b2bda6f6ea2bbc7bb881d62782d2964e2feae100e407e858
+EBUILD xfce4-session-9999.ebuild 825 RMD160 da0014b7ae146c077c261f115c0fef86c83aa91d SHA1 e7c6d3f1b990e6b9a1699a050308425e9667318f SHA256 360dff71ad34b2407e7a0ee92e336ed5de5fb2e5f5de14c793d75fdb4b82d48f
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/xfce4-session/xfce4-session-9999.ebuild b/xfce-base/xfce4-session/xfce4-session-9999.ebuild
index 5f15c32..9f2fae5 100644
--- a/xfce-base/xfce4-session/xfce4-session-9999.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-9999.ebuild
@@ -19,7 +19,7 @@ RDEPEND="gnome-base/libglade
 	x11-libs/libwnck
 	x11-apps/iceauth
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/xfconf-${XFCE_VERSION}
 	>=xfce-base/xfce-utils-${XFCE_VERSION}
 	games-misc/fortune-mod
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 4a4dd8d..1343a0a 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-settings-9999.ebuild 1194 RMD160 02a037c3384c84875d6b25a88ceacc9bced3604b SHA1 fec458f12158391927a301dd884605642a5e9b25 SHA256 cbb3229265f25f54cdae32c9ba1c27bc0c21042913f2106d00ede096e15d456f
+EBUILD xfce4-settings-9999.ebuild 1193 RMD160 1e29c599497679ed4dd104d36ae23ab2a4732801 SHA1 577a300910021c3bcb4fc9ced0bdfbcbc9f5d6ac SHA256 03ece52989d88841fc23b2e8c5ca73d529161e6cf09fcd9d4618c81b2ac105f9
 MISC metadata.xml 363 RMD160 2f66508d394f9cc14654775f3a0b117bc10d3ef5 SHA1 8a3e6715e41535ea04377624a621c9ada60fd5ff SHA256 2442135d806e37420f1904d5b32e8b7afe94ed212307d25667f363db06c558e3
diff --git a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
index fba6268..5fe82fa 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.12:2
 	x11-libs/libXrandr
 	x11-libs/libwnck
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/xfconf-${XFCE_VERSION}
 	!xfce-base/xfce-mcs-manager
 	!xfce-base/xfce-mcs-plugins
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index fe7555f..d5cb668 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfdesktop-9999.ebuild 1827 RMD160 82327500514540f7fe2e782b3ab2bfd9e08d25de SHA1 fd127ba6e71e524d577125ed421c2102a49a870b SHA256 2eb93cc150de2c4517e009465e8558afc42b525567d49a8ab065ac923933bd97
+EBUILD xfdesktop-9999.ebuild 1826 RMD160 142bc074728dadce175a463fff16e6c037ef3389 SHA1 8236caecccdc9cc6556ea1e624ae580c26465d47 SHA256 d65c14e76eda9752d3b46926b3a1421cf921e66d5ef556077eafb3b313206997
 MISC metadata.xml 351 RMD160 4401cf2e2c9cc9f166bdff78a1e15612e784ad1d SHA1 dc6b0946171dda265a9b13871899a9a8e071f6db SHA256 f2a98defe794e66d32ba0f9041a7b0afb7209345974f114ee2b8454dbe4bc6e9
diff --git a/xfce-base/xfdesktop/xfdesktop-9999.ebuild b/xfce-base/xfdesktop/xfdesktop-9999.ebuild
index e67177a..0656b8d 100644
--- a/xfce-base/xfdesktop/xfdesktop-9999.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="gnome-base/libglade
 	>=dev-libs/glib-2.10:2
 	>=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/libxfce4menu-${XFCE_VERSION}
 	>=xfce-base/xfconf-${XFCE_VERSION}
 	file-icons? ( >=xfce-base/thunar-0.9.92
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index e41fd09..1acc894 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfwm4-9999.ebuild 1718 RMD160 7c0087ccfc54e89e55c2a887fc1e480af2e30a6e SHA1 027d80205b7b6bd1a487839bf8104ea0a9e05aa1 SHA256 3d98b1844b910ef8eca6975fcc29503ffce7e2d6beb6c04778f3f8192939e2c6
-MISC ChangeLog 1213 RMD160 ee340cfcb9115fdf5ff15ce2aab47923b14869d6 SHA1 b1d2a8a5bbc86c6931b3a4363b19a4c012ddaddd SHA256 6a8666a5734e197aa7dabe8a817321a68bae3a830bd9c7203f59cbdd02f2de9c
+EBUILD xfwm4-9999.ebuild 1717 RMD160 963c22a68c19606dac3f76b44893ed94233fa5c6 SHA1 9fa9b95a48fdb1c3c0681f708145e0d013c695bf SHA256 7650dd6059e5da0bf0ef88c2c6be17822ce9b6b191e254db2ed49edb50f5cb72
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/xfwm4/xfwm4-9999.ebuild b/xfce-base/xfwm4/xfwm4-9999.ebuild
index b5e9419..778ac27 100644
--- a/xfce-base/xfwm4/xfwm4-9999.ebuild
+++ b/xfce-base/xfwm4/xfwm4-9999.ebuild
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.10:2
 	x11-libs/pango
 	>=x11-libs/libwnck-2.12
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/xfconf-${XFCE_VERSION}
 	startup-notification? ( x11-libs/startup-notification )
 	xcomposite? ( x11-libs/libXcomposite
diff --git a/xfce-extra/xfce4-appfinder/Manifest b/xfce-extra/xfce4-appfinder/Manifest
index f2b0714..dd8b6d5 100644
--- a/xfce-extra/xfce4-appfinder/Manifest
+++ b/xfce-extra/xfce4-appfinder/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfce4-appfinder-9999.ebuild 676 RMD160 ff605018fdbc9a681f315a56f97fc26b764a9f58 SHA1 08829a4ab6b9a8896693451d438c65b80666da0d SHA256 613c37b54c3257d8fef27cdef8f7a26ebb97da4e84611728964c77bce072b9f3
-MISC ChangeLog 751 RMD160 a5ec40eb28b44cf16ca19075a890b0c05b2cbf3f SHA1 a04197473ad1a79633503a278ff6cd199a9d44b0 SHA256 db761e1784c736affa608e471d66aa87fb236e021be776a82345ec17cb2f6e22
+EBUILD xfce4-appfinder-9999.ebuild 675 RMD160 2b506c2c2e47f70ccf88d1334359fc9c5c83f595 SHA1 113e5fc517334448d6d43cb2e0fb62515cb4090e SHA256 50f626ee6995c36f4b7d617bfad724d5716d9624834876c40ab05c9a9e916659
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild b/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
index fcbfd60..52f08be 100644
--- a/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
+++ b/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
@@ -16,7 +16,7 @@ IUSE="debug"
 RDEPEND=">=dev-libs/glib-2.6:2
 	>=x11-libs/gtk+-2.6:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/thunar-${XFCE_VERSION}"
 DEPEND="${RDEPEND}
 	dev-util/intltool"
diff --git a/xfce-extra/xfce4-cddrive/Manifest b/xfce-extra/xfce4-cddrive/Manifest
index 1b21be8..d3c40b4 100644
--- a/xfce-extra/xfce4-cddrive/Manifest
+++ b/xfce-extra/xfce4-cddrive/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-cddrive-9999.ebuild 614 RMD160 0959b0cb2ddecbcb8aa154419377c7a579002231 SHA1 d44a7859e42db87d3dbf6b33ed62e54a7b45fa1b SHA256 4bdd29d28f9207204f7b2e36aff84199eba71a9113a6b46aeae2ac46ce132d10
+EBUILD xfce4-cddrive-9999.ebuild 613 RMD160 e936d1c59708dbbc7801d25b1572418a117a3ca8 SHA1 275ed5718e5b405d473699d20e27d1babb5427f4 SHA256 ad3c7a56c09d22b9000be04c672d88332af251b8a4a7bd04ca16e82c25e75ae5
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-cddrive/xfce4-cddrive-9999.ebuild b/xfce-extra/xfce4-cddrive/xfce4-cddrive-9999.ebuild
index 536ceff..874d8c9 100644
--- a/xfce-extra/xfce4-cddrive/xfce4-cddrive-9999.ebuild
+++ b/xfce-extra/xfce4-cddrive/xfce4-cddrive-9999.ebuild
@@ -15,7 +15,7 @@ IUSE="cddb debug"
 DEPEND=">=sys-apps/hal-0.5.8.1
 	>=dev-libs/dbus-glib-0.71
 	>=dev-libs/glib-2.12.4
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/exo-0.3.2
 	>=dev-libs/libcdio-0.76
 	cddb? ( >=media-libs/libcddb-1.2.1 )"
diff --git a/xfce-extra/xfce4-cpu-freq/files/xfce4-cpu-freq-compile-fix.patch b/xfce-extra/xfce4-cpu-freq/files/xfce4-cpu-freq-compile-fix.patch
index dd000b3..bd715d2 100644
--- a/xfce-extra/xfce4-cpu-freq/files/xfce4-cpu-freq-compile-fix.patch
+++ b/xfce-extra/xfce4-cpu-freq/files/xfce4-cpu-freq-compile-fix.patch
@@ -101,7 +101,7 @@ Index: panel-plugin/xfce4-cpufreq-linux.c
  
 +#include <stdlib.h>
  #include <dirent.h>
-+#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
  #include "xfce4-cpufreq-plugin.h"
  #include "xfce4-cpufreq-linux.h"
  
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index 1f8e8eb..852e318 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfce4-dict-9999.ebuild 501 RMD160 2b9120c9e117a4e0ebcaf0dfadffbad6c95a7d81 SHA1 9391f3cdf86af873b4320c4d80c4a3fad1bca08f SHA256 436325952a31b4d7ddacf26b3fd86e012de3c198073b84c514540bf93f1177ae
-MISC ChangeLog 421 RMD160 81c99d722c8999dec3c12ce777e5d770a8e281e6 SHA1 337c7f1a4a2ddb088c2a17c8fbd36b27ad905155 SHA256 744238b0b0e2ea9fc9845a82568219880dc953e591d56e9a06ee9ac9d47ca262
+EBUILD xfce4-dict-9999.ebuild 500 RMD160 349bb0f4e68b15d30e135f56eb0946eb2827445e SHA1 1e46d17a6c5632b3948a48c19a05627db229d5bb SHA256 d2de1f522ae0dc8d7551b8e2d895112284f893637fcb146e52a70d8f7456d205
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-9999.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-9999.ebuild
index 1525fee..fb86c6e 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-9999.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.6.0
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
 	>=xfce-base/xfce4-panel-${XFCE_VERSION}"
 DEPEND="${RDEPEND}
diff --git a/xfce-extra/xfce4-mixer/Manifest b/xfce-extra/xfce4-mixer/Manifest
index 4ec93bb..e8c75bb 100644
--- a/xfce-extra/xfce4-mixer/Manifest
+++ b/xfce-extra/xfce4-mixer/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfce4-mixer-9999.ebuild 799 RMD160 26c83a3555d5967c75cd7c6448dade668ab886f7 SHA1 8e342e7784c99eacf45b22d927d9df8728727e08 SHA256 8155556ac6fa63c18dc294839a18ba4da9bf923862571d3ac1c075eeebea7574
-MISC ChangeLog 890 RMD160 6dcf49eee0e9d2e6b0d31f0bb78dc4a5f7da6597 SHA1 d38bf37b6c185952b9a9fbff067910f08441d187 SHA256 bee2f7884ee7f6d43243da2e9bc583a1b47fc2f77aa77557359ad01689bff2c0
+EBUILD xfce4-mixer-9999.ebuild 798 RMD160 dde05b8891a99546d19bcb090e5f081f973ce0bc SHA1 8ba1c9988496a5bc8a9e23baefed013f81939e20 SHA256 93ab2359cea409e0a67a732345a77f91491341da65b0fbe5164f8f5e8160bcd6
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild
index 3462a73..ec7cb33 100644
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/glib-2.12:2
 	>=media-libs/gst-plugins-base-0.10.2
 	>=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/xfce4-panel-${XFCE_VERSION}
 	>=xfce-base/xfconf-${XFCE_VERSION}
 	alsa? ( media-plugins/gst-plugins-alsa )
diff --git a/xfce-extra/xfce4-modemlights/Manifest b/xfce-extra/xfce4-modemlights/Manifest
index 47fc095..dbe6e8d 100644
--- a/xfce-extra/xfce4-modemlights/Manifest
+++ b/xfce-extra/xfce4-modemlights/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfce4-modemlights-9999.ebuild 440 RMD160 a33461b6b9450a52457be6661988b4e6f3c8a990 SHA1 f1a7f3699a241c4d2e51998fa2e909c5f0a91967 SHA256 9e34ce771e30de7620c0b7eb044618fe1383c5065c2f55afe4cbcb40983a54be
-MISC ChangeLog 234 RMD160 85b89ec634f4b700f72b7500705103c1de738dca SHA1 9bfa63286e0a6a220cf48aeab292819a3383e6b1 SHA256 5e0c2c4a3ff16b15b08072dcf0cd06e5e3fc1e03ecdcba51a43a19d20f2267b2
+EBUILD xfce4-modemlights-9999.ebuild 439 RMD160 4d3af271929399c20b95743002063310c3eaafac SHA1 7b3ff72092c06db8f5142e6b311a4404a629df42 SHA256 1b05d7d84ba74bae69826b7fcf0614e3f72310dd9a465ff0f773110c6ab4b700
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-modemlights/xfce4-modemlights-9999.ebuild b/xfce-extra/xfce4-modemlights/xfce4-modemlights-9999.ebuild
index 25dc938..516a22f 100644
--- a/xfce-extra/xfce4-modemlights/xfce4-modemlights-9999.ebuild
+++ b/xfce-extra/xfce4-modemlights/xfce4-modemlights-9999.ebuild
@@ -15,6 +15,6 @@ IUSE="debug"
 DEPEND=">=dev-libs/glib-2.8:2
 	>=x11-libs/gtk+-2.6:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}"
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}"
 
 DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 2a4b48a..16bdac5 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfce4-power-manager-9999.ebuild 584 RMD160 a007d2aabf5624f055c2919db1357ce956d043d0 SHA1 852e79f5220a17f9eb77d7272f450a72c176ba80 SHA256 d4ac795901f1a62934a931feea50bd50b611ca832516e6f2cf4afcc3de24cf82
-MISC ChangeLog 1259 RMD160 1bf8c42760523d965159cb83fdd7a18fb14db091 SHA1 545879ae375f7ad05aede5b928fb6c728dc7987c SHA256 15d28f0801c06ff3f82860d2a7d84343af31efc8a531ad9ee05bb04b868d3df9
+EBUILD xfce4-power-manager-9999.ebuild 583 RMD160 b0771eb57452e07113a7c2b8e13295313ade8a2c SHA1 2ee2d715565fd55e8cb674484e68f233ca6f5a1d SHA256 86af2314b7bfafd4358405c1e9e848808112bd81a9d9db36ee7d9b90e686074c
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
index 801b861..bfda487 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-9999.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.70
 	>=sys-apps/hal-0.5.6
 	>=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/xfconf-${XFCE_VERSION}"
 DEPEND="${RDEPEND}
 	dev-util/intltool"
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index 81a9d24..6ce296b 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfce4-taskmanager-9999.ebuild 625 RMD160 7e64dcc4d8d6b3731d8effa7936910cc08d77ad2 SHA1 4c8fe4fa1c599ce75862685bbe1d02813b5b1e06 SHA256 bd7c199f991e3842712dc080234944b508a584901ff614776a28d26d22735df5
-MISC ChangeLog 351 RMD160 8e8f0c24c6d2654e1413574a5a4b00c828ccbf40 SHA1 e36fd0873571ba4dc86c23b9b497ba9962a3d4bf SHA256 b284c6b87c3ef444b44c37fabb6a3ac7bb6f26600fbc39ef9747685b1b51224c
+EBUILD xfce4-taskmanager-9999.ebuild 624 RMD160 893e07b3e38de92ffe663fce2896e9da83679a08 SHA1 4c98439707dd20b448802a755455cc02349f5df6 SHA256 adc0c4df42b25ecb4677c584b4932d7b767f2d115c51b8b3e9c47c5ddaad6124
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-9999.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-9999.ebuild
index a590e7f..b94c04f 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-9999.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-9999.ebuild
@@ -11,7 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
 
-RDEPEND=">=xfce-base/libxfcegui4-${XFCE_VERSION}
+RDEPEND=">=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/libxfce4util-${XFCE_VERSION}"
 
 src_install() {
diff --git a/xfce-extra/xfce4-volstatus-icon/Manifest b/xfce-extra/xfce4-volstatus-icon/Manifest
index c17af67..2dce168 100644
--- a/xfce-extra/xfce4-volstatus-icon/Manifest
+++ b/xfce-extra/xfce4-volstatus-icon/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-volstatus-icon-9999.ebuild 607 RMD160 0956632711a21fa3e779c06177dbfb38647faddb SHA1 42c90ec70e3ac12b9a386d95a49befee6c5b9ac0 SHA256 b7824e4d39f0a7dfa84969ab9288e6ad557f48ed42cd95e818a10bcd93fa27e6
+EBUILD xfce4-volstatus-icon-9999.ebuild 606 RMD160 531eea36ee6cedba628c99ca6b1cdc72b4e30aa4 SHA1 548c1bf261a59e5350b6b5468b192a9cc542255a SHA256 b80528878358af448b2197399248f0ba2b00dc27c718a37bf0c848ae9828f9fc
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-9999.ebuild b/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-9999.ebuild
index 828d14f..b3792dc 100644
--- a/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-9999.ebuild
+++ b/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-9999.ebuild
@@ -18,7 +18,7 @@ IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}
 	>=xfce-base/exo-0.3.4[hal]
 	>=sys-apps/hal-0.5.9
 	>=dev-libs/ghal-0.1
diff --git a/xfce-extra/xfvnc/Manifest b/xfce-extra/xfvnc/Manifest
index a66e6a3..4e4869b 100644
--- a/xfce-extra/xfvnc/Manifest
+++ b/xfce-extra/xfvnc/Manifest
@@ -1,3 +1,2 @@
-EBUILD xfvnc-9999.ebuild 477 RMD160 3c6b7bc12704ebd07e073272cd9d99cab738da79 SHA1 dab153d655e60156c5bf093f17c3dd8d114828b2 SHA256 d97fa8eefbd5bca729a914fb8682808b87a4a56f99c3129117dfcbe120dbd00e
-MISC ChangeLog 290 RMD160 44dc05c622c58422f0c6bf58f0325bc1c50caed8 SHA1 170e2f830f0d35fd0226fea9984aa28b75b741dd SHA256 bb987918290e0928d06aebfd81db245ca988ae010f2c8380d5024d165d6c91e0
+EBUILD xfvnc-9999.ebuild 476 RMD160 07eed79bd354dbf1c0b33ad5d27cec90c2548f4e SHA1 61c792a9aee5a37fa89ed6de24b3696519a25a9a SHA256 adab80cf585d226af392253acabbb2f0f4e652fc48271a9954bc025589236fd2
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfvnc/xfvnc-9999.ebuild b/xfce-extra/xfvnc/xfvnc-9999.ebuild
index 8a12f00..eafc28b 100644
--- a/xfce-extra/xfvnc/xfvnc-9999.ebuild
+++ b/xfce-extra/xfvnc/xfvnc-9999.ebuild
@@ -19,6 +19,6 @@ RDEPEND="dev-libs/glib:2
 	net-libs/gtk-vnc
 	x11-libs/gtk+:2
 	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}"
+	>=xfce-base/libxfce4ui-${XFCE_VERSION}"
 
 DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"