--- /usr/portage/dev-libs/libsigc++/libsigc++-1.2.5.ebuild	2006-07-06 03:05:47.000000000 +0200
+++ libsigc++-1.2.5.ebuild	2006-12-14 01:44:49.000000000 +0100
@@ -1,6 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.5.ebuild,v 1.22 2006/07/06 01:01:42 vapier Exp $
+# $Header: $
+
+WANT_AUTOMAKE="1.7"
+WANT_AUTOCONF="latest"
+
+inherit autotools
 
 DESCRIPTION="Typesafe callback system for standard C++"
 HOMEPAGE="http://libsigc.sourceforge.net/"
@@ -12,17 +17,13 @@
 IUSE="debug"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	amd64? ( >=sys-devel/automake-1.7 )"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	libtoolize -c -f --automake
-	WANT_AUTOMAKE=1.7 aclocal -I scripts ${ACLOCAL_FLAGS} || die "aclocal failed.  Are your \$ACLOCAL_FLAGS sane?"
-	WANT_AUTOMAKE=1.7 automake --add-missing --copy || die
-	WANT_AUTOCONF=2.5 autoconf || die
+	AT_M4DIR="scripts" eautoreconf
 }
 
 src_compile() {
@@ -32,14 +33,14 @@
 		&& myconf="--enable-debug=yes" \
 		|| myconf="--enable-debug=no"
 
-	econf ${myconf} --enable-maintainer-mode --enable-threads || die
+	econf ${myconf} --enable-maintainer-mode --enable-threads || die "econf failed"
 
 	emake || die "emake failure"
 }
 
 src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog FEATURES IDEAS README INSTALL NEWS TODO
+	einstall || die "einstall failed"
+	dodoc AUTHORS ChangeLog FEATURES IDEAS README NEWS TODO
 }
 
 pkg_postinst() {