summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2004-11-15 17:21:42 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2004-11-15 17:21:42 +0000
commitee81cfb5a78b54e89e3eaebd9c2bb5491f99685b (patch)
tree7aaa5bfcd7e1fe65a119d4f0e87b1822c3d31577 /x11-base
parentcall the right updates func (diff)
downloadhistorical-ee81cfb5a78b54e89e3eaebd9c2bb5491f99685b.tar.gz
historical-ee81cfb5a78b54e89e3eaebd9c2bb5491f99685b.tar.bz2
historical-ee81cfb5a78b54e89e3eaebd9c2bb5491f99685b.zip
In backward_compat_setup(), add a symlink for the keysym database, XKeysymDB (#70927). Also fix a hard-coded lib rather than get_libdir.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/Manifest4
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild9
3 files changed, 14 insertions, 6 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 5ea7d15b3568..2ec95faa2a2f 100644
--- 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 bdc9ec5f1391..c447bc2f28c1 100644
--- 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 9bfa90f8edb1..1d22ebed89d6 100644
--- 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() {