Index: smpeg-0.4.4-r7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r7.ebuild,v
retrieving revision 1.11
diff -u -B -r1.11 smpeg-0.4.4-r7.ebuild
--- smpeg-0.4.4-r7.ebuild	22 Mar 2006 22:07:39 -0000	1.11
+++ smpeg-0.4.4-r7.ebuild	28 Mar 2006 17:02:40 -0000
@@ -2,11 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r7.ebuild,v 1.11 2006/03/22 22:07:39 hansmi Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs autotools
 
 DESCRIPTION="SDL MPEG Player Library"
 HOMEPAGE="http://www.lokigames.com/development/smpeg.php3"
-SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz"
+SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz
+	mirrors://gentoo/${P}-gtkm4.patch.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -33,11 +34,15 @@
 	epatch "${FILESDIR}"/${P}-config.patch
 	epatch "${FILESDIR}"/${P}-PIC.patch
 	epatch "${FILESDIR}"/${P}-gcc41.patch
-	# Bundled libtool doesnt properly add C++ libs even
-	# though the shared library includes C++ objects
-	sed -i \
-		-e '/^libsmpeg_la_LIBADD =/s:$: -lstdc++:' \
-		Makefile.in || die "sed Makefile.in failed"
+	epatch "${FILESDIR}"/${P}-flags.patch
+	epatch "${FILESDIR}"/${P}-automake.patch
+
+	cd "${WORKDIR}"
+	epatch "${DISTDIR}"/${P}-gtkm4.patch.bz2
+	rm "${S}/acinclude.m4"
+
+	cd "${S}"
+	WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" AT_M4DIR="${S}/m4" eautoreconf
 }
 
 src_compile() {