gentoo resync : 10.02.2019

5 files changed, 27 insertions, 280 deletions

diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index f68e7267333c..c680985eefd4 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,9 +1,5 @@
-DIST bazel-0.17.2-dist.zip 79230155 BLAKE2B 62a60011f9605a1d615e648fdbb98b193561e1d86a7562ccb10fdbb8b6986e17a72c4076dbdbf6baf8a7af83e320af2c4e4b65b5b2101d845597ddd688194ba5 SHA512 0d277e20eac6fc972a31be1c77a750f6585d16beabfe7dd096db4103f0f191958aa83b52203b91d4df5b486ff20004c0b4b22125e58379f64f68abc4a87ac326
-DIST bazel-0.18.0-dist.zip 86890953 BLAKE2B 53da2c2d4467f1f7dd2e613a347acd0ea547bd41fe49fa39cbbcb92c337dca43412ac9b65abf7a3e00c322b8fea075cbdef0da5b064bf4e22aaaa4c545c539de SHA512 128e1041ae0d85be26933bb107b406ca4ab177f00eec2ee1d791ec9089c0cb384857b532498276480d1063b82e7a9a809b9f8a0d0715260534c3e3d202d6cf13
-DIST bazel-0.19.0-dist.zip 87333329 BLAKE2B a9a0002b6a1dc98d3c753b9e37001f41c0e9b3e8628600d10d7ffb379686a2fef33032b8264e72cb787135be0a5a3c26aa452320b309da10ed8a1f8fe6667046 SHA512 ea67fb4d13487d24a0442084f42ff3c082a107c56a06d882f579064f17c545d6e9b5f0c4d724238c22e9b3bad12c68c60c58b59f82d9e957fe3af222d44bc969
 DIST bazel-0.20.0-dist.zip 87602213 BLAKE2B 0d10fc89a8bc2bf91a67317d42302b894abbec8c4e9f39dd4fbeae71fcba847d5ae35102e3ef4a26d7dfe2da9e47cec5660dd28e1804c3ad562583e9566b78cb SHA512 1628a99a2c95334b7b190c5cf1b80ad3ce61c827103844f68401ffe5cfa994d5b7edd9e314a2775b6ed5b8da70ad79bee0ef47b9acf409919a613069356623a3
-EBUILD bazel-0.17.2.ebuild 2921 BLAKE2B 4088b739841036045d100e45904d4ca45e8feb466eed72a4732aa69f1ae212ca5d900d6312a04b1bd5c9caa2717f1e3b0741f51010d31c113dda21767e7c0e20 SHA512 53d8207474d7d0b4301484c7d7cb3ef58ba556cbda6436b430714706e69abfb6be6c49d6a3e6d86b55fdf12eda300551f0e6580ed0fb42f1dc3c94de072c71e3
-EBUILD bazel-0.18.0.ebuild 2870 BLAKE2B dca6242ba8027e5c2c62b2cae41f0962db415a11649a0850e9cef1f012e444d94f644734b6ddcfd208f16723c9907130d00e44767efca6b33b47992243964434 SHA512 dae913f3ffa15db53cdc5bcbabfed6a826bd6ff9d7ca8af7526775a5618bb415896b59f90ec10855900ffce264f5feed79c274b1419ef54123f01ca636664370
-EBUILD bazel-0.19.0.ebuild 3039 BLAKE2B c4db272e08d0ad60b54e93c66c17df0230cc447446e03d00a6bd1264422cda5f80ee7b8ab7609e00072d839a7b41addec6056b761908cb1a439300beca7f2fa3 SHA512 81affcd83028ee230aab7273eae66f1f951b867deddc0447d4fd1dca7ea66c2d343118f14ed8d06d24ff38b7baceea5f6245802cbfe2eac4995b2694d17514d8
-EBUILD bazel-0.20.0.ebuild 3059 BLAKE2B 6b0de8cd6626ed9cf8e280104bb4f831be5ff3fe6c480874b4bd44397e2924837037631ace144af1e811fd66e269871df20ff5fc74744bc6b5e3413ed153153a SHA512 2aa412d00943bc03e8600aa326e189a8aafc93cc324d10c0280fd6ba15297417a78484b8780d20f4d3f04328bbb84e6032f50ef1d4c0d14fe55532fde4f73760
+DIST bazel-0.22.0-dist.zip 88633015 BLAKE2B 7cb7ef53c9acb4089b92d82679ad82739fd3c1fd3af7147e13b1474353fdf4cba1f58deed6d1880ec85fe5a07940b8df14af2701361d86e638b5c0e6924300c1 SHA512 b93cd21f0f164c118b90efba761a9492eb9894e24f13ff468defd12b86c7e67f16e51060ac2fc4c2f8dbf51b1c833d41b255fdd8107988e5babf093cfc5b3254
+EBUILD bazel-0.20.0.ebuild 3058 BLAKE2B 120fb7b7ccc4aa2b96b626d36c182bddc2ac8495478cc077dd04921d2d5f43f9065e47096a1b9443eabe07cbdd448359b80270678fc120ce8187ae786dd630df SHA512 5d6667cf6a87beacbafddd2dbbb67f37e4f7b36b2d1f0a100bb9508a6fde8601fcc9bed0362157ab4501b5f44ab1e4a89e09c0182ca8d4b76750dcd256e83ea6
+EBUILD bazel-0.22.0.ebuild 2868 BLAKE2B 36b2141dd525a26fb9d5ba9e866806110276f86bcca728c24171a9d00c124c69be88b484286c112f2da0eee46375a90f6c001ec8bd5da26c83a9c4a356bb3518 SHA512 b1b142af04cbd4666758ffa44f56b58e7c80c36b4a3e9f95687e8ef4e6f4c8bf371d03b1ec5cf8f191b9de269a0de0666663e1e28f0409d171262c06b46c7d01
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.17.2.ebuild b/dev-util/bazel/bazel-0.17.2.ebuild
deleted file mode 100644
index 79fea4a87e0a..000000000000
--- a/dev-util/bazel/bazel-0.17.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 java-pkg-2 multiprocessing
-
-DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="http://bazel.io/"
-
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples tools zsh-completion"
-# strip corrupts the bazel binary
-RESTRICT="strip"
-RDEPEND="virtual/jdk:1.8"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip"
-
-S="${WORKDIR}"
-QA_FLAGS_IGNORED="usr/bin/bazel"
-
-bazel-get-flags() {
-	local i fs=()
-	for i in ${CFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-	done
-	for i in ${CXXFLAGS}; do
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${CPPFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${LDFLAGS}; do
-		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
-	done
-	echo "${fs[*]}"
-}
-
-pkg_setup() {
-	echo ${PATH} | grep -q ccache && \
-		ewarn "${PN} usually fails to compile with ccache, you have been warned"
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack ${P}-dist.zip
-}
-
-src_prepare() {
-	default
-
-	sed -i 's@//src:bazel@//src:bazel_nojdk@' scripts/BUILD || die
-
-	# F: fopen_wr
-	# S: deny
-	# P: /proc/self/setgroups
-	# A: /proc/self/setgroups
-	# R: /proc/24939/setgroups
-	# C: /usr/lib/systemd/systemd
-	addpredict /proc
-
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	cat > "${T}/bazelrc" <<-EOF
-	build --verbose_failures
-	build --spawn_strategy=standalone --genrule_strategy=standalone
-
-	build --distdir=${S}/derived/distdir/
-	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-
-	test --verbose_failures --verbose_test_summary
-	test --spawn_strategy=standalone --genrule_strategy=standalone
-	EOF
-
-	echo "import ${T}/bazelrc" >> "${S}/.bazelrc"
-}
-
-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
-	output/bazel shutdown
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-	output/bazel shutdown
-}
-
-src_install() {
-	dobin output/bazel
-	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/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	# could really build tools but I don't know which ones
-	# are actually used
-	if use tools; then
-		docinto tools
-		dodoc -r tools/*
-		docompress -x /usr/share/doc/${PF}/tools
-	fi
-}
diff --git a/dev-util/bazel/bazel-0.19.0.ebuild b/dev-util/bazel/bazel-0.19.0.ebuild
deleted file mode 100644
index dda30d679453..000000000000
--- a/dev-util/bazel/bazel-0.19.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 java-pkg-2 multiprocessing
-
-DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="http://bazel.io/"
-
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples tools"
-# strip corrupts the bazel binary
-RESTRICT="strip"
-RDEPEND="virtual/jdk:1.8"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-QA_FLAGS_IGNORED="usr/bin/bazel"
-
-bazel-get-flags() {
-	local i fs=()
-	for i in ${CFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-	done
-	for i in ${CXXFLAGS}; do
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${CPPFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${LDFLAGS}; do
-		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
-	done
-	echo "${fs[*]}"
-}
-
-pkg_setup() {
-	echo ${PATH} | grep -q ccache && \
-		ewarn "${PN} usually fails to compile with ccache, you have been warned"
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack ${P}-dist.zip
-}
-
-src_prepare() {
-	default
-
-	sed -i 's@//src:bazel@//src:bazel_nojdk@' scripts/BUILD || die
-
-	# F: fopen_wr
-	# S: deny
-	# P: /proc/self/setgroups
-	# A: /proc/self/setgroups
-	# R: /proc/24939/setgroups
-	# C: /usr/lib/systemd/systemd
-	addpredict /proc
-
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	cat > "${T}/bazelrc" <<-EOF
-	build --verbose_failures
-	build --spawn_strategy=standalone --genrule_strategy=standalone
-
-	build --distdir=${S}/derived/distdir/
-	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-
-	test --verbose_failures --verbose_test_summary
-	test --spawn_strategy=standalone --genrule_strategy=standalone
-	EOF
-}
-
-src_compile() {
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
-	VERBOSE=yes ./compile.sh || die
-
-	local OPTS=""
-	if [[ $(java-config -g PROVIDES_VERSION) == "1.8" ]]; then
-		OPTS="--java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8"
-		OPTS+=" --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8"
-	fi
-
-	output/bazel --bazelrc="${T}/bazelrc" build ${OPTS} //scripts:bazel-complete.bash || die
-	output/bazel shutdown
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-	output/bazel shutdown
-}
-
-src_install() {
-	dobin output/bazel
-	newbashcomp bazel-bin/scripts/bazel-complete.bash ${PN}
-	bashcomp_alias ${PN} ibazel
-	insinto /usr/share/zsh/site-functions
-	doins scripts/zsh_completion/_bazel
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	# could really build tools but I don't know which ones
-	# are actually used
-	if use tools; then
-		docinto tools
-		dodoc -r tools/*
-		docompress -x /usr/share/doc/${PF}/tools
-	fi
-}
diff --git a/dev-util/bazel/bazel-0.20.0.ebuild b/dev-util/bazel/bazel-0.20.0.ebuild
index 49ee78643806..2cb3bda8d83e 100644
--- a/dev-util/bazel/bazel-0.20.0.ebuild
+++ b/dev-util/bazel/bazel-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples tools"
 # strip corrupts the bazel binary
 RESTRICT="strip"
diff --git a/dev-util/bazel/bazel-0.18.0.ebuild b/dev-util/bazel/bazel-0.22.0.ebuild
index c1c992cd2cab..68be76691f9d 100644
--- a/dev-util/bazel/bazel-0.18.0.ebuild
+++ b/dev-util/bazel/bazel-0.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,20 +6,19 @@ EAPI=6
 inherit bash-completion-r1 java-pkg-2 multiprocessing
 
 DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="http://bazel.io/"
+HOMEPAGE="https://bazel.build/"
 
 SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="examples tools zsh-completion"
+IUSE="examples tools"
 # strip corrupts the bazel binary
 RESTRICT="strip"
 RDEPEND="virtual/jdk:1.8"
 DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip"
+	app-arch/unzip"
 
 S="${WORKDIR}"
 QA_FLAGS_IGNORED="usr/bin/bazel"
@@ -56,8 +55,6 @@ src_unpack() {
 src_prepare() {
 	default
 
-	sed -i 's@//src:bazel@//src:bazel_nojdk@' scripts/BUILD || die
-
 	# F: fopen_wr
 	# S: deny
 	# P: /proc/self/setgroups
@@ -68,23 +65,27 @@ src_prepare() {
 
 	# Use standalone strategy to deactivate the bazel sandbox, since it
 	# conflicts with FEATURES=sandbox.
-	cat > "${T}/bazelrc" <<-EOF
-	build --verbose_failures
-	build --spawn_strategy=standalone --genrule_strategy=standalone
+	cat > "${T}/bazelrc" <<-EOF || die
+		build --verbose_failures
+		build --spawn_strategy=standalone --genrule_strategy=standalone
 
-	build --distdir=${S}/derived/distdir/
-	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+		build --distdir="${S}/derived/distdir/"
+		build --jobs=$(makeopts_jobs) $(bazel-get-flags)
 
-	test --verbose_failures --verbose_test_summary
-	test --spawn_strategy=standalone --genrule_strategy=standalone
-	EOF
+		test --verbose_failures --verbose_test_summary
+		test --spawn_strategy=standalone --genrule_strategy=standalone
+		EOF
 }
 
 src_compile() {
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) --host_javabase=@local_jdk//:jdk"
 	VERBOSE=yes ./compile.sh || die
-	output/bazel --bazelrc="${T}/bazelrc" build //scripts:bazel-complete.bash || die
-	output/bazel shutdown
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash
 }
 
 src_test() {
@@ -99,12 +100,10 @@ src_test() {
 
 src_install() {
 	dobin output/bazel
-	newbashcomp bazel-bin/scripts/bazel-complete.bash ${PN}
+	newbashcomp 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
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
 
 	if use examples; then
 		docinto examples