Fix xulrunner depends, bug #217160

(Portage version: 2.1.5.5)

4 files changed, 15 insertions, 14 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index 7d35acd83012..219f9e62b2ed 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mplayerplug-in
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.105 2008/06/12 16:44:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.106 2008/06/12 18:22:58 armin76 Exp $
+
+  12 Jun 2008; Raúl Porcel <armin76@gentoo.org> mplayerplug-in-3.35.ebuild,
+  mplayerplug-in-3.45.ebuild, mplayerplug-in-3.50.ebuild:
+  Fix xulrunner depends, bug #217160
 
   12 Jun 2008; Raúl Porcel <armin76@gentoo.org>
   +files/mplayerplug-in_xulrunner-1.9.patch, mplayerplug-in-3.50.ebuild:
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
index 4e1d68b4e0d0..21ac24f353f4 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.35.ebuild,v 1.13 2008/05/18 13:31:14 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.35.ebuild,v 1.14 2008/06/12 18:22:58 armin76 Exp $
 
 inherit eutils multilib nsplugins
 
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/3.30-fix-cflags.patch"
 	epatch "${FILESDIR}/${PN}-gcc4.patch"
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild
index 1d6827a92b2c..f0ce92aad12f 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.45.ebuild,v 1.9 2008/05/18 13:31:14 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.45.ebuild,v 1.10 2008/06/12 18:22:58 armin76 Exp $
 
 inherit eutils multilib
 
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
 	epatch "${FILESDIR}/${PN}-gcc4.patch"
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild
index e6acec533487..3f4728d8db6d 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.50.ebuild,v 1.6 2008/06/12 16:44:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.50.ebuild,v 1.7 2008/06/12 18:22:58 armin76 Exp $
 
 inherit eutils multilib autotools
 
@@ -11,17 +11,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 -hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk divx firefox gmedia mplayer-bin nls quicktime realmedia seamonkey wmp"
+IUSE="gtk divx firefox gmedia mplayer-bin nls quicktime realmedia seamonkey wmp xulrunner"
 
 LANGS="cs da de en_US es fr hu it ja ko nb nl pl pt_BR ru sk se tr wa zh_CN"
 for X in ${LANGS}; do IUSE="${IUSE} linguas_${X}"; done
 
-RDEPEND="
-		firefox? ( =www-client/mozilla-firefox-2* )
-		!firefox? (
-			seamonkey? ( =www-client/seamonkey-1* )
-			!seamonkey? ( =net-libs/xulrunner-1.8* )
-		)
+RDEPEND="xulrunner? ( =net-libs/xulrunner-1.8* )
+		!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
+		!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
 		x11-libs/libXpm
 		x11-proto/xextproto
 		gtk? (
@@ -47,7 +44,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-3.40-cflags.patch"
 	epatch "${FILESDIR}/${PN}-gcc4.patch"