diff options
Diffstat (limited to 'x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild')
-rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild | 58 |
1 files changed, 1 insertions, 57 deletions
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 5db6d3c9fc72..bcbe6fff87b5 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.23 2005/06/01 10:25:57 spyderous Exp $ +# $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 $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -1487,62 +1487,6 @@ make_symlinks() { fi } -#migrate_usr_x11r6_lib() { -# # We need a symlink /usr/X11R6/libdir -> /usr/libdir so all the packages -# # whose files we move don't lose track of them. As such, we need -# # _absolutely nothing_ in /usr/X11R6/libdir so we can make such a symlink. -# # Donnie Berkholz <spyderous@gentoo.org> 20 October 2004 -# -# einfo "Migrating from /usr/X11R6/$(get_libdir) to /usr/$(get_libdir)..." -# # Get rid of "standard" symlink from <6.8.0-r2 -# # We can't overwrite symlink with directory w/ $(mv -f) -# [ -L ${ROOT}usr/$(get_libdir)/X11 ] \ -# && rm ${ROOT}usr/$(get_libdir)/X11 -# -# # If it's not a symlink (in other words, it should be a directory) -# if [ ! -L ${ROOT}usr/X11R6/$(get_libdir) ]; then -# einfo " /usr/X11R6/$(get_libdir) isn't a symlink, migrating..." -# # Move everything -# mv -f \ -# ${ROOT}usr/X11R6/$(get_libdir)/* \ -# ${ROOT}usr/X11R6/$(get_libdir)/.* \ -# ${ROOT}usr/$(get_libdir) -# # Remove any floating .keep files so we can run rmdir -# find ${ROOT}usr/X11R6/$(get_libdir) -name '\.keep' -exec rm -f {} \; -# # Get rid of the directory -# rmdir ${ROOT}usr/X11R6/$(get_libdir) -# # Put a symlink in its place -# ln -s ../$(get_libdir) ${ROOT}usr/X11R6/$(get_libdir) -# else -# # If ${ROOT}usr/X11R6/$(get_libdir) is a symlink ... -# einfo " /usr/X11R6/$(get_libdir) is a symlink, continuing..." -# -# # for amd64 at least, lib64 symlinked to lib in <=6.8.0-r4 (except -r2), -# # so the migration doesn't work properly with just the above. -# # (#78074) DO NOT use '-d' because it's true on symlinks to dirs too. -# if [ ! -L ${ROOT}usr/X11R6/lib ]; then -# einfo " /usr/X11R6/lib is a directory, migrating..." -# # Move everything -# mv -f \ -# ${ROOT}usr/X11R6/lib/* \ -# ${ROOT}usr/X11R6/lib/.* \ -# ${ROOT}usr/lib -# # Remove any floating .keep files so we can run rmdir -# find ${ROOT}usr/X11R6/lib -name '\.keep' -exec rm -f {} \; -# # Get rid of the directory -# rmdir ${ROOT}usr/X11R6/lib -# # Put a symlink in its place -# ln -s $(get_libdir) ${ROOT}usr/X11R6/lib -# # Make _sure_ we don't get a circular symlink, even though -# # we do the symlink again later on -# rm ${ROOT}usr/X11R6/$(get_libdir) -# ln -s ../$(get_libdir) ${ROOT}usr/X11R6/$(get_libdir) -# else -# einfo " /usr/X11R6/lib isn't a directory, not migrating" -# fi -# fi -#} - update_config_files() { # Fix any installed config files for installing fonts to /usr/share/fonts # This *needs* to be after all other installation so files aren't |