gnome-2.10 release

Package-Manager: portage-2.0.51.19

5 files changed, 190 insertions, 13 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index b5b5aa119f02..b20d37322c00 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.91 2005/02/24 07:48:35 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.92 2005/03/09 08:42:28 joem Exp $
+
+*control-center-2.10.0 (09 Mar 2005)
+
+  09 Mar 2005; Joe McCann <joem@gentoo.org> +control-center-2.10.0.ebuild:
+  gnome-2.10 release
 
 *control-center-2.8.2 (24 Feb 2005)
 
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index d88a7a6a83ca..882a548d51b3 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,18 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f4f76b9cbe40d2e0ee58a35a07b06f3a ChangeLog 12094
+MD5 aa3234dd1a36f666ba5ace0047cdd8b9 control-center-1.4.0.5-r1.ebuild 1258
+MD5 2aecca7e67d6a685c8aafc7acf2528c2 control-center-2.6.1.ebuild 1883
 MD5 f9a1a02659086003d74a108906fcbaf4 control-center-2.8.0.ebuild 1845
 MD5 f68b6df3a65aa38d649e26ef1b20fe00 control-center-2.8.1-r1.ebuild 1846
-MD5 2aecca7e67d6a685c8aafc7acf2528c2 control-center-2.6.1.ebuild 1883
-MD5 bd73b1ff8d296cd062512c8b82043831 control-center-2.8.2.ebuild 1850
-MD5 aa3234dd1a36f666ba5ace0047cdd8b9 control-center-1.4.0.5-r1.ebuild 1258
-MD5 16edf3229cba822255b69e4525640589 ChangeLog 11958
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 3afae17cdd913d2de47ec8017cafe327 files/digest-control-center-2.6.1 74
-MD5 0ac36f350969840cdac6ab03ead02612 files/digest-control-center-2.8.0 74
-MD5 67a5a28783f9b30d8f05ef301d2eeb7a files/digest-control-center-2.8.2 74
-MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
+MD5 bd73b1ff8d296cd062512c8b82043831 control-center-2.8.2.ebuild 1850
+MD5 22f48b539b9ae4910fd8c1a8615be7e9 control-center-2.10.0.ebuild 1861
+MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 MD5 cfecda4817a0252254abf7ee4d1a10ba files/control-center-2-logout.patch 12887
-MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
-MD5 a9b97cf7218d917325a6e3b8504276fd files/control-center-2.8-logout.patch 13181
 MD5 adbe3cf7b6918f7681569128f76a4b71 files/control-center-2.2-icons_install.patch 2943
-MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
-MD5 3c50bab26a7b8dd1ccb40514655a0a79 files/digest-control-center-2.8.1-r1 74
+MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
+MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
+MD5 3afae17cdd913d2de47ec8017cafe327 files/digest-control-center-2.6.1 74
+MD5 0ac36f350969840cdac6ab03ead02612 files/digest-control-center-2.8.0 74
+MD5 3c50bab26a7b8dd1ccb40514655a0a79 files/digest-control-center-2.8.1-r1 74
+MD5 a9b97cf7218d917325a6e3b8504276fd files/control-center-2.8-logout.patch 13181
+MD5 67a5a28783f9b30d8f05ef301d2eeb7a files/digest-control-center-2.8.2 74
+MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
+MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCLrbZXjcVihsel0ERAoOqAJ0XQI+2e2NWzRo8S/xiOn2HsHhCYgCgpmBe
+AslZlGqMn9d3W3+DeaxkO/k=
+=8zF9
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/control-center/control-center-2.10.0.ebuild b/gnome-base/control-center/control-center-2.10.0.ebuild
new file mode 100644
index 000000000000..1ff06af524e4
--- /dev/null
+++ b/gnome-base/control-center/control-center-2.10.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.10.0.ebuild,v 1.1 2005/03/09 08:42:28 joem Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="The gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~ppc ~x86"
+IUSE="alsa gstreamer"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RDEPEND=">=x11-libs/gtk+-2.4
+	>=dev-libs/glib-2.5
+	virtual/xft
+	media-libs/fontconfig
+	>=dev-libs/atk-1.2
+	>=gnome-base/gconf-1.2
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonobo-2.2
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/nautilus-2.6
+	>=gnome-base/gnome-vfs-2.2
+	>=gnome-base/gnome-desktop-2.2
+	>=gnome-base/gnome-menus-2.9.1
+	dev-libs/libxml2
+	media-sound/esound
+	>=x11-wm/metacity-2.8.6-r1
+	>=x11-libs/libxklavier-1.14
+	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
+	gstreamer? ( >=media-libs/gst-plugins-0.8 )
+	!gnome-extra/fontilus
+	!gnome-extra/themus
+	!gnome-extra/acme"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS ChangeLog README TODO NEWS"
+
+G2CONF="${G2CONF} \
+	--disable-schemas-install\
+	--enable-vfs-methods \
+	$(use_enable alsa) \
+	$(use_enable gstreamer)"
+
+USE_DESTDIR="1"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
+	# what this is about.
+	use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch
+
+	# Temporary workaround for a problematic behaviour with acme.
+	epatch ${FILESDIR}/control-center-2.6.0-remove-pmu.patch
+
+	# Fix the logout keyboard shortcut by moving it out of
+	# the control-center here, and into metacity, bug #52034
+	epatch ${FILESDIR}/control-center-2.9-logout.patch
+
+}
diff --git a/gnome-base/control-center/files/control-center-2.9-logout.patch b/gnome-base/control-center/files/control-center-2.9-logout.patch
new file mode 100644
index 000000000000..ea141f41ddb7
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.9-logout.patch
@@ -0,0 +1,85 @@
+diff -ur control-center-2.9.4/capplets/keybindings/gnome-keybinding-properties.c control-center-2.9.4-patched/capplets/keybindings/gnome-keybinding-properties.c
+--- control-center-2.9.4/capplets/keybindings/gnome-keybinding-properties.c	2004-10-17 17:17:31.000000000 +0800
++++ control-center-2.9.4-patched/capplets/keybindings/gnome-keybinding-properties.c	2005-02-06 15:42:14.136619824 +0800
+@@ -41,13 +41,13 @@
+ const KeyListEntry desktop_key_list[] =
+ {
+   { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 },
+-  { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 },
+   { "/apps/gnome_settings_daemon/keybindings/sleep", ALWAYS_VISIBLE, 0 },
+   { "/apps/gnome_settings_daemon/keybindings/screensaver", ALWAYS_VISIBLE, 0 },
+   { "/apps/gnome_settings_daemon/keybindings/home", ALWAYS_VISIBLE, 0 },
+   { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 },
+   { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 },
+   { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 },
++  { "/apps/metacity/global_keybindings/logout", ALWAYS_VISIBLE, 0 },
+   { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 },
+   { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 },
+   { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 },
+diff -ur control-center-2.9.4/gnome-settings-daemon/actions/acme.h control-center-2.9.4-patched/gnome-settings-daemon/actions/acme.h
+--- control-center-2.9.4/gnome-settings-daemon/actions/acme.h	2004-03-24 10:54:33.000000000 +0800
++++ control-center-2.9.4-patched/gnome-settings-daemon/actions/acme.h	2005-02-06 15:42:39.995688648 +0800
+@@ -29,7 +29,6 @@
+ 	MUTE_KEY,
+ 	VOLUME_DOWN_KEY,
+ 	VOLUME_UP_KEY,
+-	POWER_KEY,
+ 	EJECT_KEY,
+ 	HOME_KEY,
+ 	SEARCH_KEY,
+@@ -64,7 +63,6 @@
+ 	{ MUTE_KEY, GCONF_BINDING_DIR "/volume_mute",NULL },
+ 	{ VOLUME_DOWN_KEY, GCONF_BINDING_DIR "/volume_down", NULL },
+ 	{ VOLUME_UP_KEY, GCONF_BINDING_DIR "/volume_up", NULL },
+-	{ POWER_KEY, GCONF_BINDING_DIR "/power", NULL },
+ 	{ EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL },
+ 	{ HOME_KEY, GCONF_BINDING_DIR "/home", NULL },
+ 	{ SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL },
+diff -ur control-center-2.9.4/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.9.4-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+--- control-center-2.9.4/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2005-01-05 11:03:10.000000000 +0800
++++ control-center-2.9.4-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2005-02-06 15:43:33.263590696 +0800
+@@ -661,12 +661,6 @@
+ }
+ 
+ static void
+-do_exit_action (Acme *acme)
+-{
+-	execute ("gnome-session-save --kill", FALSE);
+-}
+-
+-static void
+ do_eject_action (Acme *acme)
+ {
+ 	GtkWidget *progress;
+@@ -807,9 +801,6 @@
+ 	case VOLUME_UP_KEY:
+ 		do_sound_action (acme, type);
+ 		break;
+-	case POWER_KEY:
+-		do_exit_action (acme);
+-		break;
+ 	case EJECT_KEY:
+ 		do_eject_action (acme);
+ 		break;
+diff -ur control-center-2.9.4/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.9.4-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in
+--- control-center-2.9.4/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2004-05-18 01:03:38.000000000 +0800
++++ control-center-2.9.4-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2005-02-06 15:46:33.028262312 +0800
+@@ -50,18 +50,6 @@
+ 
+ 
+         <schema>
+-            <key>/schemas/apps/gnome_settings_daemon/keybindings/power</key>
+-            <applyto>/apps/gnome_settings_daemon/keybindings/power</applyto>
+-            <type>string</type>
+-            <default></default>
+-            <locale name="C">
+-                <short>Log out</short>
+-                <long>Log out's shortcut.</long>
+-            </locale>
+-        </schema>
+-
+-
+-        <schema>
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/eject</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/eject</applyto>
+             <type>string</type>
diff --git a/gnome-base/control-center/files/digest-control-center-2.10.0 b/gnome-base/control-center/files/digest-control-center-2.10.0
new file mode 100644
index 000000000000..59d6b969b819
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.10.0
@@ -0,0 +1 @@
+MD5 23ee64b8e559cce4aa6beb70ad675130 control-center-2.10.0.tar.bz2 2617716