Mask ebul ebuilds which don't provide working env.d entries.

diff --git a/profiles/default-linux/amd64/2005.0/package.mask b/profiles/default-linux/amd64/2005.0/package.mask
index d2c9df2111b846e57db1db7496acf21d472f065b..94662bbfe65b2f5bcd34a21f5791d8bfcfe22934 100644 (file)
--- 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 <eradicator@gentoo.org>
 # Force binutils-config versions of binutils
@@ -25,6 +25,11 @@
 -=app-emulation/emul-linux-x86-glibc-1000
 <app-emulation/emul-linux-x86-glibc-1000
 
+# Jeremy Huddleston <eradicator@gentoo.org>
+# Make sure we have a correct /etc/env.d entry
+<app-emulation/emul-linux-x86-baselibs-1.2.2-r2
+<app-emulation/emul-linux-x86-xlibs-1.2-r2
+
 # Jeremy Huddleston <eradicator@gentoo.org>
 # 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 119d933d31f0fef2e902792493f0d2d76e6c768c..5e4f81e01f36fe3ca0d1a9f1dc418169d5582ac4 100644 (file)
--- 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