Add patch to avoid binding ESC, bug #230153. Clean up old revision.

(Portage version: 2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

4 files changed, 26 insertions, 95 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 7d96fe42983e..52f861677786 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.5 2008/07/30 22:01:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.6 2008/07/31 21:59:43 eva Exp $
+
+  31 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-control-center-2.22.2.1-caps-esc-bindable.patch,
+  -gnome-control-center-2.22.1.ebuild, gnome-control-center-2.22.2.1.ebuild:
+  gnome-control-center-2.22.2.1.ebuild:
+  Add patch to avoid binding ESC, bug #230153.
+  Clean up old revision.
 
   30 Jul 2008; Brent Baude <ranger@gentoo.org>
   gnome-control-center-2.22.2.1.ebuild:
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.22.2.1-caps-esc-bindable.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.22.2.1-caps-esc-bindable.patch
new file mode 100644
index 000000000000..1a0f15f212c3
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.22.2.1-caps-esc-bindable.patch
@@ -0,0 +1,14 @@
+Index: capplets/keybindings/eggcellrendererkeys.c
+===================================================================
+--- capplets/keybindings/eggcellrendererkeys.c	(revision 8602)
++++ capplets/keybindings/eggcellrendererkeys.c	(working copy)
+@@ -421,7 +421,8 @@
+ 
+   egg_keymap_resolve_virtual_modifiers (gdk_keymap_get_default (),
+                                         EGG_VIRTUAL_NUM_LOCK_MASK |
+-                                        EGG_VIRTUAL_SCROLL_LOCK_MASK,
++                                        EGG_VIRTUAL_SCROLL_LOCK_MASK |
++                                        EGG_VIRTUAL_LOCK_MASK,
+                                         &ignored_modifiers);
+   
+   /* http://bugzilla.gnome.org/show_bug.cgi?id=139605
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.22.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.22.1.ebuild
deleted file mode 100644
index e93bcc34029a..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-2.22.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.22.1.ebuild,v 1.1 2008/06/05 11:21:09 remi Exp $
-
-EAPI="1"
-
-inherit gnome2
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa eds esd hal"
-
-RDEPEND=">=virtual/xft-2.1.2
-		 >=x11-libs/gtk+-2.11.6
-		 >=dev-libs/glib-2.15.5
-		 >=gnome-base/gconf-2.0
-		 >=gnome-base/libglade-2
-		 >=gnome-base/librsvg-2.0
-		 >=gnome-base/nautilus-2.6
-		 >=media-libs/fontconfig-1
-		 >=dev-libs/dbus-glib-0.73
-		 >=gnome-base/gnome-vfs-2.2
-		 >=x11-libs/libxklavier-3.3
-		 >=x11-wm/metacity-2.21.21
-		 >=gnome-base/gnome-panel-2.0
-		 >=gnome-base/libgnomekbd-2.21.4.1
-		 >=gnome-base/gnome-desktop-2.21.4
-		 >=gnome-base/gnome-menus-2.11.1
-		 gnome-base/eel
-		 gnome-base/gnome-settings-daemon
-
-		>=media-libs/gstreamer-0.10.1.2
-		>=media-libs/gst-plugins-base-0.10.1.2
-		>=media-plugins/gst-plugins-gconf-0.10
-		media-plugins/gst-plugins-meta:0.10
-
-		x11-libs/pango
-		dev-libs/libxml2
-		media-libs/freetype
-
-		!arm? ( alsa? ( >=media-libs/alsa-lib-0.9.0 ) )
-		eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
-		esd? ( >=media-sound/esound-0.2.28 )
-		hal? ( >=sys-apps/hal-0.5.6 )
-
-		>=gnome-base/libbonobo-2
-		>=gnome-base/libgnome-2.2
-		>=gnome-base/libbonoboui-2
-		>=gnome-base/libgnomeui-2.2
-
-		x11-apps/xmodmap
-		x11-libs/libXScrnSaver
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXxf86misc
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXcursor"
-DEPEND="${RDEPEND}
-		x11-proto/scrnsaverproto
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/xf86miscproto
-		x11-proto/kbproto
-		x11-proto/randrproto
-		x11-proto/renderproto
-
-		sys-devel/gettext
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.19
-		dev-util/desktop-file-utils
-
-		app-text/scrollkeeper
-		>=app-text/gnome-doc-utils-0.10.1"
-# Needed for autoreconf
-#		gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--enable-vfs-methods
-		--enable-gstreamer=0.10
-		$(use_enable alsa)
-		$(use_enable eds aboutme)
-		$(use_enable esd)
-		$(use_enable hal)"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild
index 462154811cb7..470909bd405f 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild,v 1.4 2008/07/30 22:01:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.22.2.1.ebuild,v 1.5 2008/07/31 21:59:43 eva Exp $
 
 EAPI="1"
 
@@ -95,4 +95,7 @@ src_unpack() {
 
 	# Show more apps for favorite app selection, bug #215313
 	epatch "${FILESDIR}/${P}-extra-programs.patch"
+
+	# Make esc not bindable with caps lock, bug #230153
+	epatch "${FILESDIR}/${P}-caps-esc-bindable.patch"
 }