Fix an xkb symlink that was hardcoded lib rather than using get_libdir(). Reported...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 3ace36cafa9c41a385fb5e60bc023e49a3232960..1e952dbdd68301211ded37a53a64466b7204a0ad 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.231 2004/12/06 23:23:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.232 2004/12/06 23:27:20 spyderous Exp $
+
+  06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  Fix an xkb symlink that was hardcoded lib rather than using get_libdir().
+  Reported by Georgi Georgiev <chutz@gg3.net>.
 
   06 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 57f487759085be8265551681e47421565cb10e44..ea79181b70a4f8ce4376e193da8b594995cfa7ce 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,10 +1,10 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 398036bb9c0b024279b79de650d294f9 xorg-x11-6.7.0-r2.ebuild 38087
 MD5 186fd28bc746a6e98ae52356c8246348 xorg-x11-6.8.0-r1.ebuild 41341
-MD5 93e3562dea36557ba3aa444042282395 ChangeLog 53614
+MD5 d7ae3b0bf320e20ae07de046ad2c79a8 ChangeLog 53821
 MD5 b45f1c127c54662901d9e88a9dc7ad1e xorg-x11-6.7.0-r3.ebuild 38105
 MD5 1ad6566a5ebfc982d9f8567214e5b7e5 xorg-x11-6.8.0-r3.ebuild 39794
-MD5 7b7d35e0e96944b0f3f412587d19c54e xorg-x11-6.8.0-r4.ebuild 51882
+MD5 d251e5142ef154b69bd21394a5949dae xorg-x11-6.8.0-r4.ebuild 51914
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index 774e5c85c4900dd07a53c80cd8b9aa523df0b65d..2cb8fd8968d3435a30f9ed41585ba9e5f646c4e1 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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-r4.ebuild,v 1.20 2004/12/06 23:23:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.21 2004/12/06 23:27:20 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1075,8 +1075,9 @@ setup_standard_symlinks() {
        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
+       # Added one to reflect xkb move from /usr/X11R6/libdir/X11/xkb
+       # to /usr/libdir/xkb
+       dosym ../../$(get_libdir)/xkb /usr/X11R6/$(get_libdir)/X11/xkb
 }
 
 compose_files_setup() {
@@ -1328,7 +1329,7 @@ migrate_usr_x11r6_lib() {
                && ln -s ../$(get_libdir) ${ROOT}usr/X11R6/$(get_libdir)
 
        # We also need to create a symlink from /usr/X11R6/libdir/X11/xkb
-       # to /usr/lib/xkb, so libxklavier and xkb stuff is happy
+       # to /usr/libdir/xkb, so libxklavier and xkb stuff is happy
 
        einfo "Migrating from /usr/X11R6/$(get_libdir)/X11/xkb to /usr/$(get_libdir)/xkb..."
        # Make the new dir if it doesn't already exist