Bump, drop old. Lots of bugfixes, particularly for the printers panel.

(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

6 files changed, 69 insertions, 123 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 877ba7bfb1a6..46771ddb433d 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.92 2011/10/29 06:53:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.93 2011/11/13 18:02:54 tetromino Exp $
+
+*gnome-control-center-3.2.2 (13 Nov 2011)
+
+  13 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-control-center-3.0.2-r2.ebuild,
+  -files/gnome-control-center-3.0.2-cups-ppd.h.patch,
+  -files/gnome-control-center-3.0.2-delete-users-32-bit.patch,
+  -files/gnome-control-center-3.0.2-https-handler.patch,
+  +gnome-control-center-3.2.2.ebuild,
+  +files/gnome-control-center-3.2.2-metacity-gconf.patch:
+  Bump, drop old. Lots of bugfixes, particularly for the printers panel.
 
 *gnome-control-center-3.2.1 (29 Oct 2011)
 
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch
deleted file mode 100644
index ce2a75dc1366..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 246dfbcca4906db9c2ef01990ad482270324309e Mon Sep 17 00:00:00 2001
-From: Marek Kasik <mkasik@redhat.com>
-Date: Mon, 20 Jun 2011 15:04:25 +0000
-Subject: Printers: Include cups/ppd.h explicitly
-
-cups/ppd.h is not included by cups/cups.h since CUPS 1.5.
----
-diff --git a/configure.ac b/configure.ac
-index b26fb7c..b7e6259 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -145,7 +145,7 @@ if test x"$enable_cups" != x"no" ; then
-   CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
-   CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
- 
--  AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h],,
-+  AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
-                    AC_MSG_ERROR([CUPS headers not found but CUPS support requested]))
- 
-   if ! test $CUPS_API_MAJOR -gt 1 -o \
-diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
-index 0b9ece9..69372c2 100644
---- a/panels/printers/pp-new-printer-dialog.c
-+++ b/panels/printers/pp-new-printer-dialog.c
-@@ -31,6 +31,7 @@
- #include <gtk/gtk.h>
- 
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- 
- #include "pp-new-printer-dialog.h"
- #include "pp-utils.h"
-diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c
-index 8dbe04f..cb7c29f 100644
---- a/panels/printers/pp-utils.c
-+++ b/panels/printers/pp-utils.c
-@@ -25,6 +25,7 @@
- #include <glib/gstdio.h>
- #include <gtk/gtk.h>
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <dbus/dbus-glib.h>
- 
- #include "pp-utils.h"
---
-cgit v0.9
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch
deleted file mode 100644
index d773408a3160..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6ee7b75e0f87bc39baa262b270c73f7de699c406 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Sat, 11 Jun 2011 11:40:39 +0000
-Subject: user-accounts: Fix deleting users on 32-bit systems
-
-https://bugzilla.gnome.org/show_bug.cgi?id=652073
----
-diff --git a/panels/user-accounts/um-user-manager.c b/panels/user-accounts/um-user-manager.c
-index 6bf8b42..442809a 100644
---- a/panels/user-accounts/um-user-manager.c
-+++ b/panels/user-accounts/um-user-manager.c
-@@ -577,7 +577,7 @@ um_user_manager_delete_user (UmUserManager       *manager,
-                                  delete_user_done,
-                                  data,
-                                  async_user_op_data_free,
--                                 G_TYPE_INT64, um_user_get_uid (user),
-+                                 G_TYPE_INT64, (gint64) um_user_get_uid (user),
-                                  G_TYPE_BOOLEAN, remove_files,
-                                  G_TYPE_INVALID);
- }
---
-cgit v0.9
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch
deleted file mode 100644
index 45e3e5035129..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6a6a8583803464d4b56870c7faf4db035b97e12d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Thu, 23 Jun 2011 00:05:34 -0400
-Subject: [PATCH] Fix https scheme handler app setting (bug #653211)
-
-default_app_changed() contains a typo: we need to set the https
-handler app when the user changes the http app chooser, not the
-(non-existent) https app chooser.
----
- panels/info/cc-info-panel.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
-index 2283896..f4dba1b 100644
---- a/panels/info/cc-info-panel.c
-+++ b/panels/info/cc-info-panel.c
-@@ -922,7 +922,7 @@ default_app_changed (GtkAppChooserButton *button,
-     }
- 
-   /* Set https support for the browser as well */
--  if (g_str_equal (content_type, "x-scheme-handler/https"))
-+  if (g_str_equal (content_type, "x-scheme-handler/http"))
-     {
-       if (g_app_info_set_as_default_for_type (info, "x-scheme-handler/https", &error) == FALSE)
-         {
--- 
-1.7.5.3
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.2-metacity-gconf.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.2-metacity-gconf.patch
new file mode 100644
index 000000000000..ff9c590dceee
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.2-metacity-gconf.patch
@@ -0,0 +1,29 @@
+From 24e0ee05784b8f6f74425971651b60cc8974cdbe Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 11 Nov 2011 13:17:26 +0000
+Subject: [PATCH] universal-access: Avoid crashing when GConf is broken
+
+Or when metacity is badly installed. gconf_value_get_string()
+_can_ return NULL.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=751007
+---
+ panels/universal-access/cc-ua-panel.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c
+index a615534..40c4900 100644
+--- a/panels/universal-access/cc-ua-panel.c
++++ b/panels/universal-access/cc-ua-panel.c
+@@ -550,7 +550,7 @@ visual_bell_type_notify_cb (GConfClient *client,
+ 
+   value = gconf_value_get_string (entry->value);
+ 
+-  if (!strcmp ("frame_flash", value))
++  if (g_strcmp0 ("frame_flash", value) == 0)
+     widget = WID (panel->priv->builder, "hearing_flash_window_title_button");
+   else
+     widget = WID (panel->priv->builder, "hearing_flash_screen_button");
+-- 
+1.7.8.rc1
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild
index 003cc7db4a5d..dc7df69d5e4c 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild
@@ -1,47 +1,50 @@
 # Copyright 1999-2011 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-3.0.2-r2.ebuild,v 1.3 2011/10/28 00:57:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild,v 1.1 2011/11/13 18:02:54 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 
-inherit gnome2
+inherit autotools gnome2
 
 DESCRIPTION="GNOME Desktop Configuration Tool"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="+cheese +cups +networkmanager +socialweb"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+cheese +colord +cups +networkmanager +socialweb"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
 # XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
 #
 # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# Latest gsettings-desktop-schemas is needed for commit 73f9bffb
+# Latest gsettings-desktop-schemas is neededfor commit 73f9bffb
+# gnome-settings-daemon-3.1.4 is needed for power panel (commit 4f08a325)
 COMMON_DEPEND="
-	>=dev-libs/glib-2.25.11:2
+	>=dev-libs/glib-2.29.14:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.0.2:3
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-libs/gtk+-3.1.19:3
+	>=gnome-base/gsettings-desktop-schemas-3.0.2
 	>=gnome-base/gconf-2.0:2
 	>=dev-libs/dbus-glib-0.73
-	>=gnome-base/gnome-desktop-2.91.5:3
-	>=gnome-base/gnome-settings-daemon-2.91.94
+	>=gnome-base/gnome-desktop-3.1.0:3
+	>=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?]
 	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
 	dev-libs/libxml2:2
-	gnome-base/gnome-menus:0
+	gnome-base/gnome-menus:3
 	gnome-base/libgtop:2
 	media-libs/fontconfig
+	net-libs/gnome-online-accounts
 
 	>=media-libs/libcanberra-0.13[gtk3]
 	>=media-sound/pulseaudio-0.9.16[glib]
 	>=sys-auth/polkit-0.97
 	>=sys-power/upower-0.9.1
+	>=x11-libs/libnotify-0.7.3
 
 	x11-apps/xmodmap
 	x11-libs/libX11
@@ -52,13 +55,19 @@ COMMON_DEPEND="
 	cheese? (
 		media-libs/gstreamer:0.10
 		>=media-video/cheese-2.91.91.1 )
+	colord? ( >=x11-misc/colord-0.1.8 )
 	cups? ( >=net-print/cups-1.4[dbus] )
-	networkmanager? ( >=net-misc/networkmanager-0.8.997 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-0.9.1.90
+		>=net-misc/networkmanager-0.8.997 )
 	socialweb? ( net-libs/libsocialweb )"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
+	app-admin/apg
 	sys-apps/accountsservice
 	cups? ( net-print/cups-pk-helper )
 
+	!<gnome-extra/gnome-color-manager-3.1.2
 	!gnome-extra/gnome-media[pulseaudio]
 	!<gnome-extra/gnome-media-2.32.0-r300
 	!<gnome-base/gdm-2.91.94"
@@ -84,27 +93,20 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-static
-		--disable-maintainer-mode
 		$(use_with cheese)
+		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
 
 src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=651162
-	# XXX: remove for next release
-	sed -e 's:no-undefined:-no-undefined:' \
-		-i libgnome-control-center/Makefile.* || die "sed failed"
+	# Upstream patch to not crash on missing metacity; will be in next release
+	epatch "${FILESDIR}/${P}-metacity-gconf.patch"
 
-	# cups-1.5 compatibility; will be in next release
-	epatch "${FILESDIR}/${P}-cups-ppd.h.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=653211, will be in next release
-	epatch "${FILESDIR}/${P}-https-handler.patch"
-
-	# fix deleting users on 32-bit systems, will be in next release
-	epatch "${FILESDIR}/${P}-delete-users-32-bit.patch"
+	# Make colord plugin optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
+	eautoreconf
 
 	gnome2_src_prepare
 }