Added -r1 to ensure everyone got their plugins, thanks truedfx.

Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 119 insertions, 11 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index df031adf6516..0bd239525b67 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,12 @@
 # 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.70 2006/08/30 19:54:45 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.71 2006/09/01 07:13:10 josejx Exp $
+
+*mplayerplug-in-3.31-r1 (01 Sep 2006)
+
+  01 Sep 2006; Joseph Jezak <josejx@gentoo.org> mplayerplug-in-3.31.ebuild,
+  +mplayerplug-in-3.31-r1.ebuild:
+  Added -r1 to ensure everyone got their plugins, thanks truedfx.
 
   30 Aug 2006; Joseph Jezak <josejx@gentoo.org> mplayerplug-in-3.31.ebuild:
   Cleaned up the ebuild as suggested by Todd Merrill.
diff --git a/net-www/mplayerplug-in/Manifest b/net-www/mplayerplug-in/Manifest
index 595790b6ceb4..0c190e44f941 100644
--- a/net-www/mplayerplug-in/Manifest
+++ b/net-www/mplayerplug-in/Manifest
@@ -30,14 +30,18 @@ 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.ebuild 2327 RMD160 974ef8ea9cbce529a976ef9ae53c6359b0f42ae0 SHA1 16efcdc4c8cf5e53cdacf3bbf2e54469335608b9 SHA256 36462585615eb63c5eee49cc39e74562e39f67fd4e0666a01109b5dd9098a99f
-MD5 a57c432123941cdd8d10c83e3d9a3f4e mplayerplug-in-3.31.ebuild 2327
-RMD160 974ef8ea9cbce529a976ef9ae53c6359b0f42ae0 mplayerplug-in-3.31.ebuild 2327
-SHA256 36462585615eb63c5eee49cc39e74562e39f67fd4e0666a01109b5dd9098a99f mplayerplug-in-3.31.ebuild 2327
-MISC ChangeLog 11031 RMD160 2d69178f0d2ca0d3542aa9bab07572d833969a4b SHA1 dfe4b25adbda5bf74a0590ee5532006b25f7222e SHA256 77ecc1e767098a8b9f6ab738e7f83ffac5099267b0c55961291e0c7133c52502
-MD5 c44ebcb3da9bf7de53c0ccefe7672a40 ChangeLog 11031
-RMD160 2d69178f0d2ca0d3542aa9bab07572d833969a4b ChangeLog 11031
-SHA256 77ecc1e767098a8b9f6ab738e7f83ffac5099267b0c55961291e0c7133c52502 ChangeLog 11031
+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
 MISC metadata.xml 250 RMD160 b217596057a0f66de68ba60b3aa6c9e7e505c82f SHA1 f2daa68d53d4780a8470a790b1bbc9ae124ef587 SHA256 c2c5efc70c34197524037240b015bbdb5beb3b62883dc2eacb21926c69883324
 MD5 66c156160ef60780ee4c80a28873e766 metadata.xml 250
 RMD160 b217596057a0f66de68ba60b3aa6c9e7e505c82f metadata.xml 250
@@ -57,3 +61,6 @@ SHA256 b718f8b8707befdb80067e429072c33b08ab2cac69801dd67f543d2640e31f29 files/di
 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-r1 b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.31-r1
new file mode 100644
index 000000000000..5d15b045462e
--- /dev/null
+++ b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.31-r1
@@ -0,0 +1,3 @@
+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-r1.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild
new file mode 100644
index 000000000000..87f0c46110c7
--- /dev/null
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.31-r1.ebuild
@@ -0,0 +1,92 @@
+# 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-r1.ebuild,v 1.1 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
+}
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.31.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.31.ebuild
index c28aa70c6cf1..9eedf29432de 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.31.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.31.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2006/08/30 19:54:45 josejx Exp $
+# $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
 
@@ -50,7 +50,7 @@ src_compile() {
 
 	# Media Playback Support (bug #145517)
 	econf \
-		$(myconf) \
+		${myconf} \
 		$(use_enable divx dvx) \
 		$(use_enable gmedia gmp) \
 		$(use_enable real rm) \