Bump to 3.0.2, from gnome overlay for GNOME 3

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

4 files changed, 281 insertions, 1 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index c1079c68231d..6f7b5ae1c1da 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.158 2011/08/13 17:35:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.159 2011/08/19 10:49:13 nirbheek Exp $
+
+*gnome-power-manager-3.0.2-r1 (19 Aug 2011)
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +gnome-power-manager-3.0.2-r1.ebuild,
+  +files/gnome-power-manager-3.0.2-idle-status.patch,
+  +files/gnome-power-manager-3.0.2-screensaver.patch:
+  Bump to 3.0.2, from gnome overlay for GNOME 3
 
   13 Aug 2011; Raúl Porcel <armin76@gentoo.org>
   gnome-power-manager-2.32.0-r1.ebuild:
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch
new file mode 100644
index 000000000000..acd9093cd949
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-idle-status.patch
@@ -0,0 +1,31 @@
+From 44503c5bca065290ce73b0d064a1a0db7de2936d Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 02 May 2011 23:18:58 +0000
+Subject: gpm-idle: manually update the status property
+
+gnome-session doesn't emit PropertyChanged since it uses dbus-glib,
+therefore we need to manually update the cached property when
+receiving a SessionChanged signal.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=679083
+
+Signed-off-by: Richard Hughes <richard@hughsie.com>
+---
+diff --git a/src/gpm-idle.c b/src/gpm-idle.c
+index 04225fc..0f2f1ee 100644
+--- a/src/gpm-idle.c
++++ b/src/gpm-idle.c
+@@ -424,6 +424,11 @@ gpm_idle_dbus_signal_cb (GDBusProxy *proxy, const gchar *sender_name, const gcha
+ 		return;
+ 	}
+ 	if (g_strcmp0 (signal_name, "StatusChanged") == 0) {
++                guint status;
++
++                g_variant_get (parameters, "(u)", &status);
++                g_dbus_proxy_set_cached_property (proxy, "status",
++                                                  g_variant_new ("u", status));
+ 		g_debug ("Received gnome session status change");
+ 		gpm_idle_evaluate (idle);
+ 		return;
+--
+cgit v0.9
diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch
new file mode 100644
index 000000000000..1ff7cc6d785b
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/files/gnome-power-manager-3.0.2-screensaver.patch
@@ -0,0 +1,146 @@
+From c36c35b2ecd818e54de975fe81885eca05a1be98 Mon Sep 17 00:00:00 2001
+From: Gary Ching-Pang Lin <chingpang@gmail.com>
+Date: Wed, 08 Jun 2011 16:01:33 +0000
+Subject: Query gnome-screensaver settings with GSettings
+
+https://bugzilla.gnome.org/show_bug.cgi?id=650464
+---
+diff --git a/configure.ac b/configure.ac
+index 90bbe5f..3134ae4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -107,7 +107,6 @@ PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= 0.10)
+ 
+ PKG_CHECK_MODULES(GNOME, [
+  gtk+-3.0 >= 2.91.0
+- gconf-2.0 >= 2.31.1
+  gnome-keyring-1 >= 0.6.0
+  cairo >= 1.0.0])
+ 
+diff --git a/src/gpm-common.h b/src/gpm-common.h
+index b540c05..dabda1a 100644
+--- a/src/gpm-common.h
++++ b/src/gpm-common.h
+@@ -129,8 +129,8 @@ G_BEGIN_DECLS
+ #define GPM_SETTINGS_INFO_LAST_DEVICE			"info-last-device"
+ 
+ /* gnome-screensaver */
+-#define GS_CONF_DIR					"/apps/gnome-screensaver"
+-#define GS_CONF_PREF_LOCK_ENABLED			GS_CONF_DIR "/lock_enabled"
++#define GS_SETTINGS_SCHEMA				"org.gnome.desktop.screensaver"
++#define GS_SETTINGS_PREF_LOCK_ENABLED			"lock-enabled"
+ 
+ typedef enum {
+ 	GPM_ICON_POLICY_PRESENT,
+diff --git a/src/gpm-control.c b/src/gpm-control.c
+index 0fc864d..902db44 100644
+--- a/src/gpm-control.c
++++ b/src/gpm-control.c
+@@ -38,7 +38,6 @@
+ 
+ #include <glib/gi18n.h>
+ #include <gnome-keyring.h>
+-#include <gconf/gconf-client.h>
+ #include <libupower-glib/upower.h>
+ 
+ #include "egg-console-kit.h"
+@@ -51,8 +50,8 @@
+ 
+ struct GpmControlPrivate
+ {
+-	GConfClient		*conf;
+ 	GSettings		*settings;
++	GSettings		*settings_ss;
+ 	UpClient		*client;
+ };
+ 
+@@ -118,7 +117,7 @@ gpm_control_get_lock_policy (GpmControl *control, const gchar *policy)
+ 	   See bug #331164 for all the juicy details. :-) */
+ 	use_ss_setting = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_USE_SCREENSAVER);
+ 	if (use_ss_setting) {
+-		do_lock = gconf_client_get_bool (control->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
++		do_lock = g_settings_get_boolean (control->priv->settings_ss, GS_SETTINGS_PREF_LOCK_ENABLED);
+ 		g_debug ("Using ScreenSaver settings (%i)", do_lock);
+ 	} else {
+ 		do_lock = g_settings_get_boolean (control->priv->settings, policy);
+@@ -256,8 +255,8 @@ gpm_control_finalize (GObject *object)
+ 	g_return_if_fail (GPM_IS_CONTROL (object));
+ 	control = GPM_CONTROL (object);
+ 
+-	g_object_unref (control->priv->conf);
+ 	g_object_unref (control->priv->settings);
++	g_object_unref (control->priv->settings_ss);
+ 	g_object_unref (control->priv->client);
+ 
+ 	g_return_if_fail (control->priv != NULL);
+@@ -306,7 +305,7 @@ gpm_control_init (GpmControl *control)
+ 
+ 	control->priv->client = up_client_new ();
+ 	control->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
+-	control->priv->conf = gconf_client_get_default ();
++	control->priv->settings_ss = g_settings_new (GS_SETTINGS_SCHEMA);
+ }
+ 
+ /**
+diff --git a/src/gpm-screensaver.c b/src/gpm-screensaver.c
+index 842ea7c..f41baed 100644
+--- a/src/gpm-screensaver.c
++++ b/src/gpm-screensaver.c
+@@ -25,7 +25,6 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+-#include <gconf/gconf-client.h>
+ 
+ #include "gpm-screensaver.h"
+ #include "gpm-common.h"
+@@ -41,7 +40,7 @@ static void     gpm_screensaver_finalize   (GObject		*object);
+ struct GpmScreensaverPrivate
+ {
+ 	GDBusProxy		*proxy;
+-	GConfClient		*conf;
++	GSettings		*settings;
+ };
+ 
+ enum {
+@@ -63,7 +62,7 @@ gpm_screensaver_lock_enabled (GpmScreensaver *screensaver)
+ {
+ 	gboolean enabled;
+ 	g_return_val_if_fail (GPM_IS_SCREENSAVER (screensaver), FALSE);
+-	enabled = gconf_client_get_bool (screensaver->priv->conf, GS_CONF_PREF_LOCK_ENABLED, NULL);
++	enabled = g_settings_get_boolean (screensaver->priv->settings, GS_SETTINGS_PREF_LOCK_ENABLED);
+ 	return enabled;
+ }
+ 
+@@ -296,7 +295,7 @@ gpm_screensaver_init (GpmScreensaver *screensaver)
+ 		g_warning ("failed to setup screensaver proxy: %s", error->message);
+ 		g_error_free (error);
+ 	}
+-	screensaver->priv->conf = gconf_client_get_default ();
++	screensaver->priv->settings = g_settings_new (GS_SETTINGS_SCHEMA) ;
+ }
+ 
+ /**
+@@ -313,7 +312,7 @@ gpm_screensaver_finalize (GObject *object)
+ 	screensaver = GPM_SCREENSAVER (object);
+ 	screensaver->priv = GPM_SCREENSAVER_GET_PRIVATE (screensaver);
+ 
+-	g_object_unref (screensaver->priv->conf);
++	g_object_unref (screensaver->priv->settings);
+ 	g_object_unref (screensaver->priv->proxy);
+ 
+ 	G_OBJECT_CLASS (gpm_screensaver_parent_class)->finalize (object);
+diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
+index e7eb21b..a444c2e 100644
+--- a/src/gpm-statistics.c
++++ b/src/gpm-statistics.c
+@@ -27,7 +27,6 @@
+ #include <glib/gi18n.h>
+ 
+ #include <gtk/gtk.h>
+-#include <gconf/gconf-client.h>
+ #include <libupower-glib/upower.h>
+ 
+ #include "gpm-array-float.h"
+--
+cgit v0.9
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..589305543942
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-3.0.2-r1.ebuild,v 1.1 2011/08/19 10:49:13 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="Gnome Power Manager"
+HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc test"
+
+# FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
+RESTRICT="test"
+
+# Latest libcanberra is needed due to gtk+:3 API changes
+COMMON_DEPEND=">=dev-libs/glib-2.25.9
+	>=x11-libs/gtk+-2.91.7:3
+	>=gnome-base/gnome-keyring-0.6.0
+	>=x11-libs/libnotify-0.7.0
+	>=x11-libs/cairo-1.0.0
+	>=gnome-base/gconf-2.31.1:2
+	>=media-libs/libcanberra-0.26-r2[gtk3]
+	>=sys-power/upower-0.9.1
+	>=x11-apps/xrandr-1.3
+	>=x11-proto/xproto-7.0.15
+	x11-libs/libX11
+	x11-libs/libXext"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/consolekit-0.4[policykit]
+	sys-auth/polkit
+	gnome-extra/polkit-gnome"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/randrproto
+
+	sys-devel/gettext
+	app-text/scrollkeeper
+	app-text/docbook-xml-dtd:4.3
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? (
+		app-text/xmlto
+		app-text/docbook-sgml-utils
+		app-text/docbook-xml-dtd:4.4
+		app-text/docbook-sgml-dtd:4.1
+		app-text/docbook-xml-dtd:4.1.2 )
+	test? ( sys-apps/dbus )"
+
+# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
+# (files under ${S}/man).
+# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable test tests)
+		$(use_enable doc docbook-docs)
+		--disable-strict
+		--enable-compile-warnings=minimum
+		--disable-schemas-compile"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+	if ! use doc; then
+		G2CONF="${G2CONF} DOCBOOK2MAN=$(type -p false)"
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# https://bugzilla.redhat.com/show_bug.cgi?id=679083
+	# will be in next release
+	epatch "${FILESDIR}/${P}-idle-status.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=650464
+	# will be in next release
+	epatch "${FILESDIR}/${P}-screensaver.patch"
+
+	# Drop debugger CFLAGS from configure
+	# XXX: touch configure.ac only if running eautoreconf, otherwise
+	# maintainer mode gets triggered -- even if the order is correct
+	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
+		-i configure || die "debugger sed failed"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "Test phase failed"
+}