Fix compability with >=libxklavier-4.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 59 insertions, 2 deletions

diff --git a/xfce-extra/xfce4-xkb/ChangeLog b/xfce-extra/xfce4-xkb/ChangeLog
index baa9a13fdbc9..fd1dbef12464 100644
--- a/xfce-extra/xfce4-xkb/ChangeLog
+++ b/xfce-extra/xfce4-xkb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-xkb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/ChangeLog,v 1.47 2009/07/20 15:44:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/ChangeLog,v 1.48 2009/07/20 16:28:03 ssuominen Exp $
+
+*xfce4-xkb-0.5.3.3-r1 (20 Jul 2009)
+
+  20 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-xkb-0.5.3.3-r1.ebuild, +files/xfce4-xkb-0.5.3.3-libxklavier.patch:
+  Fix compability with >=libxklavier-4.
 
   20 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-xkb-0.5.3.3.ebuild:
diff --git a/xfce-extra/xfce4-xkb/Manifest b/xfce-extra/xfce4-xkb/Manifest
index a8099732829c..f5919db6b79a 100644
--- a/xfce-extra/xfce4-xkb/Manifest
+++ b/xfce-extra/xfce4-xkb/Manifest
@@ -1,6 +1,8 @@
+AUX xfce4-xkb-0.5.3.3-libxklavier.patch 843 RMD160 32c11dbbec33df267185f4b2f48855ec42b880ea SHA1 82490cc65d589ead5697f0c1bb8eba62a7be92f2 SHA256 d35deb49f42e081700542dd7bac180b8b17c58eb83a2b0f5682d54c07e96de7d
 DIST xfce4-xkb-plugin-0.5.2.tar.gz 832449 RMD160 a55cdc77e5303e08d6d203607e4ce80cf1c435d4 SHA1 28fe7940416887aeea555433c4e7a0f2e10c575b SHA256 ff18a46137184870307c958614c2f22b16dac9472132dec2aba5608cde489346
 DIST xfce4-xkb-plugin-0.5.3.3.tar.gz 768414 RMD160 c4f691f0712c105ca37e4af4b311b066cceb3eec SHA1 5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7 SHA256 97b257ae15feefb9a32ef1d34d696797e2555862e19cc46bc31d84379c531379
 EBUILD xfce4-xkb-0.5.2.ebuild 589 RMD160 7dfda409e22329848b9bc9209db6d4bc3ac91f11 SHA1 517d5e19e1c9fa9231972326c311e46c79f85f84 SHA256 de60d0c8cec49dd5c21bc3928211721e1495cb5f3e3bcf00edbeba8c6dcc53fa
+EBUILD xfce4-xkb-0.5.3.3-r1.ebuild 696 RMD160 95f4ade703a5bd2c95fdec22615faa79a6de837c SHA1 b58a7178b19656f12f6508f16b9b810d05d1ad7b SHA256 00d4c8dcf1a87ef0f5650cd7219b0fa94449b5adf5a72057145f8315a983e736
 EBUILD xfce4-xkb-0.5.3.3.ebuild 628 RMD160 6b0d56a5f4f69b6c5dcd9e15b183535af16cce5f SHA1 2841cfacaff6496a7bc83c254f068ecf7188c072 SHA256 f52fdc6d8f0d39d24d79084dd7478acb81af06fe523227cb20c21882e145c943
-MISC ChangeLog 6124 RMD160 3b6d37057d4bc2a96f002e8f2b313d3e47f46f69 SHA1 9e7aeddc7ffb1b482e32ccfcce4054d93b16702f SHA256 9f48c248b60558a5b9c599944a5b05dd8382748abafc5110fe1c89d3f957f5e8
+MISC ChangeLog 6332 RMD160 40893c8834f78660ca319710d81c64f67ce7d342 SHA1 5dced385bfada30e881997aa5e294b026fe84226 SHA256 3434826677516db64d03231d745ba70e3013bd382e82d8861c2054729f54bb67
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-xkb/files/xfce4-xkb-0.5.3.3-libxklavier.patch b/xfce-extra/xfce4-xkb/files/xfce4-xkb-0.5.3.3-libxklavier.patch
new file mode 100644
index 000000000000..fbb918905654
--- /dev/null
+++ b/xfce-extra/xfce4-xkb/files/xfce4-xkb-0.5.3.3-libxklavier.patch
@@ -0,0 +1,21 @@
+diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
+--- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c	2009-03-06 15:16:03.000000000 +0200
++++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c	2009-07-20 18:40:34.000000000 +0300
+@@ -150,7 +150,7 @@
+     config->application_map = g_hash_table_new (g_direct_hash, NULL);
+ 
+     registry = xkl_config_registry_get_instance (config->engine);
+-    xkl_config_registry_load (registry);
++    xkl_config_registry_load (registry, FALSE);
+     
+     config_item = xkl_config_item_new ();
+ 
+@@ -547,7 +547,7 @@
+     if (!config) return NULL;
+ 
+     registry = xkl_config_registry_get_instance (config->engine);
+-    xkl_config_registry_load (registry);
++    xkl_config_registry_load (registry, FALSE);
+ 
+     return registry;
+ }
diff --git a/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.3-r1.ebuild b/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.3-r1.ebuild
new file mode 100644
index 000000000000..37ad6eac8ac5
--- /dev/null
+++ b/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-xkb/xfce4-xkb-0.5.3.3-r1.ebuild,v 1.1 2009/07/20 16:28:03 ssuominen Exp $
+
+inherit eutils xfce4
+
+XFCE_VERSION=4.6
+xfce4_gzipped
+
+DESCRIPTION="XKB layout switching panel plugin"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+RDEPEND=">=x11-libs/libxklavier-4
+	x11-libs/libwnck"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	x11-proto/kbproto
+	gnome-base/librsvg"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+xfce4_panel_plugin
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libxklavier.patch
+}