Added patch for seamonkey (same as firefox patch), thanks to Dustin Surawicz in bug #171010 for the patch.

(Portage version: 2.1.2.2)

5 files changed, 126 insertions, 3 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index 3872ba795bff..f864630b5a61 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,13 @@
 # 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.84 2007/03/13 13:39:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.85 2007/03/19 05:39:39 josejx Exp $
+
+  19 Mar 2007; Joseph Jezak <josejx@gentoo.org>
+  +files/mplayerplug-in-3.31-seamonkey.patch,
+  +files/mplayerplug-in-3.35-seamonkey.patch, mplayerplug-in-3.31-r1.ebuild,
+  mplayerplug-in-3.35.ebuild:
+  Added patch for seamonkey (same as firefox patch), thanks to Dustin Surawicz
+  in bug #171010 for the patch.
 
   13 Mar 2007; Raúl Porcel <armin76@gentoo.org> mplayerplug-in-3.35.ebuild:
   x86 stable
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
new file mode 100644
index 000000000000..a30fdaf6df4e
--- /dev/null
+++ b/net-www/mplayerplug-in/files/mplayerplug-in-3.31-seamonkey.patch
@@ -0,0 +1,57 @@
+--- 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.35-seamonkey.patch b/net-www/mplayerplug-in/files/mplayerplug-in-3.35-seamonkey.patch
new file mode 100644
index 000000000000..6286d71b9fb9
--- /dev/null
+++ b/net-www/mplayerplug-in/files/mplayerplug-in-3.35-seamonkey.patch
@@ -0,0 +1,57 @@
+--- 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/mplayerplug-in-3.31-r1.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild
index 97003308fc2a..efd195238a57 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2007/02/27 03:51:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild,v 1.10 2007/03/19 05:39:39 josejx Exp $
 
 inherit eutils multilib nsplugins
 
@@ -38,6 +38,7 @@ src_unpack() {
 	epatch ${FILESDIR}/3.30-fix-cflags.patch
 	epatch ${FILESDIR}/${PN}-gcc4.patch
 	epatch ${FILESDIR}/${P}-firefox.patch
+	epatch ${FILESDIR}/${P}-seamonkey.patch
 }
 
 src_compile() {
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
index 6e507f2b93df..656a9461a237 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
 # 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.4 2007/03/13 13:39:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild,v 1.5 2007/03/19 05:39:39 josejx Exp $
 
 inherit eutils multilib nsplugins
 
@@ -39,6 +39,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-gcc4.patch
 	epatch ${FILESDIR}/${P}-X.patch
 	epatch ${FILESDIR}/${P}-firefox.patch
+	epatch ${FILESDIR}/${P}-seamonkey.patch
 }
 
 src_compile() {