dev-util/cargo: fix wrong dependencies

When these packages were added the wrong crate dependencies were used
and as a result the package relies on reaching out to the internet
during the compile phase to build properly. This fails for users using
FEATURE="network-sandbox". The dependencies are generated using
https://crates.io/crates/cargo-ebuild

Signed-off-by: Doug Goldstein <cardoe@gentoo.org>

3 files changed, 15 insertions, 2 deletions

diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index fc2a3678e58d..555c930465d0 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -6,7 +6,9 @@ DIST aho-corasick-0.5.3.crate 252052 SHA256 ca972c2ea5f742bfce5687b9aef75506a764
 DIST bitflags-0.1.1.crate 8719 SHA256 2a6577517ecd0ee0934f48a7295a89aaef3e6dfafeac404f94c0b3448518ddfe SHA512 aa85c6adda0e9d192f2ae817e3c727167bac8609eb85c8153d99bb42d990de3f931e890924841ca11ba8dbd1413d1c5bf20acd584d182292e8828ed56fcedc18 WHIRLPOOL c93a45bb238b32e551dee23f9023db97eab10c2418a59dd9e3c44ca8cf7c8916de90ffbb5e84b7bff4863ce7a71de54e9fa760967989be906a90bec509a2956a
 DIST bitflags-0.7.0.crate 10851 SHA256 aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0 WHIRLPOOL 60551486cd6688c78ecd0ac40ca39b1f3d75537dd96ec32e9882e205bfe2062de939a129777d66f8c269c8a71e2f2aa240e015c0b3bfa51adbad478024e296d4
 DIST bufstream-0.1.1.crate 7437 SHA256 7e493de6a8aed51697088e36dc5245ea3edd34e6872e32c732e5f996ed5b23b2 SHA512 e1d378a5dd9d6b096f9b8d9de018c17652615ff373d1644b0978b74325f22fba2157ce0aa9fba423e1f452119af1485a72c2e44f7b3b8c5350dfd3f8f2e93436 WHIRLPOOL de26e042bbb6323946d8570c682fa9ea08292508910ca7c928206935d6c1f6c888d3cb04bf285f1404b59c109cf813cc79ecbc64a6d16dfabf72412aabfc6be9
+DIST bufstream-0.1.2.crate 7477 SHA256 7b48dbe2ff0e98fa2f03377d204a9637d3c9816cd431bfe05a8abbd0ea11d074 SHA512 ddbb8597cd430111e58facfc30e6cf93bce174b09a8f7eeaf7d7062dc856137dbd238a0c7794336d9a2b7d0a1859dc8b8d225116c0c57591106dc6f2e1adc0a9 WHIRLPOOL 7a5bac1c3309d6f5d9dad3a21a7fa146815d2b35444dc356ade49f6f05df2896ee0d88570ac3964939db20633651721e41d7757060b9a5c1b2c5878e68c5adfe
 DIST cargo-0.12.0.tar.gz 574902 SHA256 4080d76b56b8202f7df271b4bb7d7d22abea5ff8c261aef42e6e5d248ca5972b SHA512 6fba348b068c07d49a6a263f143b31c3dff1e0aa399b90193830ad1823a3c07c5097fb39ff09fcc7713e78e85cfa1b5d8825db75055c49e2c3237fe4bffad3bc WHIRLPOOL dceacc324bf167276c0f3163c1a476064362679220e0c310c97021e69b691d3c03fc6b6f967b66290c7c63512ca70ac78c09642585ef5f96264bffd50603c832
+DIST cargo-0.13.0.crate 631199 SHA256 8360389a6b6ba539eb1f533a4452fd5eccfa4bb2b4e73bfa103c3751d5353ea6 SHA512 278ebedcb21df0b2e4e6a86e356a7795e23f3f980c5445ef9d0b6c5df704766f79936d30103193034a66ad2b91919f68692f48b6bd6bb79cb116c1e032deef0d WHIRLPOOL 7376721ea2419f6b781a4846ef58566d4b6737b3a0c31e92ae3907cd7876963dc3c0e13b6f30c6c57b8d1c7bac4a89eb150b8d0952ba1ec4b55573bcef32a7ca
 DIST cargo-0.13.0.tar.gz 610125 SHA256 90429180d3724385acb094f2896feea0c73690451a92215d6054d05edf4a5c49 SHA512 04b5ad177fb58696534eeee9a11da36a1fff0d883ff2b21e783a6163c0c5497d559c44c9fb98e201eb7e5dc0e72608f83f9990e239df3a23824c961e305cced7 WHIRLPOOL 8d40be025f04097ec34866ecf242bd31734a9820c3955b936099266f89b7f0a1d94ce4ac5b87b64ec8a43b40160ffe196deb225359279b9bf426f9c90ba040bd
 DIST cargo-0.14.0.tar.gz 625305 SHA256 90ec0e644586959f62e6e34e649ba57db6f74aa37b89e90972f817c49b187531 SHA512 dcd6857f256f1b4cd4d0dfedbb7fceedadcf3ecbe92014f58ff3e668870624d5a1cddda1c4b2653b6ec713c6aef4810760e112e589b6eba81bba9692356acb4f WHIRLPOOL d9794dc55539356d48d05f72fd16794956b4dc6b05e31a2df214513d3aabc32e81ae41ef17b42c6852de01dc7c4bc8ca1fdb988fd717e8d062e681a0f92f45a4
 DIST cargo-registry-14f7adaa984f78037839f7e64912fe89d7af025a.tar.gz 2567101 SHA256 ee2e0232c730876a49f212e227b1f4990059a090300b061a79ca358d590533e2 SHA512 16c2c0fbbb9632547a1227d241025d550bd40125e9c6b04ddd3b1e07dc829dd7b41ad645cce0934e0e4b4c174cf4ba94eea404642de268d137359e06948288c0 WHIRLPOOL f7eb57414927a9d704254d7dd67064f3d89e9c92adb71a55e43e486330eea50a664f738582f1d959c1cb80c2c2bdc70bc95805148a758cfda98c625d034f9c35
@@ -14,6 +16,7 @@ DIST cargo-registry-2aed1d5050840971fd1527e2a2961e05dd392e04.tar.gz 2340078 SHA2
 DIST cargo-registry-64a9f2f594cefc2ca652e0cecf7ce6e41c0279ee.tar.gz 2149630 SHA256 3c0f6e30fa266e39975e8b983d325f34c0d34e6b9bfb82ad93c625b33f2adc82 SHA512 57341ef04e747ddb67d1105b7599ad59fbb386b71ae885158c5163654d409933e086bc55cc5bc15735afdb1013e3fe127df474269073c9d800c598af026592cc WHIRLPOOL d2eb55b69f5fc7163672a43e626d475b1bf4d15ddf0a66e6a0b8fa7dce2deb7bf5ed4aa5754db5761d483b6516bf97c2ad6b70e887473e036272725e749f0c1b
 DIST cargo-snapshot-amd64-2016-03-21.tar.gz 4163903 SHA256 55ad9a8929303b4e06c18d0dd30b0d6296da784606d9c55cce98d5d7fc39a0b2 SHA512 475087ff1905fc42bd875488696d8f67fc68f9fb3e48ef9f25bbd6d8f949aa9a3984f61a8bd1741ce8c98e33c6910e020ea7fd5cb67cf2b7fc1703947561ae0e WHIRLPOOL ddda8983c38f238237fbb78fd8242e08df44c31bd0c29d2e75b53dcb0ecc601660f4c765b00e066781da6feb9ccccf8df494b99228b126f3cdd89d028253c2c5
 DIST cargo-snapshot-x86-2016-03-21.tar.gz 3889095 SHA256 b2a1c4c33fb9274771c8d830cd8ac07f7ae96af341fa30399d6929ffd6c8b425 SHA512 3c6d6a9c6ee2a93abec5c9c3d79f86a623db6429e192d028729279c07d5769548d6f716afbd8e984ab2f6449f75cd24efb32b87f97b6b90c0e7b3b25779e8624 WHIRLPOOL 8bafd298e6cf54d22c420859c105be98047b556802494d2ccf9b13b06837f85902cf61fd1846dcff3e527d0ce0ee188723f44f4cb598cc34e0fedb6c2f2b3d41
+DIST cargotest-0.1.0.crate 335 SHA256 9f159eae7986fc918c85a308f9389aacaf569d78e0431e777376432d7aa4ddd5 SHA512 d96dfc584dd6c0ed05b609d4fc4375af4950e37d41493113d2693c5180ebb11987c4f7e3fe9e5ccb4b71f37b3afe3bcc646f92ad325ed5fd1df92ac5b095dde8 WHIRLPOOL 21331acc22c77610fded8b48f0e38502f63b7fd7a33daea02d4bd00022ccc59238d5d909ff25fd22a984fb4f7bb39a41abec83244a9f3500c853b3411b714d3a
 DIST cfg-if-0.1.0.crate 2758 SHA256 de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c SHA512 d2f10ae39a7fe712cd9d228e3b5a96448acaeab3b92d1b97229d54e5201237b9434ceecb1f38f1ebc1f678da5cfc33aa46c810f422f68a21aa341666c27572fb WHIRLPOOL 8a57a78a8e4a72c3321cf8ac97c2b50f18eb4ed35b2e3c22ca06b5f8031eadccce015237ac846ce78ecf9414632b75a04b168993439d1469eb928d4d05c843e5
 DIST cmake-0.1.16.crate 10125 SHA256 eb61a8d3b65f8e0af52ac579923ec48bdd5ca4e335c0fde4071e5860eb650532 SHA512 80f8f33fc66402b1a5a31f993349d9c6a6237ebe461e1aa24064eb31328e7f5901303b5753d1f62ece0881de9f7c1c42077488ce682a3889a8a74642a8b84f84 WHIRLPOOL 5a02bbda79faa44f3e3696f490e146fabf1a3a06a5563ea53040fa949086c5469afb82b8cb49cc52c360f7c2a31587f30039a49717574189a0062e575658502f
 DIST cmake-0.1.17.crate 10222 SHA256 dfcf5bcece56ef953b8ea042509e9dcbdfe97820b7e20d86beb53df30ed94978 SHA512 ed29f455bde5cdcf43ef0c6b10e33703de02dc11ddf4cb979a76386e4dadb99c2176c8021e19d4c25ab0379d1f397f4b6a0305fb055b4856444e1153df531851 WHIRLPOOL e81024e22f8337efa7e74c68286c51a60459ead95158eb6448cf8c2cf31a465fe57e2906364db8ea807fd896fa4b65092c25a69ea8550556dcab99d3548578f0
@@ -45,6 +48,7 @@ DIST git2-0.4.4.crate 121616 SHA256 33a96eeef227403006cdb59ea6e05baad8cddde6b79a
 DIST git2-curl-0.5.0.crate 4060 SHA256 3d5f766d804e3cf2b90e16ab77c3ddedcb1ca5d2456cadb7b3f907345f8c3498 SHA512 c88b5db20a2e718c89734bfbbd94e74c40cd118ed2775b30230a136707158370557cd09a452b592e6cabd04b5f524013f1dd0ec27410b29d805965f786e71396 WHIRLPOOL a9fb05966a8cbf63ddb23369c7f8c03249964860ec0c7439d9d2cd9f834a3c8440dc03eca3ab01033f45b87cac41e0b29cb4ae4b8ce0c70f9e5631384e8e2693
 DIST glob-0.2.11.crate 18065 SHA256 8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e WHIRLPOOL 5f9b80d74ffcda693a008367d73fa0646b1dd73068fcd0075227d15c9bfcc86a05fe8a34163fe9d12806ef10d35f27649459ae05de71abd3a044f99baae041d1
 DIST hamcrest-0.1.0.crate 4027 SHA256 27c180b409b988760a018e5cb5f0812bd67e87f40236e41d3b9375d3046e04ab SHA512 c343a36d346a1128628f31661d196cd9e91254a71b1d9d64f5ea4a16fb439b74032239985056b993b81f79cdf8a1a4e0e6f435c00b864ed2be8044c57a5f3d7d WHIRLPOOL ffb793b767cb97fb50237547709af92782e5903552ddb65b3e7827b8cfda9da2748b44ead5790af62a0ab5030805d030d13a7ec164695b12697714234a943e5a
+DIST hamcrest-0.1.1.crate 9217 SHA256 bf088f042a467089e9baa4972f57f9247e42a0cc549ba264c7a04fbb8ecb89d4 SHA512 6d6557cec99f482d6a738835d32504252e0a666c1318f6f0ac0f811afa7c087c048960ecd2fad22b403fae9a00b06f742de643a7b5ded1f816c118272232ec2d WHIRLPOOL 463d49d5403692dbe6d604bffdf689069e7998aa21e8658c8478adb9a8c4aa3019e063278694aa8eca98773162f90a1da126b962a487d8bd99f32048fef939b6
 DIST idna-0.1.0.crate 234027 SHA256 1053236e00ce4f668aeca4a769a09b3bf5a682d802abd6f3cb39374f6b162c11 SHA512 a3bdcd7934c8f2823e8be7b467a829334ab53c71e225f2ae73b379db6bf47c8c8fb28d30900eb18c7ce79e9d9780d45babff3d7e77c20640001e6f6ad93b2424 WHIRLPOOL 9bfe69ec718606736b4844a6884872dfb2cf608b3a21494016abbcb44d08400c489a8f51f142b6892501073d3d67b634d6ab593c0282032f5be3ccbbc517db0f
 DIST kernel32-sys-0.2.1.crate 24530 SHA256 b5b5e7edf375e6d26243bde172f1d5ed1446f4a766fc9b7006e1fd27258243f1 SHA512 7d63fda3200fc565853e5c2733f06c97f48f94ddfb13db73f889197917478948c3f73b61a9c0efc42cd4f8a4355af4c1790e3145ea18f35ccf29a2be997f5bad WHIRLPOOL 80af653642291337ba9a3d581f8c98f042f26c6138e650a563eae8b7e41064934c565dab2b50b55e93482cb0567a14ae2fd46bb89beda528675e59ba47bdf7c5
 DIST kernel32-sys-0.2.2.crate 24537 SHA256 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b WHIRLPOOL 036baa6611f13d76692a5c032e7e8e8b5a82e12bdf13d5a2cdcf4d33020b003c941331f0c8aa774e7f7cc7b36ad7403bb2cbdecb739d7645cff66aeecd59b09f
diff --git a/dev-util/cargo/cargo-0.13.0-r1.ebuild b/dev-util/cargo/cargo-0.13.0-r1.ebuild
index 12d1dd2f3944..963ac609c61f 100644
--- a/dev-util/cargo/cargo-0.13.0-r1.ebuild
+++ b/dev-util/cargo/cargo-0.13.0-r1.ebuild
@@ -6,10 +6,14 @@ EAPI=6
 
 CARGO_SNAPSHOT_DATE="2016-03-21"
 CARGO_INDEX_COMMIT="2aed1d5050840971fd1527e2a2961e05dd392e04"
-CRATES="advapi32-sys-0.2.0
+CRATES="
+advapi32-sys-0.2.0
 aho-corasick-0.5.2
 bitflags-0.1.1
 bitflags-0.7.0
+bufstream-0.1.2
+cargo-0.13.0
+cargotest-0.1.0
 cfg-if-0.1.0
 cmake-0.1.17
 crates-io-0.4.0
@@ -26,6 +30,7 @@ gdi32-sys-0.2.0
 git2-0.4.4
 git2-curl-0.5.0
 glob-0.2.11
+hamcrest-0.1.0
 idna-0.1.0
 kernel32-sys-0.2.2
 lazy_static-0.2.1
diff --git a/dev-util/cargo/cargo-0.14.0.ebuild b/dev-util/cargo/cargo-0.14.0.ebuild
index 1b8d661b3a11..25808b053ad1 100644
--- a/dev-util/cargo/cargo-0.14.0.ebuild
+++ b/dev-util/cargo/cargo-0.14.0.ebuild
@@ -6,10 +6,13 @@ EAPI=6
 
 CARGO_SNAPSHOT_DATE="2016-03-21"
 CARGO_INDEX_COMMIT="14f7adaa984f78037839f7e64912fe89d7af025a"
-CRATES="advapi32-sys-0.2.0
+CRATES="
+advapi32-sys-0.2.0
 aho-corasick-0.5.3
 bitflags-0.1.1
 bitflags-0.7.0
+bufstream-0.1.2
+cargotest-0.1.0
 cfg-if-0.1.0
 cmake-0.1.17
 crates-io-0.4.0
@@ -26,6 +29,7 @@ gdi32-sys-0.2.0
 git2-0.4.4
 git2-curl-0.5.0
 glob-0.2.11
+hamcrest-0.1.1
 idna-0.1.0
 kernel32-sys-0.2.2
 lazy_static-0.2.1