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.

3 files changed, 176 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" ;;