gentoo resync : 11.07.2019

4 files changed, 116 insertions, 33 deletions

diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index bab927cd9ca6..9b23992fdb54 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -5,7 +5,8 @@ DIST bazel-0.26.1-dist.zip 244633948 BLAKE2B 667078bda6e52f696127b7a4914ec52ab67
 DIST bazel-0.27.0-dist.zip 247946763 BLAKE2B f061793de89144c77bd42de56c495e8b3399ac1892bdd2b0e210102ea1c2835a848432b2964ddcc6ebe77aa580efa378d46afad1faa6dec0831666f201a6dd74 SHA512 f5c6a0c789eb55790479ff839f7f959e7d0e46e5f14b5cdcd720e4dc2c36122345c9dcd6bfa803f88fb5264553a3d63ae0c8e4c7b9779bfc65183e2aaee5a666
 EBUILD bazel-0.20.0.ebuild 3072 BLAKE2B e357ef6c41a91ecd538250fd47830076db961e2234c7c734d24ae3c501517d0f16bf5934896a0e7efe271af926953b083c47c924c581b7ef208af2c4d53bf623 SHA512 982ca89595f13670dc117ba3504e8de6f3d5f4a7ec2af3a11bfadc3ce25bd75c85387b53464bd0348b0842d25454a1c1398ecc4f1146f9eb2fafa857e2193487
 EBUILD bazel-0.22.0.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
+EBUILD bazel-0.24.1-r1.ebuild 2536 BLAKE2B c738d9b9155ad0d95f801c20ba7b79a493cad2d49abf3e4ad16fa31d9d5a9107028e735cfbc6075255c062e033b0ddcb0767809c61486a2095194fd05413b508 SHA512 6a565ea0494bc8723ec9895fe6bd24869801a950d15812422c643bceead44d49b647a9557a2164aa781d4a788758dec1b0eab43deaa83ff0880650482bddc734
 EBUILD bazel-0.24.1.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
-EBUILD bazel-0.26.1.ebuild 2931 BLAKE2B 322360454f6a14dbf71e7987c6cd4014ee9bf52600ac763abbb3f72ea77396476c7656943c949d619f0c6e30a0b221c0e13a0ccd83227b83ee5cad1fc0d31f2c SHA512 b78d60b5da6e998b4a0600fbbe8422008239eb90c73e4701ad0635d898596a1733f7ecb92a16e7d14c6126232f15cdc7e708f1529e2c8f36ebf8984cfacc57f5
-EBUILD bazel-0.27.0.ebuild 2933 BLAKE2B 1c4b1d61da2e9c52e5d1ef888a5f3a0b7db397d338ca85a0b1fc2ed49a49777ba4ed0b2ad36dd396835cb038853116f18044210d27346d0e395e1c00e71d23eb SHA512 7555ba2fd65c17d1da5f2096ce94c5604579fed40078d8325e698ee2ba374ce60852482a721167f72f4afc510f0f5c7f9ce8313c1e8e9821f8f1a28aa4a62957
+EBUILD bazel-0.26.1-r1.ebuild 2536 BLAKE2B c738d9b9155ad0d95f801c20ba7b79a493cad2d49abf3e4ad16fa31d9d5a9107028e735cfbc6075255c062e033b0ddcb0767809c61486a2095194fd05413b508 SHA512 6a565ea0494bc8723ec9895fe6bd24869801a950d15812422c643bceead44d49b647a9557a2164aa781d4a788758dec1b0eab43deaa83ff0880650482bddc734
+EBUILD bazel-0.27.0-r1.ebuild 2536 BLAKE2B c738d9b9155ad0d95f801c20ba7b79a493cad2d49abf3e4ad16fa31d9d5a9107028e735cfbc6075255c062e033b0ddcb0767809c61486a2095194fd05413b508 SHA512 6a565ea0494bc8723ec9895fe6bd24869801a950d15812422c643bceead44d49b647a9557a2164aa781d4a788758dec1b0eab43deaa83ff0880650482bddc734
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.27.0.ebuild b/dev-util/bazel/bazel-0.24.1-r1.ebuild
index 3011c92b93f3..a1d730d57133 100644
--- a/dev-util/bazel/bazel-0.27.0.ebuild
+++ b/dev-util/bazel/bazel-0.24.1-r1.ebuild
@@ -22,7 +22,6 @@ DEPEND="${RDEPEND}
 	app-arch/zip"
 
 S="${WORKDIR}"
-QA_FLAGS_IGNORED="usr/bin/bazel"
 
 bazel-get-flags() {
 	local i fs=()
@@ -63,23 +62,10 @@ src_prepare() {
 	# 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 || die
-		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) --host_javabase=@local_jdk//:jdk"
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
 	VERBOSE=yes ./compile.sh || die
 
 	./scripts/generate_bash_completion.sh \
@@ -117,5 +103,6 @@ src_install() {
 		docinto tools
 		dodoc -r tools/*
 		docompress -x /usr/share/doc/${PF}/tools
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
 	fi
 }
diff --git a/dev-util/bazel/bazel-0.26.1.ebuild b/dev-util/bazel/bazel-0.26.1-r1.ebuild
index f423e4855300..a1d730d57133 100644
--- a/dev-util/bazel/bazel-0.26.1.ebuild
+++ b/dev-util/bazel/bazel-0.26.1-r1.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="~amd64"
 IUSE="examples test tools"
 # strip corrupts the bazel binary
 RESTRICT="strip test? ( network-sandbox ) !test? ( test )"
-RDEPEND=">=virtual/jdk-1.8"
+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=()
@@ -63,23 +62,10 @@ src_prepare() {
 	# 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 || die
-		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) --host_javabase=@local_jdk//:jdk"
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
 	VERBOSE=yes ./compile.sh || die
 
 	./scripts/generate_bash_completion.sh \
@@ -117,5 +103,6 @@ src_install() {
 		docinto tools
 		dodoc -r tools/*
 		docompress -x /usr/share/doc/${PF}/tools
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
 	fi
 }
diff --git a/dev-util/bazel/bazel-0.27.0-r1.ebuild b/dev-util/bazel/bazel-0.27.0-r1.ebuild
new file mode 100644
index 000000000000..a1d730d57133
--- /dev/null
+++ b/dev-util/bazel/bazel-0.27.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+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 test tools"
+# strip corrupts the bazel binary
+RESTRICT="strip test? ( network-sandbox ) !test? ( test )"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+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
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
+	VERBOSE=yes ./compile.sh || die
+
+	./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() {
+	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-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
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}