2 files changed, 12 insertions, 30 deletions
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 127feab0d484..66a4ede93d2a 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,7 +1,7 @@
-DIST bazel-0.14.1-dist.zip 89415405 BLAKE2B 7be5d4630d024d235a66f6bdf495c282b04a4034dde156c50d37a7e2eb3bf98df0caead7887f421b664fe92486e6baa5cd90e61b1e82b07b1691dc509ab93a68 SHA512 02c7125438f060d8e5e25b91ce3ca76fac6681b4f12033d807955a4ca5a5c22a3508a7229581b7349f35f343911f8408f43f8d78d54601277576dd32539e4681
 DIST bazel-0.16.0-dist.zip 89720984 BLAKE2B be8ad9c94b13dd8d1d1de76ed67a3a695a2541327b8cb8a4d27b9279c065cb351d6b2d5785024d11a163bfd4697fb1375b350c8220387ab79db7e95537def5c3 SHA512 89cefed69df1cae7076673900546199427fab3508aad1f0347b9da38153b6b1566b19a4c205055f41ca431fd9444ec772c86bc32fbff0da0485a5e5f11728932
+DIST bazel-0.17.1-dist.zip 79229870 BLAKE2B 0f149ac881dc1bc02ab5b07590620d19921034d6d5fb88bf46b0a10e0eceac1ba0f33181e9912d342c01e551bf94e38a13e4252762e6b4e7800ec1527a970f76 SHA512 b8c2292baf67b0b8a85811145ac220084975a2bcd2f2a9f461e83589296c56166886f91a32cde343762247a9c3a04100b3f86a8f969d880f641f88183a804e6b
 DIST google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip 1056996 BLAKE2B bf168c41a9958bcdc679a40d1e88911c6af0e47207362204326b712e0129b37348360a855f44af8b76acc46108ac89a707d0c0f793500c513a919070248939b9 SHA512 40cb9ffcaa3c57c69bcbec7b070fad5865e7317817049b7588dd42899054eb97cd17cb0019df99ad2324ed8e2efd8334cd83ace758a4c2d3f453503ccf54a91e
 DIST zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz 53360827 BLAKE2B 2cf000a50950d839fec4a0ff871632a18a67e93ff31a430d8af92fb0bf40f11d0d45a4427ec546618620aa1c1fc1078a9e918c540315ef8e5fb3928c9b36019d SHA512 63c3989b97845d9a019be5f20e667d9c96550738502c148b0dbf6cd9c1553df077217cb6fa0a9517d555c53a7a6eadeb7403d94aebca01f67aee3d97517df4fd
-EBUILD bazel-0.14.1.ebuild 3603 BLAKE2B 3cc3d61b45ea0595ad543d240c13b7f61ff6f76ae5cd34f7f2ba60823fcbb3ad31653fbc09b5a7030df7f0750ae33d3c0c454d162e72911e0cb2944036fd71f2 SHA512 9369b64769351b94d119323f1d506ffe9816b3ab3a2a33f4f1977b2aeede49b85833aa3454a4ce1b0b4a8026fffe731302b60aaab42c326c1ec733cb20aec332
 EBUILD bazel-0.16.0.ebuild 3718 BLAKE2B 95348099ab995f8f93b7d040aa6f032ac84fddfb1f0c0f12881ad15bd238a8fb08d912e6f1f3cb4eff124b43e3c04db25d3b400991ebe5c2eee50734a00f63e8 SHA512 bdd0d7a445b08bc9df7babb2fd04b607d366bdc69ac75623f523f0f6d4921ae094b3fcc328d4ec36d9f6352fddc1121e403f8114105c2d370acf0d62578007db
+EBUILD bazel-0.17.1.ebuild 2921 BLAKE2B 4088b739841036045d100e45904d4ca45e8feb466eed72a4732aa69f1ae212ca5d900d6312a04b1bd5c9caa2717f1e3b0741f51010d31c113dda21767e7c0e20 SHA512 53d8207474d7d0b4301484c7d7cb3ef58ba556cbda6436b430714706e69abfb6be6c49d6a3e6d86b55fdf12eda300551f0e6580ed0fb42f1dc3c94de072c71e3
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.14.1.ebuild b/dev-util/bazel/bazel-0.17.1.ebuild
index b972de19c2d7..79fea4a87e0a 100644
--- a/dev-util/bazel/bazel-0.14.1.ebuild
+++ b/dev-util/bazel/bazel-0.17.1.ebuild
@@ -8,9 +8,7 @@ inherit bash-completion-r1 java-pkg-2 multiprocessing
 DESCRIPTION="Fast and correct automated build system"
 HOMEPAGE="http://bazel.io/"
 
-bazel_external_uris="https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip -> google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip
-	${bazel_external_uris}"
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -24,6 +22,7 @@ DEPEND="${RDEPEND}
 	app-arch/zip"
 
 S="${WORKDIR}"
+QA_FLAGS_IGNORED="usr/bin/bazel"
 
 bazel-get-flags() {
 	local i fs=()
@@ -43,25 +42,6 @@ bazel-get-flags() {
 	echo "${fs[*]}"
 }
 
-load_distfiles() {
-	# Populate the bazel distdir to fetch from since it cannot use the network
-	local s d uri rename
-	mkdir -p "${T}/bazel-distdir" || die "failed to create distdir"
-
-	while read uri rename d; do
-		[[ -z "$uri" ]] && continue
-		if [[ "$rename" == "->" ]]; then
-			s="${uri##*/}"
-			einfo "Copying $d to bazel distdir $s ..."
-		else
-			s="${uri##*/}"
-			d="${s}"
-			einfo "Copying $d to bazel distdir ..."
-		fi
-		cp "${DISTDIR}/${d}" "${T}/bazel-distdir/${s}" || die
-	done <<< "${bazel_external_uris}"
-}
-
 pkg_setup() {
 	echo ${PATH} | grep -q ccache && \
 		ewarn "${PN} usually fails to compile with ccache, you have been warned"
@@ -74,9 +54,10 @@ src_unpack() {
 }
 
 src_prepare() {
-	load_distfiles
 	default
 
+	sed -i 's@//src:bazel@//src:bazel_nojdk@' scripts/BUILD || die
+
 	# F: fopen_wr
 	# S: deny
 	# P: /proc/self/setgroups
@@ -91,7 +72,7 @@ src_prepare() {
 	build --verbose_failures
 	build --spawn_strategy=standalone --genrule_strategy=standalone
 
-	build --experimental_distdir=${T}/bazel-distdir
+	build --distdir=${S}/derived/distdir/
 	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
 
 	test --verbose_failures --verbose_test_summary
@@ -104,8 +85,8 @@ src_prepare() {
 src_compile() {
 	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
 	VERBOSE=yes ./compile.sh || die
-	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
-	mv bazel-bin/scripts/bazel-complete.bash output/ || die
+	output/bazel --bazelrc="${T}/bazelrc" build //scripts:bazel-complete.bash || die
+	output/bazel shutdown
 }
 
 src_test() {
@@ -115,17 +96,18 @@ src_test() {
 		--genrule_strategy=standalone \
 		--verbose_test_summary \
 		examples/cpp:hello-success_test || die
+	output/bazel shutdown
 }
 
 src_install() {
-	output/bazel shutdown
 	dobin output/bazel
-	newbashcomp output/bazel-complete.bash ${PN}
+	newbashcomp bazel-bin/scripts/bazel-complete.bash ${PN}
 	bashcomp_alias ${PN} ibazel
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
 		doins scripts/zsh_completion/_bazel
 	fi
+
 	if use examples; then
 		docinto examples
 		dodoc -r examples/*