Always use autotools eclass, and force latest autoconf/automake versions, closing bug #148199.

Package-Manager: portage-2.1.2_pre2-r2

6 files changed, 57 insertions, 48 deletions

diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index f136155b2923..bc0eb6eb67df 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libwww
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.62 2006/10/01 13:48:24 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.63 2006/10/04 12:53:29 flameeyes Exp $
+
+  04 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> libwww-5.4.0-r3.ebuild,
+  libwww-5.4.0-r4.ebuild, libwww-5.4.0-r5.ebuild, libwww-5.4.0-r6.ebuild:
+  Always use autotools eclass, and force latest autoconf/automake versions,
+  closing bug #148199.
 
   01 Oct 2006; Guy Martin <gmsoft@gentoo.org> libwww-5.4.0-r6.ebuild:
   Stable on hppa.
diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest
index 2ce07c5e76e5..a290e317cb1f 100644
--- a/net-libs/libwww/Manifest
+++ b/net-libs/libwww/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libwww-5.4.0-asneeded.patch 3069 RMD160 2ad4e69a0fe92ee3aa963ab3f0545352c71efc20 SHA1 43654eeb3229ab112d6cb93bcab8394fb57d3c8f SHA256 392f715f76294b8cf5875ddaa8d224cb5133b5ead2f4063f0ac5234db71dd8d1
 MD5 1a49925f104c658018fc8aa186e019c6 files/libwww-5.4.0-asneeded.patch 3069
 RMD160 2ad4e69a0fe92ee3aa963ab3f0545352c71efc20 files/libwww-5.4.0-asneeded.patch 3069
@@ -44,26 +47,26 @@ RMD160 c6b2f017f1c2ecb036aca3e6d497a1e2fc2e2d6f files/libwww-config-liborder.pat
 SHA256 01aa28bd0516ccfff053c07e02a0c323e0403a86be1845d6d5671e776a95d6d2 files/libwww-config-liborder.patch 776
 DIST libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338 RMD160 c15263ce045333f03a6f655ff3aaaf0dd14eac35 SHA1 322f9ee1c55792937c1058b81a0c8980b4b3d95c SHA256 a2e64a286c691075df952763de38bb5f5ad3611d089d3b8b9c8d7c2d2b7d1bbb
 DIST w3c-libwww-5.4.0.tgz 1129121 RMD160 12e55ecb2435f9048d627e56f8ae60d4c246648b SHA1 2394cb4e0dc4e2313a9a0ddbf508e4b726e9af63 SHA256 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef
-EBUILD libwww-5.4.0-r3.ebuild 1943 RMD160 faebfbe9f76a08fc24b4c1718c999725466f8866 SHA1 1b47f52b07de9ec7c20ebabee1e6b153870c71ae SHA256 e28a8afbe7a913a27f39ddddae525fcbc6627feb731cad67dc3bc45434e2cd67
-MD5 4c70dae7ce4964982b3ebe728633f9f0 libwww-5.4.0-r3.ebuild 1943
-RMD160 faebfbe9f76a08fc24b4c1718c999725466f8866 libwww-5.4.0-r3.ebuild 1943
-SHA256 e28a8afbe7a913a27f39ddddae525fcbc6627feb731cad67dc3bc45434e2cd67 libwww-5.4.0-r3.ebuild 1943
-EBUILD libwww-5.4.0-r4.ebuild 2149 RMD160 d2f4d623d7c64da059ab3e45d6488c4bdc276969 SHA1 f46cdefda6b75e5004c32fc19ee28ae959ba36c9 SHA256 412fa7439036e01f8a6ea6f2117ba1ba8f076d198fa3f39a48e588bf1cd49a15
-MD5 141485bbc1bfd7acd01d7383755352eb libwww-5.4.0-r4.ebuild 2149
-RMD160 d2f4d623d7c64da059ab3e45d6488c4bdc276969 libwww-5.4.0-r4.ebuild 2149
-SHA256 412fa7439036e01f8a6ea6f2117ba1ba8f076d198fa3f39a48e588bf1cd49a15 libwww-5.4.0-r4.ebuild 2149
-EBUILD libwww-5.4.0-r5.ebuild 2278 RMD160 06bb70101a0ed18f2d743af7e0a5abb2b304c634 SHA1 3b8b794fa3285453ead7ccb9d4eab2c28ef369ab SHA256 9f2294898fb0c3e0696589121132e265f88be4e0a5e5e2aab041f91191e6122c
-MD5 6c0a000741ca83d306624f2d2f3e9ada libwww-5.4.0-r5.ebuild 2278
-RMD160 06bb70101a0ed18f2d743af7e0a5abb2b304c634 libwww-5.4.0-r5.ebuild 2278
-SHA256 9f2294898fb0c3e0696589121132e265f88be4e0a5e5e2aab041f91191e6122c libwww-5.4.0-r5.ebuild 2278
-EBUILD libwww-5.4.0-r6.ebuild 2271 RMD160 bb7f683a27201ce6e1a0ddb542366240c27fd0f0 SHA1 25975ae0c785575703b19e380e8a77cddf144bb6 SHA256 b7f1e154dae97e2117b72c1b2a3857b18661f2c0a3a477184bc5b6cef969762f
-MD5 30fe32fc5708a4591d36a68c451bddfb libwww-5.4.0-r6.ebuild 2271
-RMD160 bb7f683a27201ce6e1a0ddb542366240c27fd0f0 libwww-5.4.0-r6.ebuild 2271
-SHA256 b7f1e154dae97e2117b72c1b2a3857b18661f2c0a3a477184bc5b6cef969762f libwww-5.4.0-r6.ebuild 2271
-MISC ChangeLog 8919 RMD160 0e4c5f1c509ff06b9f4f4d6b6134af640d4d5769 SHA1 6b33f8240f86dbb5fab6a9b5bac2e78f8ed9e807 SHA256 89e28d69ec0a57a0046aad286d72c1ac9433cac0a5b82719f8cc784027bc0183
-MD5 961cf2745f31e53624c2a140c87961aa ChangeLog 8919
-RMD160 0e4c5f1c509ff06b9f4f4d6b6134af640d4d5769 ChangeLog 8919
-SHA256 89e28d69ec0a57a0046aad286d72c1ac9433cac0a5b82719f8cc784027bc0183 ChangeLog 8919
+EBUILD libwww-5.4.0-r3.ebuild 1819 RMD160 236a31aaf3eeac7eb1ec02af0fa2a8c3ef2ac0b2 SHA1 5659bcab8ea77731ac771381453c90bc2d5941e4 SHA256 ce52861280239183186a7668ed2dca616389e51212255ea96a02f490b2d1a4d3
+MD5 3cc6810babfa58b4d043576bfa1650cf libwww-5.4.0-r3.ebuild 1819
+RMD160 236a31aaf3eeac7eb1ec02af0fa2a8c3ef2ac0b2 libwww-5.4.0-r3.ebuild 1819
+SHA256 ce52861280239183186a7668ed2dca616389e51212255ea96a02f490b2d1a4d3 libwww-5.4.0-r3.ebuild 1819
+EBUILD libwww-5.4.0-r4.ebuild 1997 RMD160 0f63ccf35219a2261370fd230f1c5ac4d2f9a31e SHA1 221be66c60acaec3fd63910ffa87fd238b10a178 SHA256 fdd92022ce5d824c111cfa07ecf986b54b083de54f53cf0946a358ae3400815b
+MD5 9d558b7483dcdc75c6e3fd4da2482890 libwww-5.4.0-r4.ebuild 1997
+RMD160 0f63ccf35219a2261370fd230f1c5ac4d2f9a31e libwww-5.4.0-r4.ebuild 1997
+SHA256 fdd92022ce5d824c111cfa07ecf986b54b083de54f53cf0946a358ae3400815b libwww-5.4.0-r4.ebuild 1997
+EBUILD libwww-5.4.0-r5.ebuild 2327 RMD160 c8ac9c27406c4df6be88e0ddd62854768da64ef8 SHA1 9d3490ae08173a431653dbbf404274891f774496 SHA256 715f698132fe0913d73f16faf85be3ada8b60b04eaecdb4f7b67ea5e828dbe08
+MD5 61152cf0af0383cc42e08fac8fa87ef0 libwww-5.4.0-r5.ebuild 2327
+RMD160 c8ac9c27406c4df6be88e0ddd62854768da64ef8 libwww-5.4.0-r5.ebuild 2327
+SHA256 715f698132fe0913d73f16faf85be3ada8b60b04eaecdb4f7b67ea5e828dbe08 libwww-5.4.0-r5.ebuild 2327
+EBUILD libwww-5.4.0-r6.ebuild 2294 RMD160 27f2ffadbad8dfae9eed33a93b4b9d511b113760 SHA1 ca7d00fcb879e5755404947d73ba4d68f71e000e SHA256 b1ea95cc48123eba283b4d2c063ad86338993e82a492b0fb7418024e299ad234
+MD5 140d933a241459c8ce9c4a454d017fd4 libwww-5.4.0-r6.ebuild 2294
+RMD160 27f2ffadbad8dfae9eed33a93b4b9d511b113760 libwww-5.4.0-r6.ebuild 2294
+SHA256 b1ea95cc48123eba283b4d2c063ad86338993e82a492b0fb7418024e299ad234 libwww-5.4.0-r6.ebuild 2294
+MISC ChangeLog 9173 RMD160 68b0852483ae882b641a0bfdd5cf10747924280a SHA1 8747cc4f539b57e7fe5e20d9e18233c9d09b88cf SHA256 daf9e756c293f729c343dd4caeeab53cbe80d849b07dd2ce3de6050b16ec6160
+MD5 b9f91ed738cfe8e431100ad76021dc35 ChangeLog 9173
+RMD160 68b0852483ae882b641a0bfdd5cf10747924280a ChangeLog 9173
+SHA256 daf9e756c293f729c343dd4caeeab53cbe80d849b07dd2ce3de6050b16ec6160 ChangeLog 9173
 MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
@@ -80,3 +83,10 @@ SHA256 d8df772d5553ab12bfb4b755dfcb80574536cd9091c326625493d10040934c78 files/di
 MD5 c07f06c90922520867329bd3a262e0d2 files/digest-libwww-5.4.0-r6 545
 RMD160 4bc82afdba6774f1d3252af59666f05d01bf39ca files/digest-libwww-5.4.0-r6 545
 SHA256 d8df772d5553ab12bfb4b755dfcb80574536cd9091c326625493d10040934c78 files/digest-libwww-5.4.0-r6 545
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFI67RAiZjviIA2XgRAmVHAKCQbi3gysa87PZ6FSPOue8vZTuYJQCgj4lo
+CjT1MrsCl7FwGw7Yj2xQyNY=
+=goso
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libwww/libwww-5.4.0-r3.ebuild b/net-libs/libwww/libwww-5.4.0-r3.ebuild
index a0e0cda4af33..2f877926cbc4 100644
--- a/net-libs/libwww/libwww-5.4.0-r3.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r3.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r3.ebuild,v 1.3 2005/09/30 22:47:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r3.ebuild,v 1.4 2006/10/04 12:53:29 flameeyes Exp $
 
-inherit eutils multilib
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils multilib autotools
 
 MY_P=w3c-${P}
 DESCRIPTION="A general-purpose client side WEB API"
@@ -37,14 +40,7 @@ src_unpack() {
 	# http://www.mysql.gr.jp/mysqlml/mysql/msg/8118
 	epatch "${FILESDIR}"/${P}-mysql-4.1.patch
 
-	if use ppc-macos ; then
-		glibtoolize -c -f || die "libtoolize failed"
-	else
-		libtoolize -c -f || die "libtoolize failed"
-	fi
-
-	aclocal || die "aclocal failed"
-	autoconf || die "autoconf failed"
+	eautoreconf
 }
 
 src_compile() {
diff --git a/net-libs/libwww/libwww-5.4.0-r4.ebuild b/net-libs/libwww/libwww-5.4.0-r4.ebuild
index 65f152c75c74..69c8c7c31319 100644
--- a/net-libs/libwww/libwww-5.4.0-r4.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r4.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r4.ebuild,v 1.15 2006/03/20 02:58:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r4.ebuild,v 1.16 2006/10/04 12:53:29 flameeyes Exp $
 
-inherit eutils multilib
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils multilib autotools
 
 MY_P=w3c-${P}
 DESCRIPTION="A general-purpose client side WEB API"
@@ -42,17 +45,7 @@ src_unpack() {
 	# Fix multiple problems, potentially exploitable (bug #109040)
 	epatch "${FILESDIR}"/${P}-htbound.patch
 
-	export WANT_AUTOMAKE=1.4
-	aclocal || die "aclocal failed"
-
-	if use ppc-macos;
-	then
-		glibtoolize -c -f || die "glibtoolize failed"
-	else
-		libtoolize -c -f || die "libtoolize failed"
-	fi
-
-	autoconf || die "autoconf failed"
+	eautoreconf
 }
 
 src_compile() {
diff --git a/net-libs/libwww/libwww-5.4.0-r5.ebuild b/net-libs/libwww/libwww-5.4.0-r5.ebuild
index eda1093e69f1..b85f8ab8d545 100644
--- a/net-libs/libwww/libwww-5.4.0-r5.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r5.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r5.ebuild,v 1.5 2006/05/14 08:29:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r5.ebuild,v 1.6 2006/10/04 12:53:29 flameeyes Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
 
 inherit eutils multilib autotools
 
diff --git a/net-libs/libwww/libwww-5.4.0-r6.ebuild b/net-libs/libwww/libwww-5.4.0-r6.ebuild
index c93a906e0332..db3404f913c7 100644
--- a/net-libs/libwww/libwww-5.4.0-r6.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r6.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r6.ebuild,v 1.7 2006/10/01 13:48:24 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r6.ebuild,v 1.8 2006/10/04 12:53:29 flameeyes Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
 
 inherit eutils multilib autotools
 
@@ -21,7 +24,6 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 
 DEPEND="${RDEPEND}
 	!dev-libs/9libs
-	>=sys-devel/autoconf-2.13
 	dev-lang/perl"
 
 S=${WORKDIR}/${MY_P}