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

Package-Manager: portage-2.1.2_rc3-r9

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 6a35e158ec995d7673441da2dd1814d73614af4d..df9385de5b553c1827f5c42227d8ce0305526df8 100644 (file)
--- 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/Manifest b/x11-libs/libxklavier/Manifest
index ec34977c21b17462f1bde4b6b0012ddd199f5cc8..663fc1bf44dd92b5cccc4e5f90c3315b79f7514d 100644 (file)
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -6,6 +6,10 @@ AUX libxklavier-2.0-config_xkb.patch 2457 RMD160 1bd6fc1b3aa2b4f8a8712de5c006081
 MD5 5d094aa008fd272de082c1b135c74c42 files/libxklavier-2.0-config_xkb.patch 2457
 RMD160 1bd6fc1b3aa2b4f8a8712de5c006081db07dc340 files/libxklavier-2.0-config_xkb.patch 2457
 SHA256 eac47543d6a951b43fab00b3ddfeb35a5c4259945723eb47eb2f7d17e2316812 files/libxklavier-2.0-config_xkb.patch 2457
+AUX libxklavier-3.0-libxml.diff 586 RMD160 f1cafb916f313fc0e899fd55ad4531000d42d6a1 SHA1 9bfc791c18158cbce783ef6d8bd807dbfd016f7e SHA256 b76d5161746a88571a47ef51e285b2b27d961d78835f0acf6094faff3c1d6f7f
+MD5 68523b32ec572f7a8946fd9aefefb44d files/libxklavier-3.0-libxml.diff 586
+RMD160 f1cafb916f313fc0e899fd55ad4531000d42d6a1 files/libxklavier-3.0-libxml.diff 586
+SHA256 b76d5161746a88571a47ef51e285b2b27d961d78835f0acf6094faff3c1d6f7f files/libxklavier-3.0-libxml.diff 586
 AUX sun.xml 4572 RMD160 3255a22dafebb60df1fb115a39eccf349f63d658 SHA1 cb9fb9f87879090ef20082054b0fa730b067a89f SHA256 ba4be6b7737b09875adf109384fb375377540fbb213d62b647ba36baad28a7a0
 MD5 10d8c674e282f71c1dd0e11903e86e7d files/sun.xml 4572
 RMD160 3255a22dafebb60df1fb115a39eccf349f63d658 files/sun.xml 4572
@@ -25,14 +29,18 @@ EBUILD libxklavier-2.2.ebuild 1371 RMD160 de4099bd3b298631a8a9209b7e16603ddeb8fc
 MD5 c8f0afa34c40bacb81b2599eca9e4334 libxklavier-2.2.ebuild 1371
 RMD160 de4099bd3b298631a8a9209b7e16603ddeb8fcd6 libxklavier-2.2.ebuild 1371
 SHA256 586a1857266d8f1fefa702a29c9386bec33e843292b86845c48062b078d35f44 libxklavier-2.2.ebuild 1371
+EBUILD libxklavier-3.0-r1.ebuild 1318 RMD160 3e42f17fca4fc690310619f00ceb765a30ecb240 SHA1 7bf84fffea7db2314eebb577746168bf4b6f3df0 SHA256 31f09296fdc2e9fb87b78e98381733a31387c1e19e9972bd939d61b43d771534
+MD5 49c2e3ffed9a6903c91b9f1e32470f80 libxklavier-3.0-r1.ebuild 1318
+RMD160 3e42f17fca4fc690310619f00ceb765a30ecb240 libxklavier-3.0-r1.ebuild 1318
+SHA256 31f09296fdc2e9fb87b78e98381733a31387c1e19e9972bd939d61b43d771534 libxklavier-3.0-r1.ebuild 1318
 EBUILD libxklavier-3.0.ebuild 1235 RMD160 87b706dc3b434845f7a1308555a2a991a9688244 SHA1 89aa664a060c8cb18474712fae4d47d76a4dbb4e SHA256 dbb575a25af2acc77ba04ab58ca0aeefc8dd1c19c6010f3b68e121b1c0f1d8cb
 MD5 875fbdb48d950ced35936b44e569460a libxklavier-3.0.ebuild 1235
 RMD160 87b706dc3b434845f7a1308555a2a991a9688244 libxklavier-3.0.ebuild 1235
 SHA256 dbb575a25af2acc77ba04ab58ca0aeefc8dd1c19c6010f3b68e121b1c0f1d8cb libxklavier-3.0.ebuild 1235
-MISC ChangeLog 8614 RMD160 1e885f1ca6ec9f1306a9f5f2ef62663449051398 SHA1 dc6fabce7b77cb8e2431b7359f7a792e8c7fc088 SHA256 769f1d6c1b855b73a42b5cd80edc19409a68ee2ded5204bca355560ddf1275e5
-MD5 471fde720c323fa5dbfae5713625a622 ChangeLog 8614
-RMD160 1e885f1ca6ec9f1306a9f5f2ef62663449051398 ChangeLog 8614
-SHA256 769f1d6c1b855b73a42b5cd80edc19409a68ee2ded5204bca355560ddf1275e5 ChangeLog 8614
+MISC ChangeLog 8813 RMD160 c95e4db4c1883a866723c0d4363e0d723f69b60b SHA1 67c2318f05090bc454d00587530d095ce479f8fb SHA256 d288b6fb94c277a3c464785b863d450d2953534288de63dfbee642ea4c2e5707
+MD5 78a9c98eb954ca83b0bd49eaa78c4001 ChangeLog 8813
+RMD160 c95e4db4c1883a866723c0d4363e0d723f69b60b ChangeLog 8813
+SHA256 d288b6fb94c277a3c464785b863d450d2953534288de63dfbee642ea4c2e5707 ChangeLog 8813
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -49,3 +57,6 @@ SHA256 64dfe612a8527c480bab5e5004e2c25b39e69efbf93d2063d081c0223c1b861a files/di
 MD5 ae853a43f61d7cea8cd25c976e721fe3 files/digest-libxklavier-3.0 247
 RMD160 14b9953eb8e947640ef0339ec2b047b56a1f8921 files/digest-libxklavier-3.0 247
 SHA256 5c7a38e1255f7b35228b7e8fe410e8b08607120bb4cd19ec0a990888c6d2c2e0 files/digest-libxklavier-3.0 247
+MD5 ae853a43f61d7cea8cd25c976e721fe3 files/digest-libxklavier-3.0-r1 247
+RMD160 14b9953eb8e947640ef0339ec2b047b56a1f8921 files/digest-libxklavier-3.0-r1 247
+SHA256 5c7a38e1255f7b35228b7e8fe410e8b08607120bb4cd19ec0a990888c6d2c2e0 files/digest-libxklavier-3.0-r1 247

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 (file)
index 0000000..d9f3d11
--- /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 (file)
index 0000000..7fb5942
--- /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 (file)
index 0000000..7500e80
--- /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
+}