libxklavier-3.0-r1: adding oneliner patch to fix bug #158832 in 3.0

(Portage version: 2.1.2_rc3-r9)

4 files changed, 84 insertions, 1 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 6a35e158ec99..df9385de5b55 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.77 2006/12/21 12:39:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.78 2006/12/22 20:26:45 remi Exp $
+
+*libxklavier-3.0-r1 (22 Dec 2006)
+
+  22 Dec 2006; Remi <remi@gentoo.org> +files/libxklavier-3.0-libxml.diff,
+  +libxklavier-3.0-r1.ebuild:
+  adding oneliner patch to fix bug #158832 in libxklavier-3.0
 
   21 Dec 2006; Markus Rothe <corsair@gentoo.org> libxklavier-3.0.ebuild:
   Stable on ppc64; bug #156662
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-3.0-r1 b/x11-libs/libxklavier/files/digest-libxklavier-3.0-r1
new file mode 100644
index 000000000000..d9f3d1153038
--- /dev/null
+++ b/x11-libs/libxklavier/files/digest-libxklavier-3.0-r1
@@ -0,0 +1,3 @@
+MD5 7457dc72cfcb57498882ea652cb79eeb libxklavier-3.0.tar.gz 460992
+RMD160 7835f0a4369198a9fc91077687917c2b29b05d80 libxklavier-3.0.tar.gz 460992
+SHA256 53ff8b00f80c8e35e3e800268d35fc5901329dc81515d18a9dc359ceeeda4df8 libxklavier-3.0.tar.gz 460992
diff --git a/x11-libs/libxklavier/files/libxklavier-3.0-libxml.diff b/x11-libs/libxklavier/files/libxklavier-3.0-libxml.diff
new file mode 100644
index 000000000000..7fb594269c99
--- /dev/null
+++ b/x11-libs/libxklavier/files/libxklavier-3.0-libxml.diff
@@ -0,0 +1,12 @@
+diff -ru libxklavier-3.0/libxklavier/xklavier_config.c libxklavier-3.0-r1/libxklavier/xklavier_config.c
+--- libxklavier-3.0/libxklavier/xklavier_config.c	2006-08-03 18:40:06.000000000 -0400
++++ libxklavier-3.0-r1/libxklavier/xklavier_config.c	2006-12-22 09:56:06.000000000 -0500
+@@ -261,7 +261,7 @@
+ 		return FALSE;
+ 
+ 	nodes = xpath_obj->nodesetval;
+-	if (nodes != NULL && nodes->nodeTab != NULL) {
++	if (nodes != NULL && nodes->nodeTab != NULL && nodes->nodeNr > 0) {
+ 		rv = xkl_read_config_item(config, *nodes->nodeTab, pitem);
+ 		if (pnode != NULL) {
+ 			*pnode = *nodes->nodeTab;
diff --git a/x11-libs/libxklavier/libxklavier-3.0-r1.ebuild b/x11-libs/libxklavier/libxklavier-3.0-r1.ebuild
new file mode 100644
index 000000000000..7500e80962dc
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-3.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.0-r1.ebuild,v 1.1 2006/12/22 20:26:45 remi Exp $
+
+inherit eutils
+
+DESCRIPTION="High level XKB library"
+HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
+SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
+IUSE="doc"
+
+RDEPEND="||	(
+				(
+					||	( x11-misc/xkeyboard-config x11-misc/xkbdata )
+					x11-apps/xkbcomp
+					x11-libs/libX11
+					x11-libs/libxkbfile
+				)
+				virtual/x11
+			)
+		dev-libs/libxml2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-libxml.diff"
+}
+
+
+src_compile() {
+	local xkbbase
+
+	# see bug #113108
+	if has_version x11-apps/xkbcomp; then
+		xkbbase=/usr/share/X11/xkb
+	else
+		xkbbase=/usr/$(get_libdir)/X11/xkb
+	fi
+
+	econf --with-xkb-base=${xkbbase} --with-xkb-bin-base=/usr/bin \
+		  $(use_enable doc doxygen) || die
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die
+
+	insinto /usr/share/libxklavier
+	use sparc && doins "${FILESDIR}/sun.xml"
+
+	dodoc AUTHORS CREDITS ChangeLog NEWS README
+}