Fix all the gnuconfig_update screwiness in these ebuilds #57224

8 files changed, 68 insertions, 100 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index e24ca0efc49f..7f694522d00e 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.50 2004/07/15 21:22:38 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.51 2004/07/16 04:03:19 agriffis Exp $
+
+  15 Jul 2004; Aron Griffis <agriffis@gentoo.org> libtool-1.4.3-r3.ebuild,
+  libtool-1.4.3-r4.ebuild, libtool-1.5.2-r3.ebuild, libtool-1.5.2-r4.ebuild,
+  libtool-1.5.2-r5.ebuild, libtool-1.5.6.ebuild:
+  Fix all the gnuconfig_update screwiness in these ebuilds #57224
 
   15 Jul 2004; Tom Gall <tgall@gentoo.org> libtool-1.5.2-r5.ebuild:
   calling multiple gnuconfig_updates in a row kills gnus
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index f024979229bd..aed2bf1f0702 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,64 +1,65 @@
-MD5 872c5141e4d05c256433adfab3cce71d ChangeLog 8861
+MD5 542c4a569ca615c9afa252798590abd1 libtool-1.5.2-r3.ebuild 5354
+MD5 62bbcf735380d34f96de32477ec93f75 libtool-1.4.3-r4.ebuild 5009
+MD5 6f57bdc8ebe9a15b6fdfcaf4c1599ede libtool-1.5.2-r5.ebuild 5901
+MD5 52842e1a0dc66123d0049371f3e02030 libtool-1.5.6.ebuild 5951
+MD5 81541a04cb5f25e98a3c787a454437a1 libtool-1.4.3-r3.ebuild 4697
 MD5 7f5ccbcb874cc16fbcb22e109df0090b libtool-1.4.1-r10.ebuild 1747
-MD5 d131f2f522ae395eea8d3d36c486a04f libtool-1.4.3-r3.ebuild 4668
-MD5 69e7da7b5245f687954335e5ac0f6fc3 libtool-1.4.3-r4.ebuild 5003
-MD5 7f89454a4cc974b79b84ced30e31fe20 libtool-1.5.2-r3.ebuild 5391
-MD5 5aee21ab96b90cbbe080cccf800689b8 libtool-1.5.2-r4.ebuild 5409
-MD5 b85b9f2ba07a80e648323eb7d1895737 libtool-1.5.2-r5.ebuild 5969
+MD5 36f9b7c44b951475ac6ccc5ff819ecea libtool-1.5.2-r4.ebuild 5372
+MD5 97f57fb4083ec9824b4bf7022d834cd0 ChangeLog 9132
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 26d155e17f3d84db00040dc6525a4fa0 libtool-1.5.6.ebuild 6043
-MD5 cd3779fa4710870bb83597c39736e822 files/digest-libtool-1.4.1-r10 66
+MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r3 131
 MD5 6e892e6bd1ca4d9babce9f9163f6118e files/digest-libtool-1.4.3-r4 131
+MD5 6e26db6ca2d038bca2ea11f6ba9c2e83 files/digest-libtool-1.5.6 131
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r3 131
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r4 131
 MD5 3b92d43ab25bc1ad32ee87d89660f268 files/digest-libtool-1.5.2-r5 131
 MD5 bd27a462a2a9fe3662d3d34179ed3200 files/libltdl-uclibc.patch 4590
-MD5 2cd6110e84c85c183c7b8dcd0be814e7 files/ltconfig-uclibc.patch 1167
-MD5 6e26db6ca2d038bca2ea11f6ba9c2e83 files/digest-libtool-1.5.6 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 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 aa0eb2966d772751eac3bccb6be508b4 files/1.4.2/libtool-1.4.2-relink.patch 3110
+MD5 ff5cf09ccda7f9a34f8c3c69e0c5047c files/1.4.3/libtool-1.4.3-libtoolize--config-only.patch 1288
+MD5 d4838522fa55dc06521ddde517901767 files/1.4.3/libtool-1.4.2-expsym-linux.patch 1678
 MD5 c7e04f642029498cc1652407b1ea74bf files/1.4.3/libtool-1.4-nonneg.patch 935
+MD5 c4fd959743953818fe6ab06c7d84e795 files/1.4.3/libtool-1.4.3-quotes.patch 12951
 MD5 47fd700361b3cb3aae8dc44f28f613b0 files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch 460
 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 f6f24e776d832798365777c26c2c56fc files/1.4.3/libtool-1.4.2-multilib.patch 1780
-MD5 73a7adc6c9b86c77affeeebccad0eedf files/1.4.3/libtool-1.4.2-portage.patch 2307
+MD5 5fc838faf61964397b525e579783c190 files/1.4.3/libtool-1.4.3-uclibc.patch 5911
 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 67757e15bfa1cdefb5c23f76198329ec files/1.4.3/libtool-1.3.5-nonneg.patch 895
+MD5 3b185e86e062b438eb8d418fc5af462f files/1.4.3/libtool-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch 816
 MD5 8d3d48eebb6f73bb5973d9e92e832cf9 files/1.4.3/libtool-1.4.3-amd64-alias.patch 362
-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 8ad4f6ed8863c26c4ac562e1d00e6db1 files/1.4.3/libtool-1.2f-cache.patch 698
 MD5 94591cd9fb847704a323c0faf31fdbf2 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 a9be6866b7096092613595ccff0fd773 files/1.4.3/libtool-1.4.3-pass-thread-flags.patch 494
-MD5 c4fd959743953818fe6ab06c7d84e795 files/1.4.3/libtool-1.4.3-quotes.patch 12951
-MD5 5fc838faf61964397b525e579783c190 files/1.4.3/libtool-1.4.3-uclibc.patch 5911
-MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
+MD5 73a7adc6c9b86c77affeeebccad0eedf 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
 MD5 0fb02114fa6b6cd63ea25510f04f346a files/1.5.2/libtool-1.5-testfailure.patch 6448
 MD5 8ccfbb70def73753ae1b2750c6e4e83c files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch 880
+MD5 6ef585a59058c79f3601bbd7787f2683 files/1.5.2/libtool-1.5-libtool.m4-x86_64.patch 466
 MD5 d2313fcf3c18603f201627ca94850786 files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch 1153
+MD5 5e84c0a07a77ed6408b25453373914ab files/1.5.6/libtool-1.5.6-ltmain-SED.patch 431
diff --git a/sys-devel/libtool/libtool-1.4.3-r3.ebuild b/sys-devel/libtool/libtool-1.4.3-r3.ebuild
index 313a4cbb7af1..39e1cb8a0484 100644
--- a/sys-devel/libtool/libtool-1.4.3-r3.ebuild
+++ b/sys-devel/libtool/libtool-1.4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.3-r3.ebuild,v 1.9 2004/07/15 03:33:30 agriffis 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-r3.ebuild,v 1.10 2004/07/16 04:03:19 agriffis Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
 
 IUSE=
 
@@ -66,8 +66,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-nonneg.patch
 	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-mktemp.patch
 
-	gnuconfig_update
-
 	cd ${S}
 	echo
 	# Install updated missing script
@@ -115,6 +113,10 @@ src_unpack() {
 
 	einfo "Generate ltmain.sh ..."
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+
+	# Run gnuconfig_update for both old and new versions *after* patches so we
+	# don't screw them up
+	gnuconfig_update ${WORKDIR}
 }
 
 src_compile() {
@@ -126,9 +128,6 @@ src_compile() {
 
 	cd ${OLD_S}
 
-	# Detect mips/mips64
-	gnuconfig_update
-
 	einfo "Configuring ${OLD_S##*/} ..."
 	./configure --host=${CHOST} \
 			--prefix=/usr \
@@ -143,9 +142,6 @@ src_compile() {
 
 	cd ${S}
 
-	# Detect mips/mips64
-	gnuconfig_update
-
 	einfo "Configuring ${S##*/} ..."
 	./configure --host=${CHOST} \
 		--prefix=/usr \
diff --git a/sys-devel/libtool/libtool-1.4.3-r4.ebuild b/sys-devel/libtool/libtool-1.4.3-r4.ebuild
index db9bc7ef629f..d60ee80a6e02 100644
--- a/sys-devel/libtool/libtool-1.4.3-r4.ebuild
+++ b/sys-devel/libtool/libtool-1.4.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.4.3-r4.ebuild,v 1.6 2004/07/15 03:33:30 agriffis 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-r4.ebuild,v 1.7 2004/07/16 04:03:19 agriffis Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -65,8 +65,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/${PN}-1.3.5-mktemp.patch
 	epatch ${FILESDIR}/ltconfig-uclibc.patch
 
-	gnuconfig_update
-
 	cd ${S}
 	echo
 	# Install updated missing script
@@ -118,6 +116,10 @@ src_unpack() {
 
 	einfo "Generate ltmain.sh ..."
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+
+	# Run gnuconfig_update for both old and new versions *after* patches so we
+	# don't screw them up
+	gnuconfig_update ${WORKDIR}
 }
 
 src_compile() {
@@ -129,9 +131,6 @@ src_compile() {
 
 	cd ${OLD_S}
 
-	# Detect mips/mips64 and uclibc
-	gnuconfig_update
-
 	einfo "Configuring ${OLD_S##*/} ..."
 	./configure --host=${CHOST} \
 			--prefix=/usr \
@@ -146,9 +145,6 @@ src_compile() {
 
 	cd ${S}
 
-	# Detect mips/mips64 and uclibc
-	gnuconfig_update
-
 	einfo "Configuring ${S##*/} ..."
 	./configure --host=${CHOST} \
 		--prefix=/usr \
diff --git a/sys-devel/libtool/libtool-1.5.2-r3.ebuild b/sys-devel/libtool/libtool-1.5.2-r3.ebuild
index eab7fa59e625..d2b59ddd528b 100644
--- a/sys-devel/libtool/libtool-1.5.2-r3.ebuild
+++ b/sys-devel/libtool/libtool-1.5.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r3.ebuild,v 1.6 2004/07/15 03:33:30 agriffis 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.5.2-r3.ebuild,v 1.7 2004/07/16 04:03:19 agriffis Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
 
 IUSE=
 
@@ -66,8 +66,6 @@ src_unpack() {
 	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-nonneg.patch
 	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-mktemp.patch
 
-	gnuconfig_update
-
 	cd ${S}
 	echo
 	# Install updated missing script
@@ -128,6 +126,10 @@ src_unpack() {
 
 	einfo "Generate ltmain.sh ..."
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+
+	# Run gnuconfig_update for both old and new versions *after* patches so we
+	# don't screw them up
+	gnuconfig_update ${WORKDIR}
 }
 
 src_compile() {
@@ -139,12 +141,6 @@ src_compile() {
 
 	cd ${OLD_S}
 
-	# Detect mips/mips64
-	gnuconfig_update
-
-	# regen to allow for build,host,target ppc64
-	gnuconfig_update
-
 	einfo "Configuring ${OLD_S##*/} ..."
 	./configure --host=${CHOST} \
 			--prefix=/usr \
@@ -159,9 +155,6 @@ src_compile() {
 
 	cd ${S}
 
-	# Detect mips/mips64
-	gnuconfig_update
-
 	einfo "Configuring ${S##*/} ..."
 	./configure --host=${CHOST} \
 		--prefix=/usr \
diff --git a/sys-devel/libtool/libtool-1.5.2-r4.ebuild b/sys-devel/libtool/libtool-1.5.2-r4.ebuild
index 68c498472471..e285ef8419da 100644
--- a/sys-devel/libtool/libtool-1.5.2-r4.ebuild
+++ b/sys-devel/libtool/libtool-1.5.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r4.ebuild,v 1.4 2004/07/15 03:33:30 agriffis 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.5.2-r4.ebuild,v 1.5 2004/07/16 04:03:19 agriffis Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 vapier Exp $
 
 IUSE=
 
@@ -66,8 +66,6 @@ src_unpack() {
 	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-nonneg.patch
 	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-mktemp.patch
 
-	gnuconfig_update
-
 	cd ${S}
 	echo
 	# Install updated missing script
@@ -129,6 +127,10 @@ src_unpack() {
 
 	einfo "Generate ltmain.sh ..."
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+
+	# Run gnuconfig_update for both old and new versions *after* patches so we
+	# don't screw them up
+	gnuconfig_update ${WORKDIR}
 }
 
 src_compile() {
@@ -140,12 +142,6 @@ src_compile() {
 
 	cd ${OLD_S}
 
-	# Detect mips/mips64
-	gnuconfig_update
-
-	# regen to allow for build,host,target ppc64
-	gnuconfig_update
-
 	einfo "Configuring ${OLD_S##*/} ..."
 	./configure --host=${CHOST} \
 			--prefix=/usr \
@@ -160,9 +156,6 @@ src_compile() {
 
 	cd ${S}
 
-	# Detect mips/mips64
-	gnuconfig_update
-
 	einfo "Configuring ${S##*/} ..."
 	./configure --host=${CHOST} \
 		--prefix=/usr \
diff --git a/sys-devel/libtool/libtool-1.5.2-r5.ebuild b/sys-devel/libtool/libtool-1.5.2-r5.ebuild
index d95bd19cc9a0..a4b68ea47776 100644
--- a/sys-devel/libtool/libtool-1.5.2-r5.ebuild
+++ b/sys-devel/libtool/libtool-1.5.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r5.ebuild,v 1.15 2004/07/15 21:22:38 tgall 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.2-r5.ebuild,v 1.16 2004/07/16 04:03:19 agriffis Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
 inherit eutils gnuconfig
 
@@ -68,8 +68,6 @@ src_unpack() {
 	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-mktemp.patch
 	epatch ${FILESDIR}/ltconfig-uclibc.patch
 
-	S="${OLD_S}" gnuconfig_update
-
 	cd ${S}
 	echo
 	# Install updated missing script
@@ -131,6 +129,10 @@ src_unpack() {
 
 	einfo "Generate ltmain.sh ..."
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+
+	# Run gnuconfig_update for both old and new versions *after* patches so we
+	# don't screw them up
+	gnuconfig_update ${WORKDIR}
 }
 
 src_compile() {
@@ -142,9 +144,6 @@ src_compile() {
 
 	cd ${OLD_S}
 
-	# regen to allow for build,host,target mips/mips64/ppc64/uclibc
-	gnuconfig_update
-
 	einfo "Configuring ${OLD_S##*/} ..."
 	./configure --host=${CHOST} \
 			--prefix=/usr \
@@ -159,9 +158,6 @@ src_compile() {
 
 	cd ${S}
 
-	# regen to allow for build,host,target mips/mips64/ppc64/uclibc
-	gnuconfig_update
-
 	einfo "Configuring ${S##*/} ..."
 	./configure --host=${CHOST} \
 		--prefix=/usr \
diff --git a/sys-devel/libtool/libtool-1.5.6.ebuild b/sys-devel/libtool/libtool-1.5.6.ebuild
index 99e82684f6eb..7374538876d3 100644
--- a/sys-devel/libtool/libtool-1.5.6.ebuild
+++ b/sys-devel/libtool/libtool-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.6.ebuild,v 1.4 2004/07/15 03:33:30 agriffis 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.6.ebuild,v 1.5 2004/07/16 04:03:19 agriffis Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
 
 inherit eutils gnuconfig
 
@@ -70,8 +70,6 @@ src_unpack() {
 	epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-mktemp.patch
 	epatch ${FILESDIR}/ltconfig-uclibc.patch
 
-	gnuconfig_update
-
 	cd ${S}
 	echo
 	# Install updated missing script
@@ -133,6 +131,10 @@ src_unpack() {
 
 	einfo "Generate ltmain.sh ..."
 	gen_ltmain_sh || die "Failed to generate ltmain.sh!"
+
+	# Run gnuconfig_update for both old and new versions *after* patches so we
+	# don't screw them up
+	gnuconfig_update ${WORKDIR}
 }
 
 src_compile() {
@@ -144,15 +146,6 @@ src_compile() {
 
 	cd ${OLD_S}
 
-	# Detect mips/mips64
-	gnuconfig_update
-
-	# regen to allow for build,host,target ppc64
-	gnuconfig_update
-
-	# detect uclibc
-	gnuconfig_update
-
 	einfo "Configuring ${OLD_S##*/} ..."
 	./configure --host=${CHOST} \
 			--prefix=/usr \
@@ -167,11 +160,6 @@ src_compile() {
 
 	cd ${S}
 
-	# Detect mips/mips64
-	gnuconfig_update
-
-	gnuconfig_update
-
 	einfo "Configuring ${S##*/} ..."
 	./configure --host=${CHOST} \
 		--prefix=/usr \