summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-06-01 10:34:25 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-06-01 10:34:25 +0000
commit2692298b8b91c86d999591d2909072bfe391efea (patch)
tree008d1a1eb0e0b33756e9fbf195bb35185439a330 /x11-base
parentRemove commented-out migrate_usr_x11r6_lib(). (diff)
downloadgentoo-2-2692298b8b91c86d999591d2909072bfe391efea.tar.gz
gentoo-2-2692298b8b91c86d999591d2909072bfe391efea.tar.bz2
gentoo-2-2692298b8b91c86d999591d2909072bfe391efea.zip
Remove miscellaneous commented-out symlinking and directory creation.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild11
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild11
3 files changed, 7 insertions, 21 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 174aaa169a06..28549353827e 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.407 2005/06/01 10:27:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.408 2005/06/01 10:34:25 spyderous Exp $
+
+ 01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+ Remove miscellaneous commented-out symlinking and directory creation.
01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
index bcbe6fff87b5..9d3f3e4720db 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.2-r2.ebuild,v 1.24 2005/06/01 10:27:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.25 2005/06/01 10:34:25 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -1020,9 +1020,6 @@ backward_compat_install() {
# Backwards compatibility for /usr/share move
dosym ../../share/fonts /usr/$(get_libdir)/X11/fonts
-# dodir /usr/X11R6
-# dosym ../share/man /usr/X11R6/man
-
# Have the top-level libdir symlink made first, so real dirs don't get created
local DIR DIRS
if [ "lib" != "$(get_libdir)" ]; then
@@ -1032,7 +1029,6 @@ backward_compat_install() {
dosym ../${DIR} /usr/X11R6/${DIR}
done
-# dodir /usr/X11R6/$(get_libdir)/X11
dosym ../../../share/doc/${PF} /usr/X11R6/$(get_libdir)/X11/doc
}
@@ -1091,8 +1087,6 @@ setup_standard_symlinks() {
# Stop complains about "file or directory not existing"
dodir /usr/X11R6
dosym ../include /usr/X11R6/include
-# dosym ../X11R6/include/X11 /usr/include/X11
-# dosym ../X11R6/include/DPS /usr/include/DPS
dosym ../../usr/$(get_libdir)/X11/xkb /etc/X11/xkb
# Some critical directories
@@ -1842,8 +1836,5 @@ fix_links() {
# Fix problematic links
if [ -x ${ROOT}/usr/bin/Xorg ]; then
ln -snf ../bin ${ROOT}/usr/bin/X11
-# ln -snf ../include ${ROOT}/usr/X11R6/include
-# ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
-# ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS
fi
}
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild
index b680a0acc410..b03860506c96 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.99.8.ebuild,v 1.13 2005/06/01 10:27:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild,v 1.14 2005/06/01 10:34:25 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -1031,9 +1031,6 @@ backward_compat_install() {
# Backwards compatibility for /usr/share move
dosym ../../share/fonts /usr/$(get_libdir)/X11/fonts
-# dodir /usr/X11R6
-# dosym ../share/man /usr/X11R6/man
-
# Have the top-level libdir symlink made first, so real dirs don't get created
local DIR DIRS
if [ "lib" != "$(get_libdir)" ]; then
@@ -1043,7 +1040,6 @@ backward_compat_install() {
dosym ../${DIR} /usr/X11R6/${DIR}
done
-# dodir /usr/X11R6/$(get_libdir)/X11
dosym ../../../share/doc/${PF} /usr/X11R6/$(get_libdir)/X11/doc
}
@@ -1102,8 +1098,6 @@ setup_standard_symlinks() {
# Stop complains about "file or directory not existing"
dodir /usr/X11R6
dosym ../include /usr/X11R6/include
-# dosym ../X11R6/include/X11 /usr/include/X11
-# dosym ../X11R6/include/DPS /usr/include/DPS
dosym ../../usr/$(get_libdir)/X11/xkb /etc/X11/xkb
# Some critical directories
@@ -1852,8 +1846,5 @@ fix_links() {
# Fix problematic links
if [ -x ${ROOT}/usr/bin/Xorg ]; then
ln -snf ../bin ${ROOT}/usr/bin/X11
-# ln -snf ../include ${ROOT}/usr/X11R6/include
-# ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
-# ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS
fi
}