--- mplayerplug-in-3.55-r1.ebuild	2009-06-06 22:07:34.000000000 +0200
+++ mplayerplug-in-3.55-r2.ebuild	2009-06-01 23:14:13.000000000 +0200
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/mplayerplug-in/mplayerplug-in-3.55-r1.ebuild,v 1.2 2009/05/31 00:47:07 dirtyepic Exp $
+# $Header: $
+
+EAPI=2
 
 inherit eutils multilib autotools flag-o-matic
 
@@ -18,7 +20,10 @@ IUSE="${IUSE} $(printf 'linguas_%s ' ${L
 
 RDEPEND=">=media-video/mplayer-1.0_pre5
 	xulrunner? ( net-libs/xulrunner )
-	!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
+	!xulrunner? ( firefox? ( || (
+		>=www-client/mozilla-firefox-3.0[xulrunner]
+		<www-client/mozilla-firefox-3.0
+	) ) )
 	!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
 	x11-libs/libXpm
 	x11-proto/xextproto
@@ -31,17 +36,7 @@ RDEPEND=">=media-video/mplayer-1.0_pre5
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-pkg_setup() {
-	### Mozilla Firefox 3.0 doesn't install the pkg config files
-	if has_version ">=www-client/mozilla-firefox-3.0" &&
-		! built_with_use www-client/mozilla-firefox xulrunner; then
-		die 'Firefox 3.0 must be built with USE="xulrunner"'
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
 	epatch "${FILESDIR}/${P}-gcc4.patch"
 	epatch "${FILESDIR}/${PN}-xulrunner-config-in.patch"
@@ -52,9 +47,12 @@ src_unpack() {
 	eautoreconf
 }
 
-_src_compile() {
+src_configure() {
 	local myconf
 
+	# Add -fno-strict-aliasing to ensure correct compilation
+	append-flags -fno-strict-aliasing
+
 	# We force gtk2 now because moz only compiles against gtk2
 	if use gtk; then
 		myconf="${myconf} --enable-gtk2"
@@ -73,15 +71,6 @@ _src_compile() {
 		$(use_enable quicktime qt) \
 		$(use_enable wmp) \
 		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_compile() {
-	# Add -fno-strict-aliasing to ensure correct compilation
-	append-flags -fno-strict-aliasing
-
-	_src_compile
 }
 
 src_install() {