--- picptk-0.5a-r1.ebuild.orig	2006-12-22 10:22:58.000000000 +0100
+++ picptk-0.5a-r1.ebuild	2006-12-22 10:22:32.000000000 +0100
@@ -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/dev-embedded/picptk/picptk-0.5a-r1.ebuild,v 1.1 2006/02/25 11:46:50 robbat2 Exp $
+# $Header: $
+
+WANT_AUTOMAKE="1.4"
+WANT_AUTOCONF="latest"
 
 inherit eutils flag-o-matic autotools
 
@@ -17,23 +20,17 @@
 RDEPEND="=dev-tcltk/itk-3.3*
 		 dev-tcltk/iwidgets
 		dev-tcltk/itcl"
-DEPEND="${RDEPEND}
-	sys-devel/gcc
-	sys-devel/automake
-	sys-devel/autoconf"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${PF}-headerfix.patch
-	epatch ${FILESDIR}/${PF}-gccfixes.patch
-	cd ${S}
-	export WANT_AUTOMAKE=1.4
-	export WANT_AUTOCONF=2.1
+	epatch "${FILESDIR}"/${PF}-headerfix.patch
+	epatch "${FILESDIR}"/${PF}-gccfixes.patch
+	cd "${S}"
 	sed -i.orig -e '49,53d' \
 		-e 's/AM_PROG_INSTALL/AC_PROG_INSTALL/g' \
 		${S}/aclocal.m4 || die "sed failed"
-	eautoconf || die "autoconf failed"
-	eautomake || die "automake failed"
+	eautoreconf || die "autoreconf failed"
 }
 
 src_install() {