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
commitec689617fb638540b78a2b902d8a761c9a6f2ebe (patch)
treee01c91c41784250ba3eca478e1982ee036359865 /media-gfx
parentFix error when multiple spaces separate use flags in package.use file. Bug #4... (diff)
downloadhistorical-ec689617fb638540b78a2b902d8a761c9a6f2ebe.tar.gz
historical-ec689617fb638540b78a2b902d8a761c9a6f2ebe.tar.bz2
historical-ec689617fb638540b78a2b902d8a761c9a6f2ebe.zip
Remove net-libs/xulrunner from alternative || ( ) dependency wrt #403415
Package-Manager: portage-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/Manifest20
-rw-r--r--media-gfx/picasa/picasa-3.0.0.57.4402.0_beta.ebuild9
3 files changed, 20 insertions, 17 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/Manifest b/media-gfx/picasa/Manifest
index 82680f61d7df..b735c507c677 100644
--- a/media-gfx/picasa/Manifest
+++ b/media-gfx/picasa/Manifest
@@ -1,19 +1,21 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
AUX picasa-unicode.patch 585 RMD160 33b141ccd933f36dbca0cb0ddfc743591a320dfe SHA1 5b39f1355a5be0961f3808e2ff8d56b22cf3ee24 SHA256 faaa7498cea796c068712043df37b4f2070c8d6cc7bdd0e997bad5174ee3e12f
DIST picasa-2.7.3736-15.i386.rpm 24791434 RMD160 bfacb0c87b031a4fdfaca07e27d4f9a36ed76863 SHA1 da74da69f9374b3f0d0b92e752ef256ddb4ca083 SHA256 003b5486f45229470d72937d4af880e507eb7cd024a951c9a1ecc0df1ecf426d
DIST picasa-3.0.0.57.4402.0_beta.i386.rpm 32699190 RMD160 b53eee510fe427768adc9c47463d5c0575bc0b02 SHA1 295fdddeaa1c44f2d95e4230dccf953125090ffc SHA256 924a37c8db47c3bbaa27548012f8e96242b104a1f77d03fc2644ed7ba71dbac1
EBUILD picasa-2.7.3736.15.ebuild 2372 RMD160 97145ef4573a2ddcafb28f19c3fb6c831559bc95 SHA1 d54398bbed46e18760a3a6ef2e523fc61751aeda SHA256 0b1e4ae2542828b2d56aade4d834500157f837da182544d835906d43c21be388
-EBUILD picasa-3.0.0.57.4402.0_beta.ebuild 2277 RMD160 7bfbdcc40d84ad31fc496658d6716a2f14cd8be7 SHA1 49b8e3d383abeec01c91751fcfab37d141d7def3 SHA256 5f56f9b41c0b42ad69e0e907b590499f8c27c5f1e24cd9ce6b7e418ce0f0f020
-MISC ChangeLog 3416 RMD160 40a7f48feace1852e1d561445e9d55511ccc52a3 SHA1 575636c51232de529473e4638b52409e58263113 SHA256 865ba779f5bf21b0d7b083c0b36874cbc1a774b57e26c3f37ebea95b22a4ee45
+EBUILD picasa-3.0.0.57.4402.0_beta.ebuild 2238 RMD160 47acb6863d45e0963f73ff4927a378f1bde14222 SHA1 9572819a7b1637618c028286f1fab83df84deaa8 SHA256 20411ca6878f3b780235c7aab343cd6d2084f5689669226145dd843689151123
+MISC ChangeLog 3586 RMD160 dea4ed35cd434e3eef92de9f7c99fba7c82542f9 SHA1 3e5bf290507798d68c5c51851536959571008b9d SHA256 9ce1b359bffc4df489183310360568572aad31241f043de59012c71766ec75f8
MISC metadata.xml 297 RMD160 c4ab2efcb57c2f611edd063f7494db5b152957f6 SHA1 e9131462a28eaf99a7220887dfcbf508e925996c SHA256 74540a5f8e3de3576fc613e9f58e88d8f5475aa7a94fb360185c2bef8b80ebfa
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iJwEAQEIAAYFAk59ovYACgkQfXuS5UK5QB1abQP+KtOBkKxYvXrbtzr1DUNhAqxC
-uCBDiu1qGWxBXv0kc/D9445hYiCugp9oDh6zT0Co9P1yiJHNBtErGVqBP0vaWmuq
-kKrTiFxkHg3WYSBdbQP4NnQqciNC1cZSpdNesbW59ew0FZXp/AEyK06RC4bY7lbV
-UUJtGgWBl2jdWpywdFU=
-=E61W
+iQEcBAEBAgAGBQJPjXF0AAoJEEdUh39IaPFNYwUH/AizZEmDTIlzHkrrTU1ZhMRJ
+KyGtpdAThNEg1hnXFPleY4yMRsRzTmjf5lmwD5MNbDXxAKZntDwEXnXtZnkLC14n
+h0rOH2TDjeUKmr8osAECC4wnNuQ86O23flsMM0ECSYSxBvRLBbcUqXtpGDU+Qc4C
+Mf10KEptRxvb/vCS5d2OXec4/XrvBDCk0BGCU5rdSfI+HnPAj3IZB2/jaBEQbqH1
+OR4xOBwKGBONVJCH0EiZJurRRCRBDzSnKG6q2gr2YvF/xhsdeLPtD7K9CgLQrBrV
+Hjgex56nkVNA90Fiz/mdUAOAPMwcb7NcisWQHLfp4pYI+wBGOe+gbiWyZX5qqQg=
+=s5KA
-----END PGP SIGNATURE-----
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=""