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

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

5 files changed, 39 insertions, 99 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/Manifest b/gnome-base/gnome-control-center/Manifest
index 5999bfc0a628..0d9610cd9a52 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,11 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-control-center-2.18.1-gnome-doc-utils-fix.patch 370 RMD160 1cee6610e683dbf6f162bd9c7d174f3555f3a435 SHA1 8e26e680fac18bdbec02aaba410c6b029b8071dc SHA256 197eafa5b4d445977b3a878d5642f6c5de621a410dc31524221816e4bf5a1675
 AUX gnome-control-center-2.19.90-no-esd.patch 1169 RMD160 ca43e6a2abbf145c7da529dfe39ddfaba659ee45 SHA1 3a6103b3d07ede2c6f5fd2f6600c36abbe816439 SHA256 c32780e50c751234e6e4412fe3a6deaf5635a030553fbe1a61fb19cd47defc98
+AUX gnome-control-center-2.22.2.1-caps-esc-bindable.patch 730 RMD160 76eb6b81f65b5d0a97c59ba839bada985ed3652c SHA1 0aa38ce259023fbbee36044d986b741333c095f7 SHA256 613c943a3161e8ad1ba0e0c6ba4708291cd5681a692bf1d0dbef66dee1c18d77
 AUX gnome-control-center-2.22.2.1-extra-programs.patch 6608 RMD160 154a740235903d0300ef38a59d03fa25067d20f6 SHA1 11141d89a9bd09e1cba03450087e036fea0a6568 SHA256 8aa04506d37118aef82ae5db99827c7b369960e0f80bec689b271753858b101d
 DIST gnome-control-center-2.20.3.tar.bz2 2259976 RMD160 96f56251c6a06315861dcd89a1c5f68ed47bd48f SHA1 57395df926f9fc79caa7dc94d55d22d55cfa15c0 SHA256 e3abed47de5f41511af95663d1adb3d35a575dc662b8611e959f2f5d205ab07f
-DIST gnome-control-center-2.22.1.tar.bz2 2174701 RMD160 c51bf51f26594021b98bc5e82db97fac7d9a7bd8 SHA1 d62a7cc6ce09e15e0040747a1c6eb9287d323562 SHA256 524563d285b5c3be71fce6596a81ef3057514382f4f61e4b64bb827a94a6b01c
 DIST gnome-control-center-2.22.2.1.tar.bz2 2110331 RMD160 59e27bd24f15cbf4a4cef65aad740945eee40ca0 SHA1 686151d59b99fb311481ba365b0dd3fd3680cac6 SHA256 a13eda3ffc0ec353d1b0414238f70e08155179f24cda2f4afba6d905a601e56a
 EBUILD gnome-control-center-2.20.3.ebuild 2534 RMD160 5c6fa462eb7769ea98b373a2f06d70819e376972 SHA1 17174f170b7f537cffd5c50bc29a13de415716a9 SHA256 708c482df7cafaa98de7f5c4f8eeaf1a7bed55b8b66bd4b9fc8ae5c3abbda9d7
-EBUILD gnome-control-center-2.22.1.ebuild 2342 RMD160 83dce36d6c9b357390a5340353b5e4e186240c58 SHA1 f25540b16d8cc43f936f8599335c464ab24824b6 SHA256 5fe03baf3be12c13cfa49248d166a2167f72d2877e542844e2d269cb85c1744e
-EBUILD gnome-control-center-2.22.2.1.ebuild 2419 RMD160 f56660bd4791366c56a74e758bd0872beab13955 SHA1 a051a7b43aca5d3edef632625087b9f64cdf5a79 SHA256 f543a3ce5fd8d757fa4b526c9b4f5845fe461e6e3dd785197e6f150ad05314b2
-MISC ChangeLog 38179 RMD160 8bcf7b53a3d21881c7e04ce7bbd88404e59fef86 SHA1 0efe3e683ceb12b7901fc7eae10513b75360c6bc SHA256 be49049312251c305bd341042f2a1ad31c962d4951463cc7f1f72f61579064ad
+EBUILD gnome-control-center-2.22.2.1.ebuild 2521 RMD160 d52907c81fc92d25769f4ccc77303343a9bf4c76 SHA1 943315769b611e92205292952d9a56b2e7a0bcd1 SHA256 a1ecfbc64c52c21ed76a294f864d9c35aff00846f2c160271a4975856ff0fe67
+MISC ChangeLog 38484 RMD160 b77ea64794f5383bf5a70356ee633921998f2a45 SHA1 9a88f55420397cd3f271efab6ec59da2163b8b06 SHA256 25ef318c56f6098a6ef688777837920b32272667704f5378c6fb56a9f25b4448
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiSNdgACgkQ1fmVwcYIWAbQkgCgwdWdCzJmogIbNK07zGIFUruI
+BuMAoKame9D6cXNSBxbVBy6D3i3kwzkj
+=dCxV
+-----END PGP SIGNATURE-----
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"
 }