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

(Portage version: 2.1.2_pre2-r2)

5 files changed, 27 insertions, 28 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/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}