summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-12-16 18:43:48 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-12-16 18:43:48 +0000
commit3fa104b9c1bd68d52c697eb44bfef876b2cf0cdc (patch)
tree0abc82d1058deba739ad396d79c7d19f69c0ab28 /x11-base
parentsymlink changes (diff)
downloadgentoo-2-3fa104b9c1bd68d52c697eb44bfef876b2cf0cdc.tar.gz
gentoo-2-3fa104b9c1bd68d52c697eb44bfef876b2cf0cdc.tar.bz2
gentoo-2-3fa104b9c1bd68d52c697eb44bfef876b2cf0cdc.zip
fix /usr/lib/X11 symlink
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog6
-rw-r--r--x11-base/xfree/xfree-4.2.1-r2.ebuild10
2 files changed, 13 insertions, 3 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index e55f5896f100..69339ae47e3b 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xfree
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.71 2002/12/13 05:06:24 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.72 2002/12/16 18:39:05 azarah Exp $
+
+ 16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild :
+
+ Fix /usr/lib/X11 symlink.
13 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild :
diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild
index ad4d8d07fca7..a01275063f72 100644
--- a/x11-base/xfree/xfree-4.2.1-r2.ebuild
+++ b/x11-base/xfree/xfree-4.2.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.6 2002/12/15 10:44:24 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.7 2002/12/16 18:39:05 azarah Exp $
IUSE="sse nls mmx truetype 3dnow 3dfx"
@@ -388,7 +388,7 @@ src_install() {
dosym ../X11R6/include/X11 /usr/include/X11
dosym ../X11R6/include/DPS /usr/include/DPS
dosym ../X11R6/include/GL /usr/include/GL
- dosym ../X11R6/lib/X11 /usr/lib/X11
+ dosym ../X11R6/lib /usr/lib/X11
dosym ../../usr/X11R6/lib/X11/xkb /etc/X11/xkb
# Some critical directories
@@ -553,6 +553,12 @@ pkg_preinst() {
mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
fi
+ # This one was borked, so make sure fixed one gets installed.
+ if [ -L ${ROOT}/usr/lib/X11 ]
+ then
+ rm -f ${ROOT}/usr/lib/X11
+ fi
+
# clean the dinamic libGL stuff's home to ensure
# we dont have stale libs floating around
if [ -d ${ROOT}/usr/lib/opengl/xfree ]