Fixup misc false test failures related to newer versions of autotools in general.

Package-Manager: portage-2.1.3.7

11 files changed, 189 insertions, 73 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 86b81247caba..e238ae50aa41 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.105 2007/09/08 02:22:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.106 2007/09/08 06:46:28 vapier Exp $
+
+  08 Sep 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/automake-1.6.3-test-fixes.patch,
+  +files/automake-1.7.9-test-fixes.patch,
+  +files/automake-1.8.5-test-fixes.patch, automake-1.4_p6.ebuild,
+  automake-1.5.ebuild, automake-1.6.3.ebuild, automake-1.7.9-r1.ebuild,
+  automake-1.8.5-r3.ebuild, automake-1.9.6-r2.ebuild:
+  Fixup misc false test failures related to newer versions of autotools in
+  general.
 
   08 Sep 2007; Mike Frysinger <vapier@gentoo.org> automake-1.10.ebuild:
   Set docdir to the right place #154903 by Chris Mayo.
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index e0f999158fc6..0ad43c31bf50 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -29,14 +29,26 @@ AUX automake-1.5-test-fixes.patch 1300 RMD160 02d88482792d77972aeb5fbf1cbb207bd0
 MD5 17454a36a949f506e04aa10da3df112a files/automake-1.5-test-fixes.patch 1300
 RMD160 02d88482792d77972aeb5fbf1cbb207bd0d53278 files/automake-1.5-test-fixes.patch 1300
 SHA256 117bdb7848b0c7daf8ed6253e81de265c92f427176e703c28f9de4bdbb13c235 files/automake-1.5-test-fixes.patch 1300
+AUX automake-1.6.3-test-fixes.patch 723 RMD160 f35536db686bbfd7eac9e315e3fa2e02183134a3 SHA1 a563a64f25acd30dba299a08a9deb03820a02b0b SHA256 4cfdd0646848be45106befc2652d88c307212decfd3869a029315eb8ba082134
+MD5 a19f8337e867850b498d1083ed574c1c files/automake-1.6.3-test-fixes.patch 723
+RMD160 f35536db686bbfd7eac9e315e3fa2e02183134a3 files/automake-1.6.3-test-fixes.patch 723
+SHA256 4cfdd0646848be45106befc2652d88c307212decfd3869a029315eb8ba082134 files/automake-1.6.3-test-fixes.patch 723
 AUX automake-1.7.9-infopage-namechange.patch 592 RMD160 78f09d0a4ce09d0389cd3d3f54edc16b7df8541d SHA1 816b31bd1887bad43a50e34f04d4bfe7aa702474 SHA256 3e0dae801e4ff79dc2d5a469a8be1efb5df09344f566cf39b897f385b39212ee
 MD5 e93136e02eb000c938f564484d306d76 files/automake-1.7.9-infopage-namechange.patch 592
 RMD160 78f09d0a4ce09d0389cd3d3f54edc16b7df8541d files/automake-1.7.9-infopage-namechange.patch 592
 SHA256 3e0dae801e4ff79dc2d5a469a8be1efb5df09344f566cf39b897f385b39212ee files/automake-1.7.9-infopage-namechange.patch 592
+AUX automake-1.7.9-test-fixes.patch 1159 RMD160 9d90c8d6cdcc5ba3455dee28701c2c6eb7fa86dd SHA1 bf2fd0227124555af86fdc09e9cfc6fcfcde7d91 SHA256 44221e4c945b0cb61663cb2857a3238e50800d228e7612203529726c53272dbb
+MD5 fdeb1b5ca48d002a20e844f3787bdd7b files/automake-1.7.9-test-fixes.patch 1159
+RMD160 9d90c8d6cdcc5ba3455dee28701c2c6eb7fa86dd files/automake-1.7.9-test-fixes.patch 1159
+SHA256 44221e4c945b0cb61663cb2857a3238e50800d228e7612203529726c53272dbb files/automake-1.7.9-test-fixes.patch 1159
 AUX automake-1.8.2-infopage-namechange.patch 1131 RMD160 c520c80b37dd30e0b6fca359bcc7f242ded15fae SHA1 28a051a76d90530b484c3dab1f868264df71829c SHA256 305979b9a07496352bfc6cc2177bf7aa1587ef1d0dcbbab1de7a56cb9d0ac539
 MD5 9587f00ace066c11b5c22d72afe630a9 files/automake-1.8.2-infopage-namechange.patch 1131
 RMD160 c520c80b37dd30e0b6fca359bcc7f242ded15fae files/automake-1.8.2-infopage-namechange.patch 1131
 SHA256 305979b9a07496352bfc6cc2177bf7aa1587ef1d0dcbbab1de7a56cb9d0ac539 files/automake-1.8.2-infopage-namechange.patch 1131
+AUX automake-1.8.5-test-fixes.patch 1068 RMD160 517f75255fa9d29e459b56079e2e27fff073d41c SHA1 350ac439fee8f6d0082ca876d0c7501e1e5a8a09 SHA256 1a94bcc5a8e33b4c187e6291ad672daf3dca7b2e2995586d6af39f653678cebd
+MD5 55580e93282f69d20f530d549d3f85e7 files/automake-1.8.5-test-fixes.patch 1068
+RMD160 517f75255fa9d29e459b56079e2e27fff073d41c files/automake-1.8.5-test-fixes.patch 1068
+SHA256 1a94bcc5a8e33b4c187e6291ad672daf3dca7b2e2995586d6af39f653678cebd files/automake-1.8.5-test-fixes.patch 1068
 AUX automake-1.9.6-ignore-comments.patch 614 RMD160 2d9ca9b4de82171370edd6843b4a3c2b9c073b4c SHA1 c10645bafd86fe2dfa15a4e62f96b55032c66c1b SHA256 28b80f088b53a72935f15c7d845919f474224ece83847d7b3bae5f2236fe30fe
 MD5 3099ade0063f414271664a3909abac9e files/automake-1.9.6-ignore-comments.patch 614
 RMD160 2d9ca9b4de82171370edd6843b4a3c2b9c073b4c files/automake-1.9.6-ignore-comments.patch 614
@@ -60,34 +72,34 @@ EBUILD automake-1.10.ebuild 1528 RMD160 e0f7887d559e4cf989c2cb94923af2a5897669cc
 MD5 f1d92e7e9d6f9796787fb4dbd7403763 automake-1.10.ebuild 1528
 RMD160 e0f7887d559e4cf989c2cb94923af2a5897669cc automake-1.10.ebuild 1528
 SHA256 d0fc50ac229935388aa5808f9787af1619a5fdcc04ac5e6461455eec6a6a6ac1 automake-1.10.ebuild 1528
-EBUILD automake-1.4_p6.ebuild 1884 RMD160 3aefb1a99441c45e346aabd47ceaae0033b01371 SHA1 6939ff7d45985fe7f3bbb3fbefe7bab9ccfff575 SHA256 8ac7a7d845c3110f51c7243f09d500584f997ca6071deedaf25baf75edb3b38f
-MD5 a0b1f953f89ab04c8d2e16c74a94bfd8 automake-1.4_p6.ebuild 1884
-RMD160 3aefb1a99441c45e346aabd47ceaae0033b01371 automake-1.4_p6.ebuild 1884
-SHA256 8ac7a7d845c3110f51c7243f09d500584f997ca6071deedaf25baf75edb3b38f automake-1.4_p6.ebuild 1884
-EBUILD automake-1.5.ebuild 1772 RMD160 a22479376bdb3c1e8521117e0c21b022840ecc43 SHA1 41882e9798feb95471850875265708607c595526 SHA256 2341f93375850a9a7cfec62584b7db579a6bd37520c68a9e3a8289309c42c6fe
-MD5 fe9bb4c4e8d4a7c1dcefc70a9aed1ac9 automake-1.5.ebuild 1772
-RMD160 a22479376bdb3c1e8521117e0c21b022840ecc43 automake-1.5.ebuild 1772
-SHA256 2341f93375850a9a7cfec62584b7db579a6bd37520c68a9e3a8289309c42c6fe automake-1.5.ebuild 1772
-EBUILD automake-1.6.3.ebuild 1443 RMD160 f2789851efa8dcba1ab98207479925024c590706 SHA1 15c86016170212b131ee3e8ae5ddc484e1f7a686 SHA256 28d3b1864bcd7f34bbb11a41bf5d13b6985eadae37594413fc138a6d9b8300f0
-MD5 ab3ef7d94c3d99f5ded9d94d216061d9 automake-1.6.3.ebuild 1443
-RMD160 f2789851efa8dcba1ab98207479925024c590706 automake-1.6.3.ebuild 1443
-SHA256 28d3b1864bcd7f34bbb11a41bf5d13b6985eadae37594413fc138a6d9b8300f0 automake-1.6.3.ebuild 1443
-EBUILD automake-1.7.9-r1.ebuild 1518 RMD160 148ba37784f2dc0d7c350eaeb3b42b3014d0bcba SHA1 b3aff4e5982795f7a970f36497ddb329869f97f9 SHA256 4176fe342741e3bc3415421bbebb3e24bbbd8ba8fc891165171c9207aa57e8e5
-MD5 e61537ab6c5256007afe610610123abd automake-1.7.9-r1.ebuild 1518
-RMD160 148ba37784f2dc0d7c350eaeb3b42b3014d0bcba automake-1.7.9-r1.ebuild 1518
-SHA256 4176fe342741e3bc3415421bbebb3e24bbbd8ba8fc891165171c9207aa57e8e5 automake-1.7.9-r1.ebuild 1518
-EBUILD automake-1.8.5-r3.ebuild 1516 RMD160 58907a673472a0eb8b7f33a98940b15640f72f78 SHA1 eef0db7aaa2e69fd38756a0c52eba2da9bb0bc2f SHA256 81539004a462d3d5087889fba3dbf7660cb5e3c459ee2be0d31cebb5591a38b5
-MD5 b91f3343de21630972a5977b51d151f1 automake-1.8.5-r3.ebuild 1516
-RMD160 58907a673472a0eb8b7f33a98940b15640f72f78 automake-1.8.5-r3.ebuild 1516
-SHA256 81539004a462d3d5087889fba3dbf7660cb5e3c459ee2be0d31cebb5591a38b5 automake-1.8.5-r3.ebuild 1516
-EBUILD automake-1.9.6-r2.ebuild 1655 RMD160 3a02eb3137fa4d1ff113fc557bd980a82c5e88c7 SHA1 22ec8d0efc1f6fa2432878175f89e3c4fc1eed8c SHA256 57b924b576ef3789eecccd42de1a6c07c25cc464098fbdb625d39863d4234a92
-MD5 7d9d0e5d0a940aeec37979ba2fee2192 automake-1.9.6-r2.ebuild 1655
-RMD160 3a02eb3137fa4d1ff113fc557bd980a82c5e88c7 automake-1.9.6-r2.ebuild 1655
-SHA256 57b924b576ef3789eecccd42de1a6c07c25cc464098fbdb625d39863d4234a92 automake-1.9.6-r2.ebuild 1655
-MISC ChangeLog 16532 RMD160 8f9b5568fe7405da60a603006fec471d437960a0 SHA1 3925aaa2165dc51a9de4e98c164d45e4d4abb1cb SHA256 2f27bd045b9259c3d7993dc0dc5dc58023e11ce610f410b821350808fe849b7e
-MD5 0da582a26e9644ae648f92c73369cb15 ChangeLog 16532
-RMD160 8f9b5568fe7405da60a603006fec471d437960a0 ChangeLog 16532
-SHA256 2f27bd045b9259c3d7993dc0dc5dc58023e11ce610f410b821350808fe849b7e ChangeLog 16532
+EBUILD automake-1.4_p6.ebuild 1760 RMD160 276a543564bc2a756985b0ebf51264d918de2150 SHA1 7506cff8e8fadbb8ebc1bca3625dc00749216ed4 SHA256 9d8f080ef43cfe7556ed40a709697522502e67a845d64b40e7158264272df37a
+MD5 5f8a39e0812e0b101a1e4ebb6ae738a4 automake-1.4_p6.ebuild 1760
+RMD160 276a543564bc2a756985b0ebf51264d918de2150 automake-1.4_p6.ebuild 1760
+SHA256 9d8f080ef43cfe7556ed40a709697522502e67a845d64b40e7158264272df37a automake-1.4_p6.ebuild 1760
+EBUILD automake-1.5.ebuild 1647 RMD160 323de261c7e68e727df502c900ba299e80ca9aed SHA1 7bc025534d76368a20fbc3fdf4b7d971c7b4e2b3 SHA256 a1baed63f4718d2995087c3537c12ed30f324d05f2b5cbf5cbdbdde697528452
+MD5 4c8e0e869dad0606209c568059e18111 automake-1.5.ebuild 1647
+RMD160 323de261c7e68e727df502c900ba299e80ca9aed automake-1.5.ebuild 1647
+SHA256 a1baed63f4718d2995087c3537c12ed30f324d05f2b5cbf5cbdbdde697528452 automake-1.5.ebuild 1647
+EBUILD automake-1.6.3.ebuild 1371 RMD160 3542f1e374e4c8e71e8452d7d68bf9376eabb5f4 SHA1 cbc877c199506052061b965473f01167d88e6437 SHA256 4def694c06dd859fd2fbd767be3244602a35f4eb2183792ace6c0814465c511d
+MD5 78b0ad72cb6a3c1b1068c1c363b9ae3e automake-1.6.3.ebuild 1371
+RMD160 3542f1e374e4c8e71e8452d7d68bf9376eabb5f4 automake-1.6.3.ebuild 1371
+SHA256 4def694c06dd859fd2fbd767be3244602a35f4eb2183792ace6c0814465c511d automake-1.6.3.ebuild 1371
+EBUILD automake-1.7.9-r1.ebuild 1438 RMD160 0aff05abe999126377695aff1c379b0afcbb8d0b SHA1 069a62a00c5ba94f7801f74b04474ef309e829f6 SHA256 a53eae9aeb52efba0b308f9d274970a6e27b78af89782d791aded767f16a66ac
+MD5 4a6a72e37b6dc25de8e753754f224214 automake-1.7.9-r1.ebuild 1438
+RMD160 0aff05abe999126377695aff1c379b0afcbb8d0b automake-1.7.9-r1.ebuild 1438
+SHA256 a53eae9aeb52efba0b308f9d274970a6e27b78af89782d791aded767f16a66ac automake-1.7.9-r1.ebuild 1438
+EBUILD automake-1.8.5-r3.ebuild 1443 RMD160 20d1c41e8f4504931105b3127e381d3d9a416044 SHA1 f22c69f8f5c3e1e9ad6b10ef3851716f99c743a8 SHA256 2442a30e5eb978e962698319d911e337f775265046f1cd067d4bbf5ac65200c3
+MD5 d1e98fb78afce58ea9a2c39ed8896287 automake-1.8.5-r3.ebuild 1443
+RMD160 20d1c41e8f4504931105b3127e381d3d9a416044 automake-1.8.5-r3.ebuild 1443
+SHA256 2442a30e5eb978e962698319d911e337f775265046f1cd067d4bbf5ac65200c3 automake-1.8.5-r3.ebuild 1443
+EBUILD automake-1.9.6-r2.ebuild 1655 RMD160 f383a2f4bc73cf7fdbaba5a2d414d268f22b8cfe SHA1 b2d69f71844fff9a498c3221b22ebfbe8aa54949 SHA256 80a427ed75a3167cb15d088aea809dee84bdd7a4d3ab89a793dfdd2dae0e00ce
+MD5 11f0ffb1ca9199da513a7763183e8590 automake-1.9.6-r2.ebuild 1655
+RMD160 f383a2f4bc73cf7fdbaba5a2d414d268f22b8cfe automake-1.9.6-r2.ebuild 1655
+SHA256 80a427ed75a3167cb15d088aea809dee84bdd7a4d3ab89a793dfdd2dae0e00ce automake-1.9.6-r2.ebuild 1655
+MISC ChangeLog 16945 RMD160 3cc7020a02ce3ae53adc28b2786b011c8ecdbc7a SHA1 238ebd544ffebbd6fc5e940308d624f73117efa1 SHA256 36beaef6475f44fb10bd2e376c84be8dfebe51b8b990bb1255dd36916187fce3
+MD5 1b995de032d3ace9067b76274678da10 ChangeLog 16945
+RMD160 3cc7020a02ce3ae53adc28b2786b011c8ecdbc7a ChangeLog 16945
+SHA256 36beaef6475f44fb10bd2e376c84be8dfebe51b8b990bb1255dd36916187fce3 ChangeLog 16945
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -116,7 +128,7 @@ SHA256 f525c02c9dfbac954de241d9fcdb48591042c8455d993d8bcc3d04559ed2d374 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG4getp/wUKkr7RBoRAtglAKCHpqmZ1kx/j/CBWlppl5tRj5e7gQCgiGXn
-X7J5SnskDWpDWMgqLE07758=
-=oahq
+iD8DBQFG4kWip/wUKkr7RBoRAmDVAKDZsj1lYmZF6ZO9nFEL0mSTVpuPfgCePLxy
+Eis3ZVZEcVK3KEbOtM6p2bM=
+=Z8Vk
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.4_p6.ebuild b/sys-devel/automake/automake-1.4_p6.ebuild
index 22828572cb89..73e147f3c3df 100644
--- a/sys-devel/automake/automake-1.4_p6.ebuild
+++ b/sys-devel/automake/automake-1.4_p6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6.ebuild,v 1.23 2006/11/03 18:37:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6.ebuild,v 1.24 2007/09/08 06:46:28 vapier Exp $
 
 inherit eutils
 
@@ -38,7 +38,7 @@ src_unpack() {
 }
 
 src_install() {
-	make install DESTDIR="${D}" \
+	emake install DESTDIR="${D}" \
 		pkgdatadir=/usr/share/automake-${SLOT} \
 		m4datadir=/usr/share/aclocal-${SLOT} \
 		|| die
@@ -54,8 +54,3 @@ src_install() {
 		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
-
-pkg_postinst() {
-	einfo "Please note that the 'WANT_AUTOMAKE_1_4=1' syntax has changed to:"
-	einfo "  WANT_AUTOMAKE=1.4"
-}
diff --git a/sys-devel/automake/automake-1.5.ebuild b/sys-devel/automake/automake-1.5.ebuild
index 0656e3e07621..f4c497e9e77e 100644
--- a/sys-devel/automake/automake-1.5.ebuild
+++ b/sys-devel/automake/automake-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.28 2007/07/11 20:36:28 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.29 2007/09/08 06:46:28 vapier Exp $
 
 inherit eutils
 
@@ -34,7 +34,7 @@ src_unpack() {
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
+	emake install DESTDIR="${D}" || die "make install failed"
 
 	local x=
 	for x in aclocal automake ; do
@@ -51,8 +51,3 @@ src_install() {
 		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
-
-pkg_postinst() {
-	einfo "Please note that the 'WANT_AUTOMAKE_1_5=1' syntax has changed to:"
-	einfo "  WANT_AUTOMAKE=1.5"
-}
diff --git a/sys-devel/automake/automake-1.6.3.ebuild b/sys-devel/automake/automake-1.6.3.ebuild
index ed4c8c7b3fb4..d7e75653acb9 100644
--- a/sys-devel/automake/automake-1.6.3.ebuild
+++ b/sys-devel/automake/automake-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3.ebuild,v 1.37 2006/11/03 18:37:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3.ebuild,v 1.38 2007/09/08 06:46:28 vapier Exp $
 
 inherit eutils
 
@@ -26,11 +26,12 @@ src_unpack() {
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		automake.texi || die "sed failed"
+	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
 	export WANT_AUTOCONF=2.5
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
@@ -43,8 +44,3 @@ src_install() {
 		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
-
-pkg_postinst() {
-	einfo "Please note that the 'WANT_AUTOMAKE_1_6=1' syntax has changed to:"
-	einfo "  WANT_AUTOMAKE=1.6"
-}
diff --git a/sys-devel/automake/automake-1.7.9-r1.ebuild b/sys-devel/automake/automake-1.7.9-r1.ebuild
index 63afdda28466..34193c4c4a94 100644
--- a/sys-devel/automake/automake-1.7.9-r1.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.14 2006/11/03 18:37:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.15 2007/09/08 06:46:28 vapier Exp $
 
 inherit eutils
 
@@ -27,11 +27,12 @@ src_unpack() {
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		automake.texi || die "sed texi failed"
 	epatch "${FILESDIR}"/${P}-infopage-namechange.patch
+	epatch "${FILESDIR}"/${P}-test-fixes.patch
 	export WANT_AUTOCONF=2.5
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
@@ -44,8 +45,3 @@ src_install() {
 		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
-
-pkg_postinst() {
-	einfo "Please note that the 'WANT_AUTOMAKE_1_7=1' syntax has changed to:"
-	einfo "  WANT_AUTOMAKE=1.7"
-}
diff --git a/sys-devel/automake/automake-1.8.5-r3.ebuild b/sys-devel/automake/automake-1.8.5-r3.ebuild
index 780d19f3e1ec..39bb78d23ec8 100644
--- a/sys-devel/automake/automake-1.8.5-r3.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r3.ebuild,v 1.14 2007/07/13 12:46:01 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r3.ebuild,v 1.15 2007/09/08 06:46:28 vapier Exp $
 
 inherit eutils
 
@@ -27,11 +27,12 @@ src_unpack() {
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		doc/automake.texi || die "sed failed"
 	epatch "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
+	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
 	export WANT_AUTOCONF=2.5
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
@@ -44,8 +45,3 @@ src_install() {
 		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
-
-pkg_postinst() {
-	einfo "Please note that the 'WANT_AUTOMAKE_1_8=1' syntax has changed to:"
-	einfo "  WANT_AUTOMAKE=1.8"
-}
diff --git a/sys-devel/automake/automake-1.9.6-r2.ebuild b/sys-devel/automake/automake-1.9.6-r2.ebuild
index 417879d536cb..a4203b998d65 100644
--- a/sys-devel/automake/automake-1.9.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r2.ebuild,v 1.14 2006/11/03 18:37:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r2.ebuild,v 1.15 2007/09/08 06:46:28 vapier Exp $
 
 inherit eutils
 
@@ -36,7 +36,7 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 
 	local x
 	for x in aclocal automake ; do
diff --git a/sys-devel/automake/files/automake-1.6.3-test-fixes.patch b/sys-devel/automake/files/automake-1.6.3-test-fixes.patch
new file mode 100644
index 000000000000..666517754a96
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.6.3-test-fixes.patch
@@ -0,0 +1,28 @@
+Fix the tests so they don't fail :)
+
+depcomp2: #159557 #181484
+fix false positive when using newer autoconf -- it throws a warning based
+on dataroot which causes a failure when there was none
+
+man2: #159557
+grab update from newer automake
+
+--- automake-1.6.3/tests/depcomp2.test
++++ automake-1.6.3/tests/depcomp2.test
+@@ -17,4 +17,5 @@
+ cat > Makefile.am << 'END'
+ SUBDIRS = subdir
++datarootdir = @datarootdir@
+ END
+ 
+--- automake-1.6.3/tests/man2.test
++++ automake-1.6.3/tests/man2.test
+@@ -23,7 +23,7 @@
+ $AUTOMAKE
+ 
+ # Let's play with $DESTDIR too, it shouldn't hurt.
+-./configure --prefix=''
++./configure --prefix='' --mandir=/man
+ DESTDIR="`pwd`/=inst" $MAKE -e SHELL=/bin/sh install
+ 
+ test -f ./=inst/man/man2/foo.2
diff --git a/sys-devel/automake/files/automake-1.7.9-test-fixes.patch b/sys-devel/automake/files/automake-1.7.9-test-fixes.patch
new file mode 100644
index 000000000000..00854886d66d
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.7.9-test-fixes.patch
@@ -0,0 +1,46 @@
+Fix the tests so they don't fail :)
+
+exdir2 man2 transform: #159557 #162565
+grab updates from newer automake
+
+mkdir-tests.m4:
+when mixing newer gettext with this automake, the tests bomb out
+as AM_PROG_MKDIR_P is not provided properly
+
+--- automake-1.7.9/tests/man2.test
++++ automake-1.7.9/tests/man2.test
+@@ -41,7 +41,7 @@
+ $AUTOMAKE
+ 
+ # Let's play with $DESTDIR too, it shouldn't hurt.
+-./configure --prefix=''
++./configure --prefix='' --mandir=/man
+ DESTDIR="`pwd`/_inst" $MAKE -e install
+ 
+ test -f ./_inst/man/man2/foo.2
+--- automake-1.7.9/tests/transform.test
++++ automake-1.7.9/tests/transform.test
+@@ -56,7 +56,7 @@
+ $AUTOCONF
+ $AUTOMAKE
+ 
+-./configure --program-prefix=gnu- --prefix `pwd`/inst
++./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man
+ $MAKE
+ $MAKE test-install
+ $MAKE uninstall
+--- automake-1.7.9/tests/exdir2.test
++++ automake-1.7.9/tests/exdir2.test
+@@ -23,7 +23,7 @@
+ . ./defs || exit 1
+ 
+ cat > Makefile.am << 'EOF'
+-html_DATA = zot.html
++quuz_DATA = zot.html
+ pkgdata_DATA = qbert
+ EOF
+ 
+--- automake-1.7.9/m4/mkdir-tests.m4
++++ automake-1.7.9/m4/mkdir-tests.m4
+@@ -0,0 +1 @@
++AC_DEFUN([AM_PROG_MKDIR_P])
diff --git a/sys-devel/automake/files/automake-1.8.5-test-fixes.patch b/sys-devel/automake/files/automake-1.8.5-test-fixes.patch
new file mode 100644
index 000000000000..43290d1e0d4b
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.8.5-test-fixes.patch
@@ -0,0 +1,43 @@
+Fix the tests so they don't fail :)
+
+exdir2 man2 transform: #159557 #162565
+grab updates from newer automake
+
+--- automake-1.8.5/tests/man2.test
++++ automake-1.8.5/tests/man2.test
+@@ -41,7 +41,7 @@
+ $AUTOMAKE
+ 
+ # Let's play with $DESTDIR too, it shouldn't hurt.
+-./configure --prefix=''
++./configure --prefix='' --mandir=/man
+ DESTDIR="`pwd`/_inst" $MAKE -e install
+ 
+ test -f ./_inst/man/man2/foo.2
+--- automake-1.8.5/tests/transform.test
++++ automake-1.8.5/tests/transform.test
+@@ -56,7 +56,7 @@
+ $AUTOCONF
+ $AUTOMAKE
+ 
+-./configure --program-prefix=gnu- --prefix `pwd`/inst
++./configure --program-prefix=gnu- --prefix `pwd`/inst --mandir `pwd`/inst/man
+ $MAKE
+ $MAKE test-install
+ $MAKE uninstall
+--- automake-1.8.5/tests/exdir2.test
++++ automake-1.8.5/tests/exdir2.test
+@@ -25,11 +25,11 @@
+ set -e
+ 
+ cat > Makefile.am << 'EOF'
+-html_DATA = zot.html
++quuz_DATA = zot.html
+ pkgdata_DATA = qbert
+ EOF
+ 
+ $ACLOCAL
+ AUTOMAKE_fails
+ grep 'pkgdatadir' stderr && exit 1
+-grep 'Makefile.am:1:.*htmldir.*undefined' stderr
++grep 'Makefile.am:1:.*quuzdir.*undefined' stderr