--- /usr/portage/media-sound/gmpc/gmpc-0.19.1.ebuild	2009-11-03 19:49:59.000000000 +0100
+++ gmpc-0.20.0.ebuild	2010-04-05 02:50:11.000000000 +0200
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-0.19.1.ebuild,v 1.1 2009/11/03 18:49:59 angelos Exp $
 
 EAPI=2
-inherit gnome2-utils
+inherit gnome2-utils autotools
 
 DESCRIPTION="A GTK+2 client for the Music Player Daemon"
 HOMEPAGE="http://gmpcwiki.sarine.nl/index.php/GMPC"
@@ -19,7 +19,7 @@
 	>=x11-libs/gtk+-2.12:2
 	x11-libs/libsexy
 	>=gnome-base/libglade-2
-	>=media-libs/libmpd-0.18.1
+	>=media-libs/libmpd-0.19.2
 	net-libs/libsoup:2.4
 	dev-db/sqlite:3
 	x11-libs/libSM
@@ -31,17 +31,34 @@
 	nls? ( dev-util/intltool
 		sys-devel/gettext )"
 
+src_prepare() {
+
+	# patch to avoid a build dependency on dev-lang/vala:
+	# the C files generated by Vala are already present in sources
+	epatch "${FILESDIR}/${PN}-0.20.0-avoid-useless-vala-dependency.patch"
+
+	# remove trailing whitespace in Makefile.am files
+	epatch "${FILESDIR}/${PN}-0.20.0-fix-trailing-whitespace-in-makefiles.patch"
+
+	# remove variables that are defined but not used in Makefile.am files
+	epatch "${FILESDIR}/${PN}-0.20.0-fix-defined-but-not-used-in-makefiles.patch"
+
+	# Makefiles need to be rebuilt
+	WANT_AUTOMAKE=1.11 eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable nls) \
 		--disable-dependency-tracking \
 		$(use_enable xspf libxspf) \
 		--disable-libspiff \
-		--enable-system-libsexy
+		--enable-system-libsexy \
+		|| die "econf failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake failed"
 	dodoc AUTHORS ChangeLog NEWS README
 }