Index: modules/opengl.eselect =================================================================== --- modules/opengl.eselect (revision 249) +++ modules/opengl.eselect (working copy) @@ -1,4 +1,4 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # Author: Martin Schlemmer @@ -111,15 +111,17 @@ rm -f "${ENV_FILE}" || die -q "Failed to remove ${ENV_FILE}" fi - local libdir - for libdir in $(list_libdirs); do - # Special case handling of lib32 because it can be a symlink to - # emul libs - # Kill this special case once amd64's 2004.3 crap is gone =) --eradicator - if [[ ${libdir} = "lib32" ]] ; then - [[ -d ${PREFIX}/${libdir}/opengl ]] || continue - else - [[ -d ${PREFIX}/${libdir}/opengl && ! -h ${PREFIX}/${libdir} ]] || continue + local libdir libdirs=$(list_libdirs) + for libdir in ${libdirs} ; do + if [[ ${#libdirs[@]} -gt 1 ]] ; then + # Special case handling of lib32 because it can be a symlink to + # emul libs + # Kill this special case once amd64's 2004.3 crap is gone =) --eradicator + if [[ ${libdir} = "lib32" ]] ; then + [[ -d ${PREFIX}/${libdir}/opengl ]] || continue + else + [[ -d ${PREFIX}/${libdir}/opengl && ! -h ${PREFIX}/${libdir} ]] || continue + fi fi # Fallback on xorg-x11 if we don't have this implementation for this libdir.