hardcode x11 path

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 73993b787f8aef062e53b6df1dfb1632b3bdd466..435ce19ebb8a1b41daa70715e8681cd0c4c54504 100644 (file)
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.24 2004/11/01 16:05:41 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.25 2004/11/02 23:21:32 foser Exp $
+
+  02 Nov 2004; foser <foser@gentoo.org> libxklavier-1.04.ebuild :
+  Hardcode xkb path for future xorg versions (#69400)
 
   01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> libxklavier-1.03.ebuild:
   Stable on sparc

diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index a9fff93cf2ccbc666ef00a7bc78e017dfd960fe0..92ab84105e8713605353a07f81ab3321637209d8 100644 (file)
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,11 +1,11 @@
-MD5 e937e34ad2a9955d57901eeb79c21fed ChangeLog 2606
+MD5 d3302f7efaec7b37020a32342ca8aeea libxklavier-1.04.ebuild 994
+MD5 26b50c6bfa1062b35fdac1339cdb0f2b libxklavier-1.03.ebuild 951
+MD5 a8a4fe32fa485ec483043d53b005b361 ChangeLog 2724
 MD5 52d54179cb42e2d69921b205e833c83b libxklavier-1.02.ebuild 941
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 26b50c6bfa1062b35fdac1339cdb0f2b libxklavier-1.03.ebuild 951
-MD5 5b5c52a7db67de7b54a0b360ade44536 libxklavier-1.04.ebuild 951
-MD5 2ee4cc635af9abc1de963e4d38525430 files/digest-libxklavier-1.02 68
-MD5 554177dc558823391aea91515efb3902 files/sun-keymaps-102.patch 687
 MD5 95f50dc00a9778b6f862c56e0c990b3f files/sun-keymaps.patch 940
 MD5 10d8c674e282f71c1dd0e11903e86e7d files/sun.xml 4572
+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

diff --git a/x11-libs/libxklavier/libxklavier-1.04.ebuild b/x11-libs/libxklavier/libxklavier-1.04.ebuild
index 77371a618ec28f24920af2cbd15b07f26a0063ab..77a357294f99e958df51767f2f821ef68e6d4f74 100644 (file)
--- a/x11-libs/libxklavier/libxklavier-1.04.ebuild
+++ b/x11-libs/libxklavier/libxklavier-1.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.04.ebuild,v 1.1 2004/10/27 15:23:44 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.04.ebuild,v 1.2 2004/11/02 23:21:32 foser Exp $
 
 inherit eutils
 
@@ -31,7 +31,8 @@ src_unpack() {
 
 src_compile() {
 
-       econf $(use_enable doc doxygen) || die
+       econf --with-xkb_base=/usr/X11R6/lib/X11/xkb \
+               $(use_enable doc doxygen) || die
        emake || die "emake failed"
 
 }