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 | 9c1a131b024e44c20570a9f25bffe6370061f970 (patch) | |
| tree | c17c176bcd003992b2e5c7cb5093efe20ef289a3 /x11-base | |
| parent | Build xmlgawk separately from the normal gawk so we dont link against libexpa... (diff) | |
| download | historical-9c1a131b024e44c20570a9f25bffe6370061f970.tar.gz historical-9c1a131b024e44c20570a9f25bffe6370061f970.tar.bz2 historical-9c1a131b024e44c20570a9f25bffe6370061f970.zip | |
Unfubar libdir symlinks made by migration.
Package-Manager: portage-2.0.51.16
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 14 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2.ebuild | 21 |
3 files changed, 35 insertions, 6 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/Manifest b/x11-base/xorg-x11/Manifest index 242807d2c60c..f9364fad3915 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,13 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 01a001a7e9a771e8dda7c4d540769918 ChangeLog 81023 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 MD5 2b9b70a8a132d04ffa84b047fc2736bb xorg-x11-6.7.0-r3.ebuild 38110 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114 MD5 1a41dee2ee7de099201ab7b03c17b409 xorg-x11-6.8.0-r4.ebuild 52259 MD5 964bf2fe7bbddb6eab73140faa911397 xorg-x11-6.8.1.901-r1.ebuild 52453 -MD5 2e9d18f52b7320d2d04b41877c079933 ChangeLog 80894 -MD5 2461506d5b06bcb52904251798827ef6 xorg-x11-6.8.2.ebuild 59066 +MD5 c57473bc9bcf93ec2890b04c55eed289 xorg-x11-6.8.2.ebuild 59387 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908 MD5 0fa47dcdfd673d5824ea3a6cfe17ade0 files/digest-xorg-x11-6.8.0-r4 911 MD5 31a8fa39480a7053afd4ebd7493c09c4 files/digest-xorg-x11-6.8.1.901-r1 517 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674 MD5 a89ceac8aaa19a446dab3a634a027d0b files/digest-xorg-x11-6.8.2 504 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.0 (GNU/Linux) + +iD8DBQFCEXDMArHZZzCEUG0RAuDNAJ9bvIdPQ2hsaQ7fByYj8IgfElFBvgCghDR0 +F0WdimLBkPWQjto1+FCurY4= +=4xMV +-----END PGP SIGNATURE----- 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() { |