From 8ce75886ae475b34e2a0e855a8c63ffe3f2470ec Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 18 Jan 2005 01:30:30 +0000 Subject: [PATCH] Mask ebul ebuilds which don't provide working env.d entries. --- profiles/default-linux/amd64/2005.0/package.mask | 7 ++++++- profiles/default-linux/amd64/2005.0/profile.bashrc | 12 ++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/profiles/default-linux/amd64/2005.0/package.mask b/profiles/default-linux/amd64/2005.0/package.mask index d2c9df2111b8..94662bbfe65b 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.10 2005/01/16 18:03:33 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/package.mask,v 1.11 2005/01/18 01:30:30 eradicator Exp $ # Jeremy Huddleston # Force binutils-config versions of binutils @@ -25,6 +25,11 @@ -=app-emulation/emul-linux-x86-glibc-1000 +# Make sure we have a correct /etc/env.d entry + # Non multilib-friendly baselayouts =sys-apps/baselayout-1.11.7-r2 diff --git a/profiles/default-linux/amd64/2005.0/profile.bashrc b/profiles/default-linux/amd64/2005.0/profile.bashrc index 119d933d31f0..5e4f81e01f36 100644 --- a/profiles/default-linux/amd64/2005.0/profile.bashrc +++ b/profiles/default-linux/amd64/2005.0/profile.bashrc @@ -12,23 +12,19 @@ export CFLAGS_x86 hack_use_ml() { local x - save_IFS unset IFS for x in ${USE}; do if [ "${x}" = "multilib" ]; then - restore_IFS return 0 fi done - restore_IFS return 1 } -# This seems to break kde. -#if ! hack_use_ml; then -# eerror "The 2005.0 profile requires that you have USE=multilib enabled." -# exit 1 -#fi +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 -- 2.26.2