Remove miscellaneous commented-out symlinking and directory creation.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 10 insertions, 24 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/Manifest b/x11-base/xorg-x11/Manifest
index 34fe16e5eba0..f4a9f6ecec76 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,7 +1,7 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-MD5 c92cc1d6e41c6d5a3cb690eb7552da8c xorg-x11-6.8.99.8.ebuild 55990
-MD5 b9ddac762d3fbd6bf11911b689420add xorg-x11-6.8.2-r2.ebuild 55572
-MD5 7f49ab3b679046b34172669c9e810dd2 ChangeLog 95667
+MD5 4cf623f871d92205540aad319f706611 xorg-x11-6.8.99.8.ebuild 55645
+MD5 9145ad4056b1730baefc7fb30d7de05e xorg-x11-6.8.2-r2.ebuild 55227
+MD5 bb665eb3c65e651c2cd81bf56106cf75 ChangeLog 95849
 MD5 de11c43b024974fb63f6a71fd7941f15 xorg-x11-6.8.2-r1.ebuild 59343
 MD5 2af39a82a9fcc1f16256c60178a722bd xorg-x11-6.8.99.5.ebuild 60345
 MD5 72332f87c0620ede7d4a45a4e2bf237b files/digest-xorg-x11-6.8.99.5 514
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
 }