Fix broken autotools handling.

Package-Manager: portage-2.1.2_rc4-r5

diff --git a/app-accessibility/epos/ChangeLog b/app-accessibility/epos/ChangeLog
index 18bb90c72fa0d09b1a819292bc5c1568af2b82e1..a96bde5799d51508a91c5bda0e95c8be783abe8c 100644 (file)
--- a/app-accessibility/epos/ChangeLog
+++ b/app-accessibility/epos/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-accessibility/epos
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/epos/ChangeLog,v 1.17 2006/10/14 12:12:57 kloeri Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/epos/ChangeLog,v 1.18 2007/01/04 13:49:56 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> epos-2.5.37.ebuild:
+  Fix broken autotools handling.
 
   14 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove dmwaters from metadata.xml due to retiring.

diff --git a/app-accessibility/epos/epos-2.5.37.ebuild b/app-accessibility/epos/epos-2.5.37.ebuild
index 36191f24b346d04e8a1b371301b4249444897fe3..e04791319cd238b9c00b178a9bc72e96d32db4ed 100644 (file)
--- a/app-accessibility/epos/epos-2.5.37.ebuild
+++ b/app-accessibility/epos/epos-2.5.37.ebuild
@@ -1,10 +1,13 @@
-# 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/app-accessibility/epos/epos-2.5.37.ebuild,v 1.1 2006/05/15 06:12:59 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/epos/epos-2.5.37.ebuild,v 1.2 2007/01/04 13:49:56 flameeyes Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
 
 IUSE="portaudio"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="language independent text-to-speech system"
 HOMEPAGE="http://epos.ure.cas.cz/"
@@ -15,27 +18,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="portaudio? ( =media-libs/pablio-18*
-                     >=media-libs/portaudio-18.1-r3
-                     <media-libs/portaudio-19_alpha1 )"
+                                 >=media-libs/portaudio-18.1-r3
+                                 <media-libs/portaudio-19_alpha1 )"
+
 DEPEND=">=app-text/sgmltools-lite-3.0.3-r9
-       >=sys-devel/autoconf-2.57
-       =sys-devel/automake-1.7*
-       sys-devel/libtool
        ${RDEPEND}"
 
 src_unpack() {
        unpack ${A}
 
-       cd ${S}
-       epatch ${FILESDIR}/${PN}-2.5.35-sysportaudio.patch
+       cd "${S}"
+       epatch "${FILESDIR}/${PN}-2.5.35-sysportaudio.patch"
 
-       export WANT_AUTOMAKE=1.8
-       export WANT_AUTOCONF=2.5
-       libtoolize --force --copy || die
-       aclocal || die
-       automake -a -f -c || die
-       autoheader || die
-       autoconf || die
+       eautoreconf
 }
 
 src_compile() {
@@ -45,10 +40,10 @@ src_compile() {
 
 src_install() {
        make DESTDIR="${D}" install || die
-       mv ${D}/usr/bin/say ${D}/usr/bin/epos_say
+       mv "${D}/usr/bin/say" "${D}/usr/bin/epos_say"
 
        exeinto /etc/init.d
-       doexe ${FILESDIR}/eposd
+       doexe "${FILESDIR}/eposd"
 
-       dodoc WELCOME THANKS Changes ${FILESDIR}/README.gentoo
+       dodoc WELCOME THANKS Changes "${FILESDIR}/README.gentoo"
 }

diff --git a/app-accessibility/festival-gaim/ChangeLog b/app-accessibility/festival-gaim/ChangeLog
index 3c65b10ec3aef555f7a588359949015fba2bb7cc..735d4b0ce41a68d37f49483266eaaad74936da2f 100644 (file)
--- 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 5bd9f40be39a692fe4254ca6092f239644d24583..113e7f08c79ed5d9000db7ba22e55a3418ee0cf9 100644 (file)
--- 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 004ad9291181e509fd5d9190f204c3cdebada251..01a795d2556a5b1d313e9cefad62b25359a3a2b9 100644 (file)
--- 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() {