old

Package-Manager: portage-2.1.4.4
author: Samuli Suominen <ssuominen@gentoo.org> 2008-03-20 21:10:19 +0000
committer: Samuli Suominen <ssuominen@gentoo.org> 2008-03-20 21:10:19 +0000
commit: a872cc822751da4febf3821c81c468609d554da1 (patch)
tree: e14d41c232139e41124bdc09e1e24001187c6abb /xfce-base
parent: amd64 stable, security bug #212425. (diff)
download: historical-a872cc822751da4febf3821c81c468609d554da1.tar.gz
historical-a872cc822751da4febf3821c81c468609d554da1.tar.bz2
historical-a872cc822751da4febf3821c81c468609d554da1.zip
29 files changed, 0 insertions, 2004 deletions
diff --git a/xfce-base/libxfce4mcs/libxfce4mcs-4.4.1.ebuild b/xfce-base/libxfce4mcs/libxfce4mcs-4.4.1.ebuild
deleted file mode 100644
index b7b4411e4dbc..000000000000
--- a/xfce-base/libxfce4mcs/libxfce4mcs-4.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4mcs/libxfce4mcs-4.4.1.ebuild,v 1.9 2007/06/07 18:18:10 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Components library"
-HOMEPAGE="http://www.xfce.org/projects/libraries"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug doc startup-notification"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-xfce44_core_package
diff --git a/xfce-base/libxfce4util/files/libxfce4util-4.4.1-overflow.patch b/xfce-base/libxfce4util/files/libxfce4util-4.4.1-overflow.patch
deleted file mode 100644
index 1cbf51642bea..000000000000
--- a/xfce-base/libxfce4util/files/libxfce4util-4.4.1-overflow.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: libxfce4util/xfce-fileutils.c
-===================================================================
---- libxfce4util/xfce-fileutils.c	(revision 26180)
-+++ libxfce4util/xfce-fileutils.c	(working copy)
-@@ -90,12 +90,11 @@
-         last = 1;
-       else if (p[0] != '/')
-         continue;
-+      else if (p[1] == '\0')
-+        last = 1;
- 
-       *p = '\0';
- 
--      if (p[1] == '\0')
--        last = 1;
--
-       if (first)
-         {
-           /*
diff --git a/xfce-base/libxfce4util/libxfce4util-4.4.1-r1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.4.1-r1.ebuild
deleted file mode 100644
index bbb71acba0ce..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.4.1-r1.ebuild,v 1.8 2007/12/11 10:55:37 vapier Exp $
-
-inherit eutils xfce44
-
-XFCE_VERSION="4.4.1"
-xfce44
-
-DESCRIPTION="Basic utilities library"
-HOMEPAGE="http://www.xfce.org/projects/libraries"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug doc"
-
-RDEPEND=">=dev-libs/glib-2.6"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	!xfce-extra/xfce4-panelmenu
-	!xfce-extra/xfce4-showdesktop
-	!xfce-extra/xfce4-systray
-	!xfce-extra/xfce4-taskbar
-	!xfce-extra/xfce4-toys
-	!xfce-extra/xfce4-windowlist
-	!xfce-extra/xfce4-trigger-launcher
-	!xfce-extra/xfce4-websearch
-	!xfce-extra/xfce4-modemlights
-	!xfce-extra/xfce4-minicmd
-	!xfce-extra/xfce4-megahertz
-	!xfce-extra/xfce4-iconbox
-	!xfce-base/xffm
-	!xfce-extra/xfcalendar
-	!xfce-extra/xfce4-bglist-editor
-	!<xfce-extra/xfce4-genmon-3
-	!<xfce-extra/xfce4-diskperf-2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-overflow.patch
-}
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
-
-xfce44_core_package
diff --git a/xfce-base/libxfce4util/libxfce4util-4.4.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.4.1.ebuild
deleted file mode 100644
index c7c8252cb640..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.4.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4util/libxfce4util-4.4.1.ebuild,v 1.9 2007/06/07 18:15:03 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION="4.4.1"
-xfce44
-
-DESCRIPTION="Basic utilities library"
-HOMEPAGE="http://www.xfce.org/projects/libraries"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug doc"
-
-RDEPEND=">=dev-libs/glib-2.6"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	!xfce-extra/xfce4-panelmenu
-	!xfce-extra/xfce4-showdesktop
-	!xfce-extra/xfce4-systray
-	!xfce-extra/xfce4-taskbar
-	!xfce-extra/xfce4-toys
-	!xfce-extra/xfce4-windowlist
-	!xfce-extra/xfce4-trigger-launcher
-	!xfce-extra/xfce4-websearch
-	!xfce-extra/xfce4-modemlights
-	!xfce-extra/xfce4-minicmd
-	!xfce-extra/xfce4-megahertz
-	!xfce-extra/xfce4-iconbox
-	!xfce-base/xffm
-	!xfce-extra/xfcalendar
-	!xfce-extra/xfce4-bglist-editor
-	!<xfce-extra/xfce4-genmon-3
-	!<xfce-extra/xfce4-diskperf-2"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
-
-xfce44_core_package
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.4.1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.4.1.ebuild
deleted file mode 100644
index 006d84302376..000000000000
--- a/xfce-base/libxfcegui4/libxfcegui4-4.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.4.1.ebuild,v 1.9 2007/06/07 18:16:52 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION="4.4.1"
-xfce44
-
-DESCRIPTION="Unified widgets library"
-HOMEPAGE="http://www.xfce.org/projects/libraries"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug doc startup-notification"
-
-RDEPEND="x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	!=xfce-base/xfce-mcs-plugins-4.3*
-	!<xfce-base/xfce4-panel-4.4"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-xfce44_core_package
diff --git a/xfce-base/orage/orage-4.4.1.ebuild b/xfce-base/orage/orage-4.4.1.ebuild
deleted file mode 100644
index 62275e19858d..000000000000
--- a/xfce-base/orage/orage-4.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/orage/orage-4.4.1.ebuild,v 1.9 2007/06/07 18:28:27 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION="4.4.1"
-xfce44
-
-DESCRIPTION="Calendar"
-HOMEPAGE="http://www.xfce.org/projects/orage/"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
-	!xfce-extra/xfcalendar"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-xfce44_core_package
diff --git a/xfce-base/thunar/thunar-0.9.0.ebuild b/xfce-base/thunar/thunar-0.9.0.ebuild
deleted file mode 100644
index 14f33cf1d993..000000000000
--- a/xfce-base/thunar/thunar-0.9.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.9.0.ebuild,v 1.2 2007/12/02 16:43:57 drac Exp $
-
-EAPI=1
-
-inherit eutils virtualx xfce44
-
-MY_P=${P/t/T}
-S=${WORKDIR}/${MY_P}
-
-XFCE_VERSION=4.4.2
-xfce44
-
-DESCRIPTION="File manager"
-HOMEPAGE="http://thunar.xfce.org"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc dbus debug exif gnome hal pcre startup-notification +trash-plugin"
-
-RDEPEND=">=dev-lang/perl-5.6
-	x11-libs/libSM
-	>=x11-libs/gtk+-2.6
-	>=dev-libs/glib-2.6
-	>=xfce-extra/exo-0.3.4
-	>=x11-misc/shared-mime-info-0.20
-	>=dev-util/desktop-file-utils-0.14
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	virtual/fam
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( dev-libs/dbus-glib
-		sys-apps/hal )
-	>=media-libs/freetype-2
-	gnome? ( gnome-base/gconf )
-	exif? ( >=media-libs/libexif-0.6 )
-	>=media-libs/jpeg-6b
-	startup-notification? ( x11-libs/startup-notification )
-	pcre? ( >=dev-libs/libpcre-6 )
-	trash-plugin? ( dev-libs/dbus-glib
-		>=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )
-	gnome-base/librsvg"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	doc? ( dev-util/gtk-doc )"
-
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable exif) $(use_enable gnome gnome-thumbnailers) \
-	$(use_enable dbus) $(use_enable pcre)"
-
-pkg_setup() {
-	local fail="Re-emerge xfce-extra/exo with USE hal."
-
-	if use hal; then
-		XFCE_CONFIG="${XFCE_CONFIG} --enable-dbus --with-volume-manager=hal"
-	else
-		XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=none"
-	fi
-
-	if use trash-plugin && ! use dbus; then
-		XFCE_CONFIG="${XFCE_CONFIG} --enable-dbus"
-		ewarn "USE trash-plugin detected, enabling dbus for you."
-	fi
-
-	use trash-plugin || XFCE_CONFIG="${XFCE_CONFIG} --disable-tpa-plugin"
-
-	if use hal && ! use dbus; then
-		ewarn "USE hal detected, enabling dbus for you."
-	fi
-
-	if use hal && ! built_with_use xfce-extra/exo hal; then
-		eerror "${fail}"
-		die "${fail}"
-	fi
-}
-
-src_test() {
-	Xemake check || die "emake check failed."
-}
-
-DOCS="AUTHORS ChangeLog HACKING FAQ THANKS TODO README NEWS"
-
-xfce44_extra_package
diff --git a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.4.1.ebuild b/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.4.1.ebuild
deleted file mode 100644
index 1f798812bb41..000000000000
--- a/xfce-base/xfce-mcs-manager/xfce-mcs-manager-4.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 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.4.1.ebuild,v 1.9 2007/06/07 18:23:19 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Settings manager (Multi-Channel Settings)"
-HOMEPAGE="http://www.xfce.org/projects/xfce-mcs-manager"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-xfce44_core_package
diff --git a/xfce-base/xfce-mcs-plugins/files/xfce-mcs-plugins-4.4.1-xrdb.patch b/xfce-base/xfce-mcs-plugins/files/xfce-mcs-plugins-4.4.1-xrdb.patch
deleted file mode 100644
index aa149948d350..000000000000
--- a/xfce-base/xfce-mcs-plugins/files/xfce-mcs-plugins-4.4.1-xrdb.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-diff -ur xfce-mcs-plugins-4.4.1.orig/plugins/ui_plugin/ui_plugin.c xfce-mcs-plugins-4.4.1/plugins/ui_plugin/ui_plugin.c
---- xfce-mcs-plugins-4.4.1.orig/plugins/ui_plugin/ui_plugin.c	2007-02-17 10:38:20.000000000 +0200
-+++ xfce-mcs-plugins-4.4.1/plugins/ui_plugin/ui_plugin.c	2007-05-26 10:28:34.000000000 +0300
-@@ -16,6 +16,7 @@
-         gnome theme-switcher capplet - (c) Jonathan Blandford <jrb@gnome.org>
-         xfce4 mcs plugin   - (c) 2002      Olivier Fourdan <ofourdan@xfce.org>
-                              (c) 2004-2006 Benedikt Meurer <benny@xfce.org>
-+                             (c) 2005-2007 Brian Tarircone <bjt23@cornell.edu>
-         sub-pixel icons stolen from KDE :)
- 
-  */
-@@ -29,6 +30,10 @@
- #include <string.h>
- #endif
- 
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
-+
- #include <gtk/gtk.h>
- 
- #include <libxfce4mcs/mcs-common.h>
-@@ -112,6 +117,17 @@
-     "aaaaaaaaaaaa"
- };
- 
-+static const gchar *xft_dpi_default_entries[4] =
-+{
-+    N_("System Default"), "75", "96", "100",
-+};
-+static const gint xft_dpi_default_values[4] = 
-+{
-+    /* fortunately, 'Xft.dpi: 0' appears to be interpreted as
-+     * 'system default' */
-+    0, 75, 96, 100,
-+};
-+
- #define RCDIR "mcs_settings"
- #define OLDRCDIR "settings"
- #define RCFILE  "gtk.xml"
-@@ -143,6 +159,7 @@
- static gint current_xft_hinting = DEFAULT_XFT_HINTING;
- static gchar *current_xft_hintstyle = NULL;
- static gchar *current_xft_rgba = NULL;
-+static gint current_dpi = 0;
- 
- static GtkTooltips *tooltips = NULL;
- 
-@@ -167,7 +184,9 @@
-     GtkWidget *label1;
-     GtkWidget *vbox3;
-     GtkWidget *frame2;
-+    GtkWidget *font_vbox;
-     GtkWidget *button3;
-+    GtkWidget *dpi_combo;
-     GtkWidget *frame3;
-     GtkWidget *optionmenu1;
-     GtkWidget *frame5;
-@@ -499,6 +518,188 @@
-     }
- }
- 
-+static void
-+handle_dpi_change(Itf *itf)
-+{
-+    gint r;
-+    
-+    mcs_manager_set_int(itf->mcs_plugin->manager, "Xfce/XftDPI", CHANNEL, current_dpi);
-+    mcs_manager_notify(itf->mcs_plugin->manager, CHANNEL);
-+    write_options(itf->mcs_plugin);
-+    apply_xft_options(itf);
-+    
-+    r = xfce_message_dialog(GTK_WINDOW(itf->theme_dialog), _("DPI Changed"),
-+                            GTK_STOCK_DIALOG_INFO,
-+                            _("DPI was changed successfully"),
-+                            _("However, you may need to restart your session for the settings to take effect."),
-+                            XFCE_CUSTOM_STOCK_BUTTON,
-+                            _("Log Out Later"),
-+                            GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
-+                            XFCE_CUSTOM_STOCK_BUTTON, _("Log Out Now"),
-+                            GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT, NULL);
-+    if(GTK_RESPONSE_ACCEPT == r) {
-+        GError *error = NULL;
-+        
-+        if(!xfce_exec("xfce4-session-logout", FALSE, FALSE, &error)) {
-+            xfce_message_dialog(GTK_WINDOW(itf->theme_dialog),
-+                                _("Exec Error"), GTK_STOCK_DIALOG_ERROR,
-+                                _("Failed to run \"xfce4-session-logout\""),
-+                                error->message,
-+                                GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
-+            g_error_free(error);
-+        }
-+    }
-+}
-+
-+static gboolean
-+handle_user_entered_dpi(Itf *itf)
-+{
-+    GtkWidget *dlg, *topvbox, *hbox, *img, *lbl, *spin, *spacer;
-+    gint resp;
-+    
-+    dlg = xfce_titled_dialog_new_with_buttons(_("Custom DPI"),
-+                                              GTK_WINDOW(itf->theme_dialog),
-+                                              GTK_DIALOG_NO_SEPARATOR
-+                                              | GTK_DIALOG_DESTROY_WITH_PARENT,
-+                                              GTK_STOCK_CANCEL,
-+                                              GTK_RESPONSE_CANCEL,
-+                                              GTK_STOCK_SAVE,
-+                                              GTK_RESPONSE_ACCEPT, NULL);
-+    gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT);
-+    gtk_window_set_icon_name(GTK_WINDOW(dlg), "xfce4-ui");
-+    topvbox = GTK_DIALOG(dlg)->vbox;
-+    
-+    hbox = gtk_hbox_new(FALSE, BORDER);
-+    gtk_widget_show(hbox);
-+    gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0);
-+    
-+    img = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO,
-+                                   GTK_ICON_SIZE_DIALOG);
-+    gtk_widget_show(img);
-+    gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-+    
-+    lbl = gtk_label_new(_("Enter your display's DPI below.  Numbers that are multiples of 6 usually work best.  The smaller the number, the smaller your fonts will look."));
-+    gtk_label_set_line_wrap(GTK_LABEL(lbl), TRUE);
-+    gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5);
-+    gtk_widget_show(lbl);
-+    gtk_box_pack_start(GTK_BOX(hbox), lbl, TRUE, TRUE, 0);
-+    
-+    spacer = gtk_alignment_new(0.5, 0.5, 1.0, 1.0);
-+    gtk_widget_set_size_request(spacer, -1, 12);
-+    gtk_widget_show(spacer);
-+    gtk_box_pack_start(GTK_BOX(topvbox), spacer, FALSE, FALSE, 0);
-+    
-+    hbox = gtk_hbox_new(FALSE, BORDER);
-+    gtk_widget_show(hbox);
-+    gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0);
-+    
-+    lbl = gtk_label_new_with_mnemonic(_("Custom _DPI:"));
-+    gtk_widget_show(lbl);
-+    gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0);
-+    
-+    spin = gtk_spin_button_new_with_range(24, 264, 1);
-+    if(!current_dpi) {
-+        /* FIXME: get the actual current dpi */
-+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), 100);
-+    } else
-+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), current_dpi);
-+    gtk_widget_show(spin);
-+    gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0);
-+    gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), spin);
-+    
-+    resp = gtk_dialog_run(GTK_DIALOG(dlg));
-+    
-+    if(GTK_RESPONSE_ACCEPT == resp)
-+        current_dpi = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
-+    
-+    gtk_widget_destroy(dlg);
-+    
-+    return (GTK_RESPONSE_ACCEPT == resp);
-+}
-+
-+static void
-+on_dpi_combo_changed(GtkComboBox *combo,
-+                     gpointer user_data)
-+{
-+    Itf *itf = (Itf *)user_data;
-+    gint selected, old_dpi = current_dpi;
-+    
-+    selected = gtk_combo_box_get_active(combo);
-+    
-+    if(selected < G_N_ELEMENTS(xft_dpi_default_values))
-+        current_dpi = xft_dpi_default_values[selected];
-+    else {
-+        gchar *text = gtk_combo_box_get_active_text(combo);
-+        if(!strcmp(text, _("Other..."))) {
-+            if(handle_user_entered_dpi(itf)) {
-+                gint i;
-+                gboolean done = FALSE;
-+                
-+                /* if there's an old custom dpi, remove it from the box */
-+                if(selected > G_N_ELEMENTS(xft_dpi_default_values))
-+                    gtk_combo_box_remove_text(combo, selected - 1);
-+                
-+                /* make sure they didn't set one of our default values */
-+                for(i = 1; i < G_N_ELEMENTS(xft_dpi_default_values); ++i) {
-+                    if(xft_dpi_default_values[i] == current_dpi) {
-+                        g_signal_handlers_block_by_func(G_OBJECT(combo),
-+                                                        G_CALLBACK(on_dpi_combo_changed),
-+                                                        itf);
-+                        gtk_combo_box_set_active(combo, i);
-+                        g_signal_handlers_unblock_by_func(G_OBJECT(combo),
-+                                                          G_CALLBACK(on_dpi_combo_changed),
-+                                                          itf);
-+                        done = TRUE;
-+                        break;
-+                    }
-+                }
-+                
-+                if(!done) {
-+                    /* if we get here, we have to create a new entry */
-+                    gchar *str = g_strdup_printf("%d", current_dpi);
-+                    gtk_combo_box_insert_text(combo,
-+                                              G_N_ELEMENTS(xft_dpi_default_values),
-+                                              str);
-+                    
-+                    /* set the combo to the new entry, but block this func
-+                     * from getting called on the change */
-+                    g_signal_handlers_block_by_func(G_OBJECT(combo),
-+                                                    G_CALLBACK(on_dpi_combo_changed),
-+                                                    itf);
-+                    gtk_combo_box_set_active(combo,
-+                                             G_N_ELEMENTS(xft_dpi_default_values));
-+                    g_signal_handlers_unblock_by_func(G_OBJECT(combo),
-+                                                      G_CALLBACK(on_dpi_combo_changed),
-+                                                      itf);
-+                }
-+            } else {
-+                /* user canceled, so reset the last-selected item */
-+                gint i;
-+                
-+                for(i = 0; i <= G_N_ELEMENTS(xft_dpi_default_values); ++i) {
-+                    if(G_N_ELEMENTS(xft_dpi_default_values) == i
-+                       || xft_dpi_default_values[i] == current_dpi)
-+                    {
-+                        g_signal_handlers_block_by_func(G_OBJECT(combo),
-+                                                        G_CALLBACK(on_dpi_combo_changed),
-+                                                        itf);
-+                        gtk_combo_box_set_active(combo, i);
-+                        g_signal_handlers_unblock_by_func(G_OBJECT(combo),
-+                                                          G_CALLBACK(on_dpi_combo_changed),
-+                                                          itf);
-+                        break;
-+                    }
-+                }
-+            }
-+        } else
-+            current_dpi = atoi(text);  /* we should be able to trust this */
-+        g_free(text);
-+    }
-+    
-+    if(old_dpi != current_dpi)
-+        handle_dpi_change(itf);
-+}
-+
- static gint sort_func(GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer user_data)
- {
-     gchar *a_str = NULL;
-@@ -672,6 +873,8 @@
-     GdkPixbuf *icon;
-     GtkTreeIter iter;
-     GtkCellRenderer *cell[2];
-+    GtkWidget *hbox, *lbl;
-+    gint i, selected = -1;
- 
-     dialog = g_new(Itf, 1);
- 
-@@ -758,11 +961,50 @@
-     gtk_widget_show(dialog->vbox3);
-     gtk_box_pack_start(GTK_BOX(dialog->hbox1), dialog->vbox3, TRUE, TRUE, 0);
- 
-+    dialog->font_vbox = gtk_vbox_new(FALSE, BORDER);
-+    gtk_widget_show(dialog->font_vbox);
-+    
-     dialog->button3 = gtk_button_new();
-     gtk_button_set_label(GTK_BUTTON(dialog->button3), current_font);
-     gtk_widget_show(dialog->button3);
-+    gtk_box_pack_start(GTK_BOX(dialog->font_vbox), dialog->button3, FALSE, FALSE, 0);
-+    
-+    hbox = gtk_hbox_new(FALSE, BORDER);
-+    gtk_widget_show(hbox);
-+    gtk_box_pack_start(GTK_BOX(dialog->font_vbox), hbox, FALSE, FALSE, 0);
-+    
-+    lbl = gtk_label_new_with_mnemonic(_("Font _DPI:"));
-+    gtk_widget_show(lbl);
-+    gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0);
-+    
-+    for(i = 0; i < G_N_ELEMENTS(xft_dpi_default_values); ++i) {
-+        if(xft_dpi_default_values[i] == current_dpi) {
-+            selected = i;
-+            break;
-+        }
-+    }
-+    
-+    dialog->dpi_combo = gtk_combo_box_new_text();
-+    for(i = 0; i < G_N_ELEMENTS(xft_dpi_default_entries); ++i) {
-+        gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo),
-+                                  _(xft_dpi_default_entries[i]));
-+        if(selected == i)
-+            gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->dpi_combo), selected);
-+    }
-+    if(-1 == selected) {
-+        gchar *str = g_strdup_printf("%d", current_dpi);
-+        gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), str);
-+        gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->dpi_combo),
-+                                 G_N_ELEMENTS(xft_dpi_default_entries));
-+        g_free(str);
-+    }
-+    gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo),
-+                              _("Other..."));
-+    gtk_widget_show(dialog->dpi_combo);
-+    gtk_box_pack_start(GTK_BOX(hbox), dialog->dpi_combo, TRUE, TRUE, 0);
-+    gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), dialog->dpi_combo);
- 
--    dialog->frame2 = xfce_create_framebox_with_content (_("Font"), dialog->button3);
-+    dialog->frame2 = xfce_create_framebox_with_content (_("Font"), dialog->font_vbox);
-     gtk_widget_show(dialog->frame2);
-     gtk_box_pack_start(GTK_BOX(dialog->vbox3), dialog->frame2, TRUE, FALSE, 0);
- 
-@@ -919,6 +1161,7 @@
- 
-     g_signal_connect(G_OBJECT(itf->theme_dialog), "response", G_CALLBACK(cb_dialog_response), itf->mcs_plugin);
-     g_signal_connect(G_OBJECT(itf->button3), "clicked", G_CALLBACK(show_font_selection), itf);
-+    g_signal_connect(G_OBJECT(itf->dpi_combo), "changed", G_CALLBACK(on_dpi_combo_changed), itf);
-     g_signal_connect(G_OBJECT(itf->optionmenu1), "changed", G_CALLBACK(on_icons_changed), itf);
-     g_signal_connect(G_OBJECT(itf->accel_checkbox), "toggled", G_CALLBACK(on_change_accel_toggled), itf);
- 
-@@ -1036,6 +1279,12 @@
-         current_font = g_strdup(DEFAULT_FONT);
-         mcs_manager_set_string(mcs_plugin->manager, "Gtk/FontName", CHANNEL, current_font);
-     }
-+    
-+    setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Xfce/XftDPI", CHANNEL);
-+    if(setting)
-+        current_dpi = setting->data.v_int;
-+    else
-+        mcs_manager_set_int(mcs_plugin->manager, "Xfce/XftDPI", CHANNEL, current_dpi);
- 
-     setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Gtk/ToolbarStyle", CHANNEL);
-     if(setting)
-@@ -1167,12 +1416,20 @@
-             else
-                 fprintf(fp, "Xft.hintstyle: hintnone\n");
-             fprintf(fp, "Xft.rgba: %s\n", current_xft_rgba);
-+            if(current_dpi > 0)
-+                fprintf(fp, "Xft.dpi: %d\n", current_dpi);
-             fclose(fp);
- 
-             /* run xrdb to merge the new settings */
-             cmd = g_strdup_printf("xrdb -nocpp -merge \"%s\"", path);
-             g_spawn_command_line_async(cmd, NULL);
-             g_free(cmd);
-+            
-+            if(!current_dpi) {
-+                /* filter out Xft.dpi from xrdb */
-+                g_spawn_command_line_async("sh -c \"xrdb -query | grep -i -v '^Xft.dpi:' | xrdb\"",
-+                                           NULL);
-+            }
-         }
-         g_free(path);
-     }
diff --git a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.1-r1.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.1-r1.ebuild
deleted file mode 100644
index fdbecc098a10..000000000000
--- a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 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.4.1-r1.ebuild,v 1.9 2007/10/14 16:14:46 corsair Exp $
-
-inherit eutils xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Setting plugins"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="debug"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	x11-apps/xrdb"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool"
-
-XFCE_CONFIG="${XFCE_CONFIG} --enable-xf86misc --enable-xkb --enable-randr --enable-xf86vm"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-xrdb.patch
-}
-
-xfce44_core_package
diff --git a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.1.ebuild b/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.1.ebuild
deleted file mode 100644
index 31cebd27ec6e..000000000000
--- a/xfce-base/xfce-mcs-plugins/xfce-mcs-plugins-4.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 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.4.1.ebuild,v 1.12 2007/11/18 06:41:13 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Setting plugins"
-KEYWORDS="mips"
-
-IUSE="debug"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool"
-
-XFCE_CONFIG="${XFCE_CONFIG} --enable-xf86misc --enable-xkb --enable-randr --enable-xf86vm"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-xfce44_core_package
diff --git a/xfce-base/xfce-utils/files/xfce-utils-4.4.1-xdg_data_dirs.patch b/xfce-base/xfce-utils/files/xfce-utils-4.4.1-xdg_data_dirs.patch
deleted file mode 100644
index 4eca3323cc5a..000000000000
--- a/xfce-base/xfce-utils/files/xfce-utils-4.4.1-xdg_data_dirs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur xfce-utils-4.4.1.orig/scripts/startxfce4.in xfce-utils-4.4.1/scripts/startxfce4.in
---- xfce-utils-4.4.1.orig/scripts/startxfce4.in	2007-04-02 08:34:54.000000000 +0300
-+++ xfce-utils-4.4.1/scripts/startxfce4.in	2007-04-21 15:38:21.000000000 +0300
-@@ -28,9 +28,9 @@
- 
- if test "x$XDG_DATA_DIRS" = "x"
- then
--  XDG_DATA_DIRS="usr/local/share:/usr/share:/@datadir@"
-+  XDG_DATA_DIRS="/usr/local/share:/usr/share"
- else
--  XDG_DATA_DIRS="$XDG_DATA_DIRS:@datadir@"
-+  XDG_DATA_DIRS="$XDG_DATA_DIRS:/usr/local/share:/usr/share"
- fi
- export XDG_DATA_DIRS
- 
diff --git a/xfce-base/xfce-utils/xfce-utils-4.4.1-r1.ebuild b/xfce-base/xfce-utils/xfce-utils-4.4.1-r1.ebuild
deleted file mode 100644
index 60035cc158b4..000000000000
--- a/xfce-base/xfce-utils/xfce-utils-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 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.4.1-r1.ebuild,v 1.11 2007/07/01 09:58:14 drac Exp $
-
-inherit autotools eutils xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Collection of utils"
-HOMEPAGE="http://www.xfce.org/projects/xfce-utils/"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dbus debug"
-
-RDEPEND="x11-apps/xrdb
-	x11-libs/libX11
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	dbus? ( dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=xfce-extra/xfce4-dev-tools-4.4"
-
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable dbus) --enable-gdm --with-vendor-info=Gentoo"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-xfce44_core_package
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-xdg_data_dirs.patch
-	AT_M4DIR=/usr/share/xfce4/dev-tools/m4macros eautoreconf
-}
-
-src_install() {
-	xfce44_src_install
-	insinto /usr/share/xfce4
-	doins "${FILESDIR}"/Gentoo
-}
diff --git a/xfce-base/xfce-utils/xfce-utils-4.4.2.ebuild b/xfce-base/xfce-utils/xfce-utils-4.4.2.ebuild
deleted file mode 100644
index f295afa0d8c5..000000000000
--- a/xfce-base/xfce-utils/xfce-utils-4.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 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.4.2.ebuild,v 1.1 2007/11/18 06:52:38 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION=4.4.2
-xfce44
-
-DESCRIPTION="Collection of utils"
-HOMEPAGE="http://www.xfce.org/projects/xfce-utils"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="dbus debug"
-
-RDEPEND="x11-apps/xrdb
-	x11-libs/libX11
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	dbus? ( dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable dbus) --enable-gdm --with-vendor-info=Gentoo"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-xfce44_core_package
-
-src_install() {
-	xfce44_src_install
-	insinto /usr/share/xfce4
-	doins "${FILESDIR}"/Gentoo
-}
diff --git a/xfce-base/xfce4-extras/xfce4-extras-4.4.0-r1.ebuild b/xfce-base/xfce4-extras/xfce4-extras-4.4.0-r1.ebuild
deleted file mode 100644
index c1dc618f87a3..000000000000
--- a/xfce-base/xfce4-extras/xfce4-extras-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 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.4.0-r1.ebuild,v 1.7 2007/06/08 20:29:59 drac Exp $
-
-DESCRIPTION="Meta ebuild for panel plugins and other extra applications"
-HOMEPAGE="http://www.xfce.org/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~mips"
-IUSE="battery lm_sensors wifi"
-
-RDEPEND=">=xfce-base/xfce4-4.4
-	>=xfce-extra/xfce4-clipman-0.8
-	>=xfce-extra/xfce4-datetime-0.4
-	>=xfce-extra/xfce4-dict-0.2.1
-	>=xfce-extra/xfce4-mount-0.4.8
-	>=xfce-extra/xfce4-notes-1.4.1
-	>=xfce-extra/xfce4-quicklauncher-1.9.2
-	>=xfce-extra/xfce4-screenshooter-1
-	>=xfce-extra/xfce4-systemload-0.4.2
-	>=xfce-extra/xfce4-weather-0.6
-	>=xfce-extra/xfce4-xkb-0.4.3
-	>=xfce-extra/xfce4-netload-0.4
-	>=xfce-extra/xfce4-fsguard-0.3
-	>=xfce-extra/xfce4-cpugraph-0.3
-	>=xfce-extra/xfce4-taskmanager-0.3.2
-	>=xfce-extra/xfce4-timer-0.5.1
-	battery? ( >=xfce-extra/xfce4-battery-0.5 )
-	wifi? ( >=xfce-extra/xfce4-wavelan-0.5.4 )
-	lm_sensors? ( >=xfce-extra/xfce4-sensors-0.10.0 )"
diff --git a/xfce-base/xfce4-extras/xfce4-extras-4.4.1-r1.ebuild b/xfce-base/xfce4-extras/xfce4-extras-4.4.1-r1.ebuild
deleted file mode 100644
index b1012db62833..000000000000
--- a/xfce-base/xfce4-extras/xfce4-extras-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 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.4.1-r1.ebuild,v 1.8 2007/10/14 16:13:54 corsair Exp $
-
-DESCRIPTION="Meta ebuild for panel plugins and other extra applications"
-HOMEPAGE="http://www.xfce.org/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="battery cpufreq hal gnome lm_sensors wifi"
-
-RDEPEND=">=xfce-extra/xfce4-time-out-0.1.0-r1
-	>=xfce-extra/xfce4-clipman-0.8
-	>=xfce-extra/xfce4-datetime-0.5
-	>=xfce-extra/xfce4-dict-0.2.1
-	>=xfce-extra/xfce4-mount-0.5.1
-	>=xfce-extra/xfce4-notes-1.4.1
-	>=xfce-extra/xfce4-quicklauncher-1.9.2
-	>=xfce-extra/xfce4-screenshooter-1
-	>=xfce-extra/xfce4-systemload-0.4.2
-	>=xfce-extra/xfce4-weather-0.6
-	>=xfce-extra/xfce4-xkb-0.4.3
-	>=xfce-extra/xfce4-netload-0.4
-	>=xfce-extra/xfce4-fsguard-0.3
-	>=xfce-extra/xfce4-cpugraph-0.3
-	>=xfce-extra/xfce4-taskmanager-0.3.2-r1
-	>=xfce-extra/xfce4-timer-0.5.1
-	>=xfce-extra/xfce4-diskperf-2.1
-	>=xfce-extra/xfce4-genmon-3.1
-	>=xfce-extra/xfce4-smartbookmark-0.4.2
-	>=xfce-extra/xfce4-mailwatch-1.0.1
-	>=xfce-extra/xfce4-places-0.3
-	>=xfce-extra/xfce4-eyes-4.4
-	>=xfce-extra/verve-0.3.5
-	>=xfce-extra/thunar-thumbnailers-0.2.0
-	>=xfce-extra/thunar-archive-0.2.4-r1
-	>=xfce-extra/thunar-media-tags-0.1.2
-	hal? ( >=xfce-extra/thunar-volman-0.1.2 )
-	cpufreq? ( >=xfce-extra/xfce4-cpu-freq-0.0.1 )
-	gnome? ( >=xfce-extra/xfce4-xfapplet-0.1 )
-	battery? ( >=xfce-extra/xfce4-battery-0.5 )
-	wifi? ( >=xfce-extra/xfce4-wavelan-0.5.4 )
-	lm_sensors? ( >=xfce-extra/xfce4-sensors-0.10.0-r1 )"
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.4.1-gtk212.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.4.1-gtk212.patch
deleted file mode 100644
index dbc6c2db0101..000000000000
--- a/xfce-base/xfce4-panel/files/xfce4-panel-4.4.1-gtk212.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xfce4-panel/panel/panel-dialogs.c
-===================================================================
---- xfce4-panel/panel/panel-dialogs.c	(revision 26045)
-+++ xfce4-panel/panel/panel-dialogs.c	(revision 26046)
-@@ -1429,7 +1429,7 @@
- {
-     int n = gtk_combo_box_get_active (combo);
- 
--    if (n == pmd->current)
-+    if (n == pmd->current || n < 0)
-         return;
- 
-     pmd->current = n;
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.4.1-overflow.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.4.1-overflow.patch
deleted file mode 100644
index 6ffa2561cdae..000000000000
--- a/xfce-base/xfce4-panel/files/xfce4-panel-4.4.1-overflow.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-Index: libxfce4panel/xfce-panel-plugin-iface.c
-===================================================================
---- libxfce4panel/xfce-panel-plugin-iface.c	(revision 25772)
-+++ libxfce4panel/xfce-panel-plugin-iface.c	(working copy)
-@@ -1127,7 +1127,7 @@
-     name = xfce_panel_plugin_get_name (plugin);
-     id = xfce_panel_plugin_get_id (plugin);
- 
--    g_snprintf (path, 255,
-+    g_snprintf (path, sizeof(path),
-                 "xfce4" G_DIR_SEPARATOR_S
-                 "panel" G_DIR_SEPARATOR_S
-                 "%s-%s.rc",
-@@ -1161,7 +1161,7 @@
-     name = xfce_panel_plugin_get_name (plugin);
-     id = xfce_panel_plugin_get_id (plugin);
- 
--    g_snprintf (path, 255,
-+    g_snprintf (path, sizeof(path),
-                 "xfce4" G_DIR_SEPARATOR_S
-                 "panel" G_DIR_SEPARATOR_S
-                 "%s-%s.rc",
-Index: plugins/launcher/launcher-dialog.c
-===================================================================
---- plugins/launcher/launcher-dialog.c	(revision 25772)
-+++ plugins/launcher/launcher-dialog.c	(working copy)
-@@ -1183,7 +1183,7 @@
-         {
-             char last[3];
- 
--            g_snprintf (last, 3, "%d", ld->launcher->entries->len - 2);
-+            g_snprintf (last, sizeof(last), "%d", ld->launcher->entries->len - 2);
-             path = gtk_tree_path_new_from_string (last);
-         }
-         
-Index: plugins/launcher/launcher.c
-===================================================================
---- plugins/launcher/launcher.c	(revision 25772)
-+++ plugins/launcher/launcher.c	(working copy)
-@@ -370,7 +370,7 @@
-     {
-         char first[256];
- 
--        g_snprintf (first, 256, _("Could not run \"%s\""), entry->name);
-+        g_snprintf (first, sizeof(first), _("Could not run \"%s\""), entry->name);
-     
-         xfce_message_dialog (NULL, _("Xfce Panel"), 
-                              GTK_STOCK_DIALOG_ERROR, first, error->message,
-@@ -395,7 +395,7 @@
-     {
-         char first[256];
-         
--        g_snprintf (first, 256, _("Error in command \"%s\""), 
-+        g_snprintf (first, sizeof(first), _("Error in command \"%s\""), 
-                     entry->real_exec);
-     
-         xfce_message_dialog (NULL, _("Xfce Panel"), 
-@@ -432,7 +432,7 @@
-     {
-         char first[256];
-         
--        g_snprintf (first, 256, _("Could not run \"%s\""), entry->name);
-+        g_snprintf (first, sizeof(first), _("Could not run \"%s\""), entry->name);
-     
-         xfce_message_dialog (NULL, _("Xfce Panel"), 
-                              GTK_STOCK_DIALOG_ERROR, first, error->message,
-@@ -739,11 +739,11 @@
-     if (entry->name || entry->comment)
-     {
-         if (entry->name && entry->comment)
--            g_snprintf (tip, 521, "%s\n%s", entry->name, entry->comment);
-+            g_snprintf (tip, sizeof(tip), "%s\n%s", entry->name, entry->comment);
-         else if (entry->name)
--            g_strlcpy (tip, entry->name, 521);
-+            g_strlcpy (tip, entry->name, sizeof(tip));
-         else
--            g_strlcpy (tip, entry->comment, 521);
-+            g_strlcpy (tip, entry->comment, sizeof(tip));
- 
-         gtk_tooltips_set_tip (launcher->tips, launcher->iconbutton, tip, NULL);
-     }
-@@ -1029,7 +1029,7 @@
-         LauncherEntry *entry;
-         char group[10];
-         
--        g_snprintf (group, 10, "Entry %d", i);
-+        g_snprintf (group, sizeof(group), "Entry %d", i);
-         
-         if (!xfce_rc_has_group (rc, group))
-             break;
-@@ -1098,7 +1098,7 @@
-     {
-         LauncherEntry *entry = g_ptr_array_index (launcher->entries, i);
- 
--        g_snprintf (group, 10, "Entry %d", i);
-+        g_snprintf (group, sizeof(group), "Entry %d", i);
- 
-         xfce_rc_set_group (rc, group);
- 
-Index: plugins/clock/clock.c
-===================================================================
---- plugins/clock/clock.c	(revision 25772)
-+++ plugins/clock/clock.c	(working copy)
-@@ -173,7 +173,7 @@
- 	 * %B  : full month name
- 	 * %Y  : four digit year
- 	 */
--        strftime(date_s, 255, _("%A %d %B %Y"), tm);
-+        strftime(date_s, sizeof(date_s), _("%A %d %B %Y"), tm);
- 
-         /* Conversion to utf8
-          * Patch by Oliver M. Bolzer <oliver@fakeroot.net>
-Index: panel/panel.c
-===================================================================
---- panel/panel.c	(revision 25772)
-+++ panel/panel.c	(working copy)
-@@ -988,7 +988,7 @@
-     static char id[30];
-     
-     /* unique number: pseudo-random time() + counter */
--    g_snprintf (id, 30, "%ld%d", (glong) time (NULL), counter++);
-+    g_snprintf (id, sizeof(id), "%ld%d", (glong) time (NULL), counter++);
-     
-     return id;
- }
-Index: panel/panel-dialogs.c
-===================================================================
---- panel/panel-dialogs.c	(revision 25772)
-+++ panel/panel-dialogs.c	(working copy)
-@@ -259,12 +259,12 @@
-         
-         if (info->comment)
-         {
--            g_snprintf (text, 512, "<b>%s</b>\n%s", info->display_name, 
-+            g_snprintf (text, sizeof(text), "<b>%s</b>\n%s", info->display_name, 
-                                     info->comment);
-         }
-         else
-         {
--            g_snprintf (text, 512, "<b>%s</b>", info->display_name);
-+            g_snprintf (text, sizeof(text), "<b>%s</b>", info->display_name);
-         }
- 
-         g_object_set (cell, "markup", text, 
-@@ -1276,7 +1276,7 @@
-                 gtk_widget_set_size_request (scroll, req.width, -1);
-             }
- 
--            g_snprintf (markup, 10, "<b>%d</b>", i + 1);
-+            g_snprintf (markup, sizeof(markup), "<b>%d</b>", i + 1);
-             
-             ebox = gtk_event_box_new ();
-             style = gtk_widget_get_style (ebox);
-@@ -1382,7 +1382,7 @@
-     if (G_UNLIKELY (!composite_atom))
-     {
-         char text[16];
--        g_snprintf (text, 16, "_NET_WM_CM_S%d", 
-+        g_snprintf (text, sizeof(text), "_NET_WM_CM_S%d", 
-                     GDK_SCREEN_XNUMBER(gdk_screen_get_default()));
-         composite_atom = 
-             XInternAtom (GDK_DISPLAY (), text, False);
-@@ -1453,7 +1453,7 @@
- 
-     panel_block_autohide (PANEL (g_ptr_array_index (pmd->panels, n)));
- 
--    g_snprintf (name, 20, _("Panel %d"), pmd->panels->len);
-+    g_snprintf (name, sizeof(name), _("Panel %d"), pmd->panels->len);
- 
-     gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->panel_selector), name);
- 
-@@ -1489,7 +1489,7 @@
-     {
-         char name[20];
- 
--        g_snprintf (name, 20, _("Panel %d"), i + 1);
-+        g_snprintf (name, sizeof(name), _("Panel %d"), i + 1);
- 
-         gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->panel_selector), name);
-     }
-@@ -1514,7 +1514,7 @@
-     {
-         char name[20];
- 
--        g_snprintf (name, 20, _("Panel %d"), i + 1);
-+        g_snprintf (name, sizeof(name), _("Panel %d"), i + 1);
- 
-         gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->panel_selector), name);
-     }
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.4.1-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.4.1-r1.ebuild
deleted file mode 100644
index 0c5bc8cb48a2..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 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.4.1-r1.ebuild,v 1.7 2007/11/20 06:18:47 kumba Exp $
-
-inherit eutils xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Panel"
-HOMEPAGE="http://www.xfce.org/projects/xfce4-panel/"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="debug doc startup-notification"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	gnome-base/librsvg
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	!<xfce-base/xfce-utils-4.4"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README README.Plugins"
-
-xfce44_core_package
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gtk212.patch
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.4.1-r2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.4.1-r2.ebuild
deleted file mode 100644
index 27e58928d2f3..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.4.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 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.4.1-r2.ebuild,v 1.8 2007/12/11 10:55:40 vapier Exp $
-
-inherit eutils xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Panel"
-HOMEPAGE="http://www.xfce.org/projects/xfce4-panel/"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="debug doc startup-notification"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	gnome-base/librsvg
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	!<xfce-base/xfce-utils-4.4"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README README.Plugins"
-
-xfce44_core_package
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gtk212.patch
-	epatch "${FILESDIR}"/${P}-overflow.patch
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.4.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.4.1.ebuild
deleted file mode 100644
index 0ae67bc70e66..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 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.4.1.ebuild,v 1.11 2007/11/18 06:47:01 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Panel"
-HOMEPAGE="http://www.xfce.org/projects/xfce4-panel/"
-KEYWORDS="mips"
-
-IUSE="debug doc startup-notification"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	gnome-base/librsvg
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	!<xfce-base/xfce-utils-4.4"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README README.Plugins"
-
-xfce44_core_package
diff --git a/xfce-base/xfce4-session/xfce4-session-4.4.1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.4.1.ebuild
deleted file mode 100644
index 2e30b45ad0ef..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 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.4.1.ebuild,v 1.10 2007/12/11 11:26:22 angelos Exp $
-
-inherit xfce44
-
-XFCE_VERSION="4.4.1"
-xfce44
-
-DESCRIPTION="Session manager"
-HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dbus debug gnome"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-apps/iceauth
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-utils-${XFCE_MASTER_VERSION}
-	games-misc/fortune-mod
-	gnome? ( gnome-base/gconf )
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable gnome) $(use_enable dbus)"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-xfce44_core_package
diff --git a/xfce-base/xfce4/xfce4-4.4.1.ebuild b/xfce-base/xfce4/xfce4-4.4.1.ebuild
deleted file mode 100644
index f0baf77a344d..000000000000
--- a/xfce-base/xfce4/xfce4-4.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.4.1.ebuild,v 1.12 2007/09/29 08:03:02 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-HOMEPAGE="http://www.xfce.org"
-DESCRIPTION="Meta package for Xfce4 desktop, merge this package to install."
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="alsa cups minimal oss xscreensaver"
-
-RDEPEND=">=x11-themes/gtk-engines-xfce-2.4
-	>=xfce-base/thunar-${THUNAR_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-plugins-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfwm4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-utils-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfdesktop-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce4-session-${XFCE_MASTER_VERSION}
-	>=xfce-extra/xfce4-icon-theme-${XFCE_MASTER_VERSION}
-	alsa? ( >=xfce-extra/xfce4-mixer-${XFCE_MASTER_VERSION} )
-	oss? ( >=xfce-extra/xfce4-mixer-${XFCE_MASTER_VERSION} )
-	cups? ( >=xfce-base/xfprint-${XFCE_MASTER_VERSION} )
-	!minimal? ( >=xfce-base/orage-${XFCE_MASTER_VERSION}
-		>=xfce-extra/mousepad-0.2.12
-		>=xfce-extra/xfwm4-themes-${XFCE_MASTER_VERSION}
-		>=xfce-extra/terminal-0.2.6
-		>=xfce-extra/xfce4-appfinder-${XFCE_MASTER_VERSION} )
-	xscreensaver? ( >=x11-misc/xscreensaver-5.02 )"
-DEPEND="${RDEPEND}"
-
-# hack to avoid exporting function from eclass.
-# we need eclass to get _MASTER_VERSION.
-src_compile() {
-	echo
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo startxfce4 > "${D}"/etc/X11/Sessions/Xfce4
-	fperms 755 /etc/X11/Sessions/Xfce4
-}
-
-pkg_postinst() {
-	elog
-	elog "Run Xfce4 from your favourite Display Manager by using"
-	elog "XSESSION=\"Xfce4\" in /etc/rc.conf"
-	elog
-}
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.4.1-translation.patch b/xfce-base/xfdesktop/files/xfdesktop-4.4.1-translation.patch
deleted file mode 100644
index 6a1b3ca0ac53..000000000000
--- a/xfce-base/xfdesktop/files/xfdesktop-4.4.1-translation.patch
+++ /dev/null
@@ -1,341 +0,0 @@
-diff -ur xfdesktop-4.4.1.orig/modules/menu/xfce-registered-categories.xml.it xfdesktop-4.4.1/modules/menu/xfce-registered-categories.xml.it
---- xfdesktop-4.4.1.orig/modules/menu/xfce-registered-categories.xml.it	2007-04-06 23:29:54.000000000 +0300
-+++ xfdesktop-4.4.1/modules/menu/xfce-registered-categories.xml.it	2007-04-26 14:46:30.000000000 +0300
-@@ -332,337 +332,3 @@
- 	<category name="WineX" replace="Wine" toplevel="true" builtin-icon="WINE" />
- 	<category name="CrossOver" replace="Wine" toplevel="true" builtin-icon="WINE" />
- </xfce-registered-categories>
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE xfce-registered-categories>
--
--<!-- Note: You can copy this file to ~/.config/xfce4/desktop/ for customisation. -->
--
--<!--
--	Here is how this file works:
--
--	<xfce-registered-categories> - root element, required.
--
--	<category>
--		name:  Required.  Corresponds to an official category from the
--		  freedesktop.org menu spec.
--		replace: Optional.  Name that is displayed as the menu name for items
--		  in the category (useful, e.g., for translations).
--		icon: icon to be displayed for this category (actually, for the menu
--		  item referenced by this category's 'replace' attribute)
--		toplevel: Optional.  Marks categories as being "allowed" to be toplevel
--		  menus.  Note: if a category is unrooted, it will be promoted to
--		  toplevel regardless of the value of this attribute. (default: false)
--		ignore: Optional.  This category will be ignored when organising menu
--		  items. (default: false)
--		hide: Optional.  Items referencing this category will not appear in any
--			menu. (default: false)
--
--	<subcategory> - sub-element of <category>, specifies a subcategory relation
--		name: Required.  Corresponds to an official category from the
--		  freedesktop.org menu spec.
--	  Example:
--	  <category name="Graphics">
--		  <subcategory name="RasterGraphics">
--	  </category>
--	  Note that even if subcategories are definied, it is possible to collapse
--	  all subcategories into a flat one-level menu by specifying style="simple"
--	  in the <include> tag in your menu.xml file.
---->
--
--<xfce-registered-categories>
--	<category name="Legacy" toplevel="true" replace="Accessori" builtin-icon="ACCESSORIES" />
--	<category name="Core" toplevel="true" replace="Accessori" builtin-icon="ACCESSORIES" />
--	<category name="Development" toplevel="true" replace="Sviluppo" builtin-icon="DEVELOPMENT">
--		<subcategory name="Building" />
--		<subcategory name="Debugger" />
--		<subcategory name="IDE" />
--		<subcategory name="GUIDesigner" />
--		<subcategory name="Profiling" />
--		<subcategory name="RevisionControl" />
--		<subcategory name="Translation" />
--		<subcategory name="ProjectManagement" />
--		<subcategory name="WebDevelopment" />
--	</category>
--	<category name="Building" builtin-icon="DEVELOPMENT" />
--	<category name="Debugger" replace="Strumenti di debug" builtin-icon="DEVELOPMENT" />
--	<category name="IDE" replace="Ambienti" builtin-icon="DEVELOPMENT" />
--	<category name="GUIDesigner" replace="Disegnatori GUI" builtin-icon="DEVELOPMENT" />
--	<category name="Profiling" builtin-icon="DEVELOPMENT" />
--	<category name="RevisionControl" replace="Controllo revisioni" builtin-icon="DEVELOPMENT" />
--	<category name="Translation" replace="Traduzioni" builtin-icon="DEVELOPMENT" />
--	<category name="Office" toplevel="true" replace="Ufficio" builtin-icon="OFFICE">
--		<subcategory name="Calendar" />
--		<subcategory name="ContactManagement" />
--		<subcategory name="Database" />
--		<subcategory name="Dictionary" />
--		<subcategory name="Chart" />
--		<subcategory name="Email" />
--		<subcategory name="Finance" />
--		<subcategory name="FlowChart" />
--		<subcategory name="PDA" />
--		<subcategory name="ProjectManagement" />
--		<subcategory name="Presentation" />
--		<subcategory name="Spreadsheet" />
--		<subcategory name="WordProcessor" />
--		<subcategory name="Photograph" />
--		<subcategory name="Viewer" />
--	</category>
--	<category name="Calendar" replace="Agende" builtin-icon="OFFICE" />
--	<category name="ContactManagement" replace="Gestione contatti" builtin-icon="OFFICE" />
--	<category name="Database" builtin-icon="OFFICE" />
--	<category name="Dictionary" replace="Dizionari" builtin-icon="OFFICE" />
--	<category name="Chart" replace="Diagrammmi" builtin-icon="OFFICE" />
--	<category name="Email" replace="Posta elettronica" builtin-icon="OFFICE" />
--	<category name="Finance" replace="Finanza" builtin-icon="OFFICE" />
--	<category name="FlowChart" replace="Diagrammi" builtin-icon="OFFICE" />
--	<category name="PDA" builtin-icon="OFFICE" />
--	<category name="ProjectManagement" replace="Gestione progetti" builtin-icon="OFFICE" />
--	<category name="Presentation" replace="Presentazioni" builtin-icon="OFFICE" />
--	<category name="Spreadsheet" replace="Fogli di calcolo" builtin-icon="OFFICE" />
--	<category name="WordProcessor" replace="Elaborazione testi" builtin-icon="OFFICE" />
--	<category name="Graphics" toplevel="true" replace="Grafica" builtin-icon="GRAPHICS">
--		<subcategory name="2DGraphics" />
--		<subcategory name="3DGraphics" />
--		<subcategory name="Scanning" />
--		<subcategory name="Photograph" />
--		<subcategory name="Viewer" />
--	</category>
--	<category name="2DGraphics" replace="Grafica 2-D" builtin-icon="GRAPHICS">
--		<subcategory name="VectorGraphics" />
--		<subcategory name="RasterGraphics" />
--	</category>
--	<category name="VectorGraphics" replace="Grafica vettoriale" builtin-icon="GRAPHICS" />
--	<category name="RasterGraphics" replace="Grafica Raster" builtin-icon="GRAPHICS" />
--	<category name="3DGraphics" replace="Grafica 3-D" builtin-icon="GRAPHICS" />
--	<category name="Scanning" replace="Scansione" builtin-icon="GRAPHICS">
--		<subcategory name="OCR" />
--	</category>
--	<category name="OCR" builtin-icon="GRAPHICS" />
--	<category name="Photograph" replace="Fotografia" builtin-icon="GRAPHICS" />
--	<category name="Viewer" replace="Visualizzatori" builtin-icon="GRAPHICS" />
--	<category name="Settings" toplevel="true" replace="Impostazioni" builtin-icon="SETTINGS">
--		<subcategory name="DesktopSettings" />
--		<subcategory name="HardwareSettings" />
--		<subcategory name="PackageSettings" />
--		<subcategory name="Security" />
--		<subcategory name="Accessibility" />
--		<subcategory name="Screensaver" />
--	</category>
--	<category name="DesktopSettings" replace="Impostazioni dell'ambiente" builtin-icon="SETTINGS" />
--	<category name="HardwareSettings" replace="Impostazioni dell'hardware" builtin-icon="SETTINGS" />
--	<category name="PackageSettings" replace="Impostazioni dei pacchetti" builtin-icon="SETTINGS" />
--	<category name="Network" toplevel="true" replace="Rete" builtin-icon="NETWORK">
--		<subcategory name="Email" />
--		<subcategory name="Dialup" />
--		<subcategory name="InstantMessaging" />
--		<subcategory name="IRCClient" />
--		<subcategory name="FileTransfer" />
--		<subcategory name="HamRadio" />
--		<subcategory name="News" />
--		<subcategory name="P2P" />
--		<subcategory name="RemoteAccess" />
--		<subcategory name="Telephony" />
--		<subcategory name="WebBrowser" />
--		<subcategory name="WebDevelopment" />
--	</category>
--	<category name="Dialup" builtin-icon="NETWORK" />
--	<category name="InstantMessaging" replace="Messaggistica istantanea" builtin-icon="NETWORK" />
--	<category name="IRCClient" replace="Client IRC" builtin-icon="NETWORK" />
--	<category name="FileTransfer" replace="Trasferimento file" builtin-icon="NETWORK" />
--	<category name="HamRadio" replace="Ham Radio" builtin-icon="NETWORK" />
--	<category name="News" builtin-icon="NETWORK" />
--	<category name="P2P" replace="Peer-to-Peer" builtin-icon="NETWORK" />
--	<category name="RemoteAccess" replace="Accessa remoto" builtin-icon="NETWORK" />
--	<category name="Telephony" replace="Telefonia" builtin-icon="NETWORK" />
--	<category name="WebBrowser" replace="Naviagazione internet" builtin-icon="NETWORK" />
--	<category name="WebDevelopment" replace="Sviluppo web" builtin-icon="NETWORK" />
--	<category name="AudioVideo" replace="Multimedia" toplevel="true" builtin-icon="MULTIMEDIA">
--		<subcategory name="HamRadio" />
--		<subcategory name="Audio" />
--		<subcategory name="Video" />
--		<subcategory name="AudioVideoEditing" />
--		<subcategory name="Player" />
--		<subcategory name="Recorder" />
--		<subcategory name="DiscBurning" />
--	</category>
--	<category name="Audio" builtin-icon="MULTIMEDIA">
--		<subcategory name="Midi" />
--		<subcategory name="Mixer" />
--		<subcategory name="Sequencer" />
--		<subcategory name="Tuner" />
--		<subcategory name="AudioVideoEditing" />
--		<subcategory name="Player" />
--		<subcategory name="Recorder" />
--	</category>
--	<category name="Midi"  builtin-icon="MULTIMEDIA" />
--	<category name="Mixer" replace="Mixer del suono" builtin-icon="MULTIMEDIA" />
--	<category name="Sequencer" replace="Sequencer" builtin-icon="MULTIMEDIA" />
--	<category name="Tuner" replace="Sintonizzatori" builtin-icon="MULTIMEDIA" />
--	<category name="Video" builtin-icon="MULTIMEDIA">
--		<subcategory name="TV" />
--		<subcategory name="AudioVideoEditing" />
--		<subcategory name="Player" />
--		<subcategory name="Recorder" />
--		<subcategory name="Music" />
--	</category>
--	<category name="TV" builtin-icon="MULTIMEDIA" />
--	<category name="AudioVideoEditing" replace="Montaggio" builtin-icon="MULTIMEDIA" />
--	<category name="Player" replace="Riproduttori multimediali" builtin-icon="MULTIMEDIA" />
--	<category name="Recorder" replace="Registratori" builtin-icon="MULTIMEDIA" />
--	<category name="DiscBurning" replace="Masterizzazione CD e DVD" builtin-icon="MULTIMEDIA" />
--	<category name="Game" toplevel="true" replace="Giochi" builtin-icon="GAME">
--		<subcategory name="ActionGame" />
--		<subcategory name="AdventureGame" />
--		<subcategory name="ArcadeGame" />
--		<subcategory name="BoardGame" />
--		<subcategory name="BlocksGame" />
--		<subcategory name="CardGame" />
--		<subcategory name="KidsGame" />
--		<subcategory name="LogicGame" />
--		<subcategory name="RolePlaying" />
--		<subcategory name="Simulation" />
--		<subcategory name="SportsGame" />
--		<subcategory name="StrategyGame" />
--	</category>
--	<category name="ActionGame" replace="Giochi d'azione" builtin-icon="GAME" />
--	<category name="AdventureGame" replace="Giochi d'avventura" builtin-icon="GAME" />
--	<category name="ArcadeGame" replace="Giochi Arcade" builtin-icon="GAME" />
--	<category name="BoardGame" replace="Giochi da tavola" builtin-icon="GAME" />
--	<category name="BlocksGame" replace="Giochi enigmistici" builtin-icon="GAME" />
--	<category name="CardGame" replace="Giochi di carte" builtin-icon="GAME" />
--	<category name="KidsGame" replace="Giochi per bambini" builtin-icon="GAME" />
--	<category name="LogicGame" replace="Giochi di logica" builtin-icon="GAME" />
--	<category name="RolePlaying" replace="Giochi di ruolo" builtin-icon="GAME" />
--	<category name="Simulation" replace="Simulazione" builtin-icon="GAME" />
--	<category name="SportsGame" replace="Giochi di sport" builtin-icon="GAME" />
--	<category name="StrategyGame" replace="Giochi di strategia" builtin-icon="GAME" />
--	<category name="Education" replace="Educazione" toplevel="true">
--		<subcategory name="Art" />
--		<subcategory name="Construction" />
--		<subcategory name="Music" />
--		<subcategory name="Languages" />
--		<subcategory name="Teaching" />
--	</category>
--	<category name="Art" replace="Arte" />
--	<category name="Construction" replace="Costruzione" />
--	<category name="Music" replace="Musica" />
--	<category name="Languages" replace="Lingue" />
--	<category name="Science" replace="Scienza" toplevel="true">
--		<subcategory name="Astronomy" />
--		<subcategory name="Biology" />
--		<subcategory name="Chemistry" />
--		<subcategory name="Geology" />
--		<subcategory name="Math" />
--		<subcategory name="MedicalSoftware" />
--		<subcategory name="Physics" />
--		<subcategory name="Engineering" />
--	</category>
--	<category name="Astronomy" replace="Astronomia" />
--	<category name="Biology" replace="Biologia" />
--	<category name="Chemistry" replace="Chimica" />
--	<category name="Geology" replace="Geometri" />
--	<category name="Math" replace="Matematica" />
--	<category name="MedicalSoftware" replace="Medicina" />
--	<category name="Physics" replace="Fisica" />
--	<category name="Teaching" replace="Insegnamento" />
--	<category name="Amusement" replace="Giochi" builtin-icon="GAME" />
--	<category name="Applet" replace="Applet" />
--	<category name="Archiving" replace="Archiviazione" />
--	<category name="Electronics" replace="Elettronica" />
--	<category name="Emulator" toplevel="true" replace="Emulazione" builtin-icon="SYSTEM" />
--	<category name="Engineering" replace="Ingegneria" />
--	<category name="FileManager" replace="Gestione file" />
--	<category name="Shell" replace="Shell" />
--	<category name="Screensaver" replace="Salva Schermi" />
--	<category name="TerminalEmulator" replace="Emulatori di terminale" />
--	<category name="TrayIcon" replace="Icone dell'area di notifica" />
--	<category name="System" toplevel="true" replace="Sistema" builtin-icon="SYSTEM">
--		<subcategory name="FileSystem" />
--		<subcategory name="Monitor" />
--		<subcategory name="Security" />
--		<subcategory name="Accessibility" />
--		<subcategory name="TerminalEmulator" />
--		<subcategory name="Shell" />
--	</category>
--	<category name="FileSystem" builtin-icon="SYSTEM" />
--	<category name="Monitor" replace="Monitoraggio" builtin-icon="SYSTEM" />
--	<category name="Security" replace="Sicurezza" builtin-icon="SYSTEM" />
--	<category name="Utility" toplevel="true" replace="Accessori" builtin-icon="ACCESSORIES">
--		<subcategory name="Accessibility" />
--		<subcategory name="Calculator" />
--		<subcategory name="Clock" />
--		<subcategory name="TextEditor" />
--		<subcategory name="Archiving" />
--		<subcategory name="TerminalEmulator" />
--		<subcategory name="FileManager" />
--		<subcategory name="Shell" />
--	</category>
--	<category name="Accessibility" replace="Accessibilità" builtin-icon="UTILITY" />
--	<category name="Calculator" replace="Calcolatrici" builtin-icon="ACCESSORIES" />
--	<category name="Clock" replace="Orologi" builtin-icon="ACCESSORIES" />
--	<category name="TextEditor" replace="Editor di testi" builtin-icon="ACCESSORIES" />
--	<category name="KDE" toplevel="true" ignore="true">
--		<subcategory name="Development" />
--		<subcategory name="Office" />
--		<subcategory name="Graphics" />
--		<subcategory name="Settings" />
--		<subcategory name="Network" />
--		<subcategory name="AudioVideo" />
--		<subcategory name="Game" />
--		<subcategory name="Education" />
--		<subcategory name="Science" />
--		<subcategory name="System" />
--		<subcategory name="Utility" />
--	</category>
--	<category name="GNOME" toplevel="true" ignore="true">
--		<subcategory name="Development" />
--		<subcategory name="Office" />
--		<subcategory name="Graphics" />
--		<subcategory name="Settings" />
--		<subcategory name="Network" />
--		<subcategory name="AudioVideo" />
--		<subcategory name="Game" />
--		<subcategory name="Education" />
--		<subcategory name="Science" />
--		<subcategory name="System" />
--		<subcategory name="Utility" />
--	</category>
--	<category name="GTK" toplevel="true" ignore="true">
--		<subcategory name="GNOME" />
--	</category>
--	<category name="Qt" toplevel="true" ignore="true">
--		<subcategory name="KDE" />
--	</category>
--	<category name="Motif" toplevel="true" ignore="true">
--		<subcategory name="Development" />
--		<subcategory name="Office" />
--		<subcategory name="Graphics" />
--		<subcategory name="Settings" />
--		<subcategory name="Network" />
--		<subcategory name="AudioVideo" />
--		<subcategory name="Game" />
--		<subcategory name="Education" />
--		<subcategory name="Science" />
--		<subcategory name="System" />
--		<subcategory name="Utility" />
--	</category>
--	<category name="Java" toplevel="true" ignore="true">
--		<subcategory name="Applet" />
--	</category>
--	<category name="ConsoleOnly" toplevel="true" replace="Console" ignore="true">
--		<subcategory name="Development" />
--		<subcategory name="Office" />
--		<subcategory name="Graphics" />
--		<subcategory name="Settings" />
--		<subcategory name="Network" />
--		<subcategory name="AudioVideo" />
--		<subcategory name="Game" />
--		<subcategory name="Education" />
--		<subcategory name="Science" />
--		<subcategory name="System" />
--		<subcategory name="Utility" />
--	</category>
--	<category name="Wine" toplevel="true" builtin-icon="WINE" />
--	<category name="WineX" replace="Wine" toplevel="true" builtin-icon="WINE" />
--	<category name="CrossOver" replace="Wine" toplevel="true" builtin-icon="WINE" />
--</xfce-registered-categories>
diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild
deleted file mode 100644
index 7c02abcc9977..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild,v 1.11 2007/07/01 09:56:15 drac Exp $
-
-inherit eutils xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-xfce44_core_package
-
-DESCRIPTION="Desktop manager"
-HOMEPAGE="http://www.xfce.org/projects/xfdesktop"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dbus debug doc minimal"
-
-LANG="be ca cs da de el es et eu fi fr he hu it ja ko nl pa pl pt_BR ro ru sk sv tr uk vi zh_CN zh_TW"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	gnome-base/librsvg
-	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	dbus? ( dev-libs/dbus-glib >=xfce-base/thunar-${THUNAR_MASTER_VERSION} )
-	!minimal? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
-		>=xfce-extra/exo-0.3.2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-for X in ${LANG}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable doc xsltproc)"
-DOCS="AUTHORS ChangeLog NEWS TODO README"
-XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/xfce-registered-categories.xml
-	/etc/xdg/xfce4/desktop/menu.xml"
-
-pkg_setup() {
-	if use dbus; then
-		XFCE_CONFIG="${XFCE_CONFIG} --enable-thunarx --enable-file-icons"
-	else
-		XFCE_CONFIG="${XFCE_CONFIG} --disable-thunarx --disable-file-icons"
-	fi
-
-	if use minimal; then
-		XFCE_CONFIG="${XFCE_CONFIG} --disable-desktop-icons --disable-exo --disable-panel-plugin"
-	else
-		XFCE_CONFIG="${XFCE_CONFIG} --enable-desktop-icons --enable-exo --enable-panel-plugin"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-translation.patch
-}
-
-src_install() {
-	xfce44_src_install
-
-	# clean out the config files that don't affect us
-	local config lang
-	for config in ${XFCE_LOCALIZED_CONFIGS}; do
-		for lang in ${LANG}; do
-			local localized_config="${D}/${config}.${lang}"
-			if [[ -f ${localized_config} ]]; then
-				use "linguas_${lang}" || rm ${localized_config}
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	xfce44_pkg_postinst
-
-	if ! use dbus; then
-		elog
-		elog "You need USE=\"dbus\" to enable desktop icons."
-		elog
-	fi
-}
diff --git a/xfce-base/xfprint/xfprint-4.4.1.ebuild b/xfce-base/xfprint/xfprint-4.4.1.ebuild
deleted file mode 100644
index e912d466272e..000000000000
--- a/xfce-base/xfprint/xfprint-4.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.4.1.ebuild,v 1.9 2007/06/07 18:32:59 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Frontend for printing, management and job queue."
-HOMEPAGE="http://www.xfce.org/projects/xfprint"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="cups debug doc"
-
-RDEPEND="cups? ( net-print/cups )
-	!cups? ( net-print/lprng )
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	app-text/a2ps"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-	if use cups; then
-		XFCE_CONFIG="${XFCE_CONFIG} --enable-bsdlpr --enable-cups"
-	else
-		XFCE_CONFIG="${XFCE_CONFIG} --enable-bsdlpr"
-	fi
-}
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-xfce44_core_package
diff --git a/xfce-base/xfwm4/files/xfwm4-gtk212.patch b/xfce-base/xfwm4/files/xfwm4-gtk212.patch
deleted file mode 100644
index c8112f44995c..000000000000
--- a/xfce-base/xfwm4/files/xfwm4-gtk212.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Index: src/display.c
-===================================================================
---- src/display.c	(revision 25830)
-+++ src/display.c	(revision 25831)
-@@ -178,6 +178,19 @@
-                           FALSE, display_info->atoms) != 0);
- }
- 
-+static void
-+myDisplayCreateTimestampWin (DisplayInfo *display_info)
-+{
-+    XSetWindowAttributes attributes;
-+
-+    attributes.event_mask = PropertyChangeMask;
-+    attributes.override_redirect = TRUE;
-+    display_info->timestamp_win = 
-+        XCreateWindow (display_info->dpy, DefaultRootWindow (display_info->dpy),
-+                       -100, -100, 10, 10, 0, 0, CopyFromParent, CopyFromParent,
-+                       CWEventMask | CWOverrideRedirect, &attributes);
-+}
-+
- DisplayInfo *
- myDisplayInit (GdkDisplay *gdisplay)
- {
-@@ -309,6 +322,8 @@
-     display->resize_cursor[CORNER_COUNT + SIDE_BOTTOM] =
-         XCreateFontCursor (display->dpy, XC_bottom_side);
- 
-+    myDisplayCreateTimestampWin (display);
-+
-     display->xfilter = NULL;
-     display->screens = NULL;
-     display->clients = NULL;
-@@ -340,6 +355,8 @@
-     display->move_cursor = None;
-     XFreeCursor (display->dpy, display->root_cursor);
-     display->root_cursor = None;
-+    XDestroyWindow (display->dpy, display->timestamp_win);
-+    display->timestamp_win = None;
- 
-     if (display->hostname)
-     {
-Index: src/display.h
-===================================================================
---- src/display.h	(revision 25830)
-+++ src/display.h	(revision 25831)
-@@ -226,6 +226,7 @@
-     gboolean quit;
-     gboolean reload;
- 
-+    Window timestamp_win;
-     Cursor busy_cursor;
-     Cursor move_cursor;
-     Cursor root_cursor;
-Index: src/client.c
-===================================================================
---- src/client.c	(revision 25830)
-+++ src/client.c	(revision 25831)
-@@ -4868,21 +4868,19 @@
- 
-     if (passdata.c)
-     {
--        GdkPixbuf *icon;
--
-         TRACE ("entering cycle loop");
-         passdata.wireframe = wireframeCreate (passdata.c);
--        icon = getAppIcon (display_info, passdata.c->window, 32, 32);
-         passdata.tabwin = tabwinCreate (passdata.c->screen_info->gscr, c,
-                                         passdata.c, passdata.cycle_range,
-                                         screen_info->params->cycle_workspaces);
-         eventFilterPush (display_info->xfilter, clientCycleEventFilter, &passdata);
-         gtk_main ();
-         eventFilterPop (display_info->xfilter);
--        wireframeDelete (screen_info, passdata.wireframe);
-         TRACE ("leaving cycle loop");
-         tabwinDestroy (passdata.tabwin);
-         g_free (passdata.tabwin);
-+        wireframeDelete (screen_info, passdata.wireframe);
-+        updateXserverTime (display_info);
-     }
- 
-     if (passdata.c)
-Index: src/hints.c
-===================================================================
---- src/hints.c	(revision 25830)
-+++ src/hints.c	(revision 25831)
-@@ -1167,27 +1167,18 @@
-     return setXAtomManagerOwner(display_info, display_info->atoms[atom_id], root, w);
- }
- 
--
--static Bool
--checkPropEvent (Display *display, XEvent *xevent, XPointer arg)
-+void
-+updateXserverTime (DisplayInfo *display_info)
- {
--    DisplayInfo *display_info;
-     ScreenInfo *screen_info;
-+    char c = '\0';
- 
--    display_info = (DisplayInfo *) arg;
--    g_return_val_if_fail (display_info, FALSE);
-+    g_return_if_fail (display_info);
- 
--    screen_info = myDisplayGetDefaultScreen (display_info);
--    g_return_val_if_fail (screen_info, FALSE);
--
--    if ((xevent->type == PropertyNotify) &&
--        (xevent->xproperty.window == screen_info->xfwm4_win) &&
--        (xevent->xproperty.atom == display_info->atoms[XFWM4_TIMESTAMP_PROP]))
--    {
--        return TRUE;
--    }
--
--    return FALSE;
-+    XChangeProperty (display_info->dpy, display_info->timestamp_win,
-+                     display_info->atoms[XFWM4_TIMESTAMP_PROP],
-+                     display_info->atoms[XFWM4_TIMESTAMP_PROP],
-+                     8, PropModeReplace, (unsigned char *) &c, 1);
- }
- 
- Time
-@@ -1196,7 +1187,6 @@
-     ScreenInfo *screen_info;
-     XEvent xevent;
-     Time timestamp;
--    char c = '\0';
- 
-     g_return_val_if_fail (display_info, (Time) CurrentTime);
-     timestamp = myDisplayGetCurrentTime (display_info);
-@@ -1206,12 +1196,8 @@
-         g_return_val_if_fail (screen_info,  (Time) CurrentTime);
- 
-         TRACE ("getXServerTime: Using X server roundtrip");
--        XChangeProperty (display_info->dpy, screen_info->xfwm4_win, 
--                         display_info->atoms[XFWM4_TIMESTAMP_PROP],
--                         display_info->atoms[XFWM4_TIMESTAMP_PROP],
--                         8, PropModeReplace, (unsigned char *) &c, 1);
--        XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer) display_info);
--
-+        updateXserverTime (display_info);
-+        XWindowEvent (display_info->dpy, display_info->timestamp_win, PropertyChangeMask, &xevent);
-         timestamp = (Time) myDisplayUpdateCurrentTime (display_info, &xevent);
-     }
- 
-Index: src/hints.h
-===================================================================
---- src/hints.h	(revision 25830)
-+++ src/hints.h	(revision 25831)
-@@ -269,6 +269,7 @@
-                                                                  int, 
-                                                                  Window , 
-                                                                  Window);
-+void                     updateXserverTime                      (DisplayInfo *);
- Time                     getXServerTime                         (DisplayInfo *);
- 
- #ifdef ENABLE_KDE_SYSTRAY_PROXY
diff --git a/xfce-base/xfwm4/xfwm4-4.4.1-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.4.1-r1.ebuild
deleted file mode 100644
index 243ffe786b7f..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.4.1-r1.ebuild,v 1.9 2007/11/20 06:16:41 kumba Exp $
-
-inherit xfce44 eutils
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Window manager"
-HOMEPAGE="http://www.xfce.org/projects/xfwm4"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="debug startup-notification xcomposite"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXpm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	xcomposite? ( x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes )
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	x11-libs/pango
-	startup-notification? ( x11-libs/startup-notification )
-	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-XFCE_CONFIG="${XFCE_CONFIG} --enable-xsync --enable-render --enable-randr \
-	$(use_enable xcomposite compositor)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-gtk212.patch"
-}
-
-DOCS="AUTHORS ChangeLog COMPOSITOR NEWS README TODO"
-
-xfce44_core_package
diff --git a/xfce-base/xfwm4/xfwm4-4.4.1.ebuild b/xfce-base/xfwm4/xfwm4-4.4.1.ebuild
deleted file mode 100644
index c2c976a62e5c..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.4.1.ebuild,v 1.10 2007/11/18 07:25:04 drac Exp $
-
-inherit xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Window manager"
-HOMEPAGE="http://www.xfce.org/projects/xfwm4"
-KEYWORDS="mips"
-
-IUSE="debug startup-notification xcomposite"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXpm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	xcomposite? ( x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes )
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	x11-libs/pango
-	startup-notification? ( x11-libs/startup-notification )
-	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-XFCE_CONFIG="${XFCE_CONFIG} --enable-xsync --enable-render --enable-randr \
-	$(use_enable xcomposite compositor)"
-
-DOCS="AUTHORS ChangeLog COMPOSITOR NEWS README TODO"
-
-xfce44_core_package
author	Samuli Suominen <ssuominen@gentoo.org>	2008-03-20 21:10:19 +0000
committer	Samuli Suominen <ssuominen@gentoo.org>	2008-03-20 21:10:19 +0000
commit	a872cc822751da4febf3821c81c468609d554da1 (patch)
tree	e14d41c232139e41124bdc09e1e24001187c6abb /xfce-base
parent	amd64 stable, security bug #212425. (diff)
download	historical-a872cc822751da4febf3821c81c468609d554da1.tar.gz historical-a872cc822751da4febf3821c81c468609d554da1.tar.bz2 historical-a872cc822751da4febf3821c81c468609d554da1.zip