summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-04-17 13:36:02 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-04-17 13:36:02 +0000
commit3bef16983e8e037ebe9c2ae50e65789f72ef2fbe (patch)
tree8e1d1f2d7586de49c067b53990ddd44d64759e54 /media-gfx
parentFix error when multiple spaces separate use flags in package.use file. Bug #4... (diff)
downloadgentoo-2-3bef16983e8e037ebe9c2ae50e65789f72ef2fbe.tar.gz
gentoo-2-3bef16983e8e037ebe9c2ae50e65789f72ef2fbe.tar.bz2
gentoo-2-3bef16983e8e037ebe9c2ae50e65789f72ef2fbe.zip
Remove net-libs/xulrunner from alternative || ( ) dependency wrt #403415
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/picasa/ChangeLog8
-rw-r--r--media-gfx/picasa/picasa-3.0.0.57.4402.0_beta.ebuild9
2 files changed, 9 insertions, 8 deletions
diff --git a/media-gfx/picasa/ChangeLog b/media-gfx/picasa/ChangeLog
index 620c48459c01..89d0e2242722 100644
--- a/media-gfx/picasa/ChangeLog
+++ b/media-gfx/picasa/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/picasa
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/ChangeLog,v 1.21 2011/03/29 12:24:56 angelos Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/ChangeLog,v 1.22 2012/04/17 13:36:02 ssuominen Exp $
+
+ 17 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+ picasa-3.0.0.57.4402.0_beta.ebuild:
+ Remove net-libs/xulrunner from alternative || ( ) dependency wrt #403415
29 Mar 2011; Christoph Mende <angelos@gentoo.org> picasa-2.7.3736.15.ebuild,
picasa-3.0.0.57.4402.0_beta.ebuild:
diff --git a/media-gfx/picasa/picasa-3.0.0.57.4402.0_beta.ebuild b/media-gfx/picasa/picasa-3.0.0.57.4402.0_beta.ebuild
index 40fc289ba639..87d2725518ed 100644
--- a/media-gfx/picasa/picasa-3.0.0.57.4402.0_beta.ebuild
+++ b/media-gfx/picasa/picasa-3.0.0.57.4402.0_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/picasa-3.0.0.57.4402.0_beta.ebuild,v 1.6 2011/03/29 12:24:56 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/picasa-3.0.0.57.4402.0_beta.ebuild,v 1.7 2012/04/17 13:36:02 ssuominen Exp $
# needs SRC_URI arrows
EAPI=2
@@ -34,10 +34,7 @@ RDEPEND="x86? (
amd64? (
app-emulation/emul-linux-x86-gtklibs
)
- nsplugin? ( || (
- >=net-libs/xulrunner-1.9:1.9
- >=www-client/firefox-3.0.0
- ) )
+ nsplugin? ( >=www-client/firefox-3.0.0 )
"
DEPEND=""