gnome 2.6 commit

11 files changed, 26 insertions, 393 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 4d877fc44159..dd3af833e6df 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.77 2004/03/16 02:45:53 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.78 2004/03/20 12:47:03 foser Exp $
+
+*gnome-panel-2.5.93 (20 Mar 2004)
+
+  20 Mar 2004; foser <foser@gentoo.org> gnome-panel-2.5.93.ebuild :
+  Gnome 2.6 release
 
   15 Mar 2004; Stephen P. Becker <geoman@gentoo.org> gnome-panel-2.4.2.ebuild:
   Added ~mips keyword.
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 81c5f33fcec1..f6eb9b41136c 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,3 +1,4 @@
+MD5 3b175510874bec18d6c0a7fe9d80baa1 gnome-panel-2.5.93.ebuild 1707
 MD5 812ccfad6763843f4c37efc6d8354614 gnome-panel-2.4.0-r2.ebuild 1872
 MD5 e11304bcd9e75b68da81a2394330bb42 gnome-panel-2.4.2.ebuild 1749
 MD5 f47c4c717069b1543c5c8207724849e1 gnome-panel-1.4.2-r2.ebuild 2021
@@ -10,6 +11,7 @@ MD5 1bb4e04fb5577b5f7ffee6c5ef2855b2 files/gnome-panel-2.4.0-drawers_fix.patch 6
 MD5 08d08fb07508d922ef40625fd41d53d6 files/gnome-panel-2.4.0-drawers_expanding_fix.patch 639
 MD5 e32de20a66c2dddfb1a4178bbce00e28 files/gnome-panel-2.4.0-autohide_fix.patch 2873
 MD5 1fda29dc30f730bf7f916139db8e8844 files/menu-2.4.0.patch 1663
+MD5 0da97a8d3431fb320df239061385648b files/digest-gnome-panel-2.5.93 72
 MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r1 71
 MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r2 71
 MD5 fd45982a0009ea6751868529516f641a files/gnome-panel-calendar-l10n.patch 1239
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.0-r2 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.0-r2
deleted file mode 100644
index 155f0241468a..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a81f7ebbb450611a28783900f5f2cbc gnome-panel-2.4.0.tar.bz2 2641373
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.1
deleted file mode 100644
index a0028f0b094b..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bdef7c238e1d1eb7976f2bca3b0c8aca gnome-panel-2.4.1.tar.bz2 2642713
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.5.93 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.5.93
new file mode 100644
index 000000000000..bdc188433d4c
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.5.93
@@ -0,0 +1 @@
+MD5 798e1daf242615c127d2c1f275af6bcd gnome-panel-2.5.93.tar.bz2 2833271
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.4.0-drawers_expanding_fix.patch b/gnome-base/gnome-panel/files/gnome-panel-2.4.0-drawers_expanding_fix.patch
deleted file mode 100644
index 57109591a601..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.4.0-drawers_expanding_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -NurB gnome-panel-2.4.0-orig/gnome-panel/panel-toplevel.c gnome-panel-2.4.0/gnome-panel/panel-toplevel.c
---- gnome-panel-2.4.0-orig/gnome-panel/panel-toplevel.c	2003-10-16 21:03:59.000000000 -0500
-+++ gnome-panel-2.4.0/gnome-panel/panel-toplevel.c	2003-10-30 05:43:01.000000000 -0500
-@@ -2187,9 +2187,10 @@
- static void
- panel_toplevel_attach_toplevel_hiding (PanelToplevel *toplevel)
- {
--	panel_toplevel_hide (toplevel, FALSE, -1);
--
--	toplevel->priv->attach_hidden = TRUE;
-+	if (!panel_toplevel_get_is_hidden (toplevel)) {
-+		panel_toplevel_hide (toplevel, FALSE, -1);
-+		toplevel->priv->attach_hidden = TRUE;
-+	}
- }
- 
- static void
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.4.0-drawers_fix.patch b/gnome-base/gnome-panel/files/gnome-panel-2.4.0-drawers_fix.patch
deleted file mode 100644
index 703b61f60375..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.4.0-drawers_fix.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-diff -NurB gnome-panel-2.4.0-orig/gnome-panel/button-widget.c gnome-panel-2.4.0/gnome-panel/button-widget.c
---- gnome-panel-2.4.0-orig/gnome-panel/button-widget.c	2003-10-10 08:38:39.000000000 -0500
-+++ gnome-panel-2.4.0/gnome-panel/button-widget.c	2003-10-10 08:39:11.000000000 -0500
-@@ -37,68 +37,6 @@
- 
- static GObjectClass *parent_class;
- 
--static void
--translate_to(GtkWidget *from, GtkWidget *to, int *x, int *y)
--{
--	while (from != to) {
--		if (!GTK_WIDGET_NO_WINDOW (from)) {
--			*x += MAX (from->allocation.x, 0);
--			*y += MAX (from->allocation.y, 0);
--		}
--		from = from->parent;
--	}
--}
--
--static void
--calculate_overlay_geometry (PanelWidget *panel,
--			    GtkWidget   *parent,
--			    GtkWidget   *applet,
--			    int         *x,
--			    int         *y,
--			    int         *w,
--			    int         *h)
--{
--	*x = applet->allocation.x;
--	*y = applet->allocation.y;
--	*w = applet->allocation.width;
--	*h = applet->allocation.height;
--
--	translate_to (GTK_WIDGET(panel), parent, x, y);
--
--	if(panel->orient == GTK_ORIENTATION_HORIZONTAL) {
--		if (applet->allocation.x > panel->size) {
--			*x = parent->requisition.width + 1;
--			*y = parent->requisition.height + 1;
--			return;
--		}
--
--		*y = 0;
--		/* we use the requisition, since allocation might have not
--		   yet happened if we are inside the allocation, anyway
--		   they are the same for basep */
--		if(*h < parent->requisition.height)
--			*h = parent->requisition.height;
--
--		if ((*w + applet->allocation.x) > panel->size) {
--			*w = panel->size - applet->allocation.x;
--		}
--	} else {
--		if (applet->allocation.y > panel->size) {
--			*x = parent->requisition.width + 1;
--			*y = parent->requisition.height + 1;
--			return;
--		}
--
--		*x = 0;
--		if(*w < parent->requisition.width)
--			*w = parent->requisition.width;
--
--		if ((*h + applet->allocation.y) > panel->size) {
--			*h = panel->size - applet->allocation.y;
--		}
--	}
--}
--
- /* colorshift a pixbuf */
- static void
- do_colorshift (GdkPixbuf *dest, GdkPixbuf *src, int shift)
-@@ -163,27 +101,19 @@
- 	GdkWindowAttr attributes;
- 	gint attributes_mask;
- 	GtkButton *button;
--	PanelWidget *panel;
--	GtkWidget *parent;
--	int x,y,w,h;
- 
- 	g_return_if_fail (widget != NULL);
- 	g_return_if_fail (BUTTON_IS_WIDGET (widget));
- 
--	panel  = PANEL_WIDGET(widget->parent);
--	parent = GTK_WIDGET (panel->toplevel);
--
--	calculate_overlay_geometry(panel, parent, widget, &x, &y, &w, &h);
--
- 	button = GTK_BUTTON (widget);
- 
- 	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
- 
- 	attributes.window_type = GDK_WINDOW_CHILD;
--	attributes.x = x;
--	attributes.y = y;
--	attributes.width = w;
--	attributes.height = h;
-+	attributes.x = widget->allocation.x;
-+	attributes.y = widget->allocation.y;
-+	attributes.width = widget->allocation.width;
-+	attributes.height = widget->allocation.height;
- 	attributes.wclass = GDK_INPUT_ONLY;
- 	attributes.event_mask = (GDK_BUTTON_PRESS_MASK |
- 				 GDK_BUTTON_RELEASE_MASK |
-@@ -194,10 +124,10 @@
- 				 GDK_LEAVE_NOTIFY_MASK);
- 	attributes_mask = GDK_WA_X | GDK_WA_Y;
- 
--	widget->window = gtk_widget_get_parent_window(widget);
-+	widget->window = gtk_widget_get_parent_window (widget);
- 	g_object_ref (G_OBJECT (widget->window));
-       
--	button->event_window = gdk_window_new (parent->window,
-+	button->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
- 					       &attributes,
- 					       attributes_mask);
- 	gdk_window_set_user_data (button->event_window, widget);
-@@ -206,24 +136,26 @@
- }
- 
- static void
--button_widget_parent_set (GtkWidget *widget,
--			  GtkWidget *previous_parent)
-+button_widget_unrealize (GtkWidget *widget)
- {
-+	GtkButton *button;
-+	PanelWidget *panel;
- 	GtkWidget *parent;
--	int        x, y, w, h;
- 
-+	g_return_if_fail (widget != NULL);
- 	g_return_if_fail (BUTTON_IS_WIDGET (widget));
- 
--	if (!GTK_WIDGET_REALIZED (widget)|| !widget->parent)
--		return;
--
--	parent = GTK_WIDGET (PANEL_WIDGET (widget->parent)->toplevel);
-+	panel  = PANEL_WIDGET (widget->parent);
-+	parent = GTK_WIDGET (panel->toplevel);
-+	button = GTK_BUTTON (widget);
- 
--	calculate_overlay_geometry (
--		PANEL_WIDGET (widget->parent), parent, widget, &x, &y, &w, &h);
-+	if (button->event_window != NULL) {
-+		gdk_window_set_user_data (button->event_window, NULL);
-+		gdk_window_destroy (button->event_window);
-+		button->event_window = NULL;
-+	}
- 
--	gdk_window_reparent (
--		GTK_BUTTON (widget)->event_window, parent->window, x, y);
-+	GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
- }
- 
- static void
-@@ -489,10 +421,8 @@
- 	if (string_empty (file))
- 		return NULL;
- 
--	if (g_path_is_absolute (file))
--		retval = load_pixbuf (file, PREFERRED_SIZE, error);
--
--	if (retval == NULL) {
-+	retval = load_pixbuf (file, PREFERRED_SIZE, NULL);
-+	if (!retval) {
- 		char *tmp;
- 
- 		if (error && *error) {
-@@ -686,15 +616,14 @@
- 
- 	if (GTK_WIDGET_REALIZED (widget)) {
- 		PanelWidget *panel;
--		int          x, y, w, h;
- 
- 		panel = PANEL_WIDGET (widget->parent);
- 
--		calculate_overlay_geometry (
--			panel, GTK_WIDGET (panel->toplevel),
--			widget, &x, &y, &w, &h);
--
--		gdk_window_move_resize (button->event_window, x, y, w, h);
-+		gdk_window_move_resize (button->event_window, 
-+					allocation->x,
-+					allocation->y,
-+					allocation->width,
-+					allocation->height);
- 	}
- }
- 
-@@ -731,10 +660,14 @@
- static gboolean
- button_widget_enter_notify (GtkWidget *widget, GdkEventCrossing *event)
- {
-+	gboolean in_button;
-+
- 	g_return_val_if_fail (BUTTON_IS_WIDGET (widget), FALSE);
- 
-+	in_button = GTK_BUTTON (widget)->in_button;
- 	GTK_WIDGET_CLASS (parent_class)->enter_notify_event (widget, event);
--	if (GTK_BUTTON (widget)->in_button)
-+	if (in_button != GTK_BUTTON (widget)->in_button &&
-+	    panel_global_config_get_highlight_when_over ())
- 		gtk_widget_queue_draw (widget);
- 
- 	return FALSE;
-@@ -818,7 +751,7 @@
- 	gobject_class->set_property = button_widget_set_property;
- 	  
- 	widget_class->realize            = button_widget_realize;
--	widget_class->parent_set         = button_widget_parent_set;
-+	widget_class->unrealize          = button_widget_unrealize;
- 	widget_class->size_allocate      = button_widget_size_allocate;
- 	widget_class->size_request       = button_widget_size_request;
- 	widget_class->button_press_event = button_widget_button_press;
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.4.1-drawers_expanding_fix.patch b/gnome-base/gnome-panel/files/gnome-panel-2.4.1-drawers_expanding_fix.patch
deleted file mode 100644
index 27571b53ef8c..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.4.1-drawers_expanding_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -NurB gnome-panel-2.4.1-orig/gnome-panel/panel-toplevel.c gnome-panel-2.4.1/gnome-panel/panel-toplevel.c
---- gnome-panel-2.4.1-orig/gnome-panel/panel-toplevel.c	2003-10-31 09:24:02.000000000 -0500
-+++ gnome-panel-2.4.1/gnome-panel/panel-toplevel.c	2003-10-31 09:25:41.000000000 -0500
-@@ -2212,9 +2212,10 @@
- static void
- panel_toplevel_attach_toplevel_hiding (PanelToplevel *toplevel)
- {
--	panel_toplevel_hide (toplevel, FALSE, -1);
--
--	toplevel->priv->attach_hidden = TRUE;
-+	if (!panel_toplevel_get_is_hidden (toplevel)) {
-+		panel_toplevel_hide (toplevel, FALSE, -1);
-+		toplevel->priv->attach_hidden = TRUE;
-+	}
- }
- 
- static void
diff --git a/gnome-base/gnome-panel/files/menu-2.4.0.patch b/gnome-base/gnome-panel/files/menu-2.4.0.patch
deleted file mode 100644
index 1968977a3fc8..000000000000
--- a/gnome-base/gnome-panel/files/menu-2.4.0.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- gnome-panel/distribution.c.1	2003-09-15 20:47:24.000000000 +0200
-+++ gnome-panel/distribution.c	2003-09-15 20:50:33.000000000 +0200
-@@ -38,6 +38,11 @@
- 	 PANEL_STOCK_CDE, "cdemenu:/",
- 	 NULL, NULL
- 	},
-+	{ DISTRIBUTION_GENTOO, "/etc/gentoo-release",
-+	 N_("Gentoo Linux"), N_("Gentoo Menu"),
-+	 PANEL_STOCK_GENTOO, "/var/lib/gnome/Gentoo/.",
-+	 NULL, NULL
-+	},
- 	{ DISTRIBUTION_UNKNOWN, NULL, NULL, NULL, NULL }
- };
- 
---- gnome-panel/panel-stock-icons.c.1	2003-09-15 20:52:10.000000000 +0200
-+++ gnome-panel/panel-stock-icons.c	2003-09-15 20:52:27.000000000 +0200
-@@ -87,6 +87,7 @@
- 	{ PANEL_STOCK_DRAWER,              "panel-drawer" },
- 	{ PANEL_STOCK_APPLETS,             "gnome-applets" },
- 	{ PANEL_STOCK_DESKTOP,             "gnome-ccdesktop" },
-+	{ PANEL_STOCK_GENTOO,              "gentoo" },
- };
- 
- static void
---- gnome-panel/panel-stock-icons.h.1	2003-09-15 21:10:32.000000000 +0200
-+++ gnome-panel/panel-stock-icons.h	2003-09-15 21:10:48.000000000 +0200
-@@ -61,6 +61,7 @@
- #define PANEL_STOCK_DRAWER              "panel-drawer"
- #define PANEL_STOCK_APPLETS             "panel-applet"
- #define PANEL_STOCK_DESKTOP             "panel-desktop"
-+#define PANEL_STOCK_GENTOO              "panel-gentoo"
- 
- /* stock items  - no point in theme the icons one these,
-  * they use stock gtk icons and just modify the text
---- gnome-panel/distribution.h.1	2003-09-15 22:00:02.000000000 +0200
-+++ gnome-panel/distribution.h	2003-09-15 22:01:13.000000000 +0200
-@@ -10,7 +10,8 @@
- 	DISTRIBUTION_UNKNOWN = 0,
- 	DISTRIBUTION_DEBIAN,
- 	DISTRIBUTION_SUSE,
--	DISTRIBUTION_SOLARIS
-+	DISTRIBUTION_SOLARIS,
-+	DISTRIBUTION_GENTOO
- } DistributionType;
- 
- typedef struct {
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild
deleted file mode 100644
index abc6edea6287..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild,v 1.9 2004/02/23 16:56:38 obz Exp $
-
-inherit gnome2 eutils
-
-SLOT="0"
-
-DESCRIPTION="The Panel for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-KEYWORDS="x86 ~ppc alpha sparc hppa ~amd64 ia64"
-
-# IUSE="doc menu"
-IUSE="doc"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=x11-libs/libwnck-2.3
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/gnome-vfs-2.3
-	>=gnome-base/gnome-desktop-2.3
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1
-	>=gnome-base/gconf-2.3.1
-	!gnome-extra/system-tray-applet"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# use menu && epatch ${FILESDIR}/menu-${PV}.patch
-	# fix initial menu size
-	epatch ${FILESDIR}/${PN}-2.4-panel_size.patch
-
-	# Fix for drawers problems. (Bug #30809)
-	epatch ${FILESDIR}/${PN}-${PV}-drawers_fix.patch
-
-	# Fixes for more drawers problem. (Bug #31309)
-	epatch ${FILESDIR}/${PN}-${PV}-autohide_fix.patch
-	epatch ${FILESDIR}/${PN}-${PV}-drawers_expanding_fix.patch
-
-
-	sed -i 's:--load:-v:' gnome-panel/Makefile.am
-
-	WANT_AUTOMAKE=1.4 automake || die
-
-	# FIXME : uh yeah, this is nice
-	touch gnome-panel/blah
-	chmod +x gnome-panel/blah
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "setting panel gconf defaults..."
-	GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
-	${ROOT}/usr/bin/gconftool-2 --direct --config-source ${GCONF_CONFIG_SOURCE} --load=/etc/gconf/schemas/panel-default-setup.entries
-
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.5.93.ebuild
index 60714d3f9bca..86b3a5732a98 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.5.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild,v 1.6 2004/01/29 04:04:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.5.93.ebuild,v 1.1 2004/03/20 12:47:03 foser Exp $
 
 inherit gnome2 eutils
 
@@ -8,31 +8,29 @@ DESCRIPTION="The Panel for Gnome2"
 HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 
-# IUSE="doc menu"
 IUSE="doc"
-KEYWORDS="x86 ~ppc alpha sparc hppa ~amd64 ia64"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
 SLOT="0"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.1
+RDEPEND=">=x11-libs/gtk+-2.3.2
 	>=x11-libs/libwnck-2.3
 	>=gnome-base/ORBit2-2.4
 	>=gnome-base/gnome-vfs-2.3
-	>=gnome-base/gnome-desktop-2.3
+	>=gnome-base/gnome-desktop-2.2
 	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/libglade-2
+	>=gnome-base/libglade-2.3
 	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1
-	>=gnome-base/gconf-2.3.1
+	>=gnome-base/libgnomeui-2.5.4
+	>=gnome-base/gconf-2.3.3
 	media-libs/libpng
 	!gnome-extra/system-tray-applet"
 
 DEPEND="${RDEPEND}
+	sys-devel/gettext
 	>=app-text/scrollkeeper-0.3.11
 	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21
-	doc? ( >=dev-util/gtk-doc-0.9 )"
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
 
@@ -40,23 +38,19 @@ src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	# use menu && epatch ${FILESDIR}/menu-${PV}.patch
-
-	# fix initial menu size
-	epatch ${FILESDIR}/${PN}-2.4-panel_size.patch
-
-	# fix bad behavior of drawers on `autohide' panels.
-	epatch ${FILESDIR}/${PN}-2.4.1-drawers_expanding_fix.patch
 
+	# FIXME : uh yeah, this is nice
+	# We should patch in a switch here and send it upstream
 	sed -i 's:--load:-v:' gnome-panel/Makefile.am
 
-	WANT_AUTOMAKE=1.4 automake || die
+	WANT_AUTOMAKE=1.7 aclocal || die
+	WANT_AUTOMAKE=1.7 automake || die
 
-	# FIXME : uh yeah, this is nice
-	#touch gnome-panel/blah
-	#chmod +x gnome-panel/blah
 }
 
+# hard disable eds support for now
+G2CONF="${G2CONF} --disable-eds"
+
 pkg_postinst() {
 
 	gnome2_pkg_postinst