Add new version for Gnome 2.30

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 135 insertions, 5 deletions

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index 98e541962024..cd6713953132 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.70 2010/06/04 20:11:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.71 2010/06/13 16:47:46 pacho Exp $
+
+*libgnomekbd-2.30.1 (13 Jun 2010)
+
+  13 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:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> libgnomekbd-2.28.2.ebuild:
   x86 stable, bug #314899
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index 9edef099f0a3..4678e164d2ed 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -4,16 +4,20 @@ Hash: SHA1
 AUX libgnomekbd-2.21.1-no-libbonobo.patch 373 RMD160 8c277c8263cbc27b4c3144f19839f202d9e785a7 SHA1 1031226ba7b1e632b88508cf68d1369bc98a14cc SHA256 e5bce7d1d9ed9be4d9ec008341aafbf66312e86bda5c9f5fdd70e5fb5086eb6d
 AUX libgnomekbd-2.22.0-system-relink.patch 1043 RMD160 a85f5f5e46ba59ae5a7acf6360d4693b2d27a4d7 SHA1 fecdf02e335c36af95bf8871f132f5915e44705b SHA256 2e3291b483dd2dc96fa63e33aa1ffc2676148f7fddb54a22134e2012d1755355
 AUX libgnomekbd-2.26.0-libxklavier4.patch 1542 RMD160 76851bb5dcb28ab5996c1c1ac3fde87c054e89c7 SHA1 8049bfddc0b05c6717afe51221ce57bc88ab7f4e SHA256 ddeef2bfcb9a4417b196f12a0a41628f7b3ed1ea4ded8c17c2f4e289f69dbeb6
+AUX libgnomekbd-2.30.1-kbd-crash.patch 1648 RMD160 e3247844067252be27f04955e10b02d0176d71fe SHA1 98a9cb4e41320e7b72ec58315fb1765d8fac0c1d SHA256 9849ab36814c1c30dfe9b9e2b787e84d6dad349c6fecdf67c3409f1be363ea2a
+AUX libgnomekbd-2.30.1-notification-area.patch 811 RMD160 159efba95b6a39915eeeee016d5711cfe2105d00 SHA1 6ed3cffcb4ac275090d11800da0f93777c1125ca SHA256 0db1363172103388ca73345d856457cf20774534aa5619b296c6ab7c2b59dfa0
 DIST libgnomekbd-2.26.0.tar.bz2 413560 RMD160 0a4b5d133efc8b08482d1dc27cdf2ca56655fd48 SHA1 0b7543df516271e16198135323471b2107dca0ec SHA256 26a53552f3eaeda8d386e31622ba605944eb97dfe5ffa834dc0708761811364f
 DIST libgnomekbd-2.28.2.tar.bz2 398401 RMD160 ab0b50e5d64e09965a4d95854371a44f935d8644 SHA1 f37ead3549232ebc3e98200086c4a6e225aeac04 SHA256 c8503ba93e462cb87975adbad43d0f77273cca038d0b5885e66f679da1ff695a
+DIST libgnomekbd-2.30.1.tar.bz2 404828 RMD160 2b02b1bd177e485abe0bef6d4c5ca56f96888c49 SHA1 9d95d0d71060ce08d7ceaccfe3bf5b283b64de48 SHA256 828faade8ef36f89cc27ca4f71e83630aa611ccb4745cb6687cdedddd461b293
 EBUILD libgnomekbd-2.26.0.ebuild 1704 RMD160 fa2bdb08087a6b438d3a4bdc268bce223311dec0 SHA1 0cfa6356e988c75eb1dbc1ffd3d5cdf0c9114a49 SHA256 1e1865fd2dcba578bf4da2bfb67d44d2f10e963eabcf2a898577765495f5d765
 EBUILD libgnomekbd-2.28.2.ebuild 1589 RMD160 d490186c2f29683715571058973194e5b61a36aa SHA1 6095b07beaa0d4d01f05745ac367a73b03511db4 SHA256 c679f6a98873f0285fa3e1282c9586ffba848464f8e3926b9944ba63e16c1e75
-MISC ChangeLog 8533 RMD160 38da874360d330f762cf059f1ed58417e2c8770b SHA1 0ca367a29b06220f5b880a21b0d2d492696309c9 SHA256 3498e4689b48096958d731f5d758f29ffb72ab5ce0de2993de246ca796496087
+EBUILD libgnomekbd-2.30.1.ebuild 1323 RMD160 8df33e1ae5522c0da40f9328b24efb1e7ce8d669 SHA1 7c4936c03d59c15f0b28e963d6dcce6f1cd366e7 SHA256 d2682ddfc5c1dad45299fc19edcc0d4f7584a51767e63be708b7d07b487e8ac8
+MISC ChangeLog 8774 RMD160 0d5e032149ea3c85bf98dfd01803b656fbf4a5f1 SHA1 be13b6dc71d15d1b0bc021cbc56b43002f2fd506 SHA256 05a6f6e6a8fc69249a9d0f38f7f403a10e979c1df0c57311490b02b375fd1725
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwJXXoACgkQkKaRLQcq0GLi7wCgpYREe1H6QyDZUtPwyeOz+/qJ
-j18AnjXOPttPXHp+WaOU5uQfFw16+Pac
-=y71a
+iEYEARECAAYFAkwVC7gACgkQCaWpQKGI+9SrfACdEdfmW6XpIT7fyOj2AvYpXBrn
+NmYAnjafvbHDpnxMfNF7Hz1XVppzXpz/
+=4BEt
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..44626a6339bc
--- /dev/null
+++ b/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-kbd-crash.patch
@@ -0,0 +1,46 @@
+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
new file mode 100644
index 000000000000..9acda770ea9f
--- /dev/null
+++ b/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-notification-area.patch
@@ -0,0 +1,24 @@
+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.1.ebuild
new file mode 100644
index 000000000000..06a9a7eb7e40
--- /dev/null
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild
@@ -0,0 +1,49 @@
+# 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 $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 multilib
+
+DESCRIPTION="Gnome keyboard configuration library"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.18
+	>=sys-apps/dbus-0.92
+	>=dev-libs/dbus-glib-0.34
+	>=gnome-base/gconf-2.14
+	>=x11-libs/gtk+-2.18
+	>=x11-libs/libxklavier-5.0"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	# Only user interaction required graphical tests at the time of 2.22.0 - not useful for us
+	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"
+	gnome2_src_compile
+}