diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-15 03:46:58 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-15 03:46:58 +0000 |
| commit | baec9140f95dea69bff940fed0a8fa1c09ec6bd2 (patch) | |
| tree | b27684b6aa36ee47f3d7800fa4206f11ab9fcdc1 /x11-base/xorg-x11 | |
| parent | Build xmlgawk separately from the normal gawk so we dont link against libexpa... (diff) | |
| download | gentoo-2-baec9140f95dea69bff940fed0a8fa1c09ec6bd2.tar.gz gentoo-2-baec9140f95dea69bff940fed0a8fa1c09ec6bd2.tar.bz2 gentoo-2-baec9140f95dea69bff940fed0a8fa1c09ec6bd2.zip | |
Unfubar libdir symlinks made by migration.
(Portage version: 2.0.51.16)
Diffstat (limited to 'x11-base/xorg-x11')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2.ebuild | 21 |
2 files changed, 23 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 183d20bb2d4a..d7e3cddf3f96 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.336 2005/02/13 22:32:15 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.337 2005/02/15 03:46:58 eradicator Exp $ + + 14 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> + xorg-x11-6.8.2.ebuild: + Unfubar libdir symlinks made by migration. 13 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.2.ebuild: diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2.ebuild index 8420057d0fdf..ec36ba6b0920 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.2.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.ebuild,v 1.6 2005/02/13 22:32:15 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2.ebuild,v 1.7 2005/02/15 03:46:58 eradicator Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -442,8 +442,6 @@ setup_multilib() { # and a few other apps to work. if ! has_multilib_profile; then use amd64 && get_libdir_override lib64 - # lib32 isnt a supported configuration (yet?) - [ "$(get_libdir)" == "lib32" ] && get_libdir_override lib fi } @@ -1511,6 +1509,23 @@ check_migrate_return() { else die "${MIGRATE_METHOD} failed. Exit code: ${MIGRATE_RETURN}." fi + + # Migration fubars lib symlinks -- eradicator + if use amd64; then + if [[ -L ${ROOT}usr/lib64 ]]; then + rm ${ROOT}usr/lib64 + dosym lib ${ROOT}usr/lib64 + elif [[ -L ${ROOT}usr/lib ]]; then + rm -f ${ROOT}usr/lib + dosym lib64 ${ROOT}usr/lib + elif [[ -L ${ROOT}usr/lib32 ]]; then + if has_multilib_profile; then + dosym lib ${ROOT}usr/lib32 + else + dosym ../emul/linux/x86/usr/lib ${ROOT}usr/lib32 + fi + fi + fi } remove_migrated_files() { |