diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-18 06:57:24 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-18 06:57:24 +0000 |
| commit | 63e5cb276d82d54d92850d5d5d435b8bd4691621 (patch) | |
| tree | f53e5a2f6c9da102a42e8d6dc90e2942e3852c62 /profiles/default-linux/amd64 | |
| parent | Use has_multilib_profile where appropriate. (diff) | |
| download | gentoo-2-63e5cb276d82d54d92850d5d5d435b8bd4691621.tar.gz gentoo-2-63e5cb276d82d54d92850d5d5d435b8bd4691621.tar.bz2 gentoo-2-63e5cb276d82d54d92850d5d5d435b8bd4691621.zip | |
Add multilib to use.mask since it's forced on everywhere now when using multilib profiles.
Diffstat (limited to 'profiles/default-linux/amd64')
| -rw-r--r-- | profiles/default-linux/amd64/2005.0/package.mask | 5 | ||||
| -rw-r--r-- | profiles/default-linux/amd64/2005.0/profile.bashrc | 16 | ||||
| -rw-r--r-- | profiles/default-linux/amd64/2005.0/use.mask | 5 |
3 files changed, 8 insertions, 18 deletions
diff --git a/profiles/default-linux/amd64/2005.0/package.mask b/profiles/default-linux/amd64/2005.0/package.mask index 94662bbfe65b..0456f2fd94af 100644 --- a/profiles/default-linux/amd64/2005.0/package.mask +++ b/profiles/default-linux/amd64/2005.0/package.mask @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/package.mask,v 1.11 2005/01/18 01:30:30 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/package.mask,v 1.12 2005/01/18 06:57:24 eradicator Exp $ # Jeremy Huddleston <eradicator@gentoo.org> # Force binutils-config versions of binutils @@ -21,9 +21,10 @@ <sys-kernel/linux-headers-2.6.8.1-r3 # Jeremy Huddleston <eradicator@gentoo.org> -# This is provided by sys-libs/glibc now +# These are provided by non-emul packages now -=app-emulation/emul-linux-x86-glibc-1000 <app-emulation/emul-linux-x86-glibc-1000 +app-emulation/emul-linux-x86-nvidia # Jeremy Huddleston <eradicator@gentoo.org> # Make sure we have a correct /etc/env.d entry diff --git a/profiles/default-linux/amd64/2005.0/profile.bashrc b/profiles/default-linux/amd64/2005.0/profile.bashrc index 5e4f81e01f36..b69715e810b6 100644 --- a/profiles/default-linux/amd64/2005.0/profile.bashrc +++ b/profiles/default-linux/amd64/2005.0/profile.bashrc @@ -10,22 +10,6 @@ fi export CFLAGS_amd64 export CFLAGS_x86 -hack_use_ml() { - local x - unset IFS - for x in ${USE}; do - if [ "${x}" = "multilib" ]; then - return 0 - fi - done - return 1 -} - -if ! hack_use_ml; then - eerror "The 2005.0 profile requires that you have USE=multilib enabled." - exit 1 -fi - # Make sure they updated to 2005.0 properly if [ -L /lib32 -o -L /usr/lib32 -o -L /usr/X11R6/lib32 ]; then eerror "It appears you have switched to the 2005.0 profile without following" diff --git a/profiles/default-linux/amd64/2005.0/use.mask b/profiles/default-linux/amd64/2005.0/use.mask new file mode 100644 index 000000000000..505a2a7b604b --- /dev/null +++ b/profiles/default-linux/amd64/2005.0/use.mask @@ -0,0 +1,5 @@ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/use.mask,v 1.1 2005/01/18 06:57:24 eradicator Exp $ + +# Jeremy Huddleston <eradicator@gentoo.org> +# multilib is forced on when we have ${MULTILIB_ABIS} defined +multilib |