backport patch from cvs, fixes #114601

(Portage version: 2.0.51.22-r3)

5 files changed, 132 insertions, 14 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 5c24203f0546..d1584fea12ee 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.52 2005/12/04 20:11:36 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.53 2005/12/11 00:49:36 allanonjl Exp $
+
+*libxklavier-2.0-r1 (11 Dec 2005)
+
+  11 Dec 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/libxklavier-2.0-config_xkb.patch, +libxklavier-2.0-r1.ebuild:
+  backport patch from cvs, fixes #114601
 
   04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> ChangeLog:
   Bump for 7.0RC3.
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 2f0bafceba05..7600e34f0864 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,17 +1,20 @@
-MD5 15eb7b9b8e4dc464304035ba8efb3028 ChangeLog 5527
-MD5 2ee4cc635af9abc1de963e4d38525430 files/digest-libxklavier-1.02 68
-MD5 e25e334ceafe0426056d920a3ead52c3 files/digest-libxklavier-1.03 68
-MD5 6b672d420ef40c97961975eb5be760e2 files/digest-libxklavier-1.04 68
-MD5 6b672d420ef40c97961975eb5be760e2 files/digest-libxklavier-1.04-r1 68
-MD5 da5387283d8b989c1809f27825f60310 files/digest-libxklavier-2.0 67
+MD5 669a0c7c6415660667532634dad30168 libxklavier-2.0-r1.ebuild 1276
+MD5 ddfe99faedd0be2841fd37eacdc38112 libxklavier-1.04.ebuild 999
+MD5 b438ab07e92289b506f360e5ebd557cf libxklavier-2.0.ebuild 1182
+MD5 11f83de3d100083dec4fa85c3a929f78 libxklavier-1.03.ebuild 949
+MD5 3da13df1d69bd656421cba7032b432a6 ChangeLog 5731
+MD5 5a267a38ce83469d40f7eb2e28de500d libxklavier-1.02.ebuild 941
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 8113cd4dbabec174f47b8767774e5b14 libxklavier-1.04-r1.ebuild 1070
 MD5 31529efcf0188518d362d24a148c74b5 files/libxklavier-1.04-fix_free.patch 301
 MD5 dd5b95ef05fbd2d67d79ce2053a1f4a2 files/libxklavier-1.14-werror.patch 1189
-MD5 554177dc558823391aea91515efb3902 files/sun-keymaps-102.patch 687
 MD5 95f50dc00a9778b6f862c56e0c990b3f files/sun-keymaps.patch 940
 MD5 10d8c674e282f71c1dd0e11903e86e7d files/sun.xml 4572
-MD5 5a267a38ce83469d40f7eb2e28de500d libxklavier-1.02.ebuild 941
-MD5 11f83de3d100083dec4fa85c3a929f78 libxklavier-1.03.ebuild 949
-MD5 8113cd4dbabec174f47b8767774e5b14 libxklavier-1.04-r1.ebuild 1070
-MD5 ddfe99faedd0be2841fd37eacdc38112 libxklavier-1.04.ebuild 999
-MD5 b438ab07e92289b506f360e5ebd557cf libxklavier-2.0.ebuild 1182
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 da5387283d8b989c1809f27825f60310 files/digest-libxklavier-2.0 67
+MD5 554177dc558823391aea91515efb3902 files/sun-keymaps-102.patch 687
+MD5 2ee4cc635af9abc1de963e4d38525430 files/digest-libxklavier-1.02 68
+MD5 e25e334ceafe0426056d920a3ead52c3 files/digest-libxklavier-1.03 68
+MD5 6b672d420ef40c97961975eb5be760e2 files/digest-libxklavier-1.04 68
+MD5 6b672d420ef40c97961975eb5be760e2 files/digest-libxklavier-1.04-r1 68
+MD5 5d094aa008fd272de082c1b135c74c42 files/libxklavier-2.0-config_xkb.patch 2457
+MD5 da5387283d8b989c1809f27825f60310 files/digest-libxklavier-2.0-r1 67
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-2.0-r1 b/x11-libs/libxklavier/files/digest-libxklavier-2.0-r1
new file mode 100644
index 000000000000..abafd90f634c
--- /dev/null
+++ b/x11-libs/libxklavier/files/digest-libxklavier-2.0-r1
@@ -0,0 +1 @@
+MD5 9257653ee3d194d9c8d669e969fe4332 libxklavier-2.0.tar.gz 435898
diff --git a/x11-libs/libxklavier/files/libxklavier-2.0-config_xkb.patch b/x11-libs/libxklavier/files/libxklavier-2.0-config_xkb.patch
new file mode 100644
index 000000000000..e7762c739c2c
--- /dev/null
+++ b/x11-libs/libxklavier/files/libxklavier-2.0-config_xkb.patch
@@ -0,0 +1,51 @@
+===================================================================
+RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_config_xkb.c,v
+rcsdiff: /cvs/xklavier/libxklavier/libxklavier/xklavier_config_xkb.c,v: warning: Unknown phrases like `commitid ...;' are present.
+retrieving revision 1.29
+retrieving revision 1.30
+diff -u -r1.29 -r1.30
+--- libxklavier/xklavier_config_xkb.c	2005/09/12 17:54:44	1.29
++++ libxklavier/xklavier_config_xkb.c	2005/12/03 13:31:58	1.30
+@@ -225,7 +225,7 @@
+           exit( 1 );
+         default:
+           /* parent */
+-          pid = wait( &status );
++          pid = waitpid( cpid, &status, 0 );
+           XklDebug( 150, "Return status of %d (well, started %d): %d\n", pid, cpid, status );
+           memset( (char *)&result, 0, sizeof(result) );
+           result.xkb = XkbAllocKeyboard();
+@@ -261,9 +261,13 @@
+               }
+               fclose( tmpxkm );
+               XklDebug( 160, "Unlinking the temporary xkm file %s\n", xkmFN );
+-              if ( remove( xkmFN ) == -1 )
+-                XklDebug( 0, "Could not unlink the temporary xkm file %s: %d\n", 
+-                             xkmFN, errno );
++              if ( _xklDebugLevel < 500 ) /* don't remove on high debug levels! */
++              {
++                if ( remove( xkmFN ) == -1 )
++                  XklDebug( 0, "Could not unlink the temporary xkm file %s: %d\n", 
++                               xkmFN, errno );
++              } else
++                XklDebug( 500, "Well, not really - the debug level is too high: %d\n", _xklDebugLevel );
+             } else /* could not open the file */
+             {
+               XklDebug( 0, "Could not open the temporary xkm file %s\n", xkmFN );
+@@ -277,9 +281,13 @@
+           break;
+       }
+       XklDebug( 160, "Unlinking the temporary xkb file %s\n", xkbFN );
+-      if ( remove( xkbFN ) == -1 )
+-        XklDebug( 0, "Could not unlink the temporary xkb file %s: %d\n", 
+-                  xkbFN, errno );
++      if ( _xklDebugLevel < 500 ) /* don't remove on high debug levels! */
++      {
++        if ( remove( xkbFN ) == -1 )
++          XklDebug( 0, "Could not unlink the temporary xkb file %s: %d\n", 
++                    xkbFN, errno );
++      } else
++        XklDebug( 500, "Well, not really - the debug level is too high: %d\n", _xklDebugLevel );
+     } else /* could not open input tmp file */
+     {
+       XklDebug( 0, "Could not open tmp XKB file [%s]: %d\n", xkbFN, errno );
diff --git a/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild b/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild
new file mode 100644
index 000000000000..65e03c30e145
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild,v 1.1 2005/12/11 00:49:36 allanonjl 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 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libxkbfile )
+	virtual/x11 )
+	dev-libs/libxml2"
+
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-libs/libXt
+		x11-proto/xproto )
+	virtual/x11 )
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Do not error on warnings (for gcc4 support).  Patch from Fedora.
+	epatch ${FILESDIR}/${PN}-1.14-werror.patch
+
+	# backport patch from cvs, fixes #114601
+	epatch ${FILESDIR}/${PN}-2.0-config_xkb.patch
+}
+
+src_compile() {
+
+	econf --with-xkb_base=/usr/$(get_libdir)/X11/xkb \
+		$(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
+
+}