Fix broken autotools handling.

(Portage version: 2.1.2_rc4-r5)

3 files changed, 24 insertions, 34 deletions

diff --git a/app-accessibility/festival-gaim/ChangeLog b/app-accessibility/festival-gaim/ChangeLog
index 3c65b10ec3ae..735d4b0ce41a 100644
--- a/app-accessibility/festival-gaim/ChangeLog
+++ b/app-accessibility/festival-gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/festival-gaim
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival-gaim/ChangeLog,v 1.25 2005/07/30 20:24:19 eradicator Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival-gaim/ChangeLog,v 1.26 2007/01/04 13:52:09 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  festival-gaim-1.1.ebuild, festival-gaim-1.1-r1.ebuild:
+  Fix broken autotools handling.
 
   30 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
   -festival-gaim-0.81.ebuild, -festival-gaim-1.00.ebuild,
diff --git a/app-accessibility/festival-gaim/festival-gaim-1.1-r1.ebuild b/app-accessibility/festival-gaim/festival-gaim-1.1-r1.ebuild
index 5bd9f40be39a..113e7f08c79e 100644
--- a/app-accessibility/festival-gaim/festival-gaim-1.1-r1.ebuild
+++ b/app-accessibility/festival-gaim/festival-gaim-1.1-r1.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival-gaim/festival-gaim-1.1-r1.ebuild,v 1.1 2005/07/30 15:20:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival-gaim/festival-gaim-1.1-r1.ebuild,v 1.2 2007/01/04 13:52:09 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit autotools
 
 IUSE=""
 
@@ -16,23 +21,11 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 RDEPEND=">=app-accessibility/festival-1.4.3-r4
 	 >=net-im/gaim-1"
 
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.50
-	sys-devel/libtool"
-
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
-	cd ${S}
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.7
-
-	libtoolize --copy --force || die "libtoolize failed"
-	aclocal || die "aclocal failed"
-	autoheader || die "autoheader failed"
-	automake --add-missing --copy || die "automake failed"
-	autoconf || die "autoconf failed"
+	eautoreconf
 
 	sed -i -e 's:/usr/lib/festival/voices:/usr/share/festival/voices:g' ${S}/src/festival.c
 }
diff --git a/app-accessibility/festival-gaim/festival-gaim-1.1.ebuild b/app-accessibility/festival-gaim/festival-gaim-1.1.ebuild
index 004ad9291181..01a795d2556a 100644
--- a/app-accessibility/festival-gaim/festival-gaim-1.1.ebuild
+++ b/app-accessibility/festival-gaim/festival-gaim-1.1.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival-gaim/festival-gaim-1.1.ebuild,v 1.3 2005/07/30 20:24:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival-gaim/festival-gaim-1.1.ebuild,v 1.4 2007/01/04 13:52:09 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit autotools
 
 IUSE=""
 
@@ -16,23 +21,11 @@ KEYWORDS="amd64 ppc sparc x86"
 RDEPEND="=app-accessibility/festival-1.4.3-r3
 	 >=net-im/gaim-1"
 
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7
-	>=sys-devel/autoconf-2.50
-	sys-devel/libtool"
-
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
-	cd ${S}
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.7
-
-	libtoolize --copy --force || die "libtoolize failed"
-	aclocal || die "aclocal failed"
-	autoheader || die "autoheader failed"
-	automake --add-missing --copy || die "automake failed"
-	autoconf || die "autoconf failed"
+	eautoreconf
 }
 
 src_install() {