On Mon, 2005-02-14 at 19:07 -0800, Jeremy Huddleston wrote: > Ok guys, best thing to do is leave your system alone right now. I'm > going to go look at sypdy's migration script and see what the problem > is.
Ok, and here's the fix I'm committing. First hunk's just a cleanup.
Donnie, if you want to move this somewhere else, that's fine, but I
needed to get this in asap.
--Jeremy
Index: xorg-x11-6.8.2.ebuild
===================================================================
RCS
file: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2.ebuild,v
retrieving revision 1.6
diff -p -u -4 -r1.6 xorg-x11-6.8.2.ebuild
--- xorg-x11-6.8.2.ebuild 13 Feb 2005 22:32:15 -0000 1.6
+++ xorg-x11-6.8.2.ebuild 15 Feb 2005 03:45:28 -0000
@@ -441,10 +441,8 @@ setup_multilib() {
# created by the emul lib ebuild in order for adobe acrobat,
staroffice,
# 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
}
################
@@ -1510,8 +1508,25 @@ check_migrate_return() {
einfo "${MIGRATE_METHOD} successful!"
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() {
# This is a copy instead of a move, so we need to get rid of what
--
Jeremy Huddleston
Unless otherwise stated, any source code or patches provided in this
mail are licensed under the Gnu Public License version 2 or later.
signature.asc
Description: This is a digitally signed message part
