Remove old and use plain xulrunner in deps wrt #300463.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 13 insertions, 66 deletions

diff --git a/www-plugins/mozplugger/ChangeLog b/www-plugins/mozplugger/ChangeLog
index f69a7f434af4..419e28397fb7 100644
--- a/www-plugins/mozplugger/ChangeLog
+++ b/www-plugins/mozplugger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/mozplugger
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/ChangeLog,v 1.2 2009/08/18 21:15:49 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/ChangeLog,v 1.3 2010/03/21 21:55:14 ssuominen Exp $
+
+  21 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  -mozplugger-1.7.3-r1.ebuild, mozplugger-1.10.2.ebuild,
+  mozplugger-1.12.1.ebuild:
+  Remove old and use plain xulrunner in deps wrt #300463.
 
 *mozplugger-1.12.1 (18 Aug 2009)
 
diff --git a/www-plugins/mozplugger/mozplugger-1.10.2.ebuild b/www-plugins/mozplugger/mozplugger-1.10.2.ebuild
index dd070f58081f..96d5ad1ccac2 100644
--- a/www-plugins/mozplugger/mozplugger-1.10.2.ebuild
+++ b/www-plugins/mozplugger/mozplugger-1.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/mozplugger-1.10.2.ebuild,v 1.1 2009/04/09 21:05:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/mozplugger-1.10.2.ebuild,v 1.2 2010/03/21 21:55:14 ssuominen Exp $
 
 inherit nsplugins
 
@@ -16,9 +16,7 @@ IUSE=""
 
 DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}
-	|| ( net-libs/xulrunner
-		www-client/mozilla-firefox
-		www-client/seamonkey )"
+	net-libs/xulrunner"
 
 src_compile() {
 	emake linux || die
diff --git a/www-plugins/mozplugger/mozplugger-1.12.1.ebuild b/www-plugins/mozplugger/mozplugger-1.12.1.ebuild
index d1aae7420bc6..6f3c1d591bb6 100644
--- a/www-plugins/mozplugger/mozplugger-1.12.1.ebuild
+++ b/www-plugins/mozplugger/mozplugger-1.12.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/mozplugger-1.12.1.ebuild,v 1.1 2009/08/18 21:15:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/mozplugger-1.12.1.ebuild,v 1.2 2010/03/21 21:55:14 ssuominen Exp $
 
 inherit nsplugins
 
@@ -16,9 +16,7 @@ IUSE=""
 
 DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}
-	|| ( net-libs/xulrunner
-		www-client/mozilla-firefox
-		www-client/seamonkey )"
+	net-libs/xulrunner"
 
 src_compile() {
 	emake linux || die
diff --git a/www-plugins/mozplugger/mozplugger-1.7.3-r1.ebuild b/www-plugins/mozplugger/mozplugger-1.7.3-r1.ebuild
deleted file mode 100644
index 258fcfd5bc80..000000000000
--- a/www-plugins/mozplugger/mozplugger-1.7.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/mozplugger/mozplugger-1.7.3-r1.ebuild,v 1.1 2009/04/09 21:05:18 ulm Exp $
-
-inherit nsplugins
-
-DESCRIPTION="Streaming media plugin for Mozilla, based on netscape-plugger"
-SRC_URI="http://downloads.mozdev.org/mozplugger/${P}.tar.gz"
-HOMEPAGE="http://mozplugger.mozdev.org/"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="firefox"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!sparc? (
-		firefox? ( =www-client/mozilla-firefox-2* )
-		!firefox? ( =www-client/seamonkey-1* )
-	)
-	sparc? ( =www-client/mozilla-firefox-2* )"
-
-src_compile()
-{
-	cd ${S}
-	make linux || die
-}
-
-src_install()
-{
-	cd ${S}
-
-	PLUGIN=/opt/netscape/$PLUGINS_DIR
-	dodir $PLUGIN /etc
-
-	insinto /etc
-	doins mozpluggerrc
-
-	insinto $PLUGIN
-	doins mozplugger.so
-
-	bunzip2 mozplugger.7.bz2
-	doman mozplugger.7
-
-	insinto /usr/bin
-	dobin mozplugger-helper
-	dobin mozplugger-controller
-
-	inst_plugin $PLUGIN/mozplugger.so
-
-	dodoc ChangeLog COPYING README
-}