Added lateset version and small gcc4 patch from bug #124685.

Package-Manager: portage-2.1_pre7-r5

7 files changed, 139 insertions, 12 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index cb721ed2d8d0..87a3bdb0bb40 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.62 2006/04/12 05:55:05 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.63 2006/04/12 20:30:54 josejx Exp $
+
+*mplayerplug-in-3.25 (12 Apr 2006)
+
+  12 Apr 2006; Joseph Jezak <josejx@gentoo.org>
+  +files/mplayerplug-in-gcc4.patch, mplayerplug-in-3.21.ebuild,
+  +mplayerplug-in-3.25.ebuild:
+  Added latest version and small gcc4 patch from bug #124685.
 
   12 Apr 2006; Joseph Jezak <josejx@gentoo.org> -mplayerplug-in-3.11.ebuild:
   Removed old version since keywording is done.
diff --git a/net-www/mplayerplug-in/Manifest b/net-www/mplayerplug-in/Manifest
index b206594c7820..0bfcf5bf5583 100644
--- a/net-www/mplayerplug-in/Manifest
+++ b/net-www/mplayerplug-in/Manifest
@@ -1,12 +1,21 @@
-MD5 1c889c63b2b46fac33ea912afb2670e6 ChangeLog 9725
-RMD160 e784e8dcdd84930263dcc4b997630305e18cd93d ChangeLog 9725
-SHA256 4a2c107ca2bb44331b6e6e0b87c9bc73af6667037596fe300dab2259ef7ac21a ChangeLog 9725
-MD5 7c690099f5b5643d3271bd349c1b38fa files/digest-mplayerplug-in-3.21 71
-RMD160 9c316fd5bb79cf880cd297b6163a92dcf033a678 files/digest-mplayerplug-in-3.21 71
-SHA256 154ead6b1bb67a4b5de74a9e22516f79c8096094a519cd6b7f2dbc5915823c96 files/digest-mplayerplug-in-3.21 71
+MD5 4734339f20ac041b59723fe3b14900cc ChangeLog 9967
+RMD160 36fa8585c38f1d85f5b3f3fc7dcd4f6d7fac68b8 ChangeLog 9967
+SHA256 5748983583fb3bbd6222b727970d65bb79226a33e25e922e7bca2261a5893406 ChangeLog 9967
+MD5 ba73e633277f44c807f7f46fb58da769 files/digest-mplayerplug-in-3.21 259
+RMD160 2d5bdae727c6751322887cdc109882f46a959211 files/digest-mplayerplug-in-3.21 259
+SHA256 fd7b514038022a2168b807ccefba8a4afffb74f2e527da472ac0cc6d06628564 files/digest-mplayerplug-in-3.21 259
+MD5 59e7ca893e6fd325b241b6f83ffd0487 files/digest-mplayerplug-in-3.25 259
+RMD160 7889ca967fec785847b229e05453b99652ccd271 files/digest-mplayerplug-in-3.25 259
+SHA256 035ad2048bd91ccfc5beb853c4aec6a7f860ec6673a34fbce84f8a2db9d0b76b files/digest-mplayerplug-in-3.25 259
+MD5 c9acf1aec483abcafc30c9bef1dbd714 files/mplayerplug-in-gcc4.patch 549
+RMD160 9768e7ba19d0cbc8c5628d16645ab97208c870b9 files/mplayerplug-in-gcc4.patch 549
+SHA256 c3afe1ab9b4eabc099b7400e7a9560a7f50b894fd8e56fee72959bfc7129f94e files/mplayerplug-in-gcc4.patch 549
 MD5 66c156160ef60780ee4c80a28873e766 metadata.xml 250
 RMD160 b217596057a0f66de68ba60b3aa6c9e7e505c82f metadata.xml 250
 SHA256 c2c5efc70c34197524037240b015bbdb5beb3b62883dc2eacb21926c69883324 metadata.xml 250
-MD5 de88b3ec904b0cb5118430137c2ed815 mplayerplug-in-3.21.ebuild 2111
-RMD160 78e67c389d0215e7bac07ce051fe5ff9827230a5 mplayerplug-in-3.21.ebuild 2111
-SHA256 222fcd0a3260b1ebbfd8cc66406e7a1a4d26f1cca3bbab6204b885acd1641444 mplayerplug-in-3.21.ebuild 2111
+MD5 2bee773a5af5d64f04f295dc1eba84d9 mplayerplug-in-3.21.ebuild 2193
+RMD160 569922d7b76d91e18ef8f469e3f4e5ea53f1d400 mplayerplug-in-3.21.ebuild 2193
+SHA256 98ad0eb3ce919cbf006f957d28b85349cdd46a517fd2927d71694bf8bb8560e6 mplayerplug-in-3.21.ebuild 2193
+MD5 b7b6687b315e51d4fc17ee24f7c0d7fa mplayerplug-in-3.25.ebuild 2198
+RMD160 b0511d6a343b47161600556b20482fceb65228c1 mplayerplug-in-3.25.ebuild 2198
+SHA256 696b9d0e7f5673177793c4e3894ba42b02639ebfba060822b082ea2984e3b228 mplayerplug-in-3.25.ebuild 2198
diff --git a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.21 b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.21
index 9517c000841e..6ba4e2bff9fa 100644
--- a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.21
+++ b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.21
@@ -1 +1,3 @@
 MD5 3e36aa1a42aa312b312ba7ceaaa75f73 mplayerplug-in-3.21.tar.gz 209865
+RMD160 7dece576be3c13031df8de47f16c2f6800c7c155 mplayerplug-in-3.21.tar.gz 209865
+SHA256 d72142236ee88a143325003eb47bcb5d41b11e0c66795f753b9f626202297193 mplayerplug-in-3.21.tar.gz 209865
diff --git a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.25 b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.25
new file mode 100644
index 000000000000..7a883ebb4c35
--- /dev/null
+++ b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.25
@@ -0,0 +1,3 @@
+MD5 fb99a2efeacd5aed8b92ae0bb33c708a mplayerplug-in-3.25.tar.gz 209554
+RMD160 885f6b7eb69f5c0ddb7e3356801a235906723efa mplayerplug-in-3.25.tar.gz 209554
+SHA256 ce8304c3cab3ffc10888f3648d9470ab7db7609c5178ef3a6cb3163fc7b901c8 mplayerplug-in-3.25.tar.gz 209554
diff --git a/net-www/mplayerplug-in/files/mplayerplug-in-gcc4.patch b/net-www/mplayerplug-in/files/mplayerplug-in-gcc4.patch
new file mode 100644
index 000000000000..8bca5f462dd8
--- /dev/null
+++ b/net-www/mplayerplug-in/files/mplayerplug-in-gcc4.patch
@@ -0,0 +1,16 @@
+diff -ur mplayerplug-in-orig/Source/plugin-ui.cpp mplayerplug-in/Source/plugin-ui.cpp
+--- mplayerplug-in-orig/Source/plugin-ui.cpp	2006-04-03 16:33:48.362321612 +0000
++++ mplayerplug-in/Source/plugin-ui.cpp	2006-04-03 16:34:34.376441250 +0000
+@@ -280,11 +280,6 @@
+     int term, chop;
+     int PercentRedraw;
+ 
+-    if (0) {
+-	printf("Widget: %i\n", (int) 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/mplayerplug-in-3.21.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild
index 64e87b301192..775e55b55259 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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.6 2006/04/11 22:00:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.21.ebuild,v 1.7 2006/04/12 20:30:54 josejx Exp $
 
-inherit nsplugins multilib
+inherit eutils multilib nsplugins
 
 DESCRIPTION="mplayer plug-in for Gecko based browsers"
 HOMEPAGE="http://mplayerplug-in.sourceforge.net/"
@@ -30,6 +30,12 @@ DEPEND=">=media-video/mplayer-1.0_pre5
 
 S=${WORKDIR}/${PN}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gcc4.patch
+}
+
 src_compile() {
 	local myconf
 
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.25.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.25.ebuild
new file mode 100644
index 000000000000..a55236199de0
--- /dev/null
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.25.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 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.25.ebuild,v 1.1 2006/04/12 20:30:54 josejx 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="~alpha ~amd64 -hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="gecko-sdk gtk"
+
+DEPEND=">=media-video/mplayer-1.0_pre5
+		gecko-sdk? ( net-libs/gecko-sdk )
+		!gecko-sdk? ( || ( >=www-client/mozilla-1.6 www-client/mozilla-firefox ) )
+		|| ( ( 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
+		)"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gcc4.patch
+}
+
+src_compile() {
+	local myconf
+
+	if use gecko-sdk; then
+		myconf="${myconf} --with-gecko-sdk=/usr/$(get_libdir)/gecko-sdk"
+	fi
+
+	# 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
+}