Pin glib/gtk dependency to slot 2, re-add libunique and libcanberra-gtk to RDEPEND. Clean up old revisions.

(Portage version: 2.2_rc89/cvs/Linux x86_64)

11 files changed, 20 insertions, 678 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 941de8b91edf..6d590252b5de 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.71 2010/10/17 19:28:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.72 2010/10/21 15:01:50 eva Exp $
+
+  21 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-control-center-2.24.0.1-fbsd.patch,
+  -gnome-control-center-2.26.0-r1.ebuild,
+  -files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch,
+  -files/gnome-control-center-2.26.0-default-background.patch,
+  -files/gnome-control-center-2.26.0-gconf-unref.patch,
+  -files/gnome-control-center-2.26.0-keybinding-crash.patch,
+  -files/gnome-control-center-2.26.0-libxklavier4.patch,
+  -gnome-control-center-2.28.1.ebuild,
+  -gnome-control-center-2.28.1-r2.ebuild,
+  gnome-control-center-2.32.0.ebuild:
+  Pin glib/gtk dependency to slot 2, re-add libunique and libcanberra-gtk to
+  RDEPEND. Clean up old revisions.
 
 *gnome-control-center-2.32.0 (17 Oct 2010)
 
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-fbsd.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-fbsd.patch
deleted file mode 100644
index afcb4cdd7923..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.24.0.1-fbsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gnome-control-center-2.24.0.1/libslab/directory-tile.c
-===================================================================
---- gnome-control-center-2.24.0.1.orig/libslab/directory-tile.c
-+++ gnome-control-center-2.24.0.1/libslab/directory-tile.c
-@@ -623,7 +623,7 @@ static void
- disown_spawned_child (gpointer user_data)
- {
- 	setsid  ();
--	setpgrp ();
-+	setpgid (0,0);
- }
- 
- static void
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch
deleted file mode 100644
index 15286e2452bc..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch
+++ /dev/null
@@ -1,69 +0,0 @@
- configure.in |   35 +++++++++++++++++++++++++----------
- 1 files changed, 25 insertions(+), 10 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 515f053..03eda8c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -60,13 +60,6 @@ AC_CHECK_FUNC(XScreenSaverQueryInfo, [
- AC_SUBST(TYPING_BREAK)
- AC_SUBST(SCREENSAVER_LIBS)
- 
--PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk, [
--  CANBERRA_GTK=1
--  AC_SUBST(LIBCANBERRA_GTK_CFLAGS)
--  AC_SUBST(LIBCANBERRA_GTK_LIBS)
--  ], [:])
--AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
--
- AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
- 
- dnl keyboard-properties-capplet
-@@ -96,6 +89,22 @@ COMMON_MODULES="gtk+-2.0 >= 2.13.1 dnl
-  gconf-2.0 dnl
-  libglade-2.0 >= 2.0.0 dnl
-  gnome-desktop-2.0 >= 2.25.1"
-+
-+AC_ARG_ENABLE([canberra],
-+	AC_HELP_STRING([--enable-canberra],
-+	[Enable canberra support @<:@default=yes@:>@]),
-+	enable_canberra=$enableval, enable_canberra=yes)
-+
-+CANBERRA_GTK=0
-+if test x$enable_canberra = xyes; then
-+   PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk, 
-+   [CANBERRA_GTK=1
-+   AC_SUBST(LIBCANBERRA_GTK_CFLAGS)
-+   AC_SUBST(LIBCANBERRA_GTK_LIBS)], [])
-+fi
-+
-+AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
-+
- PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES libgnomeui-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango libgnomeui-2.0)
- PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
- PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
-@@ -199,15 +208,21 @@ AC_ARG_ENABLE([aboutme],
-    [enable_aboutme=no])
- AC_MSG_RESULT([$enable_aboutme])
- 
-+AC_ARG_ENABLE([policykit-gnome],
-+	AC_HELP_STRING([--enable-policykit-gnome],
-+	[Enable PolicyKit-gnome support @<:@default=yes@:>@]),
-+	enable_polkit=$enableval, enable_polkit=yes)
-+
- if test "x$enable_aboutme" = "xyes"; then
-   PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90],
-                     [AC_DEFINE([HAVE_LIBEBOOK], 1,
-                     [Define if evolution-data-server libebook-1.2 is available])])
--  dnl PolicyKit-gnome is optional
-+  if test "x$enable_polkit" = "xyes"; then
-   PKG_CHECK_MODULES(POLKIT_GNOME, [polkit-gnome],
-   		    [AC_DEFINE([HAVE_POLKIT], 1,
--  		    [Define if PolicyKit-gnome is available])],
--  		    has_polkit=false)
-+  		    [Define if PolicyKit-gnome is available])], 		    
-+		    has_polkit=false)
-+  fi
- fi
- 
- AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-default-background.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-default-background.patch
deleted file mode 100644
index 7844cc83b65f..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-default-background.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-control-center-2.26.0.orig/capplets/appearance/appearance-desktop.c gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.26.0.orig/capplets/appearance/appearance-desktop.c	2008-11-04 11:09:46.000000000 -0500
-+++ gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c	2009-04-24 16:01:30.000000000 -0400
-@@ -32,6 +32,11 @@
- #include <libgnomeui/gnome-desktop-thumbnail.h>
- #include <libgnomeui/gnome-bg.h>
- 
-+#ifdef HAVE_POLKIT
-+#include <dbus/dbus-glib.h>
-+#include <polkit-gnome/polkit-gnome.h>
-+#endif /* HAVE_POLKIT */
-+
- enum {
-   TARGET_URI_LIST,
-   TARGET_BGIMAGE
-@@ -988,12 +993,65 @@ wp_select_after_realize (GtkWidget *widg
-   select_item (data, item, TRUE);
- }
- 
-+#ifdef HAVE_POLKIT
-+static void
-+set_background (GtkAction *action, gpointer data)
-+{
-+  AppearanceData *adata = (AppearanceData *)data;
-+  DBusGProxy *proxy;
-+  DBusGConnection *connection;
-+  GError *error;
-+  char *keys[7] = {
-+    "/desktop/gnome/background/picture_filename",
-+    "/desktop/gnome/background/picture_opacity",
-+    "/desktop/gnome/background/picture_options",
-+    "/desktop/gnome/background/color_shading_type",
-+    "/desktop/gnome/background/primary_color",
-+    "/desktop/gnome/background/secondary_color",
-+    NULL
-+  };
-+
-+  gconf_client_suggest_sync (adata->client, NULL);
-+
-+  error = NULL;
-+  connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-+  if (error != NULL) {
-+    g_warning ("failed to get system bus connection: %s", error->message);
-+    g_error_free (error);
-+    return;
-+  }
-+
-+  proxy = dbus_g_proxy_new_for_name (connection,
-+                                     "org.gnome.GConf.Defaults",
-+                                     "/",
-+                                     "org.gnome.GConf.Defaults");
-+  if (proxy == NULL) {
-+    g_warning ("Cannot connect to defaults mechanism");
-+    return;
-+  }
-+
-+  dbus_g_proxy_call (proxy, "SetSystem",
-+                     &error,
-+                     G_TYPE_STRV, keys,
-+                     G_TYPE_STRV, NULL,
-+                     G_TYPE_INVALID,
-+                     G_TYPE_INVALID);
-+
-+  g_object_unref (proxy);
-+}
-+#endif /* HAVE_POLKIT */
-+
- void
- desktop_init (AppearanceData *data,
- 	      const gchar **uris)
- {
-   GtkWidget *add_button;
-   GtkCellRenderer *cr;
-+#ifdef HAVE_POLKIT
-+  PolKitAction *pk_action;
-+  PolKitGnomeAction *action;
-+  GtkWidget *widget, *box, *button;
-+#endif /* HAVE_POLKIT */
- 
-   g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
- 
-@@ -1114,6 +1172,26 @@ desktop_init (AppearanceData *data,
-   /* create the file selector later to save time on startup */
-   data->wp_filesel = NULL;
- 
-+#ifdef HAVE_POLKIT
-+  widget = glade_xml_get_widget (data->xml, "background_vbox");
-+  box = gtk_hbox_new (FALSE, 0);
-+  gtk_box_pack_end (GTK_BOX (widget), box, FALSE, FALSE, 0);
-+ 
-+  pk_action = polkit_action_new ();
-+  polkit_action_set_action_id (pk_action, "org.gnome.gconf.defaults.set-default-background");
-+ 
-+  action = polkit_gnome_action_new_default ("set-system", 
-+                                            pk_action,
-+                                            _("Make Default"),
-+                                            _("Set the current background as the system-wide default"));
-+  g_object_set (action, "no-visible", FALSE, NULL);
-+          
-+  polkit_action_unref (pk_action);
-+  button = polkit_gnome_action_create_button (action);
-+  gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 0);
-+
-+  g_signal_connect (action, "activate", G_CALLBACK (set_background), data);
-+#endif /* HAVE_POLKIT */
- }
- 
- void
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-control-center-2.26.0.orig/capplets/appearance/Makefile.am gnome-control-center-2.26.0/capplets/appearance/Makefile.am
---- gnome-control-center-2.26.0.orig/capplets/appearance/Makefile.am	2009-01-27 07:48:42.000000000 -0500
-+++ gnome-control-center-2.26.0/capplets/appearance/Makefile.am	2009-04-24 15:53:58.000000000 -0400
-@@ -44,7 +44,8 @@ gnome_appearance_properties_LDADD = \
- 	$(top_builddir)/capplets/common/libcommon.la \
- 	$(GNOMECC_CAPPLETS_LIBS) \
- 	$(FONT_CAPPLET_LIBS) \
--	$(METACITY_LIBS)
-+	$(METACITY_LIBS) \
-+	$(POLKIT_GNOME_LIBS) 
- gnome_appearance_properties_LDFLAGS = -export-dynamic
- 
- gladedir = $(pkgdatadir)/glade
-@@ -55,6 +56,7 @@ INCLUDES = \
- 	$(METACITY_CFLAGS) \
- 	$(GNOMECC_CAPPLETS_CFLAGS) \
- 	$(FONT_CAPPLET_CFLAGS) \
-+	$(POLKIT_GNOME_CFLAGS) \
- 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
- 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
- 	-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gnome-control-center-2.26.0.orig/configure.in gnome-control-center-2.26.0/configure.in
---- gnome-control-center-2.26.0.orig/configure.in	2009-04-24 15:57:18.000000000 -0400
-+++ gnome-control-center-2.26.0/configure.in	2009-04-24 15:59:04.000000000 -0400
-@@ -186,6 +186,19 @@ fi
- 
- CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
- 
-+dnl For about-me and appearance
-+AC_ARG_ENABLE([policykit-gnome],
-+	AC_HELP_STRING([--enable-policykit-gnome],
-+	[Enable PolicyKit-gnome support @<:@default=yes@:>@]),
-+	enable_polkit=$enableval, enable_polkit=yes)
-+
-+if test "x$enable_polkit" = "xyes"; then
-+PKG_CHECK_MODULES(POLKIT_GNOME, [polkit-gnome],
-+	    [AC_DEFINE([HAVE_POLKIT], 1,
-+  	    [Define if PolicyKit-gnome is available])], 		    
-+	    has_polkit=false)
-+fi
-+
- dnl ==============
- dnl gswitchit
- dnl ==============
-@@ -208,21 +221,10 @@ AC_ARG_ENABLE([aboutme],
-    [enable_aboutme=no])
- AC_MSG_RESULT([$enable_aboutme])
- 
--AC_ARG_ENABLE([policykit-gnome],
--	AC_HELP_STRING([--enable-policykit-gnome],
--	[Enable PolicyKit-gnome support @<:@default=yes@:>@]),
--	enable_polkit=$enableval, enable_polkit=yes)
--
- if test "x$enable_aboutme" = "xyes"; then
-   PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90],
-                     [AC_DEFINE([HAVE_LIBEBOOK], 1,
-                     [Define if evolution-data-server libebook-1.2 is available])])
--  if test "x$enable_polkit" = "xyes"; then
--  PKG_CHECK_MODULES(POLKIT_GNOME, [polkit-gnome],
--  		    [AC_DEFINE([HAVE_POLKIT], 1,
--  		    [Define if PolicyKit-gnome is available])], 		    
--		    has_polkit=false)
--  fi
- fi
- 
- AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-gconf-unref.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-gconf-unref.patch
deleted file mode 100644
index 24e8938d81e7..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-gconf-unref.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix excessive gconf_entry_free. It causes capplets crashes when gconf isn't build with g_asserts.
-
-Gnome: http://bugzilla.gnome.org/show_bug.cgi?id=583117
-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=270319
---- a/capplets/common/gconf-property-editor.c
-+++ b/capplets/common/gconf-property-editor.c
-@@ -351,7 +351,8 @@
- 	gconf_entry = gconf_client_get_entry (client, GCONF_PROPERTY_EDITOR (obj)->p->key, NULL, TRUE, NULL);
- 	GCONF_PROPERTY_EDITOR (obj)->p->callback (client, 0, gconf_entry, obj);
- 	GCONF_PROPERTY_EDITOR (obj)->p->inited = TRUE;
--	gconf_entry_free (gconf_entry);
-+	if (gconf_entry)
-+		gconf_entry_free (gconf_entry);
- 	g_object_unref (client);
- 
- 	return obj;
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-keybinding-crash.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-keybinding-crash.patch
deleted file mode 100644
index a246e929985a..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-keybinding-crash.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5998aa90c08051cc520dfb64ede78783ef9cc2c4 Mon Sep 17 00:00:00 2001
-From: Jens Granseuer <jensgr@gmx.net>
-Date: Tue, 11 Aug 2009 16:01:55 +0000
-Subject: Fix crash when iterating through the tree model
-
-Don't use indices to move through iterators, don't skip the first
-section, and verify that we got a new iterator before using it
-(bug #591392).
----
-diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
-index fb3ba35..5383298 100644
---- a/capplets/keybindings/gnome-keybinding-properties.c
-+++ b/capplets/keybindings/gnome-keybinding-properties.c
-@@ -522,25 +522,20 @@ find_section (GtkTreeModel *model,
-               GtkTreeIter  *iter,
- 	      const char   *title)
- {
--  gint i, j;
--  gboolean found;
-+  gboolean success, found;
- 
--  i = gtk_tree_model_iter_n_children (model, NULL);
-   found = FALSE;
--  gtk_tree_model_get_iter_first (model, iter);
--  for (j = 0; j < i; j++)
-+  success = gtk_tree_model_get_iter_first (model, iter);
-+  while (success && !found)
-     {
-       char *description = NULL;
- 
--      gtk_tree_model_iter_next (model, iter);
-       gtk_tree_model_get (model, iter,
- 			  DESCRIPTION_COLUMN, &description,
- 			  -1);
--      if (g_strcmp0 (description, title) == 0)
--        {
--	  found = TRUE;
--     	  break;
--        }
-+
-+      found = (g_strcmp0 (description, title) == 0);
-+      success = gtk_tree_model_iter_next (model, iter);
-     }
-   if (!found)
-     {
---
-cgit v0.8.2
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch
deleted file mode 100644
index 29b03302ddd3..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-libxklavier4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 69e112aa566f08a782cbb8544bde43eed029081c Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 21 Jul 2009 00:30:10 +0200
-Subject: [PATCH] Add support for libxklavier-4
-
----
- capplets/keyboard/gnome-keyboard-properties-xkb.c |    4 ++++
- configure.in                                      |    4 +++-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/capplets/keyboard/gnome-keyboard-properties-xkb.c b/capplets/keyboard/gnome-keyboard-properties-xkb.c
-index a0171ac..4cfe305 100644
---- a/capplets/keyboard/gnome-keyboard-properties-xkb.c
-+++ b/capplets/keyboard/gnome-keyboard-properties-xkb.c
-@@ -155,7 +155,11 @@ setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset)
- 
- 	engine = xkl_engine_get_instance (GDK_DISPLAY ());
- 	config_registry = xkl_config_registry_get_instance (engine);
-+#ifdef HAVE_XKL_4
-+	xkl_config_registry_load (config_registry, FALSE);
-+#else
- 	xkl_config_registry_load (config_registry);
-+#endif
- 
- 	gkbd_keyboard_config_init (&initial_config, xkb_gconf_client,
- 				   engine);
-diff --git a/configure.in b/configure.in
-index 515f053..b552d4f 100644
---- a/configure.in
-+++ b/configure.in
-@@ -180,7 +180,9 @@ CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
- dnl ==============
- dnl gswitchit
- dnl ==============
--PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4.1 libxklavier >= 3.6])
-+PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4.1 libxklavier >= 4],
-+	[AC_DEFINE(HAVE_XKL_4, [1], [libxklavier-4 support])],
-+	[PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4.1 libxklavier >= 3.6])])
- AC_SUBST(LIBGNOMEKBD_CFLAGS)
- AC_SUBST(LIBGNOMEKBD_LIBS)
- 
--- 
-1.6.3.3
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.26.0-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.26.0-r1.ebuild
deleted file mode 100644
index 6a13ff559f01..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-2.26.0-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.26.0-r1.ebuild,v 1.7 2010/07/20 01:37:39 jer Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="eds hal policykit"
-
-RDEPEND="x11-libs/libXft
-	>=x11-libs/gtk+-2.13.1
-	>=dev-libs/glib-2.17.4
-	>=gnome-base/gconf-2.0
-	>=gnome-base/libglade-2
-	>=gnome-base/librsvg-2.0
-	>=gnome-base/nautilus-2.6
-	>=media-libs/fontconfig-1
-	>=dev-libs/dbus-glib-0.73
-	>=x11-libs/libxklavier-3.6
-	>=x11-wm/metacity-2.23.1
-	>=gnome-base/gnome-panel-2.0
-	>=gnome-base/libgnomekbd-2.21.4.1
-	>=gnome-base/gnome-desktop-2.25.1
-	>=gnome-base/gnome-menus-2.11.1
-	gnome-base/gnome-settings-daemon
-
-	x11-libs/pango
-	dev-libs/libxml2
-	media-libs/freetype
-	>=media-libs/libcanberra-0.4[gtk]
-
-	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
-	hal? ( >=sys-apps/hal-0.5.6 )
-	policykit? ( gnome-extra/policykit-gnome )
-
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/libgnomeui-2.2
-
-	x11-apps/xmodmap
-	x11-libs/libXScrnSaver
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXcursor"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	dev-util/desktop-file-utils
-
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.10.1
-	gnome-base/gnome-common"
-# Needed for autoreconf
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-static
-		--enable-canberra
-		$(use_enable eds aboutme)
-		$(use_enable hal)
-		$(use_enable policykit policykit-gnome)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix compilation on fbsd, bug #256958
-	epatch "${FILESDIR}/${PN}-2.24.0.1-fbsd.patch"
-
-	# Fix libcanberra and policykit-gnome for about-me capplet
-	# automagics support, bug #266110
-	epatch "${FILESDIR}/${P}-automagics-canberra+polkit.patch"
-
-	# Policykit-based solution to setting the default background.  Must be
-	# applied *after* teh automagics patch
-	epatch "${FILESDIR}"/${P}-default-background.patch
-
-	# Add support for libxklavier-4, bug #278450
-	epatch "${FILESDIR}/${PN}-2.26.0-libxklavier4.patch"
-
-	# Check pointer before unreferecing gconf client, bug #270319
-	epatch "${FILESDIR}/${PN}-2.26.0-gconf-unref.patch"
-
-	# Fix gnome-keybinding-properties crash, bug 291507
-	epatch "${FILESDIR}/${PN}-2.26.0-keybinding-crash.patch"
-
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use policykit ; then
-		# Install the policy for default backgrounds
-		insinto /usr/share/PolicyKit/policy/
-		doins "${FILESDIR}"/org.gnome.control-center.defaultbackground.policy
-	fi
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.28.1-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.28.1-r2.ebuild
deleted file mode 100644
index 83951fca0e62..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-2.28.1-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.28.1-r2.ebuild,v 1.9 2010/08/18 22:13:22 maekke Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="eds policykit"
-
-# Newer gconf[policykit] needed for CanSetSystem attribute for default bg patch
-RDEPEND="x11-libs/libXft
-	>=x11-libs/libXi-1.2
-	>=x11-libs/gtk+-2.15.0
-	>=dev-libs/glib-2.17.4
-	>=gnome-base/gconf-2.0
-	>=gnome-base/librsvg-2.0
-	>=gnome-base/nautilus-2.6
-	>=media-libs/fontconfig-1
-	>=dev-libs/dbus-glib-0.73
-	>=x11-libs/libxklavier-4.0
-	>=x11-wm/metacity-2.23.1
-	>=gnome-base/libgnomekbd-2.27.4
-	>=gnome-base/gnome-desktop-2.27.90
-	>=gnome-base/gnome-menus-2.11.1
-	gnome-base/gnome-settings-daemon
-
-	dev-libs/libunique
-	x11-libs/pango
-	dev-libs/libxml2
-	media-libs/freetype
-	>=media-libs/libcanberra-0.4[gtk]
-
-	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
-	policykit? ( >=gnome-base/gconf-2.28[policykit] )
-
-	x11-apps/xmodmap
-	x11-libs/libXScrnSaver
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXcursor"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	dev-util/desktop-file-utils
-
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.10.1"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-static
-		$(use_enable eds aboutme)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# Fix compilation on fbsd, bug #256958
-	epatch "${FILESDIR}/${PN}-2.24.0.1-fbsd.patch"
-
-	# Add functionality for setting the default background in gdm, bug 293439
-	epatch "${FILESDIR}/${P}-gdm-default-bg.patch"
-}
-
-src_install() {
-	gnome2_src_install
-	# gmodule is used to load plugins
-	# (on POSIX systems gmodule uses dlopen)
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.28.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.28.1.ebuild
deleted file mode 100644
index 27bf6b72949e..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-2.28.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.28.1.ebuild,v 1.2 2010/07/20 01:37:39 jer Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="eds"
-
-RDEPEND="x11-libs/libXft
-	>=x11-libs/libXi-1.2
-	>=x11-libs/gtk+-2.15.0
-	>=dev-libs/glib-2.17.4
-	>=gnome-base/gconf-2.0
-	>=gnome-base/librsvg-2.0
-	>=gnome-base/nautilus-2.6
-	>=media-libs/fontconfig-1
-	>=dev-libs/dbus-glib-0.73
-	>=x11-libs/libxklavier-4.0
-	>=x11-wm/metacity-2.23.1
-	>=gnome-base/libgnomekbd-2.27.4
-	>=gnome-base/gnome-desktop-2.27.90
-	>=gnome-base/gnome-menus-2.11.1
-	gnome-base/gnome-settings-daemon
-
-	dev-libs/libunique
-	x11-libs/pango
-	dev-libs/libxml2
-	media-libs/freetype
-	>=media-libs/libcanberra-0.4[gtk]
-
-	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
-
-	x11-apps/xmodmap
-	x11-libs/libXScrnSaver
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXcursor"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	dev-util/desktop-file-utils
-
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.10.1"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-static
-		$(use_enable eds aboutme)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# Fix compilation on fbsd, bug #256958
-	epatch "${FILESDIR}/${PN}-2.24.0.1-fbsd.patch"
-}
-
-src_install() {
-	gnome2_src_install
-	# gmodule is used to load plugins
-	# (on POSIX systems gmodule uses dlopen)
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.32.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.32.0.ebuild
index eb17ba65272a..9c24b016d98c 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.32.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.32.0.ebuild,v 1.1 2010/10/17 19:28:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.32.0.ebuild,v 1.2 2010/10/21 15:01:50 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -18,8 +18,8 @@ IUSE="eds"
 # TODO: appindicator
 RDEPEND="x11-libs/libXft
 	>=x11-libs/libXi-1.2
-	>=x11-libs/gtk+-2.20.0:2
-	>=dev-libs/glib-2.17.4
+	>=x11-libs/gtk+-2.20:2
+	>=dev-libs/glib-2.17.4:2
 	>=gnome-base/gconf-2.0
 	>=gnome-base/librsvg-2.0
 	>=gnome-base/nautilus-2.6
@@ -32,10 +32,11 @@ RDEPEND="x11-libs/libXft
 	>=gnome-base/gnome-menus-2.11.1
 	gnome-base/gnome-settings-daemon
 
+	dev-libs/libunique
 	x11-libs/pango
 	dev-libs/libxml2
 	media-libs/freetype
-	media-libs/libcanberra
+	media-libs/libcanberra[gtk]
 
 	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )