diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-11 10:49:53 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-11 10:49:53 +0000 |
| commit | 7aece6b66a1b3974b50c8b2e562187dfcb3edd72 (patch) | |
| tree | b7f1ac726e6a0f7c7afed545e375966427059a0c /x11-base | |
| parent | Initial ebuild for gdeskcal-skins, contributed by Steven Mertens <mertens.ste... (diff) | |
| download | gentoo-2-7aece6b66a1b3974b50c8b2e562187dfcb3edd72.tar.gz gentoo-2-7aece6b66a1b3974b50c8b2e562187dfcb3edd72.tar.bz2 gentoo-2-7aece6b66a1b3974b50c8b2e562187dfcb3edd72.zip | |
Only do amd64 libdir overriding on older profiles.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild | 11 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild | 11 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild | 11 |
4 files changed, 24 insertions, 16 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 2d29108adcf9..5ce6e58ba534 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-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.262 2005/01/10 19:42:26 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.263 2005/01/11 10:49:53 eradicator Exp $ + + 11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild, + xorg-x11-6.8.1.901.ebuild: + Only do amd64 libdir overriding on older profiles. 10 Jan 2005; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.1.901.ebuild: add ~alpha diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild index 84ac13aa0ad2..cb4155d82d9a 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.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.0-r3.ebuild,v 1.9 2005/01/01 22:13:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild,v 1.10 2005/01/11 10:49:53 eradicator Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -199,10 +199,11 @@ pkg_setup() { # 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 - + if [ -z "${MULTILIB_ABIS}" ]; then + use amd64 && get_libdir_override lib64 + # lib32 isnt a supported configuration (yet?) + [ "$(get_libdir)" == "lib32" ] && get_libdir_override lib + fi # Echo a message to the user about bitmap-fonts if ! use bitmap-fonts diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild index b7a0ac48f6ad..01e49f88f982 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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.0-r4.ebuild,v 1.41 2005/01/07 22:27:12 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.42 2005/01/11 10:49:53 eradicator Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -160,10 +160,11 @@ pkg_setup() { # on amd64 we need /usr/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 - + if [ -z "${MULTILIB_ABIS}" ]; then + use amd64 && get_libdir_override lib64 + # lib32 isnt a supported configuration (yet?) + [ "$(get_libdir)" == "lib32" ] && get_libdir_override lib + fi # Echo a message to the user about bitmap-fonts if ! use bitmap-fonts; then diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild index 4c9700080dd7..4363a743764c 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.1.901.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.1.901.ebuild,v 1.15 2005/01/10 19:42:26 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.901.ebuild,v 1.16 2005/01/11 10:49:53 eradicator Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -161,10 +161,11 @@ pkg_setup() { # on amd64 we need /usr/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 - + if [ -z "${MULTILIB_ABIS}" ]; then + use amd64 && get_libdir_override lib64 + # lib32 isnt a supported configuration (yet?) + [ "$(get_libdir)" == "lib32" ] && get_libdir_override lib + fi # Echo a message to the user about bitmap-fonts if ! use bitmap-fonts; then |