Remove gnome-base/libghttp per bug #244128

5 files changed, 169 insertions, 17 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index b435b74a12fd..d20a76c58c2c 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,13 +1,22 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.30 2009/05/10 23:01:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.31 2009/06/17 22:56:53 eva Exp $
+
+*gnome-settings-daemon-2.24.1-r2 (14 May 2009)
+
+  14 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-settings-daemon-2.24.1-r1.ebuild,
+  +gnome-settings-daemon-2.24.1-r2.ebuild,
+  +files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch:
+  Add patch for gnome-desktop API compatibility, to ease upgrade, bug
+  #269366
 
 *gnome-settings-daemon-2.26.1-r1 (10 May 2009)
 
   10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -gnome-settings-daemon-2.22.2.1.ebuild,
   +gnome-settings-daemon-2.26.1-r1.ebuild:
-  New version for GNOME 2.26. Pulseaudion support and lots of fixes. Clean
+  New version for GNOME 2.26. Pulseaudio support and lots of fixes. Clean
   up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org>
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index b245080195a4..1148cfdc29cb 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-settings-daemon-2.24.0-automagic.patch 1656 RMD160 895fe60a74854d14229fa81fb534dc2379b3de8c SHA1 dfbfdc227104cc4339e8ff4c5bc8d3208a18f09c SHA256 ebf248ccbe911200ff256df37345f07c2291caf165b16331e6916ccf24be003d
 AUX gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch 721 RMD160 0a852a0d0027d05b6086e69cc41468edf5d82192 SHA1 07f8e843740d145cc2fc0dd328435586567fbcb9 SHA256 03d5f3e46baff9f4472410e0d2a58477908af23de2148cb3cd9b202121b60663
+AUX gnome-settings-daemon-2.24.1-gnomedesktop-api.patch 2873 RMD160 8545d4e60fdc72f4153732eadfb93aecee282aed SHA1 e0711aa4382ce93b38a50357530371014a3e6de4 SHA256 9c569aaa2bd9c48771c3c13768a071c3dc999abb0def0e6cac59c7f1976a9996
 DIST gnome-settings-daemon-2.24.1.tar.bz2 1131518 RMD160 27d432cd217a836fcef0deac5f80f638a73cda7c SHA1 d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3 SHA256 a2a5132a5b9d0bef52010ea45b14560b6344f591ce3296ed555165332cce9a70
 DIST gnome-settings-daemon-2.26.1-readd-gst-vol-control-support.patch.bz2 7669 RMD160 dc616c73606981af7f47e01973d2f1881fceed04 SHA1 e0194dc45dbfd57da9eead92f4c9c0e586f8eb9f SHA256 4bb694a0ea484c6d74baf2e252c6e9ddb153a3467b480fe55ba18373312fda81
 DIST gnome-settings-daemon-2.26.1.tar.bz2 1084129 RMD160 5cca5fdcbf144d6fc950c5b5f7d5f1304168f4bd SHA1 0c2cef37a0a3333c314a8205cefea9edb8f0669a SHA256 4dff1daa84fe485e302f61286df1dd188292302ee792ddb4fb1c34e65aea0a80
-EBUILD gnome-settings-daemon-2.24.1-r1.ebuild 2366 RMD160 b4fd68bfbb5cc0a33e30f7fc0652820f3861cd43 SHA1 3b8c4c3e50cb63b3c598d65c44588ed67e395366 SHA256 48854416d3e9ad841d75e18980b14a2f06ecc296733b1b101a8fedc89aa8dd24
+EBUILD gnome-settings-daemon-2.24.1-r1.ebuild 2363 RMD160 38bc5f8149de5412f7fce43c20c9b13501fe4309 SHA1 f8dbbab0c282c71176129f3bc85fbe685ae3294f SHA256 e28d03cf7d5072a45f41ff2719636fbf3d2312f8f3a4ad13c8397b0711358379
+EBUILD gnome-settings-daemon-2.24.1-r2.ebuild 2485 RMD160 f199f30fbfa80d327df97767dd48c71464fb00c4 SHA1 9ce352b48397b331f770bf44bda5d1b94872508e SHA256 34ad7c160fe38367a5248f45ea6bea49d523f53f8e78b84fa82d8da6f1b0edf0
 EBUILD gnome-settings-daemon-2.26.1-r1.ebuild 1925 RMD160 f6f201130a8eeb65fa7100376c040660b329253b SHA1 5c32a8c9825f008efa61b537d2d4d9d6e858938c SHA256 2aa683669ffd4bdbea8f7be3f225d9994ceb45c9c6a6d7a7f82f44e0868480da
-MISC ChangeLog 5540 RMD160 52fb8a4518d481eb7ae523ebba7bc205f80b26f7 SHA1 0f8e80f5effe5d48a8eba942844dfd4be0844fdd SHA256 6471b13187d556c80a7789f833088f6a72f7fd75a01af3994845eb5ebc09deae
+MISC ChangeLog 5869 RMD160 79c60402f24f6a47f3db7d413bf05ef4175b1495 SHA1 15f1fa17287f6a2fa585c8d9c1322d3c346a4d79 SHA256 a947c1308eb426e1d8164e47905457bca9a34e438cc60bcce7fffb90052c85df
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoHXNUACgkQ1fmVwcYIWAZiBQCdFKREm/376cIOSJYqt/EaXzXo
-H8oAn2NbkDa/fVRmewoksR75sgvXTl/1
-=1FvC
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..6e771a579303
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch
@@ -0,0 +1,62 @@
+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/gnome-settings-daemon-2.24.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild
index bc6eca53de72..c931233d99f7 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2008-2009 Gentoo Foundation
+# Copyright 1999-2009 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.24.1-r1.ebuild,v 1.9 2009/04/28 11:48:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild,v 1.10 2009/06/17 22:56:53 eva Exp $
 
 inherit autotools eutils gnome2
 
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.74
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-desktop-2.23.90
+	>=gnome-base/gnome-desktop-2.26
 
 	libnotify? ( >=x11-libs/libnotify-0.4.3 )
 
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild
new file mode 100644
index 000000000000..5de3fee786e5
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2009 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.24.1-r2.ebuild,v 1.1 2009/06/17 22:56:53 eva Exp $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa debug esd gstreamer libnotify pulseaudio"
+
+RDEPEND=">=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.18.0
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/libgnomekbd-2.21.4
+
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-desktop-2.23.90
+
+	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.3
+	media-libs/fontconfig
+
+	esd? ( >=media-sound/esound-0.2.28 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10.1.2
+		>=media-libs/gst-plugins-base-0.10.1.2 )
+	!gstreamer? (
+		alsa? ( >=media-libs/alsa-lib-0.99 ) )"
+# In configure: gstreamer wins over alsa
+
+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"
+
+# FIXME: pulseaudio is used to detect if system should build
+# old sound preference capplet (some braindead logic in there)
+PDEPEND="pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )"
+
+# README is empty
+DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable esd)
+		$(use_enable gstreamer)
+		$(use_enable libnotify)
+		$(use_enable !pulseaudio legacy-sound-pref)"
+	# We use legacy-sound-pref instead of pulse because
+	# there is no gain in adding a build time dep on pulseaudio
+
+	if use esd && use pulseaudio; then
+		ewarn "You selected conflicting USE flags. Please note that USE=\"esd\""
+		ewarn "has no effect when USE=\"pulseaudio\" is selected."
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix libnotify & pulseaudio automagic dependencies
+	epatch "${FILESDIR}/${PN}-2.24.0-automagic.patch"
+
+	# Fix server-side XInput detection (Gnome bug #562977)
+	epatch "${FILESDIR}/${PN}-2.24.1-check-for-server-side-XInput.patch"
+
+	# Fix build with gnome-desktop-2.26, bug #269366
+	epatch "${FILESDIR}/${PN}-2.24.1-gnomedesktop-api.patch"
+
+	eautoreconf
+}