Updated to latest version (bug #229831). Removed old versions. Added patch for bug #233865.

(Portage version: 2.1.4.4)

11 files changed, 306 insertions, 338 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index 64d60ff9906b..6e2a6dcba4d0 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-www/mplayerplug-in
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.111 2008/08/23 03:16:10 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.112 2008/09/19 06:09:01 josejx Exp $
+
+*mplayerplug-in-3.55 (19 Sep 2008)
+
+  19 Sep 2008; Joseph Jezak <josejx@gentoo.org>
+  -files/mplayerplug-in-3.35-X.patch,
+  -files/mplayerplug-in-3.35-firefox.patch,
+  -files/mplayerplug-in-3.35-seamonkey.patch,
+  +files/mplayerplug-in-3.55-gcc4.patch, -files/3.30-fix-cflags.patch,
+  +files/mplayerplug-in-min-cache-size.patch,
+  +files/mplayerplug-in-xulrunner-config-in.patch,
+  -mplayerplug-in-3.35.ebuild, -mplayerplug-in-3.45.ebuild,
+  +mplayerplug-in-3.55.ebuild:
+  Updated to latest version (bug #229831). Removed old versions. Added patch
+  for bug #233865.
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-www/mplayerplug-in/files/3.30-fix-cflags.patch b/net-www/mplayerplug-in/files/3.30-fix-cflags.patch
deleted file mode 100644
index 79c213bdaa6d..000000000000
--- a/net-www/mplayerplug-in/files/3.30-fix-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.bak	2006-08-06 11:05:12.000000000 -0400
-+++ Makefile.in	2006-08-06 11:05:20.000000000 -0400
-@@ -12,7 +12,7 @@
- 
- CC= @CC@
- CXX= @CXX@
--CFLAGS= -Wall @CFLAGS@ @CPPFLAGS@ @CXXFLAGS@ @CXXFLAGS64@ -DXP_UNIX -DMOZ_X11 @MOZPLUG_CFLAGS@ -Iinclude -fPIC @GECKO_DEFINES@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_DEFINES@
-+CFLAGS= -Wall @CPPFLAGS@ @CXXFLAGS@ @CXXFLAGS64@ -DXP_UNIX -DMOZ_X11 @MOZPLUG_CFLAGS@ -Iinclude -fPIC @GECKO_DEFINES@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_DEFINES@
- LDFLAGS= @LDFLAGS@ @LDFLAGS64@ @LIBS@ @X_PRE_LIBS@ @XEXT_LIBS@ @XPM_LIBS@ @GTK_LIBS@ @GTHREAD_LIBS@
- LIBOBJS= @LIBOBJS@
- OBJ= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in-3.35-X.patch b/net-www/mplayerplug-in/files/mplayerplug-in-3.35-X.patch
deleted file mode 100644
index a3dade8d8572..000000000000
--- a/net-www/mplayerplug-in/files/mplayerplug-in-3.35-X.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Source/plugin-threads.cpp.bak	2006-12-19 09:24:36.000000000 -0500
-+++ Source/plugin-threads.cpp	2006-12-19 09:25:11.000000000 -0500
-@@ -1068,7 +1068,9 @@
- 	    if (DEBUG)
- 		printf("Volume = %i\n",
- 		       local_td->instance->volume);
-+#ifdef GTK_ENABLED
- 	    g_idle_add(gtkgui_setvolumetip,local_td->instance);
-+#endif
- 	}
- 
- 	pthread_testcancel();
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in-3.35-firefox.patch b/net-www/mplayerplug-in/files/mplayerplug-in-3.35-firefox.patch
deleted file mode 100644
index 77152e893710..000000000000
--- a/net-www/mplayerplug-in/files/mplayerplug-in-3.35-firefox.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.in	2007/01/28 14:24:25	1.75
-+++ configure.in	2007/02/26 18:28:41	1.76
-@@ -59,7 +59,7 @@
- ],[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`"
-+		PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`"
- MOZILLA_HOME=`$PKG_CONFIG --variable=libdir firefox-plugin`
- ],[AC_MSG_WARN([firefox-plugin not found])])
- 	fi
---- configure	2007/01/28 14:24:24	1.76
-+++ configure	2007/02/26 18:28:37	1.77
-@@ -3128,12 +3128,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
-@@ -3146,12 +3146,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
-@@ -3170,9 +3170,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.35-seamonkey.patch b/net-www/mplayerplug-in/files/mplayerplug-in-3.35-seamonkey.patch
deleted file mode 100644
index 6286d71b9fb9..000000000000
--- a/net-www/mplayerplug-in/files/mplayerplug-in-3.35-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	2007-03-15 11:31:00.000000000 +0100
-+++ /configure.in	2007-03-15 11:30:11.000000000 +0100
-@@ -51,7 +51,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/files/mplayerplug-in-3.55-gcc4.patch b/net-www/mplayerplug-in/files/mplayerplug-in-3.55-gcc4.patch
new file mode 100644
index 000000000000..86d4972e1eed
--- /dev/null
+++ b/net-www/mplayerplug-in/files/mplayerplug-in-3.55-gcc4.patch
@@ -0,0 +1,14 @@
+--- Source/plugin-ui.cpp.bak	2008-09-18 22:32:44.000000000 -0400
++++ Source/plugin-ui.cpp	2008-09-18 22:32:51.000000000 -0400
+@@ -283,11 +283,6 @@
+     int term, chop;
+     int PercentRedraw;
+ 
+-    if (0) {
+-	printf("Widget: %p\n", w);
+-	printf("Message: %s\n", message);
+-    }
+-
+     if (DEBUG > 1)
+ 	printf("state = %i, height = %i width = %i\n", instance->state,
+ 	       instance->movie_height, instance->movie_width);
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in-min-cache-size.patch b/net-www/mplayerplug-in/files/mplayerplug-in-min-cache-size.patch
new file mode 100644
index 000000000000..6ccc873d8361
--- /dev/null
+++ b/net-www/mplayerplug-in/files/mplayerplug-in-min-cache-size.patch
@@ -0,0 +1,11 @@
+--- Source/plugin-ui.cpp.bak	2008-09-18 22:24:40.000000000 -0400
++++ Source/plugin-ui.cpp	2008-09-18 22:25:16.000000000 -0400
+@@ -2865,7 +2865,7 @@
+     gtk_table_attach_defaults(GTK_TABLE(conf_table), conf_label, 0, 1,
+ 			      3, 4);
+     gtk_widget_show(conf_label);
+-    instance->conf_cachesize = gtk_hscale_new_with_range(0, 32767, 512);
++    instance->conf_cachesize = gtk_hscale_new_with_range(32, 32767, 512);
+     gtk_table_attach_defaults(GTK_TABLE(conf_table),
+ 			      instance->conf_cachesize, 1, 2, 3, 4);
+     gtk_range_set_value(GTK_RANGE(instance->conf_cachesize),
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in-xulrunner-config-in.patch b/net-www/mplayerplug-in/files/mplayerplug-in-xulrunner-config-in.patch
new file mode 100644
index 000000000000..0ed18e922ce6
--- /dev/null
+++ b/net-www/mplayerplug-in/files/mplayerplug-in-xulrunner-config-in.patch
@@ -0,0 +1,103 @@
+--- configure.in	2008-06-24 09:12:43.000000000 -0400
++++ configure.in	2008-09-19 00:32:17.000000000 -0400
+@@ -28,7 +28,7 @@
+    AC_SUBST(PKG_CONFIG_PATH)
+    AC_MSG_NOTICE("Using pkg-config path of ${PKG_CONFIG_PATH}")
+ fi   
+-   
++
+ #tell us where gecko-sdk is, try to find if not provided
+ 
+ AC_ARG_WITH([gecko-sdk],[  --with-gecko-sdk=<path> prefix of gecko-sdk installation],
+@@ -53,48 +53,49 @@
+ fi
+ 
+ ],[
+-	AC_MSG_NOTICE([Determining mozilla/firefox packages to build against])
+-	PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin mozilla-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir mozilla-plugin`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir mozilla-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir mozilla-xpcom`
+-],[AC_MSG_WARN([mozilla-plugin not found])])
+-
+-	if test "$MOZPLUG_CFLAGS" = ""; then
+-		PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir firefox-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir firefox-xpcom`
+-],[AC_MSG_WARN([firefox-plugin not found])])
+-	fi
+-	if test "$MOZPLUG_CFLAGS" = ""; then
+-		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`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir seamonkey-xpcom`
+-],[AC_MSG_WARN([seamonkey-plugin not found])])
+-	fi
+-	if test "$MOZPLUG_CFLAGS" = ""; then
+-		PKG_CHECK_MODULES(MOZPLUG,[xulrunner-plugin xulrunner-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir xulrunner-plugin`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir xulrunner-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir xulrunner-xpcom`
+-],[AC_MSG_WARN([xulrunner-plugin not found])])
+-	fi
+-	if test "$MOZPLUG_CFLAGS" = ""; then
+-		PKG_CHECK_MODULES(MOZPLUG,[libxul],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir libxul`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir libxul`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir libxul`
+-],[AC_MSG_WARN([libxul not found])])
+-	fi
+-	if test "$MOZPLUG_CFLAGS" = ""; then
+-		PKG_CHECK_MODULES(MOZPLUG,[iceape-plugin iceape-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir iceape-plugin`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir iceape-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir iceape-xpcom`
+-],[AC_MSG_WARN([iceape-plugin not found])])
+-	fi
+-
+-	if test "$MOZPLUG_CFLAGS" = ""; then
+-		AC_MSG_ERROR([Unable to find mozilla or firefox development files])
+-	fi
+-  ]
+-)
++
++PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin mozilla-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir mozilla-plugin`"
++	MOZILLA_HOME=`$PKG_CONFIG --variable=libdir mozilla-plugin`
++	GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir mozilla-xpcom`
++	],[AC_MSG_WARN([mozilla-plugin not found])])
++
++if test "$MOZPLUG_CFLAGS" = ""; then
++	PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`"
++		MOZILLA_HOME=`$PKG_CONFIG --variable=libdir firefox-plugin`
++		GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir firefox-xpcom`
++		],[AC_MSG_WARN([firefox-plugin not found])])
++fi
++if test "$MOZPLUG_CFLAGS" = ""; then
++	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`
++		GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir seamonkey-xpcom`
++		],[AC_MSG_WARN([seamonkey-plugin not found])])
++fi
++
++if test "$MOZPLUG_CFLAGS" = ""; then
++	PKG_CHECK_MODULES(MOZPLUG,[xulrunner-plugin xulrunner-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir xulrunner-plugin`"
++		MOZILLA_HOME=`$PKG_CONFIG --variable=libdir xulrunner-plugin`
++		GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir xulrunner-xpcom`
++		],[AC_MSG_WARN([xulrunner-plugin not found])])
++fi
++
++if test "$MOZPLUG_CFLAGS" = ""; then
++	PKG_CHECK_MODULES(MOZPLUG,[libxul],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir libxul`"
++		MOZILLA_HOME=`$PKG_CONFIG --variable=sdkdir libxul`
++		GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir libxul`/`pkg-config --variable=includetype libxul`
++		],[AC_MSG_WARN([xulrunner not found])])
++fi
++if test "$MOZPLUG_CFLAGS" = ""; then
++	PKG_CHECK_MODULES(MOZPLUG,[iceape-plugin iceape-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir iceape-plugin`"
++		MOZILLA_HOME=`$PKG_CONFIG --variable=libdir iceape-plugin`
++		GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir iceape-xpcom`
++		],[AC_MSG_WARN([iceape-plugin not found])])
++fi
++])
++
++if test "$MOZPLUG_CFLAGS" = ""; then
++	AC_MSG_ERROR([Unable to find mozilla or firefox development files])
++fi
+ 
+ AC_ARG_WITH([mozilla-home],[  --with-mozilla-home=<path> prefix of mozilla/firefox installation],
+ [MOZ_HOME=$with_mozilla_home
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
deleted file mode 100644
index 21ac24f353f4..000000000000
--- a/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.14 2008/06/12 18:22:58 armin76 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"
-
-RDEPEND=">=media-video/mplayer-1.0_pre5
-		|| ( =www-client/mozilla-firefox-2*
-				=www-client/seamonkey-1*
-		)
-		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
-		)"
-DEPEND="${RDEPEND}
-		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}-X.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.45.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild
deleted file mode 100644
index 18f91bac8bd5..000000000000
--- a/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.11 2008/08/01 20:31:43 armin76 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="~alpha ~amd64 -hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="gtk divx gmedia nls realmedia quicktime 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
-
-RDEPEND=">=media-video/mplayer-1.0_pre5
-		|| ( =www-client/mozilla-firefox-2*
-				=www-client/seamonkey-1*
-				=net-libs/xulrunner-1.8*
-				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
-		)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
-	epatch "${FILESDIR}/${PN}-gcc4.patch"
-	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
-
-	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
-}
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.55.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.55.ebuild
new file mode 100644
index 000000000000..901a1ee0a22b
--- /dev/null
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.55.ebuild
@@ -0,0 +1,163 @@
+# 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.55.ebuild,v 1.1 2008/09/19 06:09:01 josejx Exp $
+
+WANT_AUTOCONF="latest"
+
+inherit eutils multilib autotools flag-o-matic
+
+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 multilib nls quicktime realmedia seamonkey wmp xulrunner"
+
+LANGS="cs da de en_US es fr hu it ja ko nb nl pl pt_BR ru sk se tr wa zh_CN"
+for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}"; done
+
+RDEPEND=">=media-video/mplayer-1.0_pre5
+		xulrunner? ( net-libs/xulrunner )
+		!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
+		!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
+		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
+		)"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		multilib? (
+				amd64? (
+					app-emulation/emul-linux-x86-xlibs
+					app-emulation/emul-linux-x86-baselibs
+					app-emulation/emul-linux-x86-gtklibs
+				)
+		)"
+
+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}"
+	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${PN}-xulrunner-config-in.patch"
+	#epatch "${FILESDIR}/${PN}_xulrunner-1.9.patch"
+	#epatch "${FILESDIR}/${PN}-3.50-seamonkey.patch"
+	epatch "${FILESDIR}/${PN}-min-cache-size.patch"
+	eautoreconf
+}
+
+src_compile() {
+	# Add -fno-strict-aliasing to ensure correct compilation
+	append-flags -fno-strict-aliasing
+
+	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=/usr/lib32/ \
+			--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
+}