DEPEND on dev-python/simplejson unconditionally. Bug 386861 by Andrew Waters.

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

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 5e940338200f8103bec3799fb09a5311acb304ee..f0d6d37aab7d057467c404ffd989996a42db5617 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # 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.465 2011/10/12 23:24:47 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.466 2011/10/13 03:48:58 floppym Exp $
+
+  13 Oct 2011; Mike Gilbert <floppym@gentoo.org> chromium-16.0.904.0-r1.ebuild,
+  chromium-16.0.904.0-r2.ebuild:
+  DEPEND on dev-python/simplejson unconditionally. Bug 386861 by Andrew Waters.
 
 *chromium-15.0.874.92 (12 Oct 2011)
 

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index dee99f936bdcf6e650e4886e915af68334b65fa3..8eb8cc76c385c222d68f27cb9560716e17b250ec 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -21,15 +21,15 @@ EBUILD chromium-14.0.835.202.ebuild 13791 RMD160 68267fd5b04ef957f98ad41ece3e7d6
 EBUILD chromium-15.0.874.83.ebuild 14224 RMD160 df78a96ac7bd075a4a8f21fd24a1fc3bac6a3cea SHA1 4bd640fe84767ef334c0682ef544a76aef225631 SHA256 73d9c3db531079bbed5559e9076047b895f60e3a131fb6108a29822f3f623ab2
 EBUILD chromium-15.0.874.92.ebuild 14224 RMD160 0188245d09b5d7eb8152c5d6247fc54a36dafc59 SHA1 960f6920c927393948fca81dd93c26aef09d976f SHA256 47e9062d9f357861abc7592cf48a596003961d59a88b4ec2ac8bca4233b46093
 EBUILD chromium-16.0.899.0.ebuild 13949 RMD160 5a5333ade34f2aacc504f70e16faf4b2ad4144b7 SHA1 06bb027a26c5517240ae9c2e4aef2a8eee7e5e70 SHA256 cd314d18256783329639ab69f9e088daad5c6fe5344a6c0e4a6c0c848c5a8cf4
-EBUILD chromium-16.0.904.0-r1.ebuild 14040 RMD160 73616a8f003006d5e435f1d118c9484d4ce11769 SHA1 7d1e9778e62961b07fdeb37051ac71f07a4c24c9 SHA256 d176bff6151f9d2ccb784ac052c408d2d1d9893cc3fcf57a4dacbb595a843af9
-EBUILD chromium-16.0.904.0-r2.ebuild 14769 RMD160 d772d6c1292ded69608a3c090b591652da852e7b SHA1 48fae120a142cbcbcd30cfecb0bfe09255fe8dcd SHA256 b556b80d650397f0fd2a596e8a9fc5203f4ea668eaac8635a42811392c9933da
+EBUILD chromium-16.0.904.0-r1.ebuild 14033 RMD160 10e2b2168b0b28fd5b0917a1f07da74403a0a51e SHA1 3e6312696579f3b30f4a71ba66b08649c80b8d79 SHA256 695c873b84ac7712f307de2c0d4a9cfee7b00d4e99b92a8375d57e6fba521682
+EBUILD chromium-16.0.904.0-r2.ebuild 14762 RMD160 35dc78eedd7d3c4c313d43d1329412ce939547ff SHA1 d04b09478c1129e420880cab3ac10d7aa5c51555 SHA256 3dc72820096c558e6de790c6e0d3c7531a67584e8f73a8ba901d803eebd422c8
 EBUILD chromium-9999-r1.ebuild 17358 RMD160 a4d89193b733eec3b3b0dc966a9189b78b41d50e SHA1 53bec1e45f185b101c0761ac6c24cf42e50cbde2 SHA256 784f337c6fa1558ee3d7d070ab77d599cedaee1aeb3d26e50b6e4783a1726f2e
-MISC ChangeLog 102651 RMD160 f70bf32092eceac73c7f539e5c10ade640ada4d2 SHA1 0c80ef631aece5f0a43cb5cac9f724bf9c84f548 SHA256 f4ec2aea20ee4a27f65d371e6155e6353b2143d26ed11c908bdaf83b15fed306
+MISC ChangeLog 102845 RMD160 4df9b0188d8e49c131751f89d44fda8dd8421cf8 SHA1 f424b14c463d1ee7a7c0c2b434514a63d62e59f3 SHA256 707ccf461a28d7016a985485edd0a9205def97acd4f4bea21fd38f076ecdc9a6
 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6WIcgACgkQC77qH+pIQ6QWRQD+NPpMfj03GPWjNl15hB/M6ENZ
-ahJL5E4JnEFiGD9aOFsA/0qd+XKYGtawM7EaCYoEY/yEHKs/xFkYJwaTZi+cO5/j
-=tcpA
+iF4EAREIAAYFAk6WX74ACgkQC77qH+pIQ6S8gwD/eZ3RDr1STfnsuIMy0DSDEETq
+KHAd+nc26Jrj77JwY4sBAI1I/GkQ61vvhQ5Wxf/+bWaiP1IgProXwAxA4JRJmjdm
+=/FcQ
 -----END PGP SIGNATURE-----

diff --git a/www-client/chromium/chromium-16.0.904.0-r1.ebuild b/www-client/chromium/chromium-16.0.904.0-r1.ebuild
index f54c57a0a4c71379233bf1756e2be0474b80664f..1e4972baea026402b6959f3f575fe8c40a337730 100644 (file)
--- a/www-client/chromium/chromium-16.0.904.0-r1.ebuild
+++ b/www-client/chromium/chromium-16.0.904.0-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-16.0.904.0-r1.ebuild,v 1.1 2011/10/12 02:39:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.904.0-r1.ebuild,v 1.2 2011/10/13 03:48:58 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -57,13 +57,11 @@ DEPEND="${RDEPEND}
        dev-lang/perl
        >=dev-util/gperf-3.0.3
        >=dev-util/pkgconfig-0.23
+       dev-python/simplejson
        >=sys-devel/bison-2.4.3
        sys-devel/flex
        >=sys-devel/make-3.81-r2
-       test? (
-               dev-python/pyftpdlib
-               dev-python/simplejson
-       )"
+       test? ( dev-python/pyftpdlib )"
 RDEPEND+="
        x11-misc/xdg-utils
        virtual/ttf-fonts"

diff --git a/www-client/chromium/chromium-16.0.904.0-r2.ebuild b/www-client/chromium/chromium-16.0.904.0-r2.ebuild
index b8a99ada2ebba845eced07bf116c7b9895716c9c..8dabd365fdf1b542843fe760ec57050b806f7391 100644 (file)
--- a/www-client/chromium/chromium-16.0.904.0-r2.ebuild
+++ b/www-client/chromium/chromium-16.0.904.0-r2.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-16.0.904.0-r2.ebuild,v 1.1 2011/10/12 20:42:56 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.904.0-r2.ebuild,v 1.2 2011/10/13 03:48:58 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -58,13 +58,11 @@ DEPEND="${RDEPEND}
        dev-lang/perl
        >=dev-util/gperf-3.0.3
        >=dev-util/pkgconfig-0.23
+       dev-python/simplejson
        >=sys-devel/bison-2.4.3
        sys-devel/flex
        >=sys-devel/make-3.81-r2
-       test? (
-               dev-python/pyftpdlib
-               dev-python/simplejson
-       )"
+       test? ( dev-python/pyftpdlib )"
 RDEPEND+="
        x11-misc/xdg-utils
        virtual/ttf-fonts"