diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-08-31 09:20:01 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-08-31 09:20:01 +0000 |
| commit | d9b1bea265e7d651d0af9e479a8d7d20c026d06e (patch) | |
| tree | 52c166cca592302f79472bcec628288d4fad0460 /x11-base | |
| parent | broken makefiles; fix them later (bug #62317) (diff) | |
| download | historical-d9b1bea265e7d651d0af9e479a8d7d20c026d06e.tar.gz historical-d9b1bea265e7d651d0af9e479a8d7d20c026d06e.tar.bz2 historical-d9b1bea265e7d651d0af9e479a8d7d20c026d06e.zip | |
I've added an override for amd64 that will use lib64 as the lib directory even when CONF_LIBDIR isnt lib64. This should allow for bug 62110 to be fixed (locales broken for 32bit apps).
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 4 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild | 9 |
3 files changed, 16 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index fadb9be0c4a4..f7fc7d36ec46 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.100 2004/08/30 23:36:22 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.101 2004/08/31 09:20:01 lv Exp $ + + 31 Aug 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.99.903.ebuild: + I've added an override for amd64 that will use lib64 as the lib directory even + when CONF_LIBDIR isnt lib64. This should allow for bug 62110 to be fixed + (locales broken for 32bit apps). 30 Aug 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.7.99.903.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index c343d9122f11..475d01e95437 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,8 +1,8 @@ MD5 d9becbd2de11fb89582d64e8acfcae36 xorg-x11-6.7.0-r2.ebuild 38116 MD5 c45084d05d93bd559bcf7ca24aac3b62 xorg-x11-6.7.99.902.ebuild 40071 MD5 7fe3d25ff1d20065910e5ec4e116eeb1 xorg-x11-6.7.0-r1.ebuild 41872 -MD5 457d45cbd0b6da110e22f6ddcfbb3775 xorg-x11-6.7.99.903.ebuild 40934 -MD5 e703ed48790f8e14699be6cc40acbfca ChangeLog 24127 +MD5 0474908da429f67f670be8c4f77cc0b0 xorg-x11-6.7.99.903.ebuild 41252 +MD5 9df0d0214610a6be60c178fd20da46aa ChangeLog 24387 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230 MD5 d2be7dc9989b9f7c3e2ccb84e5297eeb files/digest-xorg-x11-6.7.0-r1 906 MD5 51c9e80b73eced56c98721ff90648866 files/digest-xorg-x11-6.7.0-r2 904 diff --git a/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild index 81aacbe15b09..293083c6115f 100644 --- a/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.7.99.903.ebuild,v 1.4 2004/08/30 23:36:22 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.99.903.ebuild,v 1.5 2004/08/31 09:20:01 lv Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -183,6 +183,13 @@ pkg_setup() { die "The static and dlloader USE flags are currently incompatible with the sdk USE flag." fi fi + + # on amd64 we need /usr/X11R6/lib64/X11/locale/lib to be a symlink + # created by the emul lib ebuild in order for adobe acrobat, staroffice, + # and a few other apps to work. + use amd64 && get_libdir_override lib64 + # lib32 isnt a supported configuration (yet?) + [ "${CONF_LIBDIR}" == "lib32" ] && get_libdir_override lib } host_def_setup() { |