New version: 2.10.2. Cleaning old ebuilds/patches.

(Portage version: 2.0.51.22-r1)

9 files changed, 42 insertions, 789 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 31bf74bba5ee..37ecefba58e7 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,12 @@
 # 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.114 2005/07/12 02:53:26 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.115 2005/07/17 04:57:41 leonardop Exp $
+
+*control-center-2.10.2 (16 Jul 2005)
+
+  16 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  control-center-2.10.2.ebuild:
+  New version. Added 'static' USE flag. Updated dependencies.
 
   12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
   control-center-2.10.0.ebuild, control-center-2.10.1-r1.ebuild:
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 7cb2b17dacf1..b0471de38b71 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,19 +1,16 @@
-MD5 5551caa90c8c7d03258274f45b35e997 control-center-2.10.1-r1.ebuild 2043
-MD5 63d40166766fb5bc828bb2bad93e6422 control-center-2.10.0.ebuild 1905
-MD5 bda544133c993d5ef9e46a1db0e1007b control-center-2.8.1-r1.ebuild 1843
-MD5 5560e49c087f38016e47c55fd821ea05 control-center-2.8.2.ebuild 1843
-MD5 aa3234dd1a36f666ba5ace0047cdd8b9 control-center-1.4.0.5-r1.ebuild 1258
 MD5 581978a6b74776d466c2c04a156c0fe1 ChangeLog 14580
+MD5 aa3234dd1a36f666ba5ace0047cdd8b9 control-center-1.4.0.5-r1.ebuild 1258
+MD5 affbe95f87bef332f9ab6d16da2921b9 control-center-2.10.2.ebuild 2024
+MD5 8eb29199e8e8127d182b752828a3df0c .control-center-2.10.2.ebuild.swp 12288
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
-MD5 67a5a28783f9b30d8f05ef301d2eeb7a files/digest-control-center-2.8.2 74
-MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
+MD5 63d40166766fb5bc828bb2bad93e6422 control-center-2.10.0.ebuild 1905
+MD5 5551caa90c8c7d03258274f45b35e997 control-center-2.10.1-r1.ebuild 2043
+MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
+MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-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 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
+MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
+MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
+MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
 MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
-MD5 3c50bab26a7b8dd1ccb40514655a0a79 files/digest-control-center-2.8.1-r1 74
 MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1-r1 75
-MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
diff --git a/gnome-base/control-center/control-center-2.8.1-r1.ebuild b/gnome-base/control-center/control-center-2.10.2.ebuild
index e65a2ded1d3e..b335c0039a06 100644
--- a/gnome-base/control-center/control-center-2.8.1-r1.ebuild
+++ b/gnome-base/control-center/control-center-2.10.2.ebuild
@@ -1,36 +1,37 @@
 # 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.8.1-r1.ebuild,v 1.9 2005/06/06 08:19:09 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.10.2.ebuild,v 1.1 2005/07/17 04:57:41 leonardop Exp $
 
-inherit gnome2 eutils
+inherit eutils gnome2
 
 DESCRIPTION="The gnome2 Desktop configuration tool"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86"
-IUSE="alsa gstreamer"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa gstreamer static"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
-RDEPEND=">=x11-libs/gtk+-2.3
+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
+	>=media-libs/fontconfig-1
+	>=gnome-base/gconf-2
 	>=gnome-base/libgnome-2.2
 	>=gnome-base/libgnomeui-2.2
 	>=gnome-base/libglade-2
-	>=gnome-base/libbonobo-2.2
+	>=gnome-base/libbonobo-2
 	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/nautilus-2.2
+	>=gnome-base/nautilus-2.6
 	>=gnome-base/gnome-vfs-2.2
 	>=gnome-base/gnome-desktop-2.2
-	dev-libs/libxml2
+	>=gnome-base/gnome-menus-2.9.1
+	>=gnome-base/orbit-2
 	media-sound/esound
 	>=x11-wm/metacity-2.8.6-r1
-	=x11-libs/libxklavier-1.0*
+	>=x11-libs/libxklavier-1.14
 	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
 	gstreamer? ( >=media-libs/gst-plugins-0.8 )
 	!gnome-extra/fontilus
@@ -38,17 +39,13 @@ RDEPEND=">=x11-libs/gtk+-2.3
 	!gnome-extra/acme"
 
 DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29"
+	dev-util/pkgconfig
+	dev-util/intltool"
 
-DOCS="AUTHORS ChangeLog README TODO NEWS"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-G2CONF="${G2CONF} \
-	--disable-schemas-install\
-	--enable-vfs-methods \
-	$(use_enable alsa) \
-	$(use_enable gstreamer)"
+G2CONF="${G2CONF} --disable-schemas-install	--enable-vfs-methods \
+$(use_enable alsa) $(use_enable gstreamer) $(use_enable static)"
 
 USE_DESTDIR="1"
 
@@ -62,10 +59,14 @@ src_unpack() {
 	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
+	epatch ${FILESDIR}/${PN}-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-logout.patch
+	epatch ${FILESDIR}/${PN}-2.9-logout.patch
+
+	# Fix the hardcoding of tar, bzip2, and gzip paths in
+	# gnome-theme-installer.  bug #84977
+	epatch ${FILESDIR}/${PN}-2.10.1-pathfix.patch
 
 }
diff --git a/gnome-base/control-center/control-center-2.8.2.ebuild b/gnome-base/control-center/control-center-2.8.2.ebuild
deleted file mode 100644
index 9cc232c6c270..000000000000
--- a/gnome-base/control-center/control-center-2.8.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.8.2.ebuild,v 1.8 2005/06/06 08:19:09 foser Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc sparc x86"
-IUSE="alsa gstreamer"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.3
-	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.2
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/gnome-desktop-2.2
-	dev-libs/libxml2
-	media-sound/esound
-	>=x11-wm/metacity-2.8.6-r1
-	=x11-libs/libxklavier-1.0*
-	!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.8-logout.patch
-
-}
diff --git a/gnome-base/control-center/files/control-center-2-logout.patch b/gnome-base/control-center/files/control-center-2-logout.patch
deleted file mode 100644
index 3374331e5a29..000000000000
--- a/gnome-base/control-center/files/control-center-2-logout.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-diff -ur control-center-2.8.1/capplets/keybindings/gnome-keybinding-properties.c control-center-2.8.1-patched/capplets/keybindings/gnome-keybinding-properties.c
---- control-center-2.8.1/capplets/keybindings/gnome-keybinding-properties.c	2004-09-10 10:34:56.000000000 +0800
-+++ control-center-2.8.1-patched/capplets/keybindings/gnome-keybinding-properties.c	2004-12-08 11:28:52.339884952 +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.8.1/gnome-settings-daemon/actions/acme.h control-center-2.8.1-patched/gnome-settings-daemon/actions/acme.h
---- control-center-2.8.1/gnome-settings-daemon/actions/acme.h	2004-03-24 10:54:33.000000000 +0800
-+++ control-center-2.8.1-patched/gnome-settings-daemon/actions/acme.h	2004-12-08 11:28:52.339884952 +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.8.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.8.1-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c
---- control-center-2.8.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2004-10-09 09:52:01.000000000 +0800
-+++ control-center-2.8.1-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2004-12-08 11:28:52.340884800 +0800
-@@ -641,22 +641,6 @@
- }
- 
- static void
--do_exit_action (Acme *acme)
--{
--	GnomeClient *master;
--
--	master = gnome_master_client();
--	g_return_if_fail(master != NULL);
--
--	gnome_client_request_save(master,
--			GNOME_SAVE_BOTH,
--			TRUE,
--			GNOME_INTERACT_ANY,
--			FALSE,
--			TRUE);
--}
--
--static void
- do_eject_action (Acme *acme)
- {
- 	GtkWidget *progress;
-@@ -797,9 +781,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.8.1/schemas/apps_gnome_settings_daemon_keybindings.schemas control-center-2.8.1-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas
---- control-center-2.8.1/schemas/apps_gnome_settings_daemon_keybindings.schemas	2004-10-15 03:00:04.000000000 +0800
-+++ control-center-2.8.1-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas	2004-12-08 11:29:58.511825288 +0800
-@@ -1106,238 +1106,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>
--
--            <locale name="ar">
--                <short>تسجيل الخروج</short>
--                <long>مختصر تسجيل الخروج.</long>
--            </locale>
--
--            <locale name="az">
--                <short>İclası sonlandır</short>
--                <long>İclası sonlandırma qısa yolu.</long>
--            </locale>
--
--            <locale name="bg">
--                <short>Смяна на потребителя</short>
--                <long>Бърз клавиш за излизане от работната среда.</long>
--            </locale>
--
--            <locale name="bn">
--                <short>লগ-আউট</short>
--                <long>লগ-আউট করার শর্টকাট।</long>
--            </locale>
--
--            <locale name="bs">
--                <short>Odjava</short>
--                <long>Kratica za odjavu.</long>
--            </locale>
--
--            <locale name="ca">
--                <short>Surt</short>
--                <long>Drecera per a sortir.</long>
--            </locale>
--
--            <locale name="cs">
--                <short>Odhlásit se</short>
--                <long>Zkratka odhlášení.</long>
--            </locale>
--
--            <locale name="cy">
--                <short>Allgofnodi</short>
--                <long>Byrlwybr i allgofnodi.</long>
--            </locale>
--
--            <locale name="da">
--                <short>Logud</short>
--                <long>Genvej til logud.</long>
--            </locale>
--
--            <locale name="de">
--                <short>Abmelden</short>
--                <long>Abmelden-Tastenkombination.</long>
--            </locale>
--
--            <locale name="el">
--                <short>Αποσύνδεση</short>
--                <long>Σύντομευση αποσύνδεσης.</long>
--            </locale>
--
--            <locale name="en_CA">
--                <short>Log out</short>
--                <long>Log out&apos;s shortcut.</long>
--            </locale>
--
--            <locale name="en_GB">
--                <short>Log out</short>
--                <long>Log out&apos;s shortcut.</long>
--            </locale>
--
--            <locale name="es">
--                <short>Terminar sesión</short>
--                <long>Combinación de teclas para terminar sesión.</long>
--            </locale>
--
--            <locale name="fi">
--                <short>Kirjaudu ulos</short>
--                <long>Ulos kirjaava pikanäppäin.</long>
--            </locale>
--
--            <locale name="fr">
--                <short>Déconnexion</short>
--                <long>Raccourci clavier de « Déconnexion ».</long>
--            </locale>
--
--            <locale name="gu">
--                <short>બહાર નીકળો</short>
--                <long>બહાર નીકળવાનું ટુંકાણ.</long>
--            </locale>
--
--            <locale name="hi">
--                <short>लॉग आउट</short>
--                <long>लॉगआउट का शॉर्टकट.</long>
--            </locale>
--
--            <locale name="hu">
--                <short>Kijelentkezés</short>
--                <long>Kijelentkezés gyorsbillentyűje.</long>
--            </locale>
--
--            <locale name="it">
--                <short>Termina sessione</short>
--                <long>Scorciatoia di «Termina sessione».</long>
--            </locale>
--
--            <locale name="ja">
--                <short>ログアウト</short>
--                <long>ログアウトする機能のショートカットです。</long>
--            </locale>
--
--            <locale name="ko">
--                <short>로그아웃</short>
--                <long>로그아웃 바로 가기.</long>
--            </locale>
--
--            <locale name="lt">
--                <short>Atsijungti</short>
--                <long>Atsijungimo susiejimas.</long>
--            </locale>
--
--            <locale name="mk">
--                <short>Одјави се</short>
--                <long>Кратенка за одјава.</long>
--            </locale>
--
--            <locale name="nb">
--                <short>Logg ut</short>
--                <long>Snarvei for å logge ut.</long>
--            </locale>
--
--            <locale name="nl">
--                <short>Afmelden</short>
--                <long>Sneltoets voor afmelden</long>
--            </locale>
--
--            <locale name="nn">
--                <short>Logg ut</short>
--                <long>Snøggtast som loggar ut.</long>
--            </locale>
--
--            <locale name="no">
--                <short>Logg ut</short>
--                <long>Snarvei for å logge ut.</long>
--            </locale>
--
--            <locale name="pa">
--                <short>ਬਾਹਰੀ ਦਰ</short>
--                <long>ਬਾਹਰੀ ਦਰ ਦਾ ਸ਼ਾਰਟਕਟ ਹੈ।</long>
--            </locale>
--
--            <locale name="pl">
--                <short>Wylogowanie</short>
--                <long>Klawisz skrótu wylogowania.</long>
--            </locale>
--
--            <locale name="pt">
--                <short>Terminar a sessão</short>
--                <long>Atalho para terminar a sessão.</long>
--            </locale>
--
--            <locale name="pt_BR">
--                <short>Sair</short>
--                <long>Atalho para Sair</long>
--            </locale>
--
--            <locale name="ro">
--                <short>Deautentificare</short>
--                <long>Combinaţie pentru Deautentificare</long>
--            </locale>
--
--            <locale name="ru">
--                <short>Завершить сеанс</short>
--                <long>Комбинация клавиш для завершения сеанса.</long>
--            </locale>
--
--            <locale name="sq">
--                <short>Dil jashtë</short>
--                <long>Shpejtuesi i tasteve për daljen jashtë(log out).</long>
--            </locale>
--
--            <locale name="sr">
--                <short>Одјава</short>
--                <long>Пречица за одјављивање.</long>
--            </locale>
--
--            <locale name="sr@Latn">
--                <short>Odjava</short>
--                <long>Prečica za odjavljivanje.</long>
--            </locale>
--
--            <locale name="sv">
--                <short>Logga ut</short>
--                <long>Genvägen för logga ut.</long>
--            </locale>
--
--            <locale name="ta">
--                <short>இட அமைவு.</short>
--                <long>_கனிமேசை குறுக்கு வழிகள்.</long>
--            </locale>
--
--            <locale name="th">
--                <short>ออกจากระบบ</short>
--                <long>ปุ่มลัดสำหรับออกจากระบบ</long>
--            </locale>
--
--            <locale name="tr">
--                <short>Çıkış</short>
--                <long>Çıkış&apos;ın kısayolu.</long>
--            </locale>
--
--            <locale name="uk">
--                <short>Завершення роботи</short>
--                <long>Комбінація клавіш для завершення роботи.</long>
--            </locale>
--
--            <locale name="vi">
--                <short>Đăng xuất</short>
--                <long>Phím tắt Đăng xuất.</long>
--            </locale>
--
--            <locale name="zh_CN">
--                <short>注销</short>
--                <long>注销的快捷键。</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 -ur control-center-2.8.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.8.1-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in
---- control-center-2.8.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2004-05-18 01:03:38.000000000 +0800
-+++ control-center-2.8.1-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2004-12-08 11:28:52.341884648 +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/control-center-2.8-logout.patch b/gnome-base/control-center/files/control-center-2.8-logout.patch
deleted file mode 100644
index b32cab21f209..000000000000
--- a/gnome-base/control-center/files/control-center-2.8-logout.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-diff -ur control-center-2.8.2/capplets/keybindings/gnome-keybinding-properties.c control-center-2.8.2-patched/capplets/keybindings/gnome-keybinding-properties.c
---- control-center-2.8.2/capplets/keybindings/gnome-keybinding-properties.c	2005-02-21 05:18:04.000000000 +0800
-+++ control-center-2.8.2-patched/capplets/keybindings/gnome-keybinding-properties.c	2005-02-24 15:09:55.344406192 +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.8.2/gnome-settings-daemon/actions/acme.h control-center-2.8.2-patched/gnome-settings-daemon/actions/acme.h
---- control-center-2.8.2/gnome-settings-daemon/actions/acme.h	2004-03-24 10:54:33.000000000 +0800
-+++ control-center-2.8.2-patched/gnome-settings-daemon/actions/acme.h	2005-02-24 15:10:30.138116744 +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.8.2/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.8.2-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c
---- control-center-2.8.2/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2005-02-21 05:18:05.000000000 +0800
-+++ control-center-2.8.2-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2005-02-24 15:11:12.842624672 +0800
-@@ -641,12 +641,6 @@
- }
- 
- static void
--do_exit_action (Acme *acme)
--{
--	execute ("gnome-session-save --kill", FALSE);
--}
--
--static void
- do_eject_action (Acme *acme)
- {
- 	GtkWidget *progress;
-@@ -787,9 +781,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.8.2/schemas/apps_gnome_settings_daemon_keybindings.schemas control-center-2.8.2-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas
---- control-center-2.8.2/schemas/apps_gnome_settings_daemon_keybindings.schemas	2005-02-21 20:28:36.000000000 +0800
-+++ control-center-2.8.2-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas	2005-02-24 15:12:33.175412232 +0800
-@@ -1165,253 +1165,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>
--
--            <locale name="ar">
--                <short>تسجيل الخروج</short>
--                <long>مختصر تسجيل الخروج.</long>
--            </locale>
--
--            <locale name="az">
--                <short>İclası sonlandır</short>
--                <long>İclası sonlandırma qısa yolu.</long>
--            </locale>
--
--            <locale name="bg">
--                <short>Смяна на потребителя</short>
--                <long>Бърз клавиш за излизане от работната среда.</long>
--            </locale>
--
--            <locale name="bn">
--                <short>লগ-আউট</short>
--                <long>লগ-আউট করার শর্টকাট।</long>
--            </locale>
--
--            <locale name="bs">
--                <short>Odjava</short>
--                <long>Kratica za odjavu.</long>
--            </locale>
--
--            <locale name="ca">
--                <short>Surt</short>
--                <long>Drecera per a sortir.</long>
--            </locale>
--
--            <locale name="cs">
--                <short>Odhlásit se</short>
--                <long>Zkratka odhlášení.</long>
--            </locale>
--
--            <locale name="cy">
--                <short>Allgofnodi</short>
--                <long>Byrlwybr i allgofnodi.</long>
--            </locale>
--
--            <locale name="da">
--                <short>Logud</short>
--                <long>Genvej til logud.</long>
--            </locale>
--
--            <locale name="de">
--                <short>Abmelden</short>
--                <long>Abmelden-Tastenkombination.</long>
--            </locale>
--
--            <locale name="el">
--                <short>Αποσύνδεση</short>
--                <long>Σύντομευση αποσύνδεσης.</long>
--            </locale>
--
--            <locale name="en_CA">
--                <short>Log out</short>
--                <long>Log out&apos;s shortcut.</long>
--            </locale>
--
--            <locale name="en_GB">
--                <short>Log out</short>
--                <long>Log out&apos;s shortcut.</long>
--            </locale>
--
--            <locale name="es">
--                <short>Terminar sesión</short>
--                <long>Combinación de teclas para terminar sesión.</long>
--            </locale>
--
--            <locale name="fi">
--                <short>Kirjaudu ulos</short>
--                <long>Ulos kirjaava pikanäppäin.</long>
--            </locale>
--
--            <locale name="fr">
--                <short>Déconnexion</short>
--                <long>Raccourci clavier de « Déconnexion ».</long>
--            </locale>
--
--            <locale name="gu">
--                <short>બહાર નીકળો</short>
--                <long>બહાર નીકળવાનું ટુંકાણ.</long>
--            </locale>
--
--            <locale name="hi">
--                <short>लॉग आउट</short>
--                <long>लॉगआउट का शॉर्टकट.</long>
--            </locale>
--
--            <locale name="hu">
--                <short>Kijelentkezés</short>
--                <long>Kijelentkezés gyorsbillentyűje.</long>
--            </locale>
--
--            <locale name="id">
--                <short>Keluar</short>
--                <long>Tombol untuk keluar dari sistem.</long>
--            </locale>
--
--            <locale name="it">
--                <short>Termina sessione</short>
--                <long>Scorciatoia di «Termina sessione».</long>
--            </locale>
--
--            <locale name="ja">
--                <short>ログアウト</short>
--                <long>ログアウトする機能のショートカットです。</long>
--            </locale>
--
--            <locale name="ko">
--                <short>로그아웃</short>
--                <long>로그아웃 바로 가기.</long>
--            </locale>
--
--            <locale name="lt">
--                <short>Atsijungti</short>
--                <long>Atsijungimo susiejimas.</long>
--            </locale>
--
--            <locale name="mk">
--                <short>Одјави се</short>
--                <long>Кратенка за одјава.</long>
--            </locale>
--
--            <locale name="nb">
--                <short>Logg ut</short>
--                <long>Snarvei for å logge ut.</long>
--            </locale>
--
--            <locale name="nl">
--                <short>Afmelden</short>
--                <long>Sneltoets voor afmelden</long>
--            </locale>
--
--            <locale name="nn">
--                <short>Logg ut</short>
--                <long>Snøggtast som loggar ut.</long>
--            </locale>
--
--            <locale name="no">
--                <short>Logg ut</short>
--                <long>Snarvei for å logge ut.</long>
--            </locale>
--
--            <locale name="nso">
--                <short>E-tšwa</short>
--                <long>Kgaoletšo ya go tšwa.</long>
--            </locale>
--
--            <locale name="pa">
--                <short>ਬਾਹਰੀ ਦਰ</short>
--                <long>ਬਾਹਰੀ ਦਰ ਦਾ ਸ਼ਾਰਟਕਟ ਹੈ।</long>
--            </locale>
--
--            <locale name="pl">
--                <short>Wylogowanie</short>
--                <long>Klawisz skrótu wylogowania.</long>
--            </locale>
--
--            <locale name="pt">
--                <short>Terminar a sessão</short>
--                <long>Atalho para terminar a sessão.</long>
--            </locale>
--
--            <locale name="pt_BR">
--                <short>Sair</short>
--                <long>Atalho para Sair</long>
--            </locale>
--
--            <locale name="ro">
--                <short>Deautentificare</short>
--                <long>Combinaţie pentru Deautentificare</long>
--            </locale>
--
--            <locale name="ru">
--                <short>Завершить сеанс</short>
--                <long>Комбинация клавиш для завершения сеанса.</long>
--            </locale>
--
--            <locale name="sq">
--                <short>Dil jashtë</short>
--                <long>Shpejtuesi i tasteve për daljen jashtë(log out).</long>
--            </locale>
--
--            <locale name="sr">
--                <short>Одјава</short>
--                <long>Пречица за одјављивање.</long>
--            </locale>
--
--            <locale name="sr@Latn">
--                <short>Odjava</short>
--                <long>Prečica za odjavljivanje.</long>
--            </locale>
--
--            <locale name="sv">
--                <short>Logga ut</short>
--                <long>Genvägen för logga ut.</long>
--            </locale>
--
--            <locale name="ta">
--                <short>இட அமைவு.</short>
--                <long>_கனிமேசை குறுக்கு வழிகள்.</long>
--            </locale>
--
--            <locale name="th">
--                <short>ออกจากระบบ</short>
--                <long>ปุ่มลัดสำหรับออกจากระบบ</long>
--            </locale>
--
--            <locale name="tr">
--                <short>Çıkış</short>
--                <long>Çıkış&apos;ın kısayolu.</long>
--            </locale>
--
--            <locale name="uk">
--                <short>Завершення роботи</short>
--                <long>Комбінація клавіш для завершення роботи.</long>
--            </locale>
--
--            <locale name="vi">
--                <short>Đăng xuất</short>
--                <long>Phím tắt Đăng xuất.</long>
--            </locale>
--
--            <locale name="zh_CN">
--                <short>注销</short>
--                <long>注销的快捷键。</long>
--            </locale>
--
--            <locale name="zu">
--                <short>Phuma</short>
--                <long>Phuma ngokunqamula.</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 -ur control-center-2.8.2/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.8.2-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in
---- control-center-2.8.2/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2004-05-18 01:03:38.000000000 +0800
-+++ control-center-2.8.2-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2005-02-24 15:13:01.977033720 +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.2 b/gnome-base/control-center/files/digest-control-center-2.10.2
new file mode 100644
index 000000000000..b8bc4df6fbec
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.10.2
@@ -0,0 +1 @@
+MD5 36022dcd340dac004903f5dadc8af589 control-center-2.10.2.tar.bz2 2833639
diff --git a/gnome-base/control-center/files/digest-control-center-2.8.1-r1 b/gnome-base/control-center/files/digest-control-center-2.8.1-r1
deleted file mode 100644
index 3d5859c76a3c..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.8.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7bd9c12b9abb05b6fcf7b4906b6918ea control-center-2.8.1.tar.bz2 2547071
diff --git a/gnome-base/control-center/files/digest-control-center-2.8.2 b/gnome-base/control-center/files/digest-control-center-2.8.2
deleted file mode 100644
index afdb9b154589..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 898ef25391c0330a31f36812fdc8a02f control-center-2.8.2.tar.bz2 2806342