--- /usr/portage/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild	2008-01-23 19:05:53.000000000 +0300
+++ /usr/local/portage/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild	2008-01-29 14:00:11.000000000 +0300
@@ -53,14 +53,15 @@
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}/mpeg4ip-1.4.1-disable-faac-test.patch"
+	epatch "${FILESDIR}/${PN}-1.4.1-disable-faac-test.patch"
 	epatch "${FILESDIR}/${P}-x264.patch"
-	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-newffmpeg.patch"
-	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-lX11.patch"
-	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-as-needed.patch"
+	epatch "${FILESDIR}/${P}-newffmpeg.patch"
+	epatch "${FILESDIR}/${P}-lX11.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 	epatch "${FILESDIR}/${P}-gcc42.patch"
 	epatch "${FILESDIR}/${P}-nasm-r.patch"
-	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-avcodec_extern_c.patch"
+	epatch "${FILESDIR}/${P}-avcodec_extern_c.patch"
+	epatch "${FILESDIR}/${P}-img_convert_workaround.patch"
 
 	eautoreconf
 }