--- /usr/portage/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild	2006-07-02 14:35:58.000000000 -0600
+++ overlay/media-libs/libmpeg3/libmpeg3-1.7.ebuild	2006-07-15 23:28:16.000000000 -0600
@@ -1,19 +1,20 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild,v 1.5 2006/07/02 20:21:36 vapier Exp $
+# $Header: $
 
 inherit flag-o-matic eutils toolchain-funcs
 
-PATCHLEVEL="3"
+PATCHLEVEL="1"
 DESCRIPTION="An mpeg library for linux"
 HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
 SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
-	mirror://gentoo/${P}-textrel-fix.patch.bz2"
+	mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2"
+	#FIXME - port 1.5.2 textrel patch to 1.7
+	#mirror://gentoo/${P}-textrel-fix.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ppc ~ppc64 sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="mmx"
 
 RDEPEND="sys-libs/zlib
@@ -28,18 +29,14 @@
 	# The Makefile is patched to install the header files as well.
 	# This patch was generated using the info in the src.rpm that
 	# SourceForge provides for this package.
-	[ "`gcc-version`" == "3.4" -o "`gcc-major-version`" -ge 4 ] || \
-		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 08_all_gcc34.patch"
-	[ "`gcc-major-version`" -ge 4 ] || \
-		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 09_all_gcc4.patch"
 
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
 
 	sed -i -e "/LIBS = /s:$: -L\${ROOT}usr/$(get_libdir) -la52:" Makefile
 
-	epatch "${FILESDIR}/${P}-a52.patch"
 	epatch "${FILESDIR}/${P}-gnustack.patch"
-	epatch "${DISTDIR}/${P}-textrel-fix.patch.bz2"
+	#FIXME - port 1.5.2 textrel patch to 1.7
+	#epatch "${DISTDIR}/${P}-textrel-fix.patch.bz2"
 
 	if ! use mmx; then
 		sed -i -e 's:^NASM =.*:NASM =:' \