Depend on simplejson unconditionally to fix native_client/SConstruct

Package-Manager: portage-2.2.0_alpha52/cvs/Linux x86_64

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 8ac3eaef193e71623610c1e2a499cb8b738f9f81..cb9e7ec65973d45fa6742ce6960a447feea9dda6 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.429 2011/09/03 19:44:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.430 2011/09/03 21:08:06 floppym Exp $
+
+  03 Sep 2011; Mike Gilbert <floppym@gentoo.org> chromium-9999-r1.ebuild:
+  Depend on simplejson unconditionally to fix native_client/SConstruct
 
 *chromium-13.0.782.220 (03 Sep 2011)
 

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 186e76bbbe6dd9eb5d6996a74f0ed2208f1f496f..fe83fa6136a3b1419fa33d0a4fd90999e98a893a 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -37,13 +37,13 @@ EBUILD chromium-14.0.835.124.ebuild 13179 RMD160 17d07e69caa5d9a5ddd286fc925a8d8
 EBUILD chromium-14.0.835.126.ebuild 13179 RMD160 079eb7cf9ba3d91b729b9058740abf8833734fda SHA1 057384f9b1c2a971e20d2d992c5b509395df2e01 SHA256 753aa679033876d52d0b7dbc204412f72e73cd6704d7e69f11b59e797ea1b8e3
 EBUILD chromium-15.0.861.0.ebuild 13774 RMD160 988860d0a6d6b2506402ace556ecce9fc6fadaee SHA1 7a7dfcb1b774616936d19eb45de940b5eafcec39 SHA256 d03f44c0c388c87fccc0fc894c9efe1cdbe8ace6ebba86400762541d93a1825d
 EBUILD chromium-15.0.865.0.ebuild 13648 RMD160 11a3b1c9f752c8feff2dd6098eb1cc074c0f0d92 SHA1 dd823a624ff08e9ea10ad6e551e147478bf649b3 SHA256 9c3be3e10a62cff3724a1e6cf9b481226249c1f13ecad2ab8ae1542b13fa3092
-EBUILD chromium-9999-r1.ebuild 15960 RMD160 87d1c3ec85ac48f7499bfb5dedbc4e8ce9d5c522 SHA1 0b4081abcae5583d3a60ef1bfdbc1075986f7b60 SHA256 16e9f774ca44fd9b5440c495ba2ece05fdc99cf1fb4bf962fdca91e7e0b6704c
-MISC ChangeLog 95605 RMD160 891bd9ed31c652c9eec300332aac8f3dd8318d42 SHA1 1c3baa473a6af0f457a562968c515fc7cdb01ded SHA256 1c40f6aadca5c1bac3ccc65b049de3c9259ba7a83733d4f4f6b70dd63fa83517
+EBUILD chromium-9999-r1.ebuild 15959 RMD160 4be0085b499debdf524113a55ab1e70c04843932 SHA1 4bb7382351836e758747445d74582e3323a9a0b7 SHA256 27ffe0840a28455fafa386e4ea08f81562d51a2c9d2fb9b6ab19551721930b08
+MISC ChangeLog 95751 RMD160 76ce25f14e80a96ad3b0397f9b193ef622b29fac SHA1 034a8ad7da28d7b833ce44fcdf7de7aae99206f8 SHA256 8c53e6c98a985e1103edb903833401ee49ae964f2cc948608d527e0d477f5e82
 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5ig8UACgkQC77qH+pIQ6RnOQD/delWwZUXA82XfeGz25HXgssJ
-4qO0bHZBCu6RNVX46uAA/3aTV+BceHk9ooyNF8h8XVcN+sf8uguM5grnP19pdXjF
-=HZm0
+iF4EAREIAAYFAk5ilzwACgkQC77qH+pIQ6TsXgD9GaDPAyMAMgGBKiQgmnj8uC6v
+hC5uBfWd3ij3sc/IcFIA/A0RJZEJiWS1ArhX0DA0SIYs0ExMxR3sLeT+hmcPlkth
+=SsGd
 -----END PGP SIGNATURE-----

diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index b1d6fb3d09f6d4b82821e0156d781267c0a21855..e42dd0f83d125d8d885e231fa78c32d83eb36f4e 100644 (file)
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.48 2011/08/30 23:41:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.49 2011/09/03 21:08:06 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -54,6 +54,7 @@ RDEPEND="app-arch/bzip2
        kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
        dev-lang/perl
+       dev-python/simplejson
        >=dev-util/gperf-3.0.3
        >=dev-util/pkgconfig-0.23
        >=sys-devel/bison-2.4.3
@@ -61,7 +62,6 @@ DEPEND="${RDEPEND}
        >=sys-devel/make-3.81-r2
        test? (
                dev-python/pyftpdlib
-               dev-python/simplejson
        )"
 RDEPEND+="
        !=www-client/chromium-9999