Add missing gnome-keyring dependency. For now it's required, making it optional is...

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 3d118d7edffdb932616a5ceab555b8bab5f6bf5c..4ca81735f77abdd30bc9c5c0a9b3268ef1892543 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.115 2010/06/17 19:59:35 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.116 2010/06/18 05:30:26 phajdan.jr Exp $
+
+  18 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-6.0.437.1.ebuild, chromium-9999.ebuild:
+  Add missing gnome-keyring dependency. For now it's required, making it
+  optional is non-trivial. Reported by spatz in bug #324517.
 
 *chromium-6.0.437.1 (17 Jun 2010)
 

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c754eee6169c4d6331952782c59aebf1044b432a..262a35003674ae091d351de9e1d91ea8c123f76a 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -12,7 +12,7 @@ DIST chromium-6.0.427.0.tar.bz2 179247836 RMD160 6b42d4145514557eba30b99a0799e18
 DIST chromium-6.0.437.1.tar.bz2 124160031 RMD160 80ac4d434de50a923f11aebaf7755c9de4b16a5b SHA1 01440e58c29bc24f9dbf646391859475dd34b856 SHA256 82207de9036cbfe30e91f3e81c5faab35a2077b9007af89b8e87c2218d8ba269
 EBUILD chromium-5.0.375.70.ebuild 5653 RMD160 accd9bebc41a61e8544e2d2073bfa8eb558cb8cc SHA1 c48b195937ea1c65bde66fdf9be0dabba470644c SHA256 68904b0221796b90cbf779d107dd81c7f31bcab12068e27fe22d24c38977133a
 EBUILD chromium-6.0.427.0.ebuild 5869 RMD160 3db0e8f2a551247e1bf370dcc09f22af48dbb628 SHA1 7499494a3540b3e802dd5cbc75f857d7075c9e1d SHA256 caf0867efaa0c786653342e0e0b62b52f49f3ac705590bac62b978d80963883c
-EBUILD chromium-6.0.437.1.ebuild 6169 RMD160 f148672874daf52217bf93071f24e7a2eadc87b1 SHA1 f578670d9479d7cd3ee73bda42afe13289ec4b9a SHA256 d3b167fb0fc5d3f7fd95bd2163109bbffe9dcb3b36ce660f8c1f943bb35986b1
-EBUILD chromium-9999.ebuild 7922 RMD160 bc3c8bc241cf1468c40db1383473c7c71bb5bbf0 SHA1 cbee99039a840b43968a1f5343eb11288b41257a SHA256 135c806cc4f079398990a61608d87a1cd6971fe882b0610c2f3934de2d0f650b
-MISC ChangeLog 26048 RMD160 de3fc9aea8eedace043c1d547f0ce3bd77538819 SHA1 a5e6529cc9198b1679e9caeed679ff1e6d8009e9 SHA256 7496b3cd9b9c0548152c8c99c98b0eb3ac23073c3fb62c88681fc36e3d7a93cd
+EBUILD chromium-6.0.437.1.ebuild 6204 RMD160 2874b086103e1ccee45af1542d885b2c1773cd9c SHA1 15f5d5de7190280d34d71eb1ecfe612020718f24 SHA256 b21e717ce193e69d202fb804f88c599cd8d5cd5cd7f0aa004f667ed2c9c5c173
+EBUILD chromium-9999.ebuild 7957 RMD160 0b6855e935d40ad8b60af825d2bca87dda270e2c SHA1 c950f409e96f384e10488ec37cda048aba4e9d38 SHA256 d814314dbc34385037b6635bcaa4af493ed0781797569221feb00e605bf0f018
+MISC ChangeLog 26289 RMD160 3653b2927142e777974eb1071f84423c2f3104ae SHA1 d9a877d0446abfeae4bb203e11c138c5ac4c7861 SHA256 a0657195009fbf1e045ee9b9e811d7cd6834e7bc6947d54f6d8b828541cf2187
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5

diff --git a/www-client/chromium/chromium-6.0.437.1.ebuild b/www-client/chromium/chromium-6.0.437.1.ebuild
index e7f435ac460963064246c3eb8a9b1cd9cf8d185a..e72eb58b4b5b94d2629702ce216af4e9fa54cada 100644 (file)
--- a/www-client/chromium/chromium-6.0.437.1.ebuild
+++ b/www-client/chromium/chromium-6.0.437.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.437.1.ebuild,v 1.1 2010/06/17 19:59:35 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.437.1.ebuild,v 1.2 2010/06/18 05:30:26 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -21,6 +21,7 @@ RDEPEND="app-arch/bzip2
        dev-libs/libxslt
        >=dev-libs/nss-3.12.3
        >=gnome-base/gconf-2.24.0
+       >=gnome-base/gnome-keyring-2.28.2
        >=media-libs/alsa-lib-1.0.19
        media-libs/jpeg:0
        media-libs/libpng

diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 860f7f76a338298c64fa67e7977ad3ea2f5af068..dce00c3bd2f6d415eace5eb0f334bf8f301a17f3 100644 (file)
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.57 2010/06/17 19:59:35 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.58 2010/06/18 05:30:26 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -23,6 +23,7 @@ RDEPEND="app-arch/bzip2
        dev-libs/libxslt
        >=dev-libs/nss-3.12.3
        >=gnome-base/gconf-2.24.0
+       >=gnome-base/gnome-keyring-2.28.2
        >=media-libs/alsa-lib-1.0.19
        media-libs/jpeg:0
        media-libs/libpng