Touch up portage patch to pass libtools `make check` #70350.

Package-Manager: portage-2.0.51-r13

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 03b4a0919e8981483b0a4b0da5e3be20247e8c69..5fa37eccca0971cf47830834e0431334e80741af 100644 (file)
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.65 2005/01/19 23:27:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.66 2005/01/20 03:19:36 vapier Exp $
+
+  19 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  files/1.4.3/libtool-1.4.2-portage.patch:
+  Touch up portage patch to pass libtools `make check` #70350.
 
   19 Jan 2005; Mike Frysinger <vapier@gentoo.org>
   files/1.5.6/libtool-1.5-filter-host-tags.patch:

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 0da9603ff3a23420eb3964b05fc099b24e4eca9d..a559629ef68a11725da18972885acfd4755806bf 100644 (file)
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f90244d091a29e12bdfb2cf0f813591d ChangeLog 11702
+MD5 8e93b54a102e752cdc2ef067e5d7b6ef ChangeLog 11859
 MD5 6b6cb21d0fd78d28bc0d9ed60fbc0717 libtool-1.5.10-r2.ebuild 5197
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 bca2c76e573b140cc3fb59e3e3b7605f libtool-1.3.5.ebuild 1496
@@ -25,7 +25,7 @@ MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cx
 MD5 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
 MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
 MD5 51df2f3c87ee74b80790edd735ddf565 files/1.4.3/libtool-1.4.2-s390_x86_64.patch 470
-MD5 346df8edf0af3e539da4b57957fffe21 files/1.4.3/libtool-1.4.2-portage.patch 2315
+MD5 696b0d0d16bb9f928647cff1cdf1099d files/1.4.3/libtool-1.4.2-portage.patch 2505
 MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
 MD5 ff5cf09ccda7f9a34f8c3c69e0c5047c files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch 1288
 MD5 94591cd9fb847704a323c0faf31fdbf2 files/1.4.3/libtool-1.4.3-ltmain-SED.patch 363
@@ -42,7 +42,7 @@ MD5 b81a86ce5e9014e53bd7beb12e46ed12 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB7u0jroRuSHgZdywRAlMNAJ9AcpfChVl7Jqjg0kQxrBOmohtn3gCbBTXP
-QaQU/FgHFTQx2Nl8p37iRGY=
-=JY0o
+iD4DBQFB7yN8roRuSHgZdywRAgU1AJ9/yAD0hS/hi3qmMkZKQwpsTjwzlACWLaWu
+8S2Tq1HidZOzOqhDsZKINA==
+=xWaP
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
index 2da7b12c233294335e1ccb465439acf159307f66..8212add90a7438348db33beaf848af43c1e111f8 100644 (file)
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
+++ b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
@@ -1,6 +1,6 @@
 --- ltmain.in.orig     Wed Apr  3 01:19:37 2002
 +++ ltmain.in  Sun May 26 19:50:52 2002
-@@ -3940,9 +3940,46 @@
+@@ -3940,9 +3940,50 @@
                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                  exit 1
                fi
@@ -8,30 +8,33 @@
 +              # 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'`"
++                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 |$EGREP -e "$mynewdependency_lib"`"; then
++                my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
++                if test -z "$my_little_ninja_foo_1"; 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.
++                # 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 |$EGREP -e "$S"`" && test "$S"; then
++                my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
++                if test -n "$my_little_ninja_foo_2" && test "$S"; then
 +                  mynewdependency_lib=""
 +                # We do not want portage's install root ($D) present.
-+                elif test -n "`echo $deplib |$EGREP -e "$D"`" && test "$D"; then
-+                  eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
++                my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
++                elif test -n "$my_little_ninja_foo_3" && test "$D"; then
++                  eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`
 +                else
 +                  mynewdependency_lib="$deplib"
 +                fi
@@ -40,7 +43,8 @@
 +              fi
 +              # Do not add duplicates
 +              if test "$mynewdependency_lib"; then
-+                if test -z "`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`"; then
++                my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
++                if test -z "$my_little_ninja_foo_4"; then
 +                      newdependency_libs="$newdependency_libs $mynewdependency_lib"
 +                fi
 +              fi
@@ -55,7 +59,7 @@
          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'`"
++          install_libdir=`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`
 +        fi
          $echo > $output "\
  # $outputname - a libtool library file