Fix bracket quoting in the sanity check and make sure LD_LIBRARY_PATH doesnt clobber wrapped libtool files.

Package-Manager: portage-2.0.52-r1 http://www.bash.org/?136501

5 files changed, 67 insertions, 37 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 6fc0769c4745..d92e9cb6af31 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.84 2005/09/10 13:43:19 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.85 2005/09/25 08:41:18 vapier Exp $
+
+  25 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  files/1.5.10/libtool-1.5.10-version-checking.patch,
+  +files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch,
+  libtool-1.5.20.ebuild:
+  Fix bracket quoting in the sanity check and make sure LD_LIBRARY_PATH doesnt
+  clobber wrapped libtool files.
 
   10 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
   files/1.5.10/libtool-1.5.10-portage.patch:
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index c3aed93e19cf..26431161ba57 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,43 +1,44 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8b6d2c96813291f0ab3ae59944f96944 ChangeLog 14543
-MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
-MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
-MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
-MD5 7c11e213296b02b7e4583d7c94e9c9e0 files/1.4.3/libtool-1.4.2-archive-shared.patch 633
-MD5 66ec977174eec4eba66454e4f0f5772a files/1.4.3/libtool-1.4.2-demo.patch 538
-MD5 d4838522fa55dc06521ddde517901767 files/1.4.3/libtool-1.4.2-expsym-linux.patch 1678
-MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 816
+MD5 2ecfb660d946d455c9798c3c2933e5f5 libtool-1.5.20.ebuild 5054
+MD5 50b3b9fe1d346665231c739e48d616b6 libtool-1.5.18-r1.ebuild 5181
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 e48784e20efad8d2437f1c271104a4b4 libtool-1.5.16.ebuild 5178
+MD5 856e14ff512ae227c3d32c3582618ff9 libtool-1.3.5.ebuild 1454
+MD5 7bc30e3440e0a69be2ad7861f056b7d1 ChangeLog 14848
+MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
+MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
+MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
+MD5 b6199e286b76757fc802a5de44fc3b79 files/digest-libtool-1.5.20 67
+MD5 e052afbe0e1106d25d39eb3ba55cf1b7 files/digest-libtool-1.5.18-r1 67
+MD5 4186a4565c7e9eca281c8ccc852abd3d files/digest-libtool-1.5.16 67
+MD5 7e914d56a9e704e071b385ca3380a974 files/1.5.10/libtool-1.5.10-version-checking.patch 1841
+MD5 6a91891583a50a0bc2124ee61814b7b8 files/1.5.10/libtool-1.5.10-portage.patch 2895
+MD5 2196d46d17a239f4b4d7629ca264a9ff files/1.5.10/libtool-1.5.10-locking.patch 513
+MD5 2badc5a56ce45a238edbef00b20677f7 files/1.5.6/libtool-1.5-filter-host-tags.patch 1146
+MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
 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 d4838522fa55dc06521ddde517901767 files/1.4.3/libtool-1.4.2-expsym-linux.patch 1678
 MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
+MD5 66ec977174eec4eba66454e4f0f5772a files/1.4.3/libtool-1.4.2-demo.patch 538
+MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 816
+MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
+MD5 7c11e213296b02b7e4583d7c94e9c9e0 files/1.4.3/libtool-1.4.2-archive-shared.patch 633
 MD5 a9be6866b7096092613595ccff0fd773 files/1.4.3/libtool-1.4.3-pass-thread-flags.patch 494
-MD5 2196d46d17a239f4b4d7629ca264a9ff files/1.5.10/libtool-1.5.10-locking.patch 513
-MD5 6a91891583a50a0bc2124ee61814b7b8 files/1.5.10/libtool-1.5.10-portage.patch 2895
-MD5 c420dec3cd806113ecc347a457137ea6 files/1.5.10/libtool-1.5.10-version-checking.patch 1805
-MD5 4e8d48f4fc332eb1291a12356b1e2f13 files/1.5.14/libtool-1.5.14-egrep.patch 404
+MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
+MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
+MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
+MD5 7f097b89e5b555f46b8c56b064f21db8 files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch 1073
+MD5 c7faa473d0ebb7cddcae5fb6e76ed29d files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch 637
 MD5 807631adcb4daeff2315f390d95d262f files/1.5.14/libtool-1.5.14-ltmain_sh-max_cmd_len.patch 1093
+MD5 4e8d48f4fc332eb1291a12356b1e2f13 files/1.5.14/libtool-1.5.14-egrep.patch 404
 MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
 MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
-MD5 7f097b89e5b555f46b8c56b064f21db8 files/1.5.20/libtool-1.5.20-ltmain_sh-max_cmd_len.patch 1073
-MD5 2badc5a56ce45a238edbef00b20677f7 files/1.5.6/libtool-1.5-filter-host-tags.patch 1146
-MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
-MD5 e893eae0aa5740740c388dbf0a35b3c6 files/digest-libtool-1.3.5 65
-MD5 4186a4565c7e9eca281c8ccc852abd3d files/digest-libtool-1.5.16 67
-MD5 e052afbe0e1106d25d39eb3ba55cf1b7 files/digest-libtool-1.5.18-r1 67
-MD5 b6199e286b76757fc802a5de44fc3b79 files/digest-libtool-1.5.20 67
-MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
-MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
-MD5 856e14ff512ae227c3d32c3582618ff9 libtool-1.3.5.ebuild 1454
-MD5 e48784e20efad8d2437f1c271104a4b4 libtool-1.5.16.ebuild 5178
-MD5 50b3b9fe1d346665231c739e48d616b6 libtool-1.5.18-r1.ebuild 5181
-MD5 9f9a51218b1c435ead6334ac861c0b44 libtool-1.5.20.ebuild 4940
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDKAHqI1lqEGTUzyQRAsASAKDC6cq4Pl11QA31KnZGuDkzK8+OSwCgvBBM
-eQW+9300UdZk1WbPnVHhx6c=
-=KPcl
+iD8DBQFDNmLjgIKl8Uu19MoRAp9aAJ9bVtPOdwUWNnJw9nzRXCU/bsXLQwCdGbxC
+FDg0fDc4u6CqxdBpgPshJkM=
+=OWmp
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch
index 392d81ceabec..da01e4553830 100644
--- a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch
+++ b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch
@@ -26,17 +26,17 @@
 +if test -z "$ltmain"; then
 +  AC_MSG_RESULT(no)
 +  echo
-+  echo "*** [Gentoo] sanity check failed! ***"
++  echo "*** @<:@Gentoo@:>@ sanity check failed! ***"
 +  echo "*** \$ltmain is not defined, please check the patch for consistency! ***"
 +  echo
 +  exit 1
 +fi
 +gentoo_lt_version="@_LT_VERSION@"
-+gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'`
++gentoo_ltmain_version=`grep '^@<:@@<:@:space:@:>@@:>@*VERSION=' $ltmain | sed -e 's|^@<:@@<:@:space:@:>@@:>@*VERSION=||'`
 +if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then
 +  AC_MSG_RESULT(no)
 +  echo
-+  echo "*** [Gentoo] sanity check failed! ***"
++  echo "*** @<:@Gentoo@:>@ sanity check failed! ***"
 +  echo "*** libtool.m4 and ltmain.sh have a version mismatch! ***"
 +  echo "*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***"
 +  echo
diff --git a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch
new file mode 100644
index 000000000000..f0bdad87ce3c
--- /dev/null
+++ b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch
@@ -0,0 +1,20 @@
+Fix build time issues with tools who like to export LD_LIBRARY_PATH
+to retarded values.
+
+http://bugs.gentoo.org/99593
+http://lists.gnu.org/archive/html/libtool/2005-09/msg00053.html
+
+--- monkey/ltmain.in
++++ butt/ltmain.in
+@@ -5085,6 +5085,11 @@
+ 	$echo >> $output "\
+     if test \"\$libtool_execute_magic\" != \"$magic\"; then
+       # Run the actual program with our arguments.
++
++      # Make sure env LD_LIBRARY_PATH does not mess us up
++      if test -n \"\${LD_LIBRARY_PATH+set}\"; then
++        export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
++      fi
+ "
+ 	case $host in
+ 	# Backslashes separate directories on plain windows
diff --git a/sys-devel/libtool/libtool-1.5.20.ebuild b/sys-devel/libtool/libtool-1.5.20.ebuild
index dc8bb39b2b26..19b21efac81a 100644
--- a/sys-devel/libtool/libtool-1.5.20.ebuild
+++ b/sys-devel/libtool/libtool-1.5.20.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.20.ebuild,v 1.1 2005/09/02 05:06:09 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.20.ebuild,v 1.2 2005/09/25 08:41:18 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
-inherit eutils libtool
+inherit eutils
 
 DESCRIPTION="A shared library tool for developers"
 HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
@@ -106,6 +106,9 @@ src_unpack() {
 	# In some cases EGREP is not set by the build system.
 	epatch "${FILESDIR}"/1.5.14/libtool-1.5.14-egrep.patch
 
+	# Make sure LD_LIBRARY_PATH doesn't override RUNPATH #99593
+	epatch "${FILESDIR}"/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch
+
 	ebegin "Generating ltmain.sh"
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
 	eend 0
@@ -125,7 +128,6 @@ src_unpack() {
 	done
 	cd "${S}"
 
-	uclibctoolize
 	epunt_cxx
 }