eselect-opengl-non-multilib.patch

   1 Index: modules/opengl.eselect
   2 ===================================================================
   3 --- modules/opengl.eselect      (revision 249)
   4 +++ modules/opengl.eselect      (working copy)
   5 @@ -1,4 +1,4 @@
   6 -# Copyright 1999-2004 Gentoo Foundation
   7 +# Copyright 1999-2006 Gentoo Foundation
   8  # Distributed under the terms of the GNU General Public License v2
   9  # $Id$
  10  # Author:  Martin Schlemmer <azarah@gentoo.org>
  11 @@ -111,15 +111,17 @@
  12                         rm -f "${ENV_FILE}" || die -q "Failed to remove ${ENV_FILE}"
  13                 fi
  14
  15 -               local libdir
  16 -               for libdir in $(list_libdirs); do
  17 -                       # Special case handling of lib32 because it can be a symlink to
  18 -                       # emul libs
  19 -                       # Kill this special case once amd64's 2004.3 crap is gone =) --eradicator
  20 -                       if [[ ${libdir} = "lib32" ]] ; then
  21 -                               [[ -d ${PREFIX}/${libdir}/opengl ]] || continue
  22 -                       else
  23 -                               [[ -d ${PREFIX}/${libdir}/opengl && ! -h ${PREFIX}/${libdir} ]] || continue
  24 +               local libdir libdirs=$(list_libdirs)
  25 +               for libdir in ${libdirs} ; do
  26 +                       if [[ ${#libdirs[@]} -gt 1 ]] ; then
  27 +                               # Special case handling of lib32 because it can be a symlink to
  28 +                               # emul libs
  29 +                               # Kill this special case once amd64's 2004.3 crap is gone =) --eradicator
  30 +                               if [[ ${libdir} = "lib32" ]] ; then
  31 +                                       [[ -d ${PREFIX}/${libdir}/opengl ]] || continue
  32 +                               else
  33 +                                       [[ -d ${PREFIX}/${libdir}/opengl && ! -h ${PREFIX}/${libdir} ]] || continue
  34 +                               fi
  35                         fi
  36
  37                         # Fallback on xorg-x11 if we don't have this implementation for this libdir.