Revert "sci-libs/tensorflow: prefer tarballs over zips"

This reverts commit 881d0205b3174fc445a63569ed9ad55d5b6d0d01.

These ones need to be the exact archives specified in the WORKSPACE
file.

Bazel fetches distfiles and verifies the hashes match. Switching zips to
tarballs will mean the filenames and hashes are wrong so bazel will fall
back to fetching from the internet, which breaks with network-sandbox.

Signed-off-by: Jason Zaman <perfinion@gentoo.org>

diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index b7c67251c4d53180f36282ecd115265491b66037..1fccc3eaf938b250c2e6252cbe099539f3b6f127 100644 (file)
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -5,17 +5,17 @@ DIST bazel-skylib.0.8.0.tar.gz 72941 BLAKE2B 1928989d3e5dc338fee974c5592a524adb4
 DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6
 DIST bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz 505681 BLAKE2B f16225eb11859f487335bddca115c9c2a05731f4bfe4240609a47e17b706d9a25b6b363b61404b4d5df0471e4dd9b4b9befbf78dbcb1c7c11e3f590039ff92b2 SHA512 7723baf2c710adb063375a33fd64e3941fae7e98c824764c266d5554cc0b0cbb1c91a5c2a9058bb4c8766ec404ca556199ce22965a6de4baee09cb740b7671c9
 DIST bazel_skylib-0.9.0.tar.gz 84644 BLAKE2B 40b69a524e632ea00d34b9cf805b882ac4c549dd465ef37f28e54729ff1b614a7610a4895cede4e0c938edba5b19f781f3c0bfdb62bde628ee0af21d6b679546 SHA512 af4bcb641fed05d15f2d0ffe0e3abdfe9c7a5deb9c53064992d6605d224ded1648b1bdfa293e161028913f9f2c178c68cc38bc16028892ca5b0f52b4e645209d
-DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.tar.gz 49926 BLAKE2B abf1fb600547bd5df539701056e9f391b081986bfe3c0bfba49ef7e0896056ded55a6e1121d7c6c9d9fd455cfd2780593eabc6669d3907507f4a44b274cf4f51 SHA512 170ab5a90c1bc78d3e50532ebc3948e7400300952c4da4413c131675985b122ffc885a23028c2e183bc6bf819653fb83c5c132d973154c309500285562752174
+DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAKE2B 0bbcc2b3fefb8df84d9f72b13da59c377fcd657ead378f85f80a587f8750302236212ae5c58819933015e62425126bead0733d2924a567fb9c5cb14fb75271a8 SHA512 1818c555504ba89afff88d75fe8b4e1386b3665a3ad477c26b4e9504c8f52f398b6aaedbad41a4ab8b8d9b3f86e0992e7c83a6da70241685d7b79ba177af1035
 DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a
 DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03
 DIST bazelbuild-rules_swift.0.11.1.tar.gz 107453 BLAKE2B 8cd686b945b5c9de9c8bfcaca38cd7c513bb8b55b4584bc569463997e7c5abcac3be4a5a31ccf95a494d17f3078ec9b1052497dba228fa3159a0c0be2a83eb88 SHA512 3479d6d8ce9111a39b9ef2e014399abc904e432841570dd0380104d80e4d3a74b6ff5cc6d2b250bcd15b152efa29d08f9ed092f70fd8bafa6deaa6f847d7f626
 DIST bazelbuild-rules_swift.0.12.1.tar.gz 111674 BLAKE2B 7c116d6098aa0725034dce4c83628c31c85c36a6331b44636deb2efe0f689a5baee8081b33d65e3727a83bca865bcabedd6f8fa1fdb60e901a9b60840c52c018 SHA512 6136feb3dc0074f82500000cf5335f046f21ea3a1edcb4dcb22228c82b56ed6a334e4b03e4e26a4d25549581abcf7df22b60a2bccf823a51bf270051fe18d489
-DIST cub-1.8.0.tar.gz 384644 BLAKE2B 17b55dd4ffc32792d5b1c5b4cd95e670d722ceed13ebcbfa4210bed60f0f6c4fb37fe8fcee5b072e4284c779e69bb638be64bde593a5e79ee2ad80bedc561d97 SHA512 c4ba51ca4e369c8ef87bc411aa011470478fcc2526b667f088e9ac8c62e6532dc2368e869f5147b56f22b3e8718c7276434c3294d9d67cb3a92c700d163e8fa7
+DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed
 DIST eigen-049af2f56331.tar.gz 2485848 BLAKE2B 9d8a91782c9d40b7a6df101d2f43df25b5a3622bc02a7b9576929afb1f2f3d7c8b80671d24f1e31670883003b60c4cc0f3c9dadff0430d2ee047eb5122805edd SHA512 ab37106e9dfebbb42d7919c16b301887607080345b7ed63c8e3b8568489cfdc2c3ca0117a77905162cb3ba8324753040c841d2c96521fa4b9486f0778f1962df
 DIST eigen-49177915a14a.tar.gz 2496808 BLAKE2B 4e89b72a2ca121e9d1951a7179434c9eb70104ad45e63ae9811e10e28e32d51386acd2fe6938970404dcada8a377d1b3c07a68a98a68a036a6e85b2cf9ff4b48 SHA512 eb036225b41ffd8cc61ef99d2d22030c0d1e0f87eefcea4dd2b1fdb16a5316e0f4f17527983a00a8a684067654bf1f87c82cfaed5764829778660485ebbfa4b5
 DIST eigen-afc120bc03bd.tar.gz 2546157 BLAKE2B 72e051d77cd22c26a4203cf244e87b1700b4dce664d7ee5f80d0dd86eb5557c93e57c50664f1d79b13796a77c5ccdf72203ec66e9376d383b5a3b056326c7b61 SHA512 61f57a22d2a7947c14cfde87946dc41528df696884502a13000ee5c9b964672a5a8d8c10f505f28ed7a2d39deb820c6818d191dc3ce13215b8b9775b33da2ed8
 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
-DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.tar.gz 838386 BLAKE2B faacadedec55defcec6994ba60838681f0238042f29381131523ff9bd4f4c8060b0e818887a252bee9720e5ba0bcc6b2ada915705c12d8a65f0c492afcb8e1b2 SHA512 f24e2c79ff1adb2036c15248e649925dfe3bf1ced61a2f2aa069bfa408a72cb819c389bf0ac0b325067bf073ecdae342689cd240d32919b81090627f9c5c978e
+DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip 935628 BLAKE2B 09bd1dd1e367b1e5c4fe9a9525449c09460f19168bc03c57ad563aa27ec74a18f08b620a3dab6da4fa1a1448cdc7ce8bc8a089becc033b53fff4cc07593315ce SHA512 bd42a364f718f3b077cd9c840d626bfc1fd92ace98ce43329d8fa54700c9d28cb47568b6567e9b081b340af7be621c44be1ce06d4b8dccc4fb5d82c35b12f951
 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
 DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b
 DIST llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz 50144723 BLAKE2B b744756c9782e5506fd6628531409e305bd9ce9a79f1776c4fe674cec5b01a86ab1793dc602f704d295587c3d769d622402a4fe07c0d66269c7f610178693bce SHA512 43f185c8dd38ae7cb048bb9c98fb94e1f43ce66764b43a7141a06a1a0b011389fa139f34b7eaee72c39b8f44aeeff3e7a2189c11d10f8f8a93e9792a1acf2b5f

diff --git a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
index 65617484b8bdbc9342f471e7db6a6bfd5d861c1f..34f6deb7f78965142ce094ded1826576249383e5 100644 (file)
--- a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
@@ -33,7 +33,7 @@ bazel_external_uris="
        https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
        https://github.com/bazelbuild/rules_swift/releases/download/0.11.1/rules_swift.0.11.1.tar.gz -> bazelbuild-rules_swift.0.11.1.tar.gz
        https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
-       https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.tar.gz -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.tar.gz
+       https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip
        https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
        https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
        https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz
@@ -41,7 +41,7 @@ bazel_external_uris="
        https://github.com/llvm-mirror/llvm/archive/7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz -> llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz
        cuda? (
                https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz
-               https://github.com/NVlabs/cub/archive/1.8.0.tar.gz -> cub-1.8.0.tar.gz
+               https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
        )
        python? (
                https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz

diff --git a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
index f89ed1994587b68811bcfea7ea2ffa5bb6776079..bdc3e475883f3afa297d0a051971bbcf6879d1ff 100644 (file)
--- a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
@@ -33,7 +33,7 @@ bazel_external_uris="
        https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
        https://github.com/bazelbuild/rules_swift/releases/download/0.11.1/rules_swift.0.11.1.tar.gz -> bazelbuild-rules_swift.0.11.1.tar.gz
        https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
-       https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.tar.gz -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.tar.gz
+       https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip
        https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
        https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
        https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz
@@ -41,7 +41,7 @@ bazel_external_uris="
        https://github.com/llvm-mirror/llvm/archive/b7d166cebcf619a3691eed3f994384aab3d80fa6.tar.gz -> llvm-b7d166cebcf619a3691eed3f994384aab3d80fa6.tar.gz
        cuda? (
                https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz
-               https://github.com/NVlabs/cub/archive/1.8.0.tar.gz -> cub-1.8.0.tar.gz
+               https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
        )
        python? (
                https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz

diff --git a/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild
index 5e8e349b18f51445544f2916d9eb1a8d9b8105e0..d936f061120e00e4cb8d63567836f68ae92ca5d4 100644 (file)
--- a/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild
@@ -30,12 +30,12 @@ bazel_external_uris="
        https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz
        https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz
        https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
-       https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.tar.gz -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.tar.gz
+       https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
        https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
        https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
        https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz
        https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
-       https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.tar.gz -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.tar.gz
+       https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip
        https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
        https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
        https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
@@ -43,7 +43,7 @@ bazel_external_uris="
        https://github.com/llvm/llvm-project/archive/ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz -> llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz
        cuda? (
                https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz
-               https://github.com/NVlabs/cub/archive/1.8.0.tar.gz -> cub-1.8.0.tar.gz
+               https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
        )
        python? (
                https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz