Pin glib/gtk+ to slot 2. Clean up old revisions.

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

8 files changed, 13 insertions, 322 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 95ade73811df..bd10bb75375b 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.63 2010/10/17 15:18:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.64 2010/10/21 21:26:32 eva Exp $
+
+  21 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-settings-daemon-2.24.0-automagic.patch,
+  -files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch,
+  -files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch,
+  -gnome-settings-daemon-2.26.1-r2.ebuild,
+  -files/gnome-settings-daemon-2.26.1-crash-default-sink-change.patch,
+  -gnome-settings-daemon-2.28.2.ebuild, gnome-settings-daemon-2.32.0.ebuild:
+  Pin glib/gtk+ to slot 2. Clean up old revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   gnome-settings-daemon-2.30.2-r1.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.0-automagic.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.0-automagic.patch
deleted file mode 100644
index e7645161af1a..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.0-automagic.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- configure.ac	2008-10-09 00:03:09.000000000 +0200
-+++ configure.ac.new	2008-10-09 00:03:46.000000000 +0200
-@@ -87,9 +87,16 @@
- dnl - Check for libnotify
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
--		  [AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available])
--                  have_libnotify=yes], [have_libnotify=no])
-+have_libnotify=no
-+AC_ARG_ENABLE(libnotify,
-+	AS_HELP_STRING([--disable-libnotify], [Enable nice notifications]),
-+	, enable_libnotify=yes)
-+
-+if test "x$enable_libnotify" = "xyes"; then
-+	have_libnotify=yes
-+	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION)
-+	AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available])
-+fi
- AC_SUBST(LIBNOTIFY_CFLAGS)
- AC_SUBST(LIBNOTIFY_LIBS)
- 
-@@ -339,9 +346,18 @@
- # ---------------------------------------------------------------------------
- # Enable Legacy Sound Preference
- # ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(PULSEAUDIO, libpulse, have_pulseaudio=yes, have_pulseaudio=no)
--if test x$have_pulseaudio = xyes; then
--	default_enable_legacy_sound_pref=no
-+
-+AC_ARG_ENABLE(libpulse,
-+	AS_HELP_STRING([--enable-libpulse], [Prefer pulseaudio over ESD]))
-+
-+if test x$enable_pulse = yes; then 
-+	PKG_CHECK_MODULES(PULSEAUDIO, libpulse, have_pulseaudio=yes, have_pulseaudio=no)
-+
-+	if test x$have_pulseaudio = xyes; then
-+		default_enable_legacy_sound_pref=no
-+	else
-+		AC_MSG_ERROR([Pulseaudio support required but libpulse not found])
-+	fi
- else
- 	default_enable_legacy_sound_pref=yes
- fi
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch
deleted file mode 100644
index e118ecc7da4f..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: plugins/mouse/gsd-mouse-manager.c
-===================================================================
---- plugins/mouse/gsd-mouse-manager.c	(revision 621)
-+++ plugins/mouse/gsd-mouse-manager.c	(working copy)
-@@ -329,9 +329,14 @@ devicepresence_filter (GdkXEvent *xevent
- static void
- set_devicepresence_handler (GsdMouseManager *manager)
- {
--        Display *display = gdk_x11_get_default_xdisplay ();
-+        Display *display;
-         XEventClass class_presence;
-         int xi_presence;
-+
-+        if (!supports_xinput_devices ())
-+                return;
-+
-+        display = gdk_x11_get_default_xdisplay ();
- 
-         gdk_error_trap_push ();
-         DevicePresence (display, xi_presence, class_presence);
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch
deleted file mode 100644
index 6e771a579303..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Allow building against gnome-desktop-2.26.
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524253
-https://bugs.gentoo.org/show_bug.cgi?id=269366
-
---- a/plugins/xrandr/gsd-xrandr-manager.c	2009-04-16 10:08:15.904851080 +0200
-+++ b/plugins/xrandr/gsd-xrandr-manager.c	2009-04-16 10:14:24.334003102 +0200
-@@ -118,7 +118,7 @@ on_client_message (GdkXEvent  *xevent,
-             ev->type == ClientMessage &&
-             ev->xclient.message_type == gnome_randr_xatom ()) {
- 
--                gnome_rr_config_apply_stored (screen);
-+                gnome_rr_config_apply_stored (screen, NULL);
- 
-                 return GDK_FILTER_REMOVE;
-         }
-@@ -146,7 +146,7 @@ event_filter (GdkXEvent           *xeven
-                 /* FIXME: here we should cycle between valid
-                  * configurations, and save them
-                  */
--                gnome_rr_config_apply_stored (manager->priv->rw_screen);
-+                gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL);
- 
-                 return GDK_FILTER_CONTINUE;
-         }
-@@ -391,7 +391,7 @@ get_allowed_rotations_for_output (GsdXra
- 
-                 output->rotation = rotation_to_test;
- 
--                if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen)) {
-+                if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen, NULL)) {
-                         (*out_num_rotations)++;
-                         (*out_rotations) |= rotation_to_test;
-                 }
-@@ -456,7 +456,7 @@ output_rotation_item_activate_cb (GtkChe
- 
-         error = NULL;
-         if (gnome_rr_config_save (priv->configuration, &error)) {
--                if (!gnome_rr_config_apply_stored (priv->rw_screen)) {
-+                if (!gnome_rr_config_apply_stored (priv->rw_screen, NULL)) {
-                         error_dialog (_("The selected rotation could not be applied"),
-                                       _("An error occurred while configuring the screen"));
-                         /* FIXME: that message is really useless.  Make
-@@ -694,7 +694,7 @@ gsd_xrandr_manager_start (GsdXrandrManag
-         g_debug ("Starting xrandr manager");
- 
-         manager->priv->rw_screen = gnome_rr_screen_new (
--                gdk_screen_get_default (), on_randr_event, manager);
-+                gdk_screen_get_default (), on_randr_event, manager, NULL);
- 
-         if (manager->priv->rw_screen == NULL) {
-                 g_set_error (error, 0, 0, "Failed to initialize XRandR extension");
-@@ -728,7 +728,7 @@ gsd_xrandr_manager_start (GsdXrandrManag
-                 gdk_error_trap_pop ();
-         }
- 
--        gnome_rr_config_apply_stored (manager->priv->rw_screen);
-+        gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL);
- 
-         gdk_window_add_filter (gdk_get_default_root_window(),
-                                (GdkFilterFunc)event_filter,
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.26.1-crash-default-sink-change.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.26.1-crash-default-sink-change.patch
deleted file mode 100644
index 5b688fd55f0e..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.26.1-crash-default-sink-change.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Second part of fix for bug 274819 -- g-s-d crashes when default sink changes
-
-Taken from upstream git repository
-
----
-From 5b73218d9170626162fca03425ac7f0b4789bc0f Mon Sep 17 00:00:00 2001
-From: Chris Coulson <chrisccoulson@googlemail.com>
-Date: Fri, 31 Jul 2009 15:59:36 +0000
-Subject: Bug 590073 – gnome-settings-daemon crashed with SIGSEGV in gvc_mixer_stream_is_running()
-
-Fix crasher when the default sink changes, we were unref'ing
-streams, when never ref'ing them.
----
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 3eeea71..8438875 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -740,7 +740,7 @@ update_default_sink (GsdMediaKeysManager *manager)
-         }
- 
-         if (stream != NULL) {
--                manager->priv->stream = stream;
-+                manager->priv->stream = g_object_ref (stream);
-                 g_signal_connect (G_OBJECT (manager->priv->stream), "notify::volume",
-                                   G_CALLBACK (on_stream_event_notify), manager);
-                 g_signal_connect (G_OBJECT (manager->priv->stream), "notify::is-muted",
---
-cgit v0.8.2
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r2.ebuild
deleted file mode 100644
index ebf9abca6c92..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.26.1-r2.ebuild
+++ /dev/null
@@ -1,80 +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-settings-daemon/gnome-settings-daemon-2.26.1-r2.ebuild,v 1.10 2010/07/20 01:51:31 jer Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-readd-gst-vol-control-support.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug libnotify pulseaudio"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.13
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/libgnomekbd-2.21.4
-
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-desktop-2.25.6
-
-	libnotify? ( >=x11-libs/libnotify-0.4.3 )
-
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-3.8
-	media-libs/fontconfig
-
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.12 )
-	!pulseaudio? (
-		>=media-libs/gstreamer-0.10.1.2
-		>=media-libs/gst-plugins-base-0.10.1.2 )"
-DEPEND="${RDEPEND}
-	!<gnome-base/gnome-control-center-2.22
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-# README is empty
-DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_with libnotify)
-		$(use_enable pulseaudio pulse)
-		$(use_enable !pulseaudio gstreamer)"
-
-	if use pulseaudio; then
-		elog "Building volume media keys using Pulseaudio"
-	else
-		elog "Building volume media keys using GStreamer"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix bug 274819 -- g-s-d crashes when pulseaudio default sink changes
-	# (not needed in 2.28)
-	epatch "${FILESDIR}/${P}-crash-default-sink-change.patch"
-
-	# Restore gstreamer volume control support, upstream bug #571145
-	epatch "${WORKDIR}/${P}-readd-gst-vol-control-support.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.28.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.28.2.ebuild
deleted file mode 100644
index 8f8be8b15524..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.28.2.ebuild
+++ /dev/null
@@ -1,84 +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-settings-daemon/gnome-settings-daemon-2.28.2.ebuild,v 1.6 2010/08/18 22:03:28 maekke Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-SRC_URI="${SRC_URI}
-mirror://gentoo/${P}-gst-vol-control-support.patch.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify pulseaudio"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.16
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/libgnomekbd-2.21.4
-	>=gnome-base/gnome-desktop-2.26.3
-
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-4.0
-	media-libs/fontconfig
-
-	libnotify? ( >=x11-libs/libnotify-0.4.3 )
-	pulseaudio? (
-		>=media-sound/pulseaudio-0.9.15
-		media-libs/libcanberra[gtk] )
-	!pulseaudio? (
-		>=media-libs/gstreamer-0.10.1.2
-		>=media-libs/gst-plugins-base-0.10.1.2 )"
-DEPEND="${RDEPEND}
-	!<gnome-base/gnome-control-center-2.22
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-# README is empty
-DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable debug)
-		$(use_with libnotify)
-		$(use_enable pulseaudio pulse)
-		$(use_enable !pulseaudio gstreamer)"
-
-	if use pulseaudio; then
-		elog "Building volume media keys using Pulseaudio"
-	else
-		elog "Building volume media keys using GStreamer"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Restore gstreamer volume control support, upstream bug #571145
-	epatch "${WORKDIR}/${P}-gst-vol-control-support.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! use pulseaudio; then
-		elog "GStreamer volume control support is a feature powered by Gentoo GNOME Team"
-		elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gentoo.org instead"
-	fi
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.0.ebuild
index a0bdba5baa88..ef3b67116a76 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-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-settings-daemon/gnome-settings-daemon-2.32.0.ebuild,v 1.1 2010/10/12 19:06:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.0.ebuild,v 1.2 2010/10/21 21:26:32 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -18,8 +18,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-fr
 IUSE="debug libnotify policykit pulseaudio smartcard"
 
 RDEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.21.2
+	>=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.21.2:2
 	>=gnome-base/gconf-2.6.1
 	>=gnome-base/libgnomekbd-2.31.2
 	>=gnome-base/gnome-desktop-2.29.92