fix libtool on amd64

2 files changed, 30 insertions, 28 deletions

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 7a4417438238..33c2df0da136 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,45 +1,45 @@
-MD5 718708240afa9170efd9c0c38be0bbb7 ChangeLog 3438
-MD5 9276f3dc658023815ec93d6311722a0c libtool-1.4.1-r10.ebuild 1780
 MD5 a8aa24a06a0b47ea97f6874ceaed30ab libtool-1.4.2-r2.ebuild 2200
-MD5 57109a0817ba0af369571d6050f1c3bd libtool-1.4.3-r1.ebuild 3100
+MD5 ebfd4fa095e31b761f8504a147ca9e57 libtool-1.4.3-r1.ebuild 3153
 MD5 64bd56158158394213034d2ac712dc2d libtool-1.4.3.ebuild 2730
-MD5 cd3779fa4710870bb83597c39736e822 files/digest-libtool-1.4.1-r10 66
+MD5 9276f3dc658023815ec93d6311722a0c libtool-1.4.1-r10.ebuild 1780
+MD5 718708240afa9170efd9c0c38be0bbb7 ChangeLog 3438
 MD5 0988730d91b787159d631c37932efef5 files/digest-libtool-1.4.2-r2 66
-MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3 131
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r1 131
-MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
-MD5 c7e04f642029498cc1652407b1ea74bf files/1.4.3/libtool-1.4-nonneg.patch 935
-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 66ec977174eec4eba66454e4f0f5772a files/1.4.3/libtool-1.4.2-demo.patch 538
-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 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.3/libtool-1.4.2-portage.patch 2307
-MD5 47fd700361b3cb3aae8dc44f28f613b0 files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch 460
-MD5 7b1baabe9b60c5cd21d203e51dc4f005 files/1.4.3/libtool-1.4.2-archive-shared.patch 633
-MD5 e3285eea22373db2a63c309d00cbe041 files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 1632
-MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
-MD5 f3465f2ea1f214828dd92e2450ca3623 files/1.4.3/libtool-1.4.3-ltmain-SED.patch 363
+MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3 131
+MD5 cd3779fa4710870bb83597c39736e822 files/digest-libtool-1.4.1-r10 66
+MD5 ff0198ffcbdb0c56335422cd792d0bee files/1.4.1/libtool-1.4.1-nonneg.patch 935
+MD5 66866531be8e6be80d0ab249fd73f113 files/1.4.1/libtool-1.4.1-relink.patch 3722
 MD5 be0c4444b82ac7cda7c40165174ef2a7 files/1.4.1/libtool-1.4.1-duplicate-dependency.patch 2895
 MD5 63c00ae5db1e0c5c92e6d2c5fdf47c19 files/1.4.1/libtool-1.4.1-ltmain.sh-hack.patch 680
-MD5 ff0198ffcbdb0c56335422cd792d0bee files/1.4.1/libtool-1.4.1-nonneg.patch 935
 MD5 dafd6bf5aafdd8c745d32d7a51f9bf5b files/1.4.1/libtool-1.4.1-portage.patch 495
 MD5 b85e2a6a099df7dd263d76899dda1f5a files/1.4.1/libtool-1.4.1-portage.patch-v2 890
 MD5 99bae50822db0d21d6fa358f17ebae72 files/1.4.1/libtool-1.4.1-portage.patch-v3 1444
 MD5 964e7d53d1ee51d78d20bd2beb0c859c files/1.4.1/libtool-1.4.1-portage.patch-v4 1941
 MD5 2356918d96b0760ab4e5b662fc2bd81b files/1.4.1/libtool-1.4.1-portage.patch-v5 2112
 MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.1/libtool-1.4.1-portage.patch-v6 2307
-MD5 66866531be8e6be80d0ab249fd73f113 files/1.4.1/libtool-1.4.1-relink.patch 3722
 MD5 3b6fe1afd09f09efd36d9f9f5225a207 files/1.4.1/libtool-1.4.1-test.patch 9320
-MD5 cbfa90e559159a2197fc19df16bddf77 files/1.4.2/libtool-1.3.5-mktemp.patch 642
 MD5 ff0198ffcbdb0c56335422cd792d0bee files/1.4.2/libtool-1.4-nonneg.patch 935
-MD5 63c00ae5db1e0c5c92e6d2c5fdf47c19 files/1.4.2/libtool-1.4.1-ltmain.sh-hack.patch 680
 MD5 47fd700361b3cb3aae8dc44f28f613b0 files/1.4.2/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch 460
+MD5 63c00ae5db1e0c5c92e6d2c5fdf47c19 files/1.4.2/libtool-1.4.1-ltmain.sh-hack.patch 680
 MD5 7b1baabe9b60c5cd21d203e51dc4f005 files/1.4.2/libtool-1.4.2-archive-shared.patch 633
-MD5 be0c4444b82ac7cda7c40165174ef2a7 files/1.4.2/libtool-1.4.2-duplicate-dependency.patch 2895
-MD5 e3285eea22373db2a63c309d00cbe041 files/1.4.2/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 1632
 MD5 a0dbdd9927749761d77ffd7bf2f7dfaa files/1.4.2/libtool-1.4.2-lib64.patch 1527
+MD5 e3285eea22373db2a63c309d00cbe041 files/1.4.2/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 1632
 MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.2/libtool-1.4.2-portage.patch 2307
-MD5 aa0eb2966d772751eac3bccb6be508b4 files/1.4.2/libtool-1.4.2-relink.patch 3110
+MD5 cbfa90e559159a2197fc19df16bddf77 files/1.4.2/libtool-1.3.5-mktemp.patch 642
+MD5 be0c4444b82ac7cda7c40165174ef2a7 files/1.4.2/libtool-1.4.2-duplicate-dependency.patch 2895
 MD5 78aba04ebd4ec67b49228a470360878a files/1.4.2/libtool-1.4.2-test.patch 19511
+MD5 aa0eb2966d772751eac3bccb6be508b4 files/1.4.2/libtool-1.4.2-relink.patch 3110
+MD5 c7e04f642029498cc1652407b1ea74bf files/1.4.3/libtool-1.4-nonneg.patch 935
+MD5 47fd700361b3cb3aae8dc44f28f613b0 files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch 460
+MD5 7b1baabe9b60c5cd21d203e51dc4f005 files/1.4.3/libtool-1.4.2-archive-shared.patch 633
+MD5 e03f7ed340f294fdb7ddd6c84d4b6b09 files/1.4.3/libtool-1.4.2-relink-58664.patch 3213
+MD5 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
+MD5 e3285eea22373db2a63c309d00cbe041 files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 1632
+MD5 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
+MD5 f3465f2ea1f214828dd92e2450ca3623 files/1.4.3/libtool-1.4.3-ltmain-SED.patch 363
+MD5 66ec977174eec4eba66454e4f0f5772a files/1.4.3/libtool-1.4.2-demo.patch 538
+MD5 191388758ae78d4982f143636e47f514 files/1.4.3/libtool-1.4.3-lib64.patch 1193
+MD5 f7177c6432cecb38e31e0b9d8681d5b0 files/1.4.3/libtool-1.4.2-portage.patch 2307
+MD5 55544e163772c87195b893d27e00a0f8 files/1.4.3/libtool-1.3.5-mktemp.patch 642
+MD5 51df2f3c87ee74b80790edd735ddf565 files/1.4.3/libtool-1.4.2-s390_x86_64.patch 470
+MD5 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
diff --git a/sys-devel/libtool/libtool-1.4.3-r1.ebuild b/sys-devel/libtool/libtool-1.4.3-r1.ebuild
index ab8b5a7505e2..3424578caf47 100644
--- a/sys-devel/libtool/libtool-1.4.3-r1.ebuild
+++ b/sys-devel/libtool/libtool-1.4.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.3-r1.ebuild,v 1.3 2003/08/02 13:34:09 azarah Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.3-r1.ebuild,v 1.4 2003/08/03 05:26:59 tester Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
 
 IUSE=
 
-inherit eutils
+inherit eutils gnuconfig
 
 # NOTE:  We install libltdl of libtool-1.3x for compat reasons ...
 
@@ -47,6 +47,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-nonneg.patch
 	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-mktemp.patch
 
+	use amd64 && S=${OLD_S} gnuconfig_update
+
 	cd ${S}
 	# Redhat patches
 	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-mktemp.patch