--- x11-misc/gigolo/gigolo-0.4.0.ebuild	2009-12-31 17:12:31.000000000 +0100
+++ x11-misc/gigolo/gigolo-0.4.0.ebuild	2010-03-08 10:14:44.996674405 +0100
@@ -3,7 +3,10 @@
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/gigolo/gigolo-0.4.0.ebuild,v 1.1 2009/12/31 16:12:31 darkside Exp $
 
 EAPI="2"
-inherit xfconf multilib
+EAUTORECONF="yes"
+EINTLTOOLIZE="yes"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+inherit xfconf multilib autotools
 
 DESCRIPTION="a frontend to easily manage connections to remote filesystems using
 GIO/GVfs"
@@ -19,25 +22,7 @@
 	>=dev-libs/glib-2.16:2"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_configure() {
-	./waf --prefix="/usr" --libdir="/usr/$(get_libdir)" configure \
-		|| die "./waf configure failed"
-}
-
-src_compile() {
-	# Build takes -jX, but not -lX so cannot use $MAKEOPTS
-	NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
-	./waf build ${NUMJOBS} || die "./waf build failed"
-}
-
 src_install() {
-	./waf --destdir="${D}" install || die "./waf install failed"
-
-	# process docs
-	dodoc ${DOCS} || die "dodoc failed"
-	rm -rf "${D}"/usr/share/doc/${PN}
+	xfconf_src_install
+	rm -rf "${D}"/usr/share/doc/${PN} || die "rm failed"
 }