summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2003-02-05 11:30:21 +0000
committerMartin Schlemmer <azarah@gentoo.org>2003-02-05 11:30:21 +0000
commit3a82a350b4ba68567bc6201a564e14e228e16b83 (patch)
treef309234c36bef7be24928345627b00d790d22567 /x11-base
parentfix /usr/lib/X11 symlink, bug #15017 (diff)
downloadhistorical-3a82a350b4ba68567bc6201a564e14e228e16b83.tar.gz
historical-3a82a350b4ba68567bc6201a564e14e228e16b83.tar.bz2
historical-3a82a350b4ba68567bc6201a564e14e228e16b83.zip
fix /usr/lib/X11 symlink, bug #15017
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog7
-rw-r--r--x11-base/xfree/xfree-4.2.1-r2.ebuild6
-rw-r--r--x11-base/xfree/xfree-4.2.99.4.ebuild6
3 files changed, 12 insertions, 7 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 799b8cd4701f..71d727c8f3c0 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
# 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.89 2003/02/04 18:19:53 doctomoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.90 2003/02/05 11:30:21 azarah Exp $
+
+ 05 Feb 2003; Martin Schlemmer <azarah@gentoo.org> :
+
+ Fix the /usr/lib/X11 symlink to point to the correct ../X11R6/lib/X11.
+ Some ebuild had this still wrong. This closes bug #15017.
04 Feb 2003; Olivier Reisch <doctomoe@gentoo.org> xfree-4.2.99.4.ebuild :
diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild
index 8791181e6f53..66975754fcb5 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.18 2003/01/31 09:16:01 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.19 2003/02/05 11:30:21 azarah Exp $
# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure
# that only we only strip stuff that are safe to strip ...
@@ -393,7 +393,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 /usr/lib/X11
+ dosym ../X11R6/lib/X11 /usr/lib/X11
dosym ../../usr/X11R6/lib/X11/xkb /etc/X11/xkb
# Some critical directories
@@ -800,7 +800,7 @@ pkg_postrm() {
ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS
ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
- ln -snf ../X11R6/lib ${ROOT}/usr/lib/X11
+ ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
fi
}
diff --git a/x11-base/xfree/xfree-4.2.99.4.ebuild b/x11-base/xfree/xfree-4.2.99.4.ebuild
index 2958e1d0e83c..8cf70cb4858d 100644
--- a/x11-base/xfree/xfree-4.2.99.4.ebuild
+++ b/x11-base/xfree/xfree-4.2.99.4.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.99.4.ebuild,v 1.3 2003/02/04 18:19:53 doctomoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.4.ebuild,v 1.4 2003/02/05 11:30:21 azarah Exp $
# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure
# that only we only strip stuff that are safe to strip ...
@@ -416,7 +416,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 /usr/lib/X11
+ dosym ../X11R6/lib/X11 /usr/lib/X11
dosym ../../usr/X11R6/lib/X11/xkb /etc/X11/xkb
# Some critical directories
@@ -814,7 +814,7 @@ pkg_postrm() {
ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS
ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
- ln -snf ../X11R6/lib ${ROOT}/usr/lib/X11
+ ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
fi
}