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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 16 insertions, 71 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/Manifest b/www-plugins/mozplugger/Manifest
index 3c55b419f78f..d76bbc724e97 100644
--- a/www-plugins/mozplugger/Manifest
+++ b/www-plugins/mozplugger/Manifest
@@ -1,8 +1,6 @@
 DIST mozplugger-1.10.2.tar.gz 68982 RMD160 6e9edb8dcc27fc36f28e153d29939d9c9c5e77a3 SHA1 67b06281e49937766703fb8ab07c9a7bccf0e7b3 SHA256 b5609e864f78f1c70772db62b281542d9b3e61b95e49573b25f4a3b262e7bbf4
 DIST mozplugger-1.12.1.tar.gz 86874 RMD160 f437d20533ff39ec3ef3e9f54ca0a59369fc94a3 SHA1 2a8967ae7acb5170f653b656636e025375aba2ec SHA256 97fa713033f0d31c36800c5d850dbf3e4ae95816b40edf8fe71122b773c1c646
-DIST mozplugger-1.7.3.tar.gz 54718 RMD160 2d40ff56414e4a29e5e6aaf0bae7a534e1d121bb SHA1 ee41042528692a6d3679ca4604cc9b4e830577d9 SHA256 5dcac24b34db58d17dbf2f9dac720f4172fdec7d72aa56e6f3a38a97fb30c524
-EBUILD mozplugger-1.10.2.ebuild 819 RMD160 f2ebfebe826f69c09490115668235fb12327d346 SHA1 18d6f46520883c484ec9ac8a27899f60535142f1 SHA256 67d7421ae75252a75b1b9a0cdafb8d354bc849d51cd78aca55e786ea604c7dd5
-EBUILD mozplugger-1.12.1.ebuild 823 RMD160 01c2b622024a446e4499364965a4b77133ec1d53 SHA1 8cf3abc9eccd1b7aca7473f5420d7ab18c1c82a3 SHA256 df34a6ea58788e50f2c0ae1f99a447a38d3a40b2cbf010efc5743e02c67b1fb2
-EBUILD mozplugger-1.7.3-r1.ebuild 1079 RMD160 56cd8ec4d73f5df2b29702f072bf806ed3f0ae9f SHA1 fd268c27e9c929359a06b18fd37b12dc15f59b2b SHA256 e96943845f42d32c0771509f35776590aeecb7552911d932051b155cf9bb2408
-MISC ChangeLog 3743 RMD160 4111d7010fb0497e690c6aa7af3d693e27bd8b62 SHA1 86953c2abf948c7076485aae6d4f20a6c0e4d2ac SHA256 b71045490ce4aeba31444c46662f1cb939f333d859bcb08ef42c5cfb10d200f7
+EBUILD mozplugger-1.10.2.ebuild 766 RMD160 4ce2e04412076b96d09b4d689fbe88d0607e700d SHA1 77d798455a990e2069adc326b4b63790e3a113cd SHA256 b566d1dcab88ca086e49571c734bcad0a3a01d91f0b362bd53772c0ec95b3902
+EBUILD mozplugger-1.12.1.ebuild 766 RMD160 4d748c6c2b4f4a9fd067d9ef099778e2474577e9 SHA1 f6bd0b0588e238153d2a23a4d345d162e5b0253b SHA256 d15be10ae7ac2f4a76aea5fb1228c70384cdd48617e45ee26e40f825054c04de
+MISC ChangeLog 3943 RMD160 22bb1badffeca57e146e293101ce2819e989f5bc SHA1 c2b56337e159b3b7d5e0d4e7afd555dae9200d29 SHA256 5ec24bcf5965e08108a55f327961baaa0b18b821f709070c6231047703fccd31
 MISC metadata.xml 252 RMD160 63f47ae817f26b798f5055b32bd87d4e87c79333 SHA1 5e23c4c1b0bedce4cc2784c72f83e1a9aa23f9cb SHA256 04c5450ecf2dc062c8c50cbdcba6c5e2bafe0be3aa36bb78a0e3bd765250aaac
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
-}