Version bump

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 11 insertions, 83 deletions

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index cd6713953132..78d94839b13f 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.71 2010/06/13 16:47:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.72 2010/06/23 11:57:48 pacho Exp $
+
+*libgnomekbd-2.30.2 (23 Jun 2010)
+
+  23 Jun 2010; Pacho Ramos <pacho@gentoo.org> -libgnomekbd-2.30.1.ebuild,
+  -files/libgnomekbd-2.30.1-kbd-crash.patch,
+  -files/libgnomekbd-2.30.1-notification-area.patch,
+  +libgnomekbd-2.30.2.ebuild:
+  Version bump with updated translations and fixes, remove old.
 
 *libgnomekbd-2.30.1 (13 Jun 2010)
 
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-kbd-crash.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-kbd-crash.patch
deleted file mode 100644
index 44626a6339bc..000000000000
--- a/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-kbd-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4f9c7b401e948756fbe76a56a7619052f8acae42 Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov <svu@gnome.org>
-Date: Tue, 04 May 2010 23:36:04 +0000
-Subject: Do not crash on kbd plug in
-
-There is funny race condition in X - when _XKB_RULES_NAMES is already
-loaded from sysconfig while actual XKB config is still not changed (from
-user config). This commit should fix
-https://bugzilla.gnome.org/show_bug.cgi?id=617643
----
-diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
-index 5def369..f6064fa 100644
---- a/libgnomekbd/gkbd-indicator.c
-+++ b/libgnomekbd/gkbd-indicator.c
-@@ -318,7 +318,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine,
- 				    gchar ** short_group_names,
- 				    gchar ** full_group_names)
- {
--	char *layout_name;
-+	char *layout_name = NULL;
- 	if (group < g_strv_length (short_group_names)) {
- 		if (xkl_engine_get_features (engine) &
- 		    XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
-@@ -352,7 +352,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine,
- 	}
- 
- 	if (layout_name == NULL)
--		layout_name = g_strdup ("??");
-+		layout_name = g_strdup ("");
- 
- 	return layout_name;
- }
-diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
-index 90731af..efcad6a 100644
---- a/libgnomekbd/gkbd-status.c
-+++ b/libgnomekbd/gkbd-status.c
-@@ -152,6 +152,7 @@ gkbd_status_render_cairo (cairo_t * cr, int group)
- 	cairo_font_options_t *fo;
- 	static GHashTable *ln2cnt_map = NULL;
- 
-+	xkl_debug (160, "Rendering cairo for group %d\n", group);
- 	if (globals.ind_cfg.background_color != NULL &&
- 	    globals.ind_cfg.background_color[0] != 0) {
- 		if (sscanf
---
-cgit v0.8.3.1
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-notification-area.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-notification-area.patch
deleted file mode 100644
index 9acda770ea9f..000000000000
--- a/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-notification-area.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8dbeec103124f9de1ed515ef50ff79eff3ecd52c Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov <svu@gnome.org>
-Date: Sun, 25 Apr 2010 22:59:53 +0000
-Subject: Provide the proper place in NA by using the name
-
-The name "keyboard" is known to the NA applet - so it positions the icon
-properly, on the right side, after all apps
----
-diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
-index efcad6a..5e62ae9 100644
---- a/libgnomekbd/gkbd-status.c
-+++ b/libgnomekbd/gkbd-status.c
-@@ -632,6 +632,9 @@ gkbd_status_init (GkbdStatus * gki)
- 
- 	gki->priv = g_new0 (GkbdStatusPrivate, 1);
- 
-+	/* This should give NA a hint about the order */
-+	gtk_status_icon_set_name (GTK_STATUS_ICON(gki), "keyboard");
-+
- 	xkl_debug (100, "Initiating the widget startup process for %p\n",
- 		   gki);
- 
---
-cgit v0.8.3.1
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.30.2.ebuild
index 06a9a7eb7e40..87b1584699a9 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.30.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild,v 1.1 2010/06/13 16:47:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.30.2.ebuild,v 1.1 2010/06/23 11:57:48 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2 multilib
+inherit gnome2 multilib
 
 DESCRIPTION="Gnome keyboard configuration library"
 HOMEPAGE="http://www.gnome.org"
@@ -32,16 +32,6 @@ pkg_setup() {
 	G2CONF="${G2CONF} --disable-tests --disable-static"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not crash on kbd plug in; upstream bug 617643
-	epatch "${FILESDIR}/${P}-kbd-crash.patch"
-
-	# Provide the proper place in NA by using the name
-	epatch "${FILESDIR}/${P}-notification-area.patch"
-}
-
 src_compile() {
 	# FreeBSD doesn't like -j, upstream? bug #????
 	use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1"