In backward_compat_setup(), add a symlink for the keysym database, XKeysymDB (#70927...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 5ea7d15b3568bab6dbf6778e4f54b98f3c196bb5..2ec95faa2a2f293a16159bb1db993b5d79a98a33 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.202 2004/11/05 07:53:07 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.203 2004/11/15 17:21:42 spyderous Exp $
+
+  15 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  In backward_compat_setup(), add a symlink for the keysym database, XKeysymDB
+  (#70927). Also fix a hard-coded lib rather than get_libdir.
 
   04 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 bdc9ec5f139126064be94cc5ecc18ae4d30337c1..c447bc2f28c19b1d6f0105754c76b36ee721c57b 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
 MD5 a2e1b9169dec8e5eb20d49694b6bbcf0 xorg-x11-6.8.0-r1.ebuild 41338
-MD5 b13ed519b6b141167d72c8f5c349d3b0 ChangeLog 44569
-MD5 67dcd0e52c6cb62688cc297db9f9489f xorg-x11-6.8.0-r2.ebuild 50117
+MD5 27fddbbce9643d6bd31eec17d1aa5554 ChangeLog 44794
+MD5 7b4c10e956654c08456a4b97c03b8c60 xorg-x11-6.8.0-r2.ebuild 50246
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 b7a56cbcde55a013564f056f87e59867 files/digest-xorg-x11-6.8.0-r2 908

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 9bfa90f8edb117d7a4cccb4748644afa398818fd..1d22ebed89d63f80e9f8350371b68b270d344e6e 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.56 2004/11/05 07:53:07 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.57 2004/11/15 17:21:42 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -976,10 +976,13 @@ backward_compat_setup() {
        if ! use minimal; then
                dosym ../share/man /usr/X11R6/man
        fi
-       # Have the top-level lib symlink made first, so real dirs don't get created
-       dosym ../lib /usr/X11R6/lib
+       # Have the top-level libdir symlink made first, so real dirs don't get created
+       dosym ../$(get_libdir) /usr/X11R6/$(get_libdir)
        dosym ../../../share/doc/${PF} /usr/X11R6/$(get_libdir)/X11/doc
 #      dosym ../share/bin /usr/X11R6/bin
+
+       # Another symlink for the keysym database (#70927)
+       dosym ../XKeysymDB /usr/$(get_libdir)/X11/XKeysymDB
 }
 
 fix_permissions() {