New version for GNOME 2.26. Drop libgnome/libgnomeui dependencies, support for policykit for default/mandatory keys. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 344 insertions, 68 deletions

diff --git a/gnome-extra/gconf-editor/ChangeLog b/gnome-extra/gconf-editor/ChangeLog
index 7df8a91bc24c..b4c9ef29da7c 100644
--- a/gnome-extra/gconf-editor/ChangeLog
+++ b/gnome-extra/gconf-editor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/gconf-editor
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.142 2009/04/28 10:58:23 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.143 2009/05/11 22:23:55 eva Exp $
+
+*gconf-editor-2.26.0 (11 May 2009)
+
+  11 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gconf-editor-2.20.0.ebuild, -gconf-editor-2.22.0.ebuild,
+  +gconf-editor-2.26.0.ebuild,
+  +files/gconf-editor-2.26.0-optional-policykit.patch:
+  New version for GNOME 2.26. Drop libgnome/libgnomeui dependencies, support
+  for policykit for default/mandatory keys. Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> gconf-editor-2.24.1.ebuild:
   arm/sh stable
diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest
index 8311100435df..121d9d148329 100644
--- a/gnome-extra/gconf-editor/Manifest
+++ b/gnome-extra/gconf-editor/Manifest
@@ -1,8 +1,17 @@
-DIST gconf-editor-2.20.0.tar.bz2 892603 RMD160 b951b2a7db1fd315e0068ec00612297cb7ffd14f SHA1 628404983b89e005cbd688d841291ddc46c361a2 SHA256 10b5043c4152cf5d33b138c516c10708005212ee150ea8dc6c7dc396ac27a79a
-DIST gconf-editor-2.22.0.tar.bz2 873868 RMD160 c1ac899ac48a907420af28295de8fa66c1d45add SHA1 7ca44dbb09136203b37d7dd5398b62bcf15ee528 SHA256 e701134a1f5293070ca7d8d6311468f61e3a9765ebc520fcca6a0a38b214b7dc
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gconf-editor-2.26.0-optional-policykit.patch 9159 RMD160 75a3e1a21e43c2140a37d79bf705a98c1007ac79 SHA1 4f22920c78fef3d301d871fc12d2043d82354287 SHA256 e01387accdee2c183ea677d15d751678959883ddd9ababb7d16dda7818cee9b1
 DIST gconf-editor-2.24.1.tar.bz2 1142041 RMD160 ee8607b951548a16fdb6705c3efa95e5349fb0e1 SHA1 cc19e19add4f509d75553e5d03609f7529cc29a4 SHA256 7d63d9f4c23da91b2b06fe264ff4d1c40c20563220525837de7bb2dc442821fb
-EBUILD gconf-editor-2.20.0.ebuild 738 RMD160 4b6208fe2fe8148941247d5db158be5adb9f2c6b SHA1 b889f81f544e3947a51d2991331144d8d7f17053 SHA256 cfdf81c125716632ba143ecb0a194b3800dc97993dc7752a09748796d33cbd39
-EBUILD gconf-editor-2.22.0.ebuild 838 RMD160 f05884974822dc33705d179b208b5617c7ddef6a SHA1 e4ca82b2669f6cb8c3921367d080a5a239f1aee6 SHA256 7df8dfd855bfd3b2ac1b4400fa03ba7746c7eb74c3e8a8265ac494d064b36ca0
+DIST gconf-editor-2.26.0.tar.bz2 1262213 RMD160 ef5a446bb99617208d2f6de374f9d2c764a29bc9 SHA1 8b0369a747394f2ee0bec225dab561477b1531c6 SHA256 2801ff7d595039292850d4f7d87b3f7c950e92dbcb39facfe62c6fb184640e1f
 EBUILD gconf-editor-2.24.1.ebuild 841 RMD160 55682276e356772bb6187792bb5be1fc7aa6d5a1 SHA1 4659a3c6e3a7463546b43e551510efaf5bdeee3c SHA256 f5b066ccad9ab0a11a6ee0e32e3a3a73489c11c6cfe11374411f523ce5f87320
-MISC ChangeLog 16957 RMD160 a686bf6ba6cc1992337c05c23ecc8805931244d0 SHA1 8a0b9ac658d3432b665de09fc4b08e79f51900c1 SHA256 6033797423248286396251ac490cb2106c3b0990a004cf203d1724fbccc53344
+EBUILD gconf-editor-2.26.0.ebuild 1138 RMD160 7b1aec9485d38101603b9d5c2adfdc49abd02952 SHA1 af7352da6923bdea839d5304e04cd4fef4932acb SHA256 5ae26c88112f4fe6c27cb38f793819d0d567aa6a3c2f63b336e87b197b695a01
+MISC ChangeLog 17335 RMD160 ff77a3ca03454e9bdf6f0c225d0cfe46fa2f8644 SHA1 db3ef895b4a93d9e2fa3aef3f1e8bca284de6354 SHA256 f507064746f18e484a286e55b93f509d24e97e7f7b900ed9e08b808478d896f4
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoIpYEACgkQ1fmVwcYIWAa+jQCfawcZdkc8oIlpnljkM9bifvEw
+s88AoNPuAKRK5WmDNChQ9DRgdcOT+hj7
+=P1Rd
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-2.26.0-optional-policykit.patch b/gnome-extra/gconf-editor/files/gconf-editor-2.26.0-optional-policykit.patch
new file mode 100644
index 000000000000..f953c0d2c7ab
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/gconf-editor-2.26.0-optional-policykit.patch
@@ -0,0 +1,273 @@
+---
+ Allow gconf-editor to build without policykit.
+
+ configure.in              |   25 ++++++++++++++----
+ src/Makefile.am           |   15 +++++++----
+ src/gconf-editor-window.c |   62 ++++++++++++++++++++++++++++++++++++----------
+ 3 files changed, 79 insertions(+), 23 deletions(-)
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -34,9 +34,7 @@ changequote([,])dnl
+ 
+ PKG_CHECK_MODULES(GCONF_EDITOR,
+ 		  gconf-2.0 >= 2.9.2
+-		  gtk+-2.0 >= 2.12.0
+-		  polkit-dbus >= 0.7
+-		  dbus-glib-1 >= 0.71)
++		  gtk+-2.0 >= 2.12.0)
+ 
+ if test "$enable_maintainer_mode" = "yes"; then
+ 	DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+@@ -55,6 +53,22 @@ GNOME_COMMON_INIT
+ GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_MAINTAINER_MODE_DEFINES
+ 
++dnl Enable or not the policykit support
++AC_ARG_WITH([policykit],
++	AC_HELP_STRING([--with-policykit],
++	[Compile with policykit support @<:@default=yes@:>@]),
++	[with_polkit=$withval],
++	[with_polkit=yes])
++
++if test x$with_polkit = xyes; then
++   AC_DEFINE([HAVE_POLICYKIT], 1, [PolicyKit support is required])
++   PKG_CHECK_MODULES(GCONF_EDITOR_POLKIT,
++                     polkit-dbus >= 0.7
++		     dbus-glib-1 >= 0.71)
++fi
++
++AM_CONDITIONAL([HAVE_POLICYKIT], [test x$with_polkit = xyes])
++
+ dnl Get the GConf defaults source, and sed it to make the mandatory source.
+ GCONF_DEFAULTS_SOURCE=`gconftool-2 --get-default-source`
+ AC_ARG_WITH(gconf-defaults-source,
+@@ -86,5 +100,6 @@ AC_OUTPUT
+ 
+ echo "
+ Configuration Sources:
+-GConf default values source: ${GCONF_DEFAULTS_SOURCE}
+-GConf mandatory values source: ${GCONF_MANDATORY_SOURCE}"
++GConf default values source:	${GCONF_DEFAULTS_SOURCE}
++GConf mandatory values source:	${GCONF_MANDATORY_SOURCE}
++PolicyKit support:     		${with_polkit}"
+Index: b/src/Makefile.am
+===================================================================
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,14 +3,15 @@ INCLUDES = \
+ 	-DDATADIR=\""$(pkgdatadir)"\" 	\
+ 	-DICONDIR="\"$(pkgdatadir)/icons\"" \
+ 	$(DISABLE_DEPRECATED_CFLAGS) \
+-	$(GCONF_EDITOR_CFLAGS)
++	$(GCONF_EDITOR_CFLAGS) \
++	$(GCONF_EDITOR_POLKIT_CFLAGS)
+ 
+ bin_PROGRAMS = gconf-editor
+ 
+ gconf_editor_built_headers = gconf-marshal.h
+ gconf_editor_built_cfiles = gconf-marshal.c
+ 
+-gconf_editor_SOURCES = \
++gconf_editor_SOURCES =			\
+ 	gconf-bookmarks.c		\
+ 	gconf-bookmarks.h		\
+ 	gconf-bookmarks-dialog.c	\
+@@ -33,8 +34,6 @@ gconf_editor_SOURCES = \
+ 	gconf-util.h			\
+ 	gedit-output-window.c		\
+ 	gedit-output-window.h		\
+-	gconf-policykit.c		\
+-	gconf-policykit.h		\
+ 	gconf-search.h                  \
+ 	gconf-search.c                  \
+ 	gconf-search-dialog.h           \
+@@ -43,6 +42,11 @@ gconf_editor_SOURCES = \
+ 	$(gconf_editor_built_headers)	\
+ 	$(gconf_editor_built_cfiles)
+ 
++if HAVE_POLICYKIT
++gconf_editor_SOURCES +=	gconf-policykit.h	\
++			gconf-policykit.c
++endif
++
+ ## we just punt on built sources, and check them into svn, manually updating
+ ## when required.
+ regenerate-built-sources:
+@@ -54,7 +58,8 @@ regenerate-built-sources:
+ 
+ 
+ gconf_editor_LDADD = \
+-	$(GCONF_EDITOR_LIBS)
++	$(GCONF_EDITOR_LIBS) \
++	$(GCONF_EDITOR_POLKIT_LIBS)
+ 
+ EXTRA_DIST = \
+ 	gconf-marshal.list
+Index: b/src/gconf-editor-window.c
+===================================================================
+--- a/src/gconf-editor-window.c
++++ b/src/gconf-editor-window.c
+@@ -27,7 +27,9 @@
+ #include "gconf-cell-renderer.h"
+ #include "gconf-editor-application.h"
+ #include "gconf-key-editor.h"
+-#include "gconf-policykit.h"
++#ifdef HAVE_POLICYKIT
++# include "gconf-policykit.h"
++#endif
+ #include "gconf-stock-icons.h"
+ #include "gconf-util.h"
+ #include "gedit-output-window.h"
+@@ -640,26 +642,34 @@ gconf_editor_window_row_expanded (GtkTre
+   gdk_display_flush (gtk_widget_get_display (GTK_WIDGET (gconfwindow)));
+ }
+ 
++#ifdef HAVE_POLICYKIT
++/* QA Warning: Only used with policykit support ,
++   so avoiding ' defined but not used' warning
++*/
+ static void
+ gconf_editor_popup_policykit_callback (GtkWindow *window, GError *error)
+ {
+   if (error)
+     gconf_editor_window_popup_error_dialog (window, _("Could not set value. Error was:\n%s"), error);
+ }
++#endif
+ 
+ static void
+ gconf_editor_popup_window_set_as_default (GtkAction *action, GtkWidget *callback_data)
+ {
+   GConfEditorWindow *gconfwindow = GCONF_EDITOR_WINDOW (callback_data);
+-  GtkWindow *window = GTK_WINDOW (callback_data);
+ 
+   GtkTreeIter iter;
+   GConfValue *value;
+   char *path = NULL;
++
++#ifdef HAVE_POLICYKIT
++  /* QA Warning: unsed variable if policykit is disable */
++  GtkWindow *window = GTK_WINDOW (callback_data);
+   gboolean can_use_pk;
+   
+   can_use_pk = (gconfwindow->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL);
+-  
++#endif
+   gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (gconfwindow->list_view)),
+                                    NULL, &iter);
+   gtk_tree_model_get (gconfwindow->sorted_list_model, &iter,
+@@ -680,12 +690,13 @@ gconf_editor_popup_window_set_as_default
+ 
+       if (!error)
+         return;
+-
++#ifdef HAVE_POLICYKIT
+       if (!can_use_pk)
+         gconf_editor_window_popup_error_dialog (window, _("Could not sync value. Error was:\n%s"), error);
++#endif
+     }
+   }
+-
++#ifdef HAVE_POLICYKIT
+   if (can_use_pk) {
+     gconf_client_suggest_sync (gconfwindow->client, NULL);
+     gconf_pk_set_default_async (path,
+@@ -693,21 +704,24 @@ gconf_editor_popup_window_set_as_default
+                                 (GFunc) gconf_editor_popup_policykit_callback,
+                                 g_object_ref (window), g_object_unref);
+   }
++#endif
+ }
+ 
+ static void
+ gconf_editor_popup_window_set_as_mandatory (GtkAction *action, GtkWidget *callback_data)
+ {
+   GConfEditorWindow *gconfwindow = GCONF_EDITOR_WINDOW (callback_data);
+-  GtkWindow *window = GTK_WINDOW (callback_data);
+ 
+   GtkTreeIter iter;
+   GConfValue *value;
+   char *path = NULL;
++#ifdef HAVE_POLICYKIT
++  /* QA Warning */
++  GtkWindow *window = GTK_WINDOW (callback_data);
+   gboolean can_use_pk;
+   
+   can_use_pk = (gconfwindow->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL);
+-
++#endif
+   gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (gconfwindow->list_view)),
+                                    NULL, &iter);
+   gtk_tree_model_get (gconfwindow->sorted_list_model, &iter,
+@@ -728,12 +742,13 @@ gconf_editor_popup_window_set_as_mandato
+ 
+       if (!error)
+         return;
+-      
++#ifdef HAVE_POLICYKIT
+       if (!can_use_pk)
+         gconf_editor_window_popup_error_dialog (window, _("Could not sync value. Error was:\n%s"), error);
++#endif
+     }
+   }
+-
++#ifdef HAVE_POLICYKIT
+   if (can_use_pk) {
+     gconf_client_suggest_sync (gconfwindow->client, NULL);
+     gconf_pk_set_mandatory_async (path,
+@@ -741,6 +756,7 @@ gconf_editor_popup_window_set_as_mandato
+                                   (GFunc) gconf_editor_popup_policykit_callback,
+                                   g_object_ref (window), g_object_unref);
+   }
++#endif
+ }
+ 
+ static GtkActionEntry entries[] = {
+@@ -934,10 +950,20 @@ list_view_button_press_event (GtkTreeVie
+ 						  window->type != GCONF_EDITOR_WINDOW_TYPE_DEFAULTS);
+ 			gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/DefaultKey"), 
+ 						  (gconf_util_can_edit_defaults () && window->type != GCONF_EDITOR_WINDOW_TYPE_DEFAULTS) ||
+-						  (gconf_pk_can_set_default () && window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
++#ifdef HAVE_POLICYKIT
++						  (gconf_pk_can_set_default () &&
++#else
++						   (
++#endif
++						    window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
+ 			gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/MandatoryKey"), 
+ 						  (gconf_util_can_edit_mandatory () && window->type != GCONF_EDITOR_WINDOW_TYPE_MANDATORY) ||
+-						  (gconf_pk_can_set_mandatory () && window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
++#ifdef HAVE_POLICYKIT
++						  (gconf_pk_can_set_mandatory () &&
++#else
++						   (
++#endif
++window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
+ 			
+ 			gtk_tree_path_free (path);
+ 		}
+@@ -1037,10 +1063,20 @@ gconf_editor_window_list_view_popup_menu
+ 					  window->type != GCONF_EDITOR_WINDOW_TYPE_DEFAULTS);
+ 		gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/DefaultKey"), 
+ 					  (gconf_util_can_edit_defaults () && window->type != GCONF_EDITOR_WINDOW_TYPE_DEFAULTS) ||
+-					  (gconf_pk_can_set_default () && window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
++#ifdef HAVE_POLICYKIT
++					  (gconf_pk_can_set_default () &&
++#else
++					   (
++#endif
++window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
+ 		gtk_widget_set_sensitive (gtk_ui_manager_get_widget (window->ui_manager, "/GConfKeyPopupMenu/MandatoryKey"), 
+ 					  (gconf_util_can_edit_mandatory () && window->type != GCONF_EDITOR_WINDOW_TYPE_MANDATORY) ||
+-					  (gconf_pk_can_set_mandatory () && window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
++#ifdef HAVE_POLICYKIT
++					  (gconf_pk_can_set_mandatory () &&
++#else
++					   (
++#endif
++window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL));
+ 			
+ 	}
+ 	else {
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.20.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.20.0.ebuild
deleted file mode 100644
index 4c45fa70a95d..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-2.20.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.20.0.ebuild,v 1.11 2009/01/29 22:44:19 eva Exp $
-
-inherit gnome2
-
-DESCRIPTION="An editor to the GNOME 2 config system"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="arm sh"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=gnome-base/gconf-2.10
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.6"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	sys-devel/gettext
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-}
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.22.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.22.0.ebuild
deleted file mode 100644
index c3547dc2f1eb..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-2.22.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.22.0.ebuild,v 1.8 2009/01/29 22:44:19 eva Exp $
-
-inherit gnome2
-
-DESCRIPTION="An editor to the GNOME 2 config system"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=gnome-base/gconf-2.10
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.6"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	sys-devel/gettext
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-}
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.26.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.26.0.ebuild
new file mode 100644
index 000000000000..dff5d5b445e9
--- /dev/null
+++ b/gnome-extra/gconf-editor/gconf-editor-2.26.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.26.0.ebuild,v 1.1 2009/05/11 22:23:55 eva Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="An editor to the GNOME 2 config system"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="policykit test"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=gnome-base/gconf-2.12.0
+	policykit? (
+		>=sys-auth/policykit-0.7
+		>=dev-libs/dbus-glib-0.71 )"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	sys-devel/gettext
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		$(use_with policykit)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix automagic policykit, bug #266031
+	epatch "${FILESDIR}/${P}-optional-policykit.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}