Mostly complete rewrite in effort to make it easier to maintain.

Add all the patches temporary in ELT-patches, until I can get a
better place that do not need a tarball or such to download.

14 files changed, 1678 insertions, 0 deletions

diff --git a/eclass/ELT-patches/fix-relink/1.4.0 b/eclass/ELT-patches/fix-relink/1.4.0
new file mode 100644
index 000000000000..c8edade31e35
--- /dev/null
+++ b/eclass/ELT-patches/fix-relink/1.4.0
@@ -0,0 +1,63 @@
+--- ltmain.sh	2003-09-24 18:22:17.528129376 +0200
++++ ltmain.sh	2003-09-24 18:23:17.101072912 +0200
+@@ -1582,6 +1582,8 @@
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ 	    tmp_libs=
++	    # PKGW 
++	    dependency_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+               if test "X$duplicate_deps" = "Xyes" ; then
+@@ -1699,6 +1701,8 @@
+ 	  fi
+ 
+ 	  tmp_libs=
++	  #PKGW
++	  dependency_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    case $deplib in
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+@@ -1860,6 +1864,16 @@
+ 		add="$dir/$linklib"
+ 	      elif test "$hardcode_minus_L" = yes; then
+ 		add_dir="-L$dir"
++		# Try looking first in the location we're being installed to.
++		if test -n "$inst_prefix_dir"; then
++		  case "$libdir" in
++		    [\\/]*)
++		      # Add the install location to the beginning, minimising possiblilty
++		      # of linking to older version of the lib already installed.
++		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		      ;;
++		  esac
++		fi
+ 		add="-l$name"
+ 	      elif test "$hardcode_shlibpath_var" = yes; then
+ 		add_shlibpath="$dir"
+@@ -1918,6 +1932,16 @@
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+ 	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      if test -n "$inst_prefix_dir"; then
++	        case "$libdir" in
++	          [\\/]*)
++	            # Add the install location to the beginning, minimising possiblilty
++	            # of linking to older version of the lib already installed.
++	            add_dir="-L$inst_prefix_dir$libdir $add_dir"
++	            ;;
++	        esac
++	      fi
+ 	      add="-l$name"
+ 	    fi
+ 
+@@ -2117,7 +2141,7 @@
+ 	    -L*)
+ 	      case " $tmp_libs " in
+ 	      *" $deplib "*) ;;
+-	      *) tmp_libs="$tmp_libs $deplib" ;;
++	      *) tmp_libs="$deplib $tmp_libs" ;;
+ 	      esac
+ 	      ;;
+ 	    *) tmp_libs="$tmp_libs $deplib" ;;
diff --git a/eclass/ELT-patches/fix-relink/1.4.3 b/eclass/ELT-patches/fix-relink/1.4.3
new file mode 100644
index 000000000000..959fe1dd76f6
--- /dev/null
+++ b/eclass/ELT-patches/fix-relink/1.4.3
@@ -0,0 +1,62 @@
+--- ltmain.sh	2003-09-24 19:48:39.367370072 +0200
++++ ltmain.sh	2003-09-24 19:49:31.773403144 +0200
+@@ -1593,6 +1593,8 @@
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ 	    tmp_libs=
++	    # PKGW 
++	    dependency_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+               if test "X$duplicate_deps" = "Xyes" ; then
+@@ -1710,6 +1712,8 @@
+ 	  fi
+ 
+ 	  tmp_libs=
++	  #PKGW
++	  dependency_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    case $deplib in
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+@@ -1871,6 +1875,16 @@
+ 		add="$dir/$linklib"
+ 	      elif test "$hardcode_minus_L" = yes; then
+ 		add_dir="-L$dir"
++		# Try looking first in the location we're being installed to.
++		if test -n "$inst_prefix_dir"; then
++		  case "$libdir" in
++		    [\\/]*)
++		      # Add the install location to the beginning, minimising possiblilty
++		      # of linking to older version of the lib already installed.
++		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
++		      ;;
++		  esac
++		fi
+ 		add="-l$name"
+ 	      elif test "$hardcode_shlibpath_var" = yes; then
+ 		add_shlibpath="$dir"
+@@ -1938,11 +1952,13 @@
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+ 	      # Try looking first in the location we're being installed to.
+-	      add_dir=
++	      add_dir="-L$dir"
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case "$libdir" in
+ 		[\\/]*)
+-		  add_dir="-L$inst_prefix_dir$libdir"
++		  # Add the install location to the beginning, minimising possiblilty
++		  # of linking to older version of the lib already installed.
++		  add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ 		  ;;
+ 		esac
+ 	      fi
+@@ -2146,7 +2162,7 @@
+ 	    -L*)
+ 	      case " $tmp_libs " in
+ 	      *" $deplib "*) ;;
+-	      *) tmp_libs="$tmp_libs $deplib" ;;
++	      *) tmp_libs="$deplib $tmp_libs" ;;
+ 	      esac
+ 	      ;;
+ 	    *) tmp_libs="$tmp_libs $deplib" ;;
diff --git a/eclass/ELT-patches/fix-relink/1.5.0 b/eclass/ELT-patches/fix-relink/1.5.0
new file mode 100644
index 000000000000..29b7db7b1dd4
--- /dev/null
+++ b/eclass/ELT-patches/fix-relink/1.5.0
@@ -0,0 +1,51 @@
+--- ltmain.sh	2003-09-24 18:18:14.961005184 +0200
++++ ltmain.sh	2003-09-24 18:20:11.204333512 +0200
+@@ -2022,6 +2022,8 @@
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ 	    tmp_libs=
++	    # PKGW 
++	    dependency_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+               if test "X$duplicate_deps" = "Xyes" ; then
+@@ -2143,6 +2145,8 @@
+ 	  fi
+ 
+ 	  tmp_libs=
++	  #PKGW
++	  dependency_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    case $deplib in
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+@@ -2359,7 +2363,9 @@
+ 		if test -n "$inst_prefix_dir"; then
+ 		  case "$libdir" in
+ 		    [\\/]*)
+-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
++		      # Add the install location to the beginning, minimising possiblilty
++		      # of linking to older version of the lib already installed.
++		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ 		      ;;
+ 		  esac
+ 		fi
+@@ -2431,7 +2437,9 @@
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case "$libdir" in
+ 		  [\\/]*)
+-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
++		    # Add the install location to the beginning, minimising possiblilty
++		    # of linking to older version of the lib already installed.
++		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ 		    ;;
+ 		esac
+ 	      fi
+@@ -2691,7 +2699,7 @@
+ 	    -L*)
+ 	      case " $tmp_libs " in
+ 	      *" $deplib "*) ;;
+-	      *) tmp_libs="$tmp_libs $deplib" ;;
++	      *) tmp_libs="$deplib $tmp_libs" ;;
+ 	      esac
+ 	      ;;
+ 	    *) tmp_libs="$tmp_libs $deplib" ;;
diff --git a/eclass/ELT-patches/portage/1.4.1 b/eclass/ELT-patches/portage/1.4.1
new file mode 100644
index 000000000000..d4592784c4bc
--- /dev/null
+++ b/eclass/ELT-patches/portage/1.4.1
@@ -0,0 +1,62 @@
+--- ltmain.sh	Wed Apr  3 01:19:37 2002
++++ ltmain.sh	Sun May 26 19:50:52 2002
+@@ -3940,9 +3940,46 @@
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		  exit 1
+ 		fi
+-		newdependency_libs="$newdependency_libs $libdir/$name"
++		# We do not want portage's install root ($D) present.  Check only for
++		# this if the .la is being installed.
++		if test "$installed" = yes && test "$D"; then
++		  eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`"
++		else
++		  mynewdependency_lib="$libdir/$name"
++		fi
++		# Do not add duplicates
++		if test "$mynewdependency_lib"; then
++		  if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
++		    newdependency_libs="$newdependency_libs $mynewdependency_lib"
++		  fi
++		fi
++		;;
++		  *)
++		if test "$installed" = yes; then
++   	  # Rather use S=WORKDIR if our version of portage supports it.
++   	  # This is because some ebuild (gcc) do not use $S as buildroot.
++		  if test "$PWORKDIR"; then
++		    S="$PWORKDIR"
++		  fi
++		  # We do not want portage's build root ($S) present.
++		  if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
++		    mynewdependency_lib=""
++		  # We do not want portage's install root ($D) present.
++		  elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
++		    eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
++		  else
++		    mynewdependency_lib="$deplib"
++		  fi
++		else
++		  mynewdependency_lib="$deplib"
++		fi
++		# Do not add duplicates
++		if test "$mynewdependency_lib"; then
++		  if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
++			newdependency_libs="$newdependency_libs $mynewdependency_lib"
++		  fi
++		fi
+ 		;;
+-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+ 	      esac
+ 	    done
+ 	    dependency_libs="$newdependency_libs"
+@@ -3975,6 +4005,10 @@
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
++	  # Do not add duplicates
++	  if test "$installed" = yes && test "$D"; then
++	    install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
++	  fi
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
diff --git a/eclass/ELT-patches/relink/1.4.0a-GCC3.0-1 b/eclass/ELT-patches/relink/1.4.0a-GCC3.0-1
new file mode 100644
index 000000000000..6bf45e58c57d
--- /dev/null
+++ b/eclass/ELT-patches/relink/1.4.0a-GCC3.0-1
@@ -0,0 +1,99 @@
+--- ltmain.sh	Wed Oct  3 02:05:35 2001
++++ ltmain.sh	Wed Oct  3 05:16:14 2001
+@@ -754,6 +754,7 @@
+     linker_flags=
+     dllsearchpath=
+     lib_search_path=`pwd`
++    inst_prefix_dir=
+ 
+     avoid_version=no
+     dlfiles=
+@@ -884,6 +885,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++        inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -985,6 +991,11 @@
+ 	continue
+ 	;;
+ 
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
++
+       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+       # so, if we see these flags be careful not to treat them like -L
+       -L[A-Z][A-Z]*:*)
+@@ -1866,6 +1877,7 @@
+ 
+ 	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
++	    add_prefix_dir=
+ 	    add_dir=
+ 	    add=
+ 	    # Finalize command for both is simple: just hardcode it.
+@@ -1886,10 +1898,22 @@
+ 	      add="-l$name"
+ 	    fi
+ 
++	    if test -n "$inst_prefix_dir"; then
++	      case "$libdir" in
++	      [\\/]*)
++		add_prefix_dir="-L$inst_prefix_dir$libdir"
++		;;
++	      esac
++	    fi
++
++	    # add_prefix_dir must be appended instead, otherwise it can
++	    # possibly be overrided by any hardcoded -L/... path in deplibs
+ 	    if test "$linkmode" = prog; then
++	      test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
++	      test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
+ 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+@@ -3856,7 +3880,7 @@
+       for tag in $taglist; do
+         tagopts="$tagopts --tag $tag"
+       done
+-      relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args)"
++      relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+@@ -4157,6 +4181,24 @@
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
++
++	  # Don't allow the user to place us outside of our expected
++	  # location b/c this prevents finding dependent libraries that
++	  # are installed to the same prefix.
++	  if test "$inst_prefix_dir" = "$destdir"; then
++	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++	    exit 1
++	  fi
++
++	  if test -n "$inst_prefix_dir"; then
++	    # Stick the inst_prefix_dir data into the link command.
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	  else
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
++	  fi
++
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
diff --git a/eclass/ELT-patches/relink/1.4.0a-GCC3.0-2 b/eclass/ELT-patches/relink/1.4.0a-GCC3.0-2
new file mode 100644
index 000000000000..55103a42e204
--- /dev/null
+++ b/eclass/ELT-patches/relink/1.4.0a-GCC3.0-2
@@ -0,0 +1,100 @@
+--- ltmain.sh	Wed Oct  3 02:05:35 2001
++++ ltmain.sh	Wed Oct  3 05:16:14 2001
+@@ -754,6 +754,7 @@
+     linker_flags=
+     dllsearchpath=
+     lib_search_path=`pwd`
++    inst_prefix_dir=
+ 
+     avoid_version=no
+     dlfiles=
+@@ -884,6 +885,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++        inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -985,6 +991,11 @@
+ 	continue
+ 	;;
+ 
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
++
+       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+       # so, if we see these flags be careful not to treat them like -L
+       -L[A-Z][A-Z]*:*)
+@@ -1866,6 +1877,7 @@
+ 
+ 	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
++	    add_prefix_dir=
+ 	    add_dir=
+ 	    add=
+ 	    # Finalize command for both is simple: just hardcode it.
+@@ -1886,10 +1898,22 @@
+ 	      add="-l$name"
+ 	    fi
+ 
+-	    if test $linkmode = prog; then
++	    if test -n "$inst_prefix_dir"; then
++	      case "$libdir" in
++	      [\\/]*)
++		add_prefix_dir="-L$inst_prefix_dir$libdir"
++		;;
++	      esac
++	    fi
++
++	    # add_prefix_dir must be appended instead, otherwise it can
++	    # possibly be overrided by any hardcoded -L/... path in deplibs
++	    if test "$linkmode" = prog; then
++	      test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
++	      test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
+ 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+@@ -3856,7 +3880,7 @@
+       for tag in $taglist; do
+         tagopts="$tagopts --tag $tag"
+       done
+-      relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args)"
++      relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+@@ -4157,6 +4181,24 @@
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
++
++	  # Don't allow the user to place us outside of our expected
++	  # location b/c this prevents finding dependent libraries that
++	  # are installed to the same prefix.
++	  if test "$inst_prefix_dir" = "$destdir"; then
++	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++	    exit 1
++	  fi
++
++	  if test -n "$inst_prefix_dir"; then
++	    # Stick the inst_prefix_dir data into the link command.
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	  else
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
++	  fi
++
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
diff --git a/eclass/ELT-patches/relink/1.4.1 b/eclass/ELT-patches/relink/1.4.1
new file mode 100644
index 000000000000..f34863f685e9
--- /dev/null
+++ b/eclass/ELT-patches/relink/1.4.1
@@ -0,0 +1,124 @@
+--- ltmain.sh	Sun Aug 12 18:08:05 2001
++++ ltmain.sh	Tue Aug 28 18:55:13 2001
+@@ -827,6 +827,7 @@
+     linker_flags=
+     dllsearchpath=
+     lib_search_path=`pwd`
++    inst_prefix_dir=
+ 
+     avoid_version=no
+     dlfiles=
+@@ -959,6 +960,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++        inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -1167,6 +1173,11 @@
+ 	continue
+ 	;;
+ 
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
++
+       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+       # so, if we see these flags be careful not to treat them like -L
+       -L[A-Z][A-Z]*:*)
+@@ -2231,7 +2242,16 @@
+ 	    if test "$hardcode_direct" = yes; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+-	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      add_dir=
++	      if test -n "$inst_prefix_dir"; then
++		case "$libdir" in
++		[\\/]*)
++		  add_dir="-L$inst_prefix_dir$libdir"
++		  ;;
++		esac
++	      fi
++	      add_dir="$add_dir -L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
+@@ -2241,7 +2261,16 @@
+ 	      add="-l$name"
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      add_dir=
++	      if test -n "$inst_prefix_dir"; then
++		case "$libdir" in
++		[\\/]*)
++		  add_dir="-L$inst_prefix_dir$libdir"
++		  ;;
++		esac
++	      fi
++	      add_dir="$add_dir -L$libdir"
+ 	      add="-l$name"
+ 	    fi
+ 
+@@ -4321,7 +4350,7 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
++      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+@@ -4622,12 +4651,30 @@
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
++
++	  # Don't allow the user to place us outside of our expected
++	  # location b/c this prevents finding dependent libraries that
++	  # are installed to the same prefix.
++	  if test "$inst_prefix_dir" = "$destdir"; then
++	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++	    exit 1
++	  fi
++
++	  if test -n "$inst_prefix_dir"; then
++	    # Stick the inst_prefix_dir data into the link command.
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	  else
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
++	  fi
++
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-	    continue
++	    exit 1
+ 	  fi
+ 	fi
+ 
+@@ -4782,7 +4829,11 @@
+ 	    if test "$finalize" = yes && test -z "$run"; then
+ 	      tmpdir="/tmp"
+ 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+-	      tmpdir="$tmpdir/libtool-$$"
++              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
++              if test $? = 0 ; then :
++              else
++                tmpdir="$tmpdir/libtool-$$"
++              fi
+ 	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+ 	      else
+ 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
diff --git a/eclass/ELT-patches/relink/1.4.2 b/eclass/ELT-patches/relink/1.4.2
new file mode 100644
index 000000000000..17a630b7cfe8
--- /dev/null
+++ b/eclass/ELT-patches/relink/1.4.2
@@ -0,0 +1,99 @@
+--- ltmain.sh	Wed Oct  3 02:05:35 2001
++++ ltmain.sh	Wed Oct  3 05:16:14 2001
+@@ -754,6 +754,7 @@
+     linker_flags=
+     dllsearchpath=
+     lib_search_path=`pwd`
++    inst_prefix_dir=
+ 
+     avoid_version=no
+     dlfiles=
+@@ -884,6 +885,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++        inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -985,6 +991,11 @@
+ 	continue
+ 	;;
+ 
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
++
+       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+       # so, if we see these flags be careful not to treat them like -L
+       -L[A-Z][A-Z]*:*)
+@@ -1866,6 +1877,7 @@
+ 
+ 	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
++	    add_prefix_dir=
+ 	    add_dir=
+ 	    add=
+ 	    # Finalize command for both is simple: just hardcode it.
+@@ -1886,10 +1898,22 @@
+ 	      add="-l$name"
+ 	    fi
+ 
++	    if test -n "$inst_prefix_dir"; then
++	      case "$libdir" in
++	      [\\/]*)
++		add_prefix_dir="-L$inst_prefix_dir$libdir"
++		;;
++	      esac
++	    fi
++
++	    # add_prefix_dir must be appended instead, otherwise it can
++	    # possibly be overrided by any hardcoded -L/... path in deplibs
+ 	    if test "$linkmode" = prog; then
++	      test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir"
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
++	      test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir"
+ 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+@@ -3856,7 +3880,7 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
++      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+@@ -4157,6 +4181,24 @@
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
++
++	  # Don't allow the user to place us outside of our expected
++	  # location b/c this prevents finding dependent libraries that
++	  # are installed to the same prefix.
++	  if test "$inst_prefix_dir" = "$destdir"; then
++	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++	    exit 1
++	  fi
++
++	  if test -n "$inst_prefix_dir"; then
++	    # Stick the inst_prefix_dir data into the link command.
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	  else
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
++	  fi
++
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
diff --git a/eclass/ELT-patches/relink/1.4.3 b/eclass/ELT-patches/relink/1.4.3
new file mode 100644
index 000000000000..3ed5fe3784a6
--- /dev/null
+++ b/eclass/ELT-patches/relink/1.4.3
@@ -0,0 +1,111 @@
+--- ltmain.sh	Mon Feb  4 15:12:15 2002
++++ ltmain.sh	Mon Feb  4 15:12:15 2002
+@@ -745,6 +745,7 @@
+     linker_flags=
+     dllsearchpath=
+     lib_search_path=`pwd`
++    inst_prefix_dir=
+ 
+     avoid_version=no
+     dlfiles=
+@@ -875,6 +876,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++        inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -976,6 +982,11 @@
+ 	continue
+ 	;;
+ 
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
++
+       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+       # so, if we see these flags be careful not to treat them like -L
+       -L[A-Z][A-Z]*:*)
+@@ -1851,7 +1862,16 @@
+ 	    if test "$hardcode_direct" = yes; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+-	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      add_dir=
++	      if test -n "$inst_prefix_dir"; then
++		case "$libdir" in
++		[\\/]*)
++		  add_dir="-L$inst_prefix_dir$libdir"
++		  ;;
++		esac
++	      fi
++	      add_dir="$add_dir -L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
+@@ -1861,7 +1881,16 @@
+ 	      add="-l$name"
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      add_dir=
++	      if test -n "$inst_prefix_dir"; then
++		case "$libdir" in
++		[\\/]*)
++		  add_dir="-L$inst_prefix_dir$libdir"
++		  ;;
++		esac
++	      fi
++	      add_dir="$add_dir -L$libdir"
+ 	      add="-l$name"
+ 	    fi
+ 
+@@ -3823,7 +3852,7 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
++      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+@@ -4124,12 +4153,30 @@
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
++
++	  # Don't allow the user to place us outside of our expected
++	  # location b/c this prevents finding dependent libraries that
++	  # are installed to the same prefix.
++	  if test "$inst_prefix_dir" = "$destdir"; then
++	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++	    exit 1
++	  fi
++
++	  if test -n "$inst_prefix_dir"; then
++	    # Stick the inst_prefix_dir data into the link command.
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	  else
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
++	  fi
++
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-	    continue
++	    exit 1
+ 	  fi
+ 	fi
+ 
diff --git a/eclass/ELT-patches/rem-int-dep/1.3.5 b/eclass/ELT-patches/rem-int-dep/1.3.5
new file mode 100644
index 000000000000..4302623607b6
--- /dev/null
+++ b/eclass/ELT-patches/rem-int-dep/1.3.5
@@ -0,0 +1,11 @@
+--- ltmain.sh	2002-11-01 19:56:50.000000000 -0600
++++ ltmain.sh	2002-11-01 19:57:03.000000000 -0600
+@@ -4551,6 +4551,8 @@
+ 	  if test "$installed" = yes && test "$D"; then
+ 	    install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
+ 	  fi
++	  # Removing @REM_INT_DEP@ from dependency_libs in .la
++	  dependency_libs=`echo $dependency_libs | $Xsed -e 's%\([^ ]*lib@REM_INT_DEP@\.\(so\|la\|a\)\)\|\(-l@REM_INT_DEP@\)%%g'`
+ 	  \$echo > \$output "\\
+ # \$outputname - a libtool library file
+ # Generated by \$PROGRAM - GNU \$PACKAGE \$VERSION\$TIMESTAMP
diff --git a/eclass/ELT-patches/sed/1.4.3 b/eclass/ELT-patches/sed/1.4.3
new file mode 100644
index 000000000000..20178a03de05
--- /dev/null
+++ b/eclass/ELT-patches/sed/1.4.3
@@ -0,0 +1,12 @@
+--- ltmain.sh	2003-02-13 14:54:24.000000000 +0100
++++ ltmain.sh	2003-02-13 15:24:49.000000000 +0100
+@@ -48,6 +48,9 @@ EOF
+   exit 0
+ fi
+ 
++# define SED for historic ltconfig's generated by Libtool 1.3
++test -z "$SED" && SED=sed
++
+ # The name of this program.
+ progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+ modename="$progname"
diff --git a/eclass/ELT-patches/test/1.4.1 b/eclass/ELT-patches/test/1.4.1
new file mode 100644
index 000000000000..d6f442f0e38d
--- /dev/null
+++ b/eclass/ELT-patches/test/1.4.1
@@ -0,0 +1,291 @@
+--- ltmain.sh	Tue May 29 19:16:03 2001
++++ ltmain.sh	Tue May 29 21:26:50 2001
+@@ -459,7 +459,7 @@
+       pic_mode=default
+       ;;
+     esac
+-    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
++    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+       # non-PIC code in shared libraries is not supported
+       pic_mode=default
+     fi
+@@ -1343,7 +1343,7 @@
+ 	;;
+     esac
+     for pass in $passes; do
+-      if test $linkmode = prog; then
++      if test "$linkmode" = prog; then
+ 	# Determine which files to process
+ 	case $pass in
+ 	dlopen)
+@@ -1360,11 +1360,11 @@
+ 	found=no
+ 	case $deplib in
+ 	-l*)
+-	  if test $linkmode = oldlib && test $linkmode = obj; then
++	  if test "$linkmode" = oldlib && test "$linkmode" = obj; then
+ 	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
+ 	    continue
+ 	  fi
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+@@ -1384,7 +1384,7 @@
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    else
+ 	      deplibs="$deplib $deplibs"
+-	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
++	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
+ 	    continue
+ 	  fi
+@@ -1393,16 +1393,16 @@
+ 	  case $linkmode in
+ 	  lib)
+ 	    deplibs="$deplib $deplibs"
+-	    test $pass = conv && continue
++	    test "$pass" = conv && continue
+ 	    newdependency_libs="$deplib $newdependency_libs"
+ 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  prog)
+-	    if test $pass = conv; then
++	    if test "$pass" = conv; then
+ 	      deplibs="$deplib $deplibs"
+ 	      continue
+ 	    fi
+-	    if test $pass = scan; then
++	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+ 	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+@@ -1417,7 +1417,7 @@
+ 	  continue
+ 	  ;; # -L
+ 	-R*)
+-	  if test $pass = link; then
++	  if test "$pass" = link; then
+ 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ 	    # Make sure the xrpath contains only unique directories.
+ 	    case "$xrpath " in
+@@ -1430,7 +1430,7 @@
+ 	  ;;
+ 	*.la) lib="$deplib" ;;
+ 	*.$libext)
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+@@ -1451,7 +1451,7 @@
+ 	    continue
+ 	    ;;
+ 	  prog)
+-	    if test $pass != link; then
++	    if test "$pass" != link; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+@@ -1462,7 +1462,7 @@
+ 	  esac # linkmode
+ 	  ;; # *.$libext
+ 	*.lo | *.$objext)
+-	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ 	    # If there is no dlopen support or we're linking statically,
+ 	    # we need to preload.
+ 	    newdlprefiles="$newdlprefiles $deplib"
+@@ -1512,13 +1512,13 @@
+ 
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+-	   { test $linkmode = oldlib && test $linkmode = obj; }; then
++	   { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
+ 	   # Add dl[pre]opened files of deplib
+ 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ 	fi
+ 
+-	if test $pass = conv; then
++	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+ 	  if test -z "$libdir"; then
+@@ -1537,7 +1537,7 @@
+ 	      esac
+ 	      tmp_libs="$tmp_libs $deplib"
+ 	    done
+-	  elif test $linkmode != prog && test $linkmode != lib; then
++	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ 	    exit 1
+ 	  fi
+@@ -1555,7 +1555,7 @@
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+-	if test $pass = dlopen; then
++	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+@@ -1604,7 +1604,7 @@
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+ 	# This library was specified with -dlpreopen.
+-	if test $pass = dlpreopen; then
++	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+@@ -1623,7 +1623,7 @@
+ 
+ 	if test -z "$libdir"; then
+ 	  # Link the convenience library
+-	  if test $linkmode = lib; then
++	  if test "$linkmode" = lib; then
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	  elif test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$dir/$old_library $compile_deplibs"
+@@ -1634,7 +1634,7 @@
+ 	  continue
+ 	fi
+ 
+-	if test $linkmode = prog && test $pass != link; then
++	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+ 
+@@ -1671,7 +1671,7 @@
+ 	  # Link against this shared library
+ 
+ 	  if test "$linkmode,$pass" = "prog,link" ||
+-	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
++	   { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
+ 	    # Hardcode the library path.
+ 	    # Skip directories that are in the system default run-time
+ 	    # search path.
+@@ -1693,7 +1693,7 @@
+ 	      esac
+ 	      ;;
+ 	    esac
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      # We need to hardcode the library path
+ 	      if test -n "$shlibpath_var"; then
+ 		# Make sure the rpath contains only unique directories.
+@@ -1777,7 +1777,7 @@
+ 	    linklib=$newlib
+ 	  fi # test -n $old_archive_from_expsyms_cmds
+ 
+-	  if test $linkmode = prog || test "$mode" != relink; then
++	  if test "$linkmode" = prog || test "$mode" != relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+@@ -1826,7 +1826,7 @@
+ 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ 	      esac
+ 	    fi
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ 	    else
+@@ -1843,7 +1843,7 @@
+ 	    fi
+ 	  fi
+ 
+-	  if test $linkmode = prog || test "$mode" = relink; then
++	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+@@ -1865,7 +1865,7 @@
+ 	      add="-l$name"
+ 	    fi
+ 
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
+@@ -1873,7 +1873,7 @@
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+ 	  fi
+-	elif test $linkmode = prog; then
++	elif test "$linkmode" = prog; then
+ 	  if test "$alldeplibs" = yes &&
+ 	     { test "$deplibs_check_method" = pass_all ||
+ 	       { test "$build_libtool_libs" = yes &&
+@@ -1932,9 +1932,9 @@
+ 	  fi
+ 	fi # link shared/static library?
+ 
+-	if test $linkmode = lib; then
++	if test "$linkmode" = lib; then
+ 	  if test -n "$dependency_libs" &&
+-	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
++	     { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
+ 	       test $link_static = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+@@ -1964,7 +1964,7 @@
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done
+ 
+-	  if test $link_all_deplibs != no; then
++	  if test "$link_all_deplibs" != no; then
+ 	    # Add the search paths of all dependency libraries
+ 	    for deplib in $dependency_libs; do
+ 	      case $deplib in
+@@ -2007,15 +2007,15 @@
+ 	  fi # link_all_deplibs != no
+ 	fi # linkmode = lib
+       done # for deplib in $libs
+-      if test $pass = dlpreopen; then
++      if test "$pass" = dlpreopen; then
+ 	# Link the dlpreopened libraries before other libraries
+ 	for deplib in $save_deplibs; do
+ 	  deplibs="$deplib $deplibs"
+ 	done
+       fi
+-      if test $pass != dlopen; then
+-	test $pass != scan && dependency_libs="$newdependency_libs"
+-	if test $pass != conv; then
++      if test "$pass" != dlopen; then
++	test "$pass" != scan && dependency_libs="$newdependency_libs"
++	if test "$pass" != conv; then
+ 	  # Make sure lib_search_path contains only unique directories.
+ 	  lib_search_path=
+ 	  for dir in $newlib_search_path; do
+@@ -2073,7 +2073,7 @@
+ 	deplibs=
+       fi
+     done # for pass
+-    if test $linkmode = prog; then
++    if test "$linkmode" = prog; then
+       dlfiles="$newdlfiles"
+       dlprefiles="$newdlprefiles"
+     fi
+@@ -2410,7 +2410,7 @@
+ 	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+-	    if test $build_libtool_need_lc = "yes"; then
++	    if test "$build_libtool_need_lc" = "yes"; then
+ 	      deplibs="$deplibs -lc"
+ 	    fi
+ 	    ;;
+@@ -2683,7 +2683,7 @@
+ 
+       # Test again, we may have decided not to build it any more
+       if test "$build_libtool_libs" = yes; then
+-	if test $hardcode_into_libs = yes; then
++	if test "$hardcode_into_libs" = yes; then
+ 	  # Hardcode the library paths
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
diff --git a/eclass/ELT-patches/test/1.4.2 b/eclass/ELT-patches/test/1.4.2
new file mode 100644
index 000000000000..8ae65ef00280
--- /dev/null
+++ b/eclass/ELT-patches/test/1.4.2
@@ -0,0 +1,578 @@
+--- ltmain.sh	2001-09-10 19:40:18.000000000 -0400
++++ ltmain.sh	2002-07-11 14:49:35.000000000 -0400
+@@ -467,7 +467,7 @@ if test -z "$show_help"; then
+       pic_mode=default
+       ;;
+     esac
+-    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
++    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+       # non-PIC code in shared libraries is not supported
+       pic_mode=default
+     fi
+@@ -1303,11 +1303,11 @@ compiler."
+       output_objdir="$output_objdir/$objdir"
+     fi
+     # Create the object directory.
+-    if test ! -d $output_objdir; then
++    if test ! -d "$output_objdir"; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+       status=$?
+-      if test $status -ne 0 && test ! -d $output_objdir; then
++      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+ 	exit $status
+       fi
+     fi
+@@ -1366,7 +1366,7 @@ compiler."
+ 	;;
+     esac
+     for pass in $passes; do
+-      if test $linkmode = prog; then
++      if test "$linkmode" = prog; then
+ 	# Determine which files to process
+ 	case $pass in
+ 	dlopen)
+@@ -1383,11 +1383,11 @@ compiler."
+ 	found=no
+ 	case $deplib in
+ 	-l*)
+-	  if test $linkmode = oldlib && test $linkmode = obj; then
++	  if test "$linkmode" = oldlib && test "$linkmode" = obj; then
+ 	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
+ 	    continue
+ 	  fi
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+@@ -1407,7 +1407,7 @@ compiler."
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    else
+ 	      deplibs="$deplib $deplibs"
+-	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
++	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
+ 	    continue
+ 	  fi
+@@ -1416,16 +1416,16 @@ compiler."
+ 	  case $linkmode in
+ 	  lib)
+ 	    deplibs="$deplib $deplibs"
+-	    test $pass = conv && continue
++	    test "$pass" = conv && continue
+ 	    newdependency_libs="$deplib $newdependency_libs"
+ 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  prog)
+-	    if test $pass = conv; then
++	    if test "$pass" = conv; then
+ 	      deplibs="$deplib $deplibs"
+ 	      continue
+ 	    fi
+-	    if test $pass = scan; then
++	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+ 	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+@@ -1440,7 +1440,7 @@ compiler."
+ 	  continue
+ 	  ;; # -L
+ 	-R*)
+-	  if test $pass = link; then
++	  if test "$pass" = link; then
+ 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ 	    # Make sure the xrpath contains only unique directories.
+ 	    case "$xrpath " in
+@@ -1453,7 +1453,7 @@ compiler."
+ 	  ;;
+ 	*.la) lib="$deplib" ;;
+ 	*.$libext)
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+@@ -1474,7 +1474,7 @@ compiler."
+ 	    continue
+ 	    ;;
+ 	  prog)
+-	    if test $pass != link; then
++	    if test "$pass" != link; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+@@ -1485,7 +1485,7 @@ compiler."
+ 	  esac # linkmode
+ 	  ;; # *.$libext
+ 	*.lo | *.$objext)
+-	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ 	    # If there is no dlopen support or we're linking statically,
+ 	    # we need to preload.
+ 	    newdlprefiles="$newdlprefiles $deplib"
+@@ -1501,7 +1501,7 @@ compiler."
+ 	  continue
+ 	  ;;
+ 	esac # case $deplib
+-	if test $found = yes || test -f "$lib"; then :
++	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+ 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+ 	  exit 1
+@@ -1535,13 +1535,13 @@ compiler."
+ 
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+-	   { test $linkmode = oldlib && test $linkmode = obj; }; then
++	   { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
+ 	   # Add dl[pre]opened files of deplib
+ 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ 	fi
+ 
+-	if test $pass = conv; then
++	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+ 	  if test -z "$libdir"; then
+@@ -1560,7 +1560,7 @@ compiler."
+ 	      esac
+ 	      tmp_libs="$tmp_libs $deplib"
+ 	    done
+-	  elif test $linkmode != prog && test $linkmode != lib; then
++	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ 	    exit 1
+ 	  fi
+@@ -1578,7 +1578,7 @@ compiler."
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+-	if test $pass = dlopen; then
++	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+@@ -1627,7 +1627,7 @@ compiler."
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+ 	# This library was specified with -dlpreopen.
+-	if test $pass = dlpreopen; then
++	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+@@ -1646,7 +1646,7 @@ compiler."
+ 
+ 	if test -z "$libdir"; then
+ 	  # Link the convenience library
+-	  if test $linkmode = lib; then
++	  if test "$linkmode" = lib; then
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	  elif test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$dir/$old_library $compile_deplibs"
+@@ -1657,7 +1657,7 @@ compiler."
+ 	  continue
+ 	fi
+ 
+-	if test $linkmode = prog && test $pass != link; then
++	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+ 
+@@ -1673,7 +1673,7 @@ compiler."
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+ 	    esac
+ 	    # Need to link against all dependency_libs?
+-	    if test $linkalldeplibs = yes; then
++	    if test "$linkalldeplibs" = yes; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      # Need to hardcode shared library paths
+@@ -1694,7 +1694,7 @@ compiler."
+ 	  # Link against this shared library
+ 
+ 	  if test "$linkmode,$pass" = "prog,link" ||
+-	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
++	   { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
+ 	    # Hardcode the library path.
+ 	    # Skip directories that are in the system default run-time
+ 	    # search path.
+@@ -1716,7 +1716,7 @@ compiler."
+ 	      esac
+ 	      ;;
+ 	    esac
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      # We need to hardcode the library path
+ 	      if test -n "$shlibpath_var"; then
+ 		# Make sure the rpath contains only unique directories.
+@@ -1798,9 +1798,9 @@ compiler."
+ 	    # make sure the library variables are pointing to the new library
+ 	    dir=$output_objdir
+ 	    linklib=$newlib
+-	  fi # test -n $old_archive_from_expsyms_cmds
++	  fi # test -n "$old_archive_from_expsyms_cmds"
+ 
+-	  if test $linkmode = prog || test "$mode" != relink; then
++	  if test "$linkmode" = prog || test "$mode" != relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+@@ -1849,7 +1849,7 @@ compiler."
+ 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ 	      esac
+ 	    fi
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ 	    else
+@@ -1866,7 +1866,7 @@ compiler."
+ 	    fi
+ 	  fi
+ 
+-	  if test $linkmode = prog || test "$mode" = relink; then
++	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+@@ -1888,7 +1888,7 @@ compiler."
+ 	      add="-l$name"
+ 	    fi
+ 
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
+@@ -1896,7 +1896,7 @@ compiler."
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+ 	  fi
+-	elif test $linkmode = prog; then
++	elif test "$linkmode" = prog; then
+ 	  if test "$alldeplibs" = yes &&
+ 	     { test "$deplibs_check_method" = pass_all ||
+ 	       { test "$build_libtool_libs" = yes &&
+@@ -1955,10 +1955,10 @@ compiler."
+ 	  fi
+ 	fi # link shared/static library?
+ 
+-	if test $linkmode = lib; then
++	if test "$linkmode" = lib; then
+ 	  if test -n "$dependency_libs" &&
+-	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
+-	       test $link_static = yes; }; then
++	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+ 	    for libdir in $dependency_libs; do
+@@ -1987,7 +1987,7 @@ compiler."
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done
+ 
+-	  if test $link_all_deplibs != no; then
++	  if test "$link_all_deplibs" != no; then
+ 	    # Add the search paths of all dependency libraries
+ 	    for deplib in $dependency_libs; do
+ 	      case $deplib in
+@@ -2030,15 +2030,15 @@ compiler."
+ 	  fi # link_all_deplibs != no
+ 	fi # linkmode = lib
+       done # for deplib in $libs
+-      if test $pass = dlpreopen; then
++      if test "$pass" = dlpreopen; then
+ 	# Link the dlpreopened libraries before other libraries
+ 	for deplib in $save_deplibs; do
+ 	  deplibs="$deplib $deplibs"
+ 	done
+       fi
+-      if test $pass != dlopen; then
+-	test $pass != scan && dependency_libs="$newdependency_libs"
+-	if test $pass != conv; then
++      if test "$pass" != dlopen; then
++	test "$pass" != scan && dependency_libs="$newdependency_libs"
++	if test "$pass" != conv; then
+ 	  # Make sure lib_search_path contains only unique directories.
+ 	  lib_search_path=
+ 	  for dir in $newlib_search_path; do
+@@ -2096,7 +2096,7 @@ compiler."
+ 	deplibs=
+       fi
+     done # for pass
+-    if test $linkmode = prog; then
++    if test "$linkmode" = prog; then
+       dlfiles="$newdlfiles"
+       dlprefiles="$newdlprefiles"
+     fi
+@@ -2173,7 +2173,7 @@ compiler."
+       fi
+ 
+       set dummy $rpath
+-      if test $# -gt 2; then
++      if test "$#" -gt 2; then
+ 	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+       fi
+       install_libdir="$2"
+@@ -2240,7 +2240,7 @@ compiler."
+ 	  ;;
+ 	esac
+ 
+-	if test $age -gt $current; then
++	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+@@ -2279,7 +2279,7 @@ compiler."
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$revision
+-	  while test $loop != 0; do
++	  while test "$loop" -ne 0; do
+ 	    iface=`expr $revision - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="sgi$major.$iface:$verstring"
+@@ -2302,7 +2302,7 @@ compiler."
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$age
+-	  while test $loop != 0; do
++	  while test "$loop" -ne 0; do
+ 	    iface=`expr $current - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="$verstring:${iface}.0"
+@@ -2403,7 +2403,7 @@ compiler."
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+-	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
++	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ 	  dependency_libs="$temp_xrpath $dependency_libs"
+ 	fi
+       fi
+@@ -2446,7 +2446,7 @@ compiler."
+ 	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+-	    if test $build_libtool_need_lc = "yes"; then
++	    if test "$build_libtool_need_lc" = "yes"; then
+ 	      deplibs="$deplibs -lc"
+ 	    fi
+ 	    ;;
+@@ -2487,7 +2487,7 @@ compiler."
+ EOF
+ 	  $rm conftest
+ 	  $CC -o conftest conftest.c $deplibs
+-	  if test $? -eq 0 ; then
++	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+ 	      name="`expr $i : '-l\(.*\)'`"
+@@ -2521,7 +2521,7 @@ EOF
+ 		$rm conftest
+ 		$CC -o conftest conftest.c $i
+ 		# Did it work?
+-		if test $? -eq 0 ; then
++		if test "$?" -eq 0 ; then
+ 		  ldd_output=`ldd conftest`
+ 		  libname=`eval \\$echo \"$libname_spec\"`
+ 		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+@@ -2692,7 +2692,7 @@ EOF
+ 	    echo "*** automatically added whenever a program is linked with this library"
+ 	    echo "*** or is declared to -dlopen it."
+ 
+-	    if test $allow_undefined = no; then
++	    if test "$allow_undefined" = no; then
+ 	      echo
+ 	      echo "*** Since this library must not contain undefined symbols,"
+ 	      echo "*** because either the platform does not support them or"
+@@ -2719,7 +2719,7 @@ EOF
+ 
+       # Test again, we may have decided not to build it any more
+       if test "$build_libtool_libs" = yes; then
+-	if test $hardcode_into_libs = yes; then
++	if test "$hardcode_into_libs" = yes; then
+ 	  # Hardcode the library paths
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
+@@ -2850,7 +2850,7 @@ EOF
+ 	    $show "mkdir $gentop"
+ 	    $run mkdir "$gentop"
+ 	    status=$?
+-	    if test $status -ne 0 && test ! -d "$gentop"; then
++	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	      exit $status
+ 	    fi
+ 	    generated="$generated $gentop"
+@@ -2869,7 +2869,7 @@ EOF
+ 	      $show "mkdir $xdir"
+ 	      $run mkdir "$xdir"
+ 	      status=$?
+-	      if test $status -ne 0 && test ! -d "$xdir"; then
++	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 		exit $status
+ 	      fi
+ 	      $show "(cd $xdir && $AR x $xabs)"
+@@ -2989,7 +2989,7 @@ EOF
+ 	  $show "mkdir $gentop"
+ 	  $run mkdir "$gentop"
+ 	  status=$?
+-	  if test $status -ne 0 && test ! -d "$gentop"; then
++	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	    exit $status
+ 	  fi
+ 	  generated="$generated $gentop"
+@@ -3008,7 +3008,7 @@ EOF
+ 	    $show "mkdir $xdir"
+ 	    $run mkdir "$xdir"
+ 	    status=$?
+-	    if test $status -ne 0 && test ! -d "$xdir"; then
++	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 	      exit $status
+ 	    fi
+ 	    $show "(cd $xdir && $AR x $xabs)"
+@@ -3403,7 +3403,7 @@ static const void *lt_preloaded_setup() 
+ 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+-      if test $need_relink = no || test "$build_libtool_libs" != yes; then
++      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ 	link_command="$compile_command$compile_rpath"
+@@ -3528,7 +3528,7 @@ static const void *lt_preloaded_setup() 
+ 	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ 	  fi
+ 	done
+-	relink_command="cd `pwd`; $relink_command"
++	relink_command="(cd `pwd`; $relink_command)"
+ 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+       fi
+ 
+@@ -3771,7 +3771,7 @@ fi\
+ 	$show "mkdir $gentop"
+ 	$run mkdir "$gentop"
+ 	status=$?
+-	if test $status -ne 0 && test ! -d "$gentop"; then
++	if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	  exit $status
+ 	fi
+ 	generated="$generated $gentop"
+@@ -3791,7 +3791,7 @@ fi\
+ 	  $show "mkdir $xdir"
+ 	  $run mkdir "$xdir"
+ 	  status=$?
+-	  if test $status -ne 0 && test ! -d "$xdir"; then
++	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 	    exit $status
+ 	  fi
+ 	  $show "(cd $xdir && $AR x $xabs)"
+@@ -3858,7 +3858,7 @@ fi\
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
++      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+@@ -3948,7 +3948,7 @@ dlpreopen='$dlprefiles'
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+-	  if test "$installed" = no && test $need_relink = yes; then
++	  if test "$installed" = no && test "$need_relink" = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
+@@ -4084,7 +4084,7 @@ relink_command=\"$relink_command\""
+ 
+       # Not a directory, so check to see that there is only one file specified.
+       set dummy $files
+-      if test $# -gt 2; then
++      if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+ 	exit 1
+@@ -4186,7 +4186,7 @@ relink_command=\"$relink_command\""
+ 	    $run eval "$striplib $destdir/$realname" || exit $?
+ 	  fi
+ 
+-	  if test $# -gt 0; then
++	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
+ 	    for linkname
+ 	    do
+@@ -4444,7 +4444,7 @@ relink_command=\"$relink_command\""
+     fi
+ 
+     # Exit here if they wanted silent mode.
+-    test "$show" = ":" && exit 0
++    test "$show" = : && exit 0
+ 
+     echo "----------------------------------------------------------------------"
+     echo "Libraries have been installed in:"
+@@ -4610,7 +4610,7 @@ relink_command=\"$relink_command\""
+       fi
+ 
+       # Now prepare to actually exec the command.
+-      exec_cmd='"$cmd"$args'
++      exec_cmd="\$cmd$args"
+     else
+       # Display what would be done.
+       if test -n "$shlibpath_var"; then
+@@ -4660,10 +4660,10 @@ relink_command=\"$relink_command\""
+ 	objdir="$dir/$objdir"
+       fi
+       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-      test $mode = uninstall && objdir="$dir"
++      test "$mode" = uninstall && objdir="$dir"
+ 
+       # Remember objdir for removal later, being careful to avoid duplicates
+-      if test $mode = clean; then
++      if test "$mode" = clean; then
+ 	case " $rmdirs " in
+ 	  *" $objdir "*) ;;
+ 	  *) rmdirs="$rmdirs $objdir" ;;
+@@ -4695,9 +4695,9 @@ relink_command=\"$relink_command\""
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+-	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+-	  if test $mode = uninstall; then
++	  if test "$mode" = uninstall; then
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+ 	      eval cmds=\"$postuninstall_cmds\"
+@@ -4706,7 +4706,7 @@ relink_command=\"$relink_command\""
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+-		if test $? != 0 && test "$rmforce" != yes; then
++		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+@@ -4721,7 +4721,7 @@ relink_command=\"$relink_command\""
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+-		if test $? != 0 && test "$rmforce" != yes; then
++		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+@@ -4741,7 +4741,7 @@ relink_command=\"$relink_command\""
+ 
+       *)
+ 	# Do a test to see if this is a libtool program.
+-	if test $mode = clean &&
++	if test "$mode" = clean &&
+ 	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  relink_command=
+ 	  . $dir/$file
diff --git a/eclass/ELT-patches/tmp/1.3.5 b/eclass/ELT-patches/tmp/1.3.5
new file mode 100644
index 000000000000..29b70e09378d
--- /dev/null
+++ b/eclass/ELT-patches/tmp/1.3.5
@@ -0,0 +1,15 @@
+--- ltmain.sh	Fri Jul  7 18:49:44 2000
++++ ltmain.sh	Fri May 26 21:53:15 2000
+@@ -3462,7 +3462,11 @@
+ 	    if test "$finalize" = yes && test -z "$run"; then
+ 	      tmpdir="/tmp"
+ 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+-	      tmpdir="$tmpdir/libtool-$$"
++              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
++              if test $? = 0 ; then :
++              else
++                tmpdir="$tmpdir/libtool-$$"
++              fi
+ 	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+ 	      else
+ 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2