Added gcc4 patch back for 64 bit machines.

Package-Manager: portage-2.1.1_rc1-r6

3 files changed, 8 insertions, 110 deletions

diff --git a/net-www/mplayerplug-in/Manifest b/net-www/mplayerplug-in/Manifest
index 0c190e44f941..214a0a621e21 100644
--- a/net-www/mplayerplug-in/Manifest
+++ b/net-www/mplayerplug-in/Manifest
@@ -30,18 +30,14 @@ EBUILD mplayerplug-in-3.30.ebuild 2048 RMD160 e1071250e893f584c61bf1d3ce1f536f99
 MD5 5ced674285d0384879d294bc0a0d31b4 mplayerplug-in-3.30.ebuild 2048
 RMD160 e1071250e893f584c61bf1d3ce1f536f99d51516 mplayerplug-in-3.30.ebuild 2048
 SHA256 43229fa886c08aaa61aa318119e18f961172d61eaf574da7aaa54f955d24d24e mplayerplug-in-3.30.ebuild 2048
-EBUILD mplayerplug-in-3.31-r1.ebuild 2330 RMD160 b957d454af7f97c16ccee6e8cc1f8ba73b94d1fb SHA1 f2b11e5868c620788ff44989777f1b0d447760e6 SHA256 77f956b025228cfa809a54daa76ec8b3a54e33716a1a51a165c9bc1b3664ff9b
-MD5 c6cb413f37a34ecba916f0b5947e583f mplayerplug-in-3.31-r1.ebuild 2330
-RMD160 b957d454af7f97c16ccee6e8cc1f8ba73b94d1fb mplayerplug-in-3.31-r1.ebuild 2330
-SHA256 77f956b025228cfa809a54daa76ec8b3a54e33716a1a51a165c9bc1b3664ff9b mplayerplug-in-3.31-r1.ebuild 2330
-EBUILD mplayerplug-in-3.31.ebuild 2327 RMD160 6e05b1ab663c9ae8d583e6461f32fdfb62917dc9 SHA1 38de920ab4ecde5924ee3a51fd5d7eb7e1448c06 SHA256 298a1f6a308e7b28399b17b1331b208620c036eabae05d099a8fed96999dddd2
-MD5 46524d33bac667f519adc01d1c2a58f5 mplayerplug-in-3.31.ebuild 2327
-RMD160 6e05b1ab663c9ae8d583e6461f32fdfb62917dc9 mplayerplug-in-3.31.ebuild 2327
-SHA256 298a1f6a308e7b28399b17b1331b208620c036eabae05d099a8fed96999dddd2 mplayerplug-in-3.31.ebuild 2327
-MISC ChangeLog 11247 RMD160 be5652a15a883b06c3cfcbf48c726c5bb3e44c7a SHA1 badacc2dacf44b7a31a6c2b0a6dfd416653f829f SHA256 d05a34cc558874a94f082b4a20cb7b1d009fa462e69fef202d5483a49f9fd189
-MD5 2384b412fbb91357b874ac557aa240e1 ChangeLog 11247
-RMD160 be5652a15a883b06c3cfcbf48c726c5bb3e44c7a ChangeLog 11247
-SHA256 d05a34cc558874a94f082b4a20cb7b1d009fa462e69fef202d5483a49f9fd189 ChangeLog 11247
+EBUILD mplayerplug-in-3.31-r1.ebuild 2367 RMD160 d844769c16c1ebdd616bac58da203c50dc136a3d SHA1 b81ef2ce113af7786d986e38beea80f50e7b72ed SHA256 291eda5dc6031ed9af7ea4f19ef1d736f7fa57cc2e066c72de8202209b24191a
+MD5 1faa074b92778a2c16f59110b4b274da mplayerplug-in-3.31-r1.ebuild 2367
+RMD160 d844769c16c1ebdd616bac58da203c50dc136a3d mplayerplug-in-3.31-r1.ebuild 2367
+SHA256 291eda5dc6031ed9af7ea4f19ef1d736f7fa57cc2e066c72de8202209b24191a mplayerplug-in-3.31-r1.ebuild 2367
+MISC ChangeLog 11535 RMD160 ec8c2c3a100f354345d1a42f63a46bc496593709 SHA1 e9e89f1adf4d8c4c6dff3e60a67ac8ec3ccf4a8f SHA256 f9d8449b8a2be7401d4f80d85d3ac37b024de9ff50c712ade7f4ef6aeb05c585
+MD5 e1428bf0326762abd4df3a8bb7a9e29c ChangeLog 11535
+RMD160 ec8c2c3a100f354345d1a42f63a46bc496593709 ChangeLog 11535
+SHA256 f9d8449b8a2be7401d4f80d85d3ac37b024de9ff50c712ade7f4ef6aeb05c585 ChangeLog 11535
 MISC metadata.xml 250 RMD160 b217596057a0f66de68ba60b3aa6c9e7e505c82f SHA1 f2daa68d53d4780a8470a790b1bbc9ae124ef587 SHA256 c2c5efc70c34197524037240b015bbdb5beb3b62883dc2eacb21926c69883324
 MD5 66c156160ef60780ee4c80a28873e766 metadata.xml 250
 RMD160 b217596057a0f66de68ba60b3aa6c9e7e505c82f metadata.xml 250
@@ -58,9 +54,6 @@ SHA256 035ad2048bd91ccfc5beb853c4aec6a7f860ec6673a34fbce84f8a2db9d0b76b files/di
 MD5 45f2755b9be964f792e62f192ab8d5b3 files/digest-mplayerplug-in-3.30 259
 RMD160 1ca76c34355e3efc23cbc38a9b1edb2580d57e39 files/digest-mplayerplug-in-3.30 259
 SHA256 b718f8b8707befdb80067e429072c33b08ab2cac69801dd67f543d2640e31f29 files/digest-mplayerplug-in-3.30 259
-MD5 2c347d464bb2f1f23a79aef18f345f83 files/digest-mplayerplug-in-3.31 259
-RMD160 56b0dd8d68599668c17b5e58d24164f08f8ea67a files/digest-mplayerplug-in-3.31 259
-SHA256 236b482010c4dc22d782aa07ba3d90919efec6b5e2ead7ef51681a10de35934e files/digest-mplayerplug-in-3.31 259
 MD5 2c347d464bb2f1f23a79aef18f345f83 files/digest-mplayerplug-in-3.31-r1 259
 RMD160 56b0dd8d68599668c17b5e58d24164f08f8ea67a files/digest-mplayerplug-in-3.31-r1 259
 SHA256 236b482010c4dc22d782aa07ba3d90919efec6b5e2ead7ef51681a10de35934e files/digest-mplayerplug-in-3.31-r1 259
diff --git a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.31 b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.31
deleted file mode 100644
index 5d15b045462e..000000000000
--- a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.31
+++ /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/mplayerplug-in-3.31.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.31.ebuild
deleted file mode 100644
index 9eedf29432de..000000000000
--- a/net-www/mplayerplug-in/mplayerplug-in-3.31.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.31.ebuild,v 1.4 2006/09/01 07:13:10 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="gtk divx gmedia real quicktime wmp"
-
-DEPEND=">=media-video/mplayer-1.0_pre5
-		|| ( www-client/mozilla-firefox
-				www-client/seamonkey
-		)
-		|| ( ( 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}/3.30-fix-cflags.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 real 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
-}