--- gentoo/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild	2009-09-26 23:08:26.000000000 +0100
+++ local/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild	2009-10-24 22:14:30.000000000 +0100
@@ -15,7 +15,7 @@
 #
 # Azarah.
 
-inherit eutils toolchain-funcs
+inherit eutils autotools
 
 S=${WORKDIR}/xc/lib/Xaw3d
 DESCRIPTION="drop-in 3D replacement of the Xaw widget set which comes with X"
@@ -29,46 +29,27 @@
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
-# There _might_ be something else, but I doubt it.
 RDEPEND="x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXp"
+	x11-libs/libX11
+	x11-libs/libXmu"
 
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	x11-misc/imake
-	x11-misc/gccmakedep"
+	dev-util/pkgconfig
+	sys-devel/bison
+	sys-devel/flex"
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack ${A}
 	cd "${S}"
 
-	# For some reason it isn't automatically patched.
-	# That's why I manually override the source_unpack function.
-	epatch "${FILESDIR}"/Xaw3d-xfree86.diff \
-		"${FILESDIR}"/Xaw3d-out-of-tree.diff
-
-	# This adds more familiar scroll-bar look and feel for Emacs and
-	# others <mkennedy@gentoo.org>
-	sed -i -e 's,#.*EXTRA_DEFINES,EXTRA_DEFINES,g' Imakefile || die
-}
+	epatch "${FILESDIR}"/Xaw3d-xfree86.diff
 
-src_compile() {
-	# convoluted process for out-of-tree building
-	mkdir ./X11
-	cd ./X11 ; ln -sf ../../Xaw3d . ; cd ..
-
-	xmkmf || die
-	make includes || die
-	make depend || die
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
-		SHLIBGLOBALSFLAGS="${LDFLAGS}" || die
+	cp "${FILESDIR}"/{configure.ac,Makefile.am} . || die "cp autotools failed"
+	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc README.XAW3D
+	dodoc README.XAW3D || die "dodoc failed"
 }