Removed old versions, added new version, closes bug #201257. Added amd64 multilib changes from bug #178857.

(Portage version: 2.1.4_rc13)

13 files changed, 209 insertions, 408 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index 34ca20428114..9a78f4070cdd 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-www/mplayerplug-in
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.100 2007/11/22 18:56:24 armin76 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.101 2008/01/06 22:34:21 josejx Exp $
+
+*mplayerplug-in-3.50 (06 Jan 2008)
+
+  06 Jan 2008; Joseph Jezak <josejx@gentoo.org>
+  -files/mplayerplug-in-3.31-firefox.patch,
+  -files/mplayerplug-in-3.31-seamonkey.patch,
+  +files/mplayerplug-in-3.50-seamonkey.patch, -mplayerplug-in-3.21.ebuild,
+  -mplayerplug-in-3.31-r1.ebuild, mplayerplug-in-3.35.ebuild,
+  -mplayerplug-in-3.40-r1.ebuild, mplayerplug-in-3.45.ebuild,
+  +mplayerplug-in-3.50.ebuild:
+  Removed old versions, added new version, closes bug #201257. Added amd64
+  multilib changes from bug #178857.
 
   22 Nov 2007; Raúl Porcel <armin76@gentoo.org> mplayerplug-in-3.45.ebuild:
   sparc stable wrt #192696, thanks to Alex Maclean for testing
diff --git a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.31-r1 b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.31-r1
deleted file mode 100644
index 5d15b045462e..000000000000
--- a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.31-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 be26b17cde385c7a34fc634d2c88c5c9 mplayerplug-in-3.31.tar.gz 211714
-RMD160 eea819f428dd8797387b11e5dbfda010cc36a2e9 mplayerplug-in-3.31.tar.gz 211714
-SHA256 359b33927eb2837a544592afc00b55671e02694a8c54d3e7af3c81600bc38885 mplayerplug-in-3.31.tar.gz 211714
diff --git a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.40-r1 b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.40-r1
deleted file mode 100644
index aaecab60682f..000000000000
--- a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.40-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eaeb723a346570a0e3859c7b056a513f mplayerplug-in-3.40.tar.gz 224081
-RMD160 11f364187cf38184d8f32d2e574777626741aa97 mplayerplug-in-3.40.tar.gz 224081
-SHA256 95b8c8c53029213e52fd0fc3a3332cd5d74de293b02c6303544cb9fbb106c076 mplayerplug-in-3.40.tar.gz 224081
diff --git a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.50 b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.50
new file mode 100644
index 000000000000..7def560f6816
--- /dev/null
+++ b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.50
@@ -0,0 +1,3 @@
+MD5 7a9306c39f6550090c16b9c1d87e3168 mplayerplug-in-3.50.tar.gz 452730
+RMD160 6eb61df0c06e1b9f6118be4f75bf05648bb8dbd8 mplayerplug-in-3.50.tar.gz 452730
+SHA256 046b8e65ee4e4568453b7749d7e60f521a87c2f9990f46d021da283e285f4c02 mplayerplug-in-3.50.tar.gz 452730
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in-3.31-firefox.patch b/net-www/mplayerplug-in/files/mplayerplug-in-3.31-firefox.patch
deleted file mode 100644
index 4f94b5760d2d..000000000000
--- a/net-www/mplayerplug-in/files/mplayerplug-in-3.31-firefox.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.in.bak	2007-02-26 22:38:04.000000000 -0500
-+++ configure.in	2007-02-26 22:37:16.000000000 -0500
-@@ -44,7 +44,7 @@
- 	PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir mozilla-plugin`"],[AC_MSG_WARN([mozilla-plugin not found])])
- 
- 	if test "$MOZPLUG_CFLAGS" = ""; then
--		PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`"],[AC_MSG_WARN([firefox-plugin not found])])
-+		PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`"],[AC_MSG_WARN([firefox-plugin not found])])
- 	fi
- 	if test "$MOZPLUG_CFLAGS" = ""; then
- 		PKG_CHECK_MODULES(MOZPLUG,[seamonkey-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir seamonkey-plugin`"],[AC_MSG_WARN([seamonkey-plugin not found])])
---- configure.bak	2006-08-27 15:26:34.000000000 -0400
-+++ configure	2007-02-26 22:37:16.000000000 -0500
-@@ -3076,12 +3076,12 @@
-         pkg_cv_MOZPLUG_CFLAGS="$MOZPLUG_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5
--  ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin" 2>/dev/null`
-+  pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin firefox-xpcom" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -3094,12 +3094,12 @@
-         pkg_cv_MOZPLUG_LIBS="$MOZPLUG_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5
--  ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin" 2>/dev/null`
-+  pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin firefox-xpcom" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -3118,9 +3118,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin"`
-+	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
-         else
--	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin"`
-+	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$MOZPLUG_PKG_ERRORS" >&5
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in-3.31-seamonkey.patch b/net-www/mplayerplug-in/files/mplayerplug-in-3.31-seamonkey.patch
deleted file mode 100644
index a30fdaf6df4e..000000000000
--- a/net-www/mplayerplug-in/files/mplayerplug-in-3.31-seamonkey.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure	2007-03-15 11:31:00.000000000 +0100
-+++ /configure	2007-03-15 11:30:11.000000000 +0100
-@@ -3157,12 +3157,12 @@
-         pkg_cv_MOZPLUG_CFLAGS="$MOZPLUG_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-plugin\"") >&5
--  ($PKG_CONFIG --exists --print-errors "seamonkey-plugin") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-plugin seamonkey-xpcom\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-plugin seamonkey-xpcom") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-plugin" 2>/dev/null`
-+  pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-plugin seamonkey-xpcom" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -3175,12 +3175,12 @@
-         pkg_cv_MOZPLUG_LIBS="$MOZPLUG_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-plugin\"") >&5
--  ($PKG_CONFIG --exists --print-errors "seamonkey-plugin") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-plugin seamonkey-xpcom\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-plugin seamonkey-xpcom") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "seamonkey-plugin" 2>/dev/null`
-+  pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "seamonkey-plugin seamonkey-xpcom" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -3199,9 +3199,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "seamonkey-plugin"`
-+	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "seamonkey-plugin seamonkey-xpcom"`
-         else
--	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "seamonkey-plugin"`
-+	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "seamonkey-plugin seamonkey-xpcom"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$MOZPLUG_PKG_ERRORS" >&5
---- configure.in.orig	2007-03-19 01:31:58.000000000 -0400
-+++ configure.in	2007-03-19 01:34:19.000000000 -0400
-@@ -47,7 +47,7 @@
- 		PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`"],[AC_MSG_WARN([firefox-plugin not found])])
- 	fi
- 	if test "$MOZPLUG_CFLAGS" = ""; then
--		PKG_CHECK_MODULES(MOZPLUG,[seamonkey-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir seamonkey-plugin`"],[AC_MSG_WARN([seamonkey-plugin not found])])
-+		PKG_CHECK_MODULES(MOZPLUG,[seamonkey-plugin seamonkey-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir seamonkey-plugin`"],[AC_MSG_WARN([seamonkey-plugin not found])])
- 	fi
- 	if test "$MOZPLUG_CFLAGS" = ""; then
- 		PKG_CHECK_MODULES(MOZPLUG,[xulrunner-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir xulrunner-plugin`"],[AC_MSG_WARN([xulrunner-plugin not found])])
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in-3.50-seamonkey.patch b/net-www/mplayerplug-in/files/mplayerplug-in-3.50-seamonkey.patch
new file mode 100644
index 000000000000..b4dd9597e5a2
--- /dev/null
+++ b/net-www/mplayerplug-in/files/mplayerplug-in-3.50-seamonkey.patch
@@ -0,0 +1,11 @@
+--- configure.in.bak	2008-01-06 17:13:28.000000000 -0500
++++ configure.in	2008-01-06 17:12:29.000000000 -0500
+@@ -64,7 +64,7 @@
+ ],[AC_MSG_WARN([firefox-plugin not found])])
+ 	fi
+ 	if test "$MOZPLUG_CFLAGS" = ""; then
+-		PKG_CHECK_MODULES(MOZPLUG,[seamonkey-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir seamonkey-plugin`"
++		PKG_CHECK_MODULES(MOZPLUG,[seamonkey-plugin seamonkey-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir seamonkey-plugin`"
+ MOZILLA_HOME=`$PKG_CONFIG --variable=libdir seamonkey-plugin`
+ ],[AC_MSG_WARN([seamonkey-plugin not found])])
+ 	fi
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild
deleted file mode 100644
index 796a61a2d264..000000000000
--- a/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild,v 1.12 2007/07/22 07:42:29 dberkholz Exp $
-
-inherit eutils multilib nsplugins
-
-DESCRIPTION="mplayer plug-in for Gecko based browsers"
-HOMEPAGE="http://mplayerplug-in.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -hppa ppc sparc x86"
-IUSE="gtk"
-
-DEPEND=">=media-video/mplayer-1.0_pre5
-		|| ( www-client/mozilla-firefox
-				www-client/seamonkey
-		)
-		x11-libs/libXpm
-		x11-proto/xextproto
-		gtk? (
-			>=x11-libs/gtk+-2.2.0
-			dev-libs/atk
-			>=dev-libs/glib-2.2.0
-			>=x11-libs/pango-1.2.1
-		)"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gcc4.patch
-}
-
-src_compile() {
-	local myconf
-
-	# We force gtk2 now because moz only compiles against gtk2
-	if use gtk; then
-		myconf="${myconf} --enable-gtk2"
-	else
-		ewarn "For playback controls, you must enable gtk support."
-		myconf="${myconf} --enable-x"
-	fi
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	exeinto /opt/netscape/plugins
-	doexe mplayerplug-in.so || die "plugin failed"
-	inst_plugin /opt/netscape/plugins/mplayerplug-in.so
-
-	insinto /opt/netscape/plugins
-	doins mplayerplug-in.xpt || die "xpt failed"
-	inst_plugin /opt/netscape/plugins/mplayerplug-in.xpt
-
-	PLUGINS="gmp rm qt wmp"
-
-	for plugin in ${PLUGINS}; do
-		### Install the plugin
-		exeinto /opt/netscape/plugins
-		doexe "mplayerplug-in-${plugin}.so" || die "plugin ${plugin} failed"
-		inst_plugin "/opt/netscape/plugins/mplayerplug-in-${plugin}.so"
-		### Install the xpt
-		insinto /opt/netscape/plugins
-	    doins "mplayerplug-in-${plugin}.xpt" || die "plugin ${plugin} xpt failed"
-		inst_plugin "/opt/netscape/plugins/mplayerplug-in-${plugin}.xpt"
-	done
-
-	insinto /etc
-	doins mplayerplug-in.conf
-
-	dodoc ChangeLog INSTALL README DOCS/tech/*.txt
-}
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild
deleted file mode 100644
index fdaf83deb6a1..000000000000
--- a/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild,v 1.12 2007/07/22 07:42:29 dberkholz Exp $
-
-inherit eutils multilib nsplugins
-
-DESCRIPTION="mplayer plug-in for Gecko based browsers"
-HOMEPAGE="http://mplayerplug-in.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -hppa ppc sparc x86"
-IUSE="gtk divx gmedia realmedia quicktime wmp"
-
-DEPEND=">=media-video/mplayer-1.0_pre5
-		|| ( www-client/mozilla-firefox
-				www-client/seamonkey
-		)
-		x11-libs/libXpm
-		x11-proto/xextproto
-		gtk? (
-			>=x11-libs/gtk+-2.2.0
-			dev-libs/atk
-			>=dev-libs/glib-2.2.0
-			>=x11-libs/pango-1.2.1
-		)
-		dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/3.30-fix-cflags.patch
-	epatch ${FILESDIR}/${PN}-gcc4.patch
-	epatch ${FILESDIR}/${P}-firefox.patch
-	epatch ${FILESDIR}/${P}-seamonkey.patch
-}
-
-src_compile() {
-	local myconf
-
-	# We force gtk2 now because moz only compiles against gtk2
-	if use gtk; then
-		myconf="${myconf} --enable-gtk2"
-	else
-		ewarn "For playback controls, you must enable gtk support."
-		myconf="${myconf} --enable-x"
-	fi
-
-	# Media Playback Support (bug #145517)
-	econf \
-		${myconf} \
-		$(use_enable divx dvx) \
-		$(use_enable gmedia gmp) \
-		$(use_enable realmedia rm) \
-		$(use_enable quicktime qt) \
-		$(use_enable wmp) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	exeinto /opt/netscape/plugins
-	doexe mplayerplug-in.so || die "plugin failed"
-	inst_plugin /opt/netscape/plugins/mplayerplug-in.so
-
-	insinto /opt/netscape/plugins
-	doins mplayerplug-in.xpt || die "xpt failed"
-	inst_plugin /opt/netscape/plugins/mplayerplug-in.xpt
-
-	PLUGINS="gmp rm qt wmp dvx"
-
-	for plugin in ${PLUGINS}; do
-		if [ -e "mplayerplug-in-${plugin}.so" ]; then
-			### Install the plugin
-			exeinto /opt/netscape/plugins
-			doexe "mplayerplug-in-${plugin}.so" || die "plugin ${plugin} failed"
-			inst_plugin "/opt/netscape/plugins/mplayerplug-in-${plugin}.so"
-			### Install the xpt
-			insinto /opt/netscape/plugins
-		    doins "mplayerplug-in-${plugin}.xpt" || die "plugin ${plugin} xpt failed"
-			inst_plugin "/opt/netscape/plugins/mplayerplug-in-${plugin}.xpt"
-		fi
-	done
-
-	insinto /etc
-	doins mplayerplug-in.conf
-
-	dodoc ChangeLog INSTALL README DOCS/tech/*.txt
-}
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
index 9aa57adef598..0260813a9f6c 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild,v 1.10 2007/07/22 07:42:29 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild,v 1.11 2008/01/06 22:34:21 josejx Exp $
 
 inherit eutils multilib nsplugins
 
@@ -27,16 +27,16 @@ DEPEND=">=media-video/mplayer-1.0_pre5
 		)
 		dev-util/pkgconfig"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/3.30-fix-cflags.patch
-	epatch ${FILESDIR}/${PN}-gcc4.patch
-	epatch ${FILESDIR}/${P}-X.patch
-	epatch ${FILESDIR}/${P}-firefox.patch
-	epatch ${FILESDIR}/${P}-seamonkey.patch
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/3.30-fix-cflags.patch"
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-X.patch"
+	epatch "${FILESDIR}/${P}-firefox.patch"
+	epatch "${FILESDIR}/${P}-seamonkey.patch"
 }
 
 src_compile() {
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.40-r1.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.40-r1.ebuild
deleted file mode 100644
index 00fa96e3e0ef..000000000000
--- a/net-www/mplayerplug-in/mplayerplug-in-3.40-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.40-r1.ebuild,v 1.5 2007/07/22 07:42:29 dberkholz Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="mplayer plug-in for Gecko based browsers"
-HOMEPAGE="http://mplayerplug-in.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -hppa ppc sparc x86"
-IUSE="gtk divx gmedia mplayer-bin realmedia quicktime wmp"
-
-DEPEND="
-		|| ( www-client/mozilla-firefox
-				www-client/seamonkey
-				www-client/epiphany
-		)
-		x11-libs/libXpm
-		x11-proto/xextproto
-		gtk? (
-			>=x11-libs/gtk+-2.2.0
-			dev-libs/atk
-			>=dev-libs/glib-2.2.0
-			>=x11-libs/pango-1.2.1
-		)
-		mplayer-bin? ( media-video/mplayer-bin )
-		!mplayer-bin? ( >=media-video/mplayer-1.0_pre5 )
-		dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-cflags.patch
-	epatch ${FILESDIR}/${PN}-gcc4.patch
-	### Adds support for 32 bit binary mplayer on amd64
-	if use mplayer-bin; then
-		epatch ${FILESDIR}/${PN}-mplayer-bin.patch
-	fi
-	epatch ${FILESDIR}/${PN}-3.35-seamonkey.patch
-}
-
-src_compile() {
-	local myconf
-
-	# We force gtk2 now because moz only compiles against gtk2
-	if use gtk; then
-		myconf="${myconf} --enable-gtk2"
-	else
-		ewarn "For playback controls, you must enable gtk support."
-		myconf="${myconf} --enable-x"
-	fi
-
-	# Media Playback Support (bug #145517)
-	econf \
-		${myconf} \
-		$(use_enable divx dvx) \
-		$(use_enable gmedia gmp) \
-		$(use_enable realmedia rm) \
-		$(use_enable quicktime qt) \
-		$(use_enable wmp) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/nsbrowser/plugins
-	doexe mplayerplug-in.so || die "plugin failed"
-
-	insinto /usr/$(get_libdir)/nsbrowser/plugins
-	doins mplayerplug-in.xpt || die "xpt failed"
-
-	PLUGINS="gmp rm qt wmp dvx"
-
-	for plugin in ${PLUGINS}; do
-		if [ -e "mplayerplug-in-${plugin}.so" ]; then
-			### Install the plugin
-			exeinto /usr/$(get_libdir)/nsbrowser/plugins
-			doexe "mplayerplug-in-${plugin}.so" || die "plugin ${plugin} failed"
-			### Install the xpt
-			insinto /usr/$(get_libdir)/nsbrowser/plugins
-		    doins "mplayerplug-in-${plugin}.xpt" || die "plugin ${plugin} xpt failed"
-		fi
-	done
-
-	insinto /etc
-	doins mplayerplug-in.conf
-
-	dodoc ChangeLog INSTALL README DOCS/tech/*.txt
-}
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild
index 62742b0d6acc..272077ca89c3 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild,v 1.5 2007/11/22 18:56:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild,v 1.6 2008/01/06 22:34:21 josejx Exp $
 
 inherit eutils multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 -hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 -hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="gtk divx gmedia mplayer-bin nls realmedia quicktime wmp"
 
 LANGS="da de en_US es fr hu it ja ko nb pl pt_BR nl ru se zh_CN"
@@ -37,18 +37,18 @@ DEPEND="
 		!mplayer-bin? ( >=media-video/mplayer-1.0_pre5 )
 		dev-util/pkgconfig"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-3.40-cflags.patch
-	epatch ${FILESDIR}/${PN}-gcc4.patch
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
 	### Adds support for 32 bit binary mplayer on amd64
 	if use mplayer-bin; then
-		epatch ${FILESDIR}/${PN}-mplayer-bin.patch
+		epatch "${FILESDIR}/${PN}-mplayer-bin.patch"
 	fi
-	epatch ${FILESDIR}/${PN}-3.35-seamonkey.patch
+	epatch "${FILESDIR}/${PN}-3.35-seamonkey.patch"
 }
 
 src_compile() {
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild
new file mode 100644
index 000000000000..9de317f3f554
--- /dev/null
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild,v 1.1 2008/01/06 22:34:21 josejx Exp $
+
+inherit eutils multilib autotools
+
+DESCRIPTION="mplayer plug-in for Gecko based browsers"
+HOMEPAGE="http://mplayerplug-in.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 -hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk divx firefox gmedia mplayer-bin nls quicktime realmedia seamonkey wmp"
+
+LANGS="da de en_US es fr hu it ja ko nb pl pt_BR nl ru se zh_CN"
+for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}"; done
+
+DEPEND="
+		firefox? ( www-client/mozilla-firefox )
+		!firefox? (
+			seamonkey? ( www-client/seamonkey )
+			!seamonkey? ( net-libs/xulrunner )
+		)
+		|| ( ( x11-libs/libXpm
+				x11-proto/xextproto
+			)
+			virtual/x11
+		)
+		gtk? (
+			>=x11-libs/gtk+-2.2.0
+			dev-libs/atk
+			>=dev-libs/glib-2.2.0
+			>=x11-libs/pango-1.2.1
+		)
+		mplayer-bin? ( media-video/mplayer-bin )
+		!mplayer-bin? ( >=media-video/mplayer-1.0_pre7 )
+		dev-util/pkgconfig"
+
+		if has_multilib_profile; then
+			DEPEND="${DEPEND}
+				amd64? (
+					app-emulation/emul-linux-x86-xlibs
+					app-emulation/emul-linux-x86-baselibs
+					app-emulation/emul-linux-x86-gtklibs
+				)"
+		fi
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
+	epatch "${FILESDIR}/${PN}-gcc4.patch"
+	### Adds support for 32 bit binary mplayer on amd64
+	if use mplayer-bin; then
+		epatch "${FILESDIR}/${PN}-mplayer-bin.patch"
+	fi
+	epatch "${FILESDIR}/${P}-seamonkey.patch"
+	eautoconf
+}
+
+src_compile() {
+	local myconf
+
+	# We force gtk2 now because moz only compiles against gtk2
+	if use gtk; then
+		myconf="${myconf} --enable-gtk2"
+	else
+		ewarn "For playback controls, you must enable gtk support."
+		myconf="${myconf} --enable-x"
+	fi
+
+	# Build the 32bit plugin
+	if use amd64 && has_multilib_profile; then
+		einfo "Building 32-bit plugin"
+		oldabi="${ABI}"
+		ABI="x86"
+		econf \
+			${myconf} \
+			--x-libraries=/emul/linux/x86/usr/lib/ \
+			--enable-x86_64 \
+			${myconf2} \
+			$(use_enable divx dvx) \
+			$(use_enable gmedia gmp) \
+			$(use_enable realmedia rm) \
+			$(use_enable quicktime qt) \
+			$(use_enable wmp) \
+			|| die "econf failed"
+
+		emake || die "emake failed"
+
+		# Save the 32bit plugins
+		mkdir lib32
+		mv mplayerplug-in*.so lib32
+		mv mplayerplug-in*.xpt lib32
+		ABI="${oldabi}"
+		emake -j1 clean || die "emake clean failed"
+
+		einfo "Building 64-bit plugin"
+	fi
+
+	# Media Playback Support (bug #145517)
+	econf \
+		${myconf} \
+		$(use_enable divx dvx) \
+		$(use_enable gmedia gmp) \
+		$(use_enable realmedia rm) \
+		$(use_enable quicktime qt) \
+		$(use_enable wmp) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	PLUGINS="in in-gmp in-rm in-qt in-wmp in-dvx"
+	plugindir="nsbrowser/plugins"
+
+	exeinto /usr/$(get_libdir)/${plugindir}
+	insinto /usr/$(get_libdir)/${plugindir}
+
+	for plugin in ${PLUGINS}; do
+		if [ -e "mplayerplug-${plugin}.so" ]; then
+			doexe "mplayerplug-${plugin}.so" || die "plugin mplayerplug-${plugin} failed"
+		    doins "mplayerplug-${plugin}.xpt" || die "plugin mplayerplug-${plugin} xpt failed"
+		fi
+	done
+
+	if use amd64 && has_multilib_profile; then
+		oldabi="${ABI}"
+		ABI="x86"
+		exeinto /usr/$(get_libdir)/${plugindir}
+		insinto /usr/$(get_libdir)/${plugindir}
+
+		for plugin in ${PLUGINS}; do
+			if [ -e "mplayerplug-${plugin}.so" ]; then
+				doexe "lib32/mplayerplug-${plugin}.so" || die "plugin mplayerplug-${plugin} failed"
+				doins "lib32/mplayerplug-${plugin}.xpt" || die "plugin mplayerplug-${plugin} xpt failed"
+			fi
+		done
+		ABI="${oldabi}"
+	fi
+
+	if use nls; then
+		local WANT_LANGS
+		for X in ${LANGS}; do
+			if use linguas_${X}; then
+				WANT_LANGS="${WANT_LANGS} ${X}"
+			fi
+		done
+		emake -C po LANGUAGES="${WANT_LANGS# }" DESTDIR="${D}" install \
+			|| die "Translation installation failed"
+	fi
+
+	insinto /etc
+	doins mplayerplug-in.conf
+
+	dodoc ChangeLog INSTALL README DOCS/tech/*.txt
+}