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

Package-Manager: portage-2.1.4.4

12 files changed, 312 insertions, 357 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/Manifest b/net-www/mplayerplug-in/Manifest
index 0adefb89afde..461f0c993302 100644
--- a/net-www/mplayerplug-in/Manifest
+++ b/net-www/mplayerplug-in/Manifest
@@ -1,26 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 3.30-fix-cflags.patch 675 RMD160 a79585c461ec6fad65d4c5e3c7b24c3a65934680 SHA1 796cd9f1823c346e96c5ae7b0e2b528efde87846 SHA256 619f5a86c083ed16119f483c65f702ba28e62ab7d55753ff42c407be882ee3fc
-AUX mplayerplug-in-3.35-X.patch 357 RMD160 24c5629330d8ed10fa04a7bb042e0661545ae13e SHA1 3c7127ec4d1f2d567cdde440c66bc76faadfa8e7 SHA256 6cd78f9b927f88a0b693f6b26a61e76be4709956b20efe563de19caba1bb14d8
-AUX mplayerplug-in-3.35-firefox.patch 2879 RMD160 c33911ebe7279d7e8a6098a8a27de295dc40d74c SHA1 d991a522a69d451815e08a3b1fb03bc220e46f89 SHA256 8bbc3565c2b4a6a6910b31b997481fffa0c197968e6758c9577d8ffa327599bf
-AUX mplayerplug-in-3.35-seamonkey.patch 2990 RMD160 08c5bfb4400fd06e8e90f924a8b995488d56bc37 SHA1 4c0251cd29aa4dafb655e71023657c6c7b761ec6 SHA256 629bfb855815142dbe3fb9b56cf246828ae6342b61edffc1a9f32e423b9594cf
 AUX mplayerplug-in-3.40-cflags.patch 662 RMD160 fd888c192db5c19209895d592e9b60be01e07c50 SHA1 6546337c488adb3f22e512e085aa2a80fe7fef20 SHA256 e08de6a6d285defc5644af50a692303fb83b8d14c62f7742764f6773eee5194b
 AUX mplayerplug-in-3.50-seamonkey.patch 678 RMD160 c0e78c924738cd262d2a69021f6861b76feddc56 SHA1 3617ad7aa47a8735f22bdd7fbab14e2c6ec877b8 SHA256 e691dcb0f50f7a0ea5bdc5a8fbb94f90067035c57831140026729179c91dca26
+AUX mplayerplug-in-3.55-gcc4.patch 425 RMD160 37faee824abbbdbd511b9c450d920751f64e025a SHA1 b7713da070a777ed34fef1f4d42ca5d36aa8b0e4 SHA256 33a9c591aaa157f37303019ec826e1bb31c35aa76e5c59279508888606b3fc5b
 AUX mplayerplug-in-gcc4.patch 549 RMD160 9768e7ba19d0cbc8c5628d16645ab97208c870b9 SHA1 aca3e9f0a69bac7aaeb6ade07b7cf31509163fd4 SHA256 c3afe1ab9b4eabc099b7400e7a9560a7f50b894fd8e56fee72959bfc7129f94e
+AUX mplayerplug-in-min-cache-size.patch 585 RMD160 b32024bb369e3a26b2a6ec77cf8d34ed9bfdb8cc SHA1 bcf9a7c67941ff05e51e438439f62f4dc63de651 SHA256 378de7645409c1b66aa1d7937ab16c438bdf8bd428d75c528611dc07d69c6885
+AUX mplayerplug-in-xulrunner-config-in.patch 5391 RMD160 c00f52dd9045ad6dd061fa4e70f2071eeaa090bb SHA1 25298e41a8650aa1048e03093c5e9af63910200d SHA256 b902acc83a6463a7b44c35c86f1f4b913d0d5c36d40487ab4fdb03d8e9c5118a
 AUX mplayerplug-in_xulrunner-1.9.patch 1159 RMD160 4999a043cb3b670b93f583c1aac0acf648662d69 SHA1 f1ac5d22f655aa5c10407353b41d660d54d935c6 SHA256 37581f5b52860442ce4e4f58220f193f2488ec2897e0519b4ec41d1aa7a56b98
-DIST mplayerplug-in-3.35.tar.gz 217776 RMD160 fea5640a5931af93cc85907b219a3765f79f4a51 SHA1 462dbda841f41c21cac34a902d8d3477d231368e SHA256 bc91513b874716ee30d73cf48d2571e4537fb6a42498d6ecccc91259ad15ad7f
-DIST mplayerplug-in-3.45.tar.gz 228032 RMD160 6a9700860397a6c7952b8e2ea8a9a610376a1528 SHA1 39a888c6e65b83f862abef83f5e0381ec7a6a6ea SHA256 3fcab891adf1b32374e5f525b0e91e1a2393ba85429f9ec654edadb08f06d431
 DIST mplayerplug-in-3.50.tar.gz 452730 RMD160 6eb61df0c06e1b9f6118be4f75bf05648bb8dbd8 SHA1 54e5d7a3b33f503830183545f7bc278d37cb89d5 SHA256 046b8e65ee4e4568453b7749d7e60f521a87c2f9990f46d021da283e285f4c02
-EBUILD mplayerplug-in-3.35.ebuild 2501 RMD160 2be6e47fac33c1a0a6cffb0a33c44b97e0dd7ed1 SHA1 0b7f8abceefb1f42c6367d5fbb8af4eb437a45ac SHA256 845199d4432ad877b7bc426a431d5b69681916970b7f42bdb042997a82c0929b
-EBUILD mplayerplug-in-3.45.ebuild 2694 RMD160 cd57b71b65bcaee68c02bfa9216aefbb6549aebc SHA1 74ad08049bb89929c8db2996f5a4b17a6809ce7f SHA256 10c80e799cc55866cb4fad98319086f0f291053829b63a21b50c58d017e97d8b
+DIST mplayerplug-in-3.55.tar.gz 281845 RMD160 e01224b14883a93211745be0a329a3f524f39d8c SHA1 69726d4e16523b1a39c284efee081c31b0ea7f7f SHA256 ba5affde4c5d5a89c8bf987ae9326daabbf8ea8279fccd589474e5157fc67b7e
 EBUILD mplayerplug-in-3.50.ebuild 3921 RMD160 e50ba9732ae251ad38915014e3ad88f4bfc40362 SHA1 9b0c1840252185afe5c3a6ec09ce12065f747888 SHA256 ba2c924424b4b835b5250ae4557e7bf3f62dab09c547531d7ab6eb8a3ebe2f63
-MISC ChangeLog 18000 RMD160 ecd7ee78306305a08de482bcfa686b8c898c2819 SHA1 fc325333b93b34a9d821cdda067a7997d2774344 SHA256 cdd7dc051313759da3cebcefef106db080cb417ec966fed7ecac0d6165092858
+EBUILD mplayerplug-in-3.55.ebuild 4390 RMD160 ed54c4514ce38cf3a99cb13236409a582bb6f5ea SHA1 94a675b7789da60660aa0920a938b421455eff5c SHA256 741da1ace0d867e929bf7ad7e676d7b98eb772b3b1bca1d2f180c9d11718b9f4
+MISC ChangeLog 18568 RMD160 1572eda591523c2ffbfd491a618517783e08d939 SHA1 2e5fcd6a32ffb3e3b6162f82c0411ae04a106f08 SHA256 02266293d16f8c75379dded283cdcee8f69db3285a6d1b8c81f21d5a6cbffa1b
 MISC metadata.xml 484 RMD160 10cb6522943293a3f18bd8ff4a4c741c5b8cd0ff SHA1 6b21b9c86fa0d3868a4c3cd7deadaf0330732a43 SHA256 05564b260deb500bf9c0ee6e9038ffdf3e6f84b4ed58b84331ea67e03dd997f1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivgQAACgkQoeSe8B0zEfz0AwCfVpyCxQAnbiFYR3f+4uoFf4nZ
-OykAnjlc6nkClYMSdHYQDbKSP8SYsMxC
-=+KHt
------END PGP SIGNATURE-----
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
+}