Add a symlink "../../../lib/xkb /usr/X11R6/lib/X11/xkb" so libxklavier and other...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 94c62b46beedd495c09f1f9d0c1ea71984a712cd..7f86ba45e1165abe5259b09fd979f7a0d4fc995e 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.184 2004/11/01 18:54:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.185 2004/11/03 00:16:55 spyderous Exp $
+
+  02 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add a symlink "../../../lib/xkb /usr/X11R6/lib/X11/xkb" so libxklavier and
+  other things looking for that location continue to work.
 
   01 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r2.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index e12095ff8d266ff36e7c5e3ff2533beedf70e36f..e34da8bc9873b9ebe3fff5abbbe84de464442d6d 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
-MD5 2a4d271fc8a273df7adb2dcce4e3c3c1 ChangeLog 39702
+MD5 ac04c901dd53bca69eadf21c8c0b0aba ChangeLog 39922
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
 MD5 59449d8b0ac475d3c5a4caa98b9238bb xorg-x11-6.8.0-r1.ebuild 41332
-MD5 aa6a0fafae49f18d5d47667c98522413 xorg-x11-6.8.0-r2.ebuild 44770
+MD5 6ffb9229ce93923dee7958aa6bbc0783 xorg-x11-6.8.0-r2.ebuild 44894
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 4948d68fce0cc80c309f112474e37303 files/digest-xorg-x11-6.8.0-r2 906

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
index a2ac78e7ec9fc691e593c53d09c834e734befdb5..7cfd8b4cbdf1531160fe7c74c0e8ea7446a21d58 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.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-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.39 2004/11/01 18:54:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.40 2004/11/03 00:16:55 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -946,6 +946,8 @@ src_install() {
        dosym ../X11R6/include/DPS /usr/include/DPS
        dosym ../X11R6/include/GL /usr/include/GL
        dosym ../../usr/$(get_libdir)/xkb /etc/X11/xkb
+       # Added one to reflect xkb move from /usr/X11R6/lib/X11/xkb to /usr/lib/xkb
+       dosym ../../../lib/xkb /usr/X11R6/lib/X11/xkb
 
        if use opengl; then
                fix_opengl_symlinks