--- grass-6.4.2.ebuild	2013-01-18 02:31:28.000000000 +0100
+++ grass-6.4.3_rc2.ebuild	2013-04-17 18:27:57.000000000 +0200
@@ -92,10 +92,6 @@
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-pkgconf.patch
-	"${FILESDIR}"/${PN}-6.4.1-libav-0.8.patch
-	"${FILESDIR}"/${PN}-6.4.2-ffmpeg-1.patch
-	"${FILESDIR}"/${PN}-6.4.2-configure.patch
-	"${FILESDIR}"/${PN}-6.4.2-libav-9.patch
 )
 
 REQUIRED_USE="
@@ -134,6 +130,13 @@
 src_prepare() {
 	use opengl || epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
 	base_src_prepare
+
+	# patch ffmpeg includes
+	sed -e 's:\(avcodec\|avformat\|swscale\)\.h:lib\1/\0:' \
+		-e 's:avio\.h:libavformat/\0:' \
+		-i configure.in \
+		-i lib/ogsf/gsd_img_mpeg.c
+
 	eautoconf
 }