gentoo resync : 20.05.2018

3 files changed, 58 insertions, 16 deletions

diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index eb7f4f3fa0da..9c085f2ff417 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -1,4 +1,5 @@
 AUX 0001-pip_package-modularize-build-script-to-allow-distros.patch 5995 BLAKE2B 6f65cb3337e564fc1df01e525814fecfc00a98462563ecfea2b431f6be6f8084dc7e69ebec5a88252b7ad37f416593ca9402f032d0c055563751c7cbf1402567 SHA512 88ac3bb3ca953bec494f9187db3efdd081b76a88d4d5e04e5bff4762de603c2a5f95503d811d9ee19c236947ecf3a5467aed750977f7dc810317b3a43e777693
+AUX tensorflow-1.8.0-0002-dont-strip.patch 1181 BLAKE2B 98d25909f9b7a40e2f140dc47a6a1b79d332eba465e09c67c1088ca07301144f0fdc83d9a5b88b480bc2f4ec360da8011d281fa6b00f992f1f65b5861d4a0983 SHA512 af2311856f2efe3ea6ecf84aef4446f2a5dd79238fee26737b7ae9c1af861d8e95128046750f403c05be1c6c2a25129013f74f9d21f4204283938b50e1fc4356
 DIST ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz 99753 BLAKE2B 79b0c9e2f3a8de91bb042e55cbc9f589970add4c9bdccd96c9a0f38887418c97aa67fc433b4feffb92a1384039b0d68a7cc6cda141371427a310172422bd41d6 SHA512 a21df040a5b3f67d9be006ae414113fa1ca86d38fa446acfab18afcbbb89ee7c48776fac5565d0694c99f1ff6ead3b10a9915eac7aae4d2a532ef5ac126a0072
 DIST LMDB_0.9.19.tar.gz 143141 BLAKE2B 69f39e2194638989d8a17b79edd7918966d5608f4e611a7446b45e7321adf3b7d4bd69107fe00a1476d32cbd43b83f512c8498cefa3fca7eea8ba615821341fe SHA512 1d9825f09592ad92a540a1dec232cf6649f41cc67b0d59dc8958a71f4090f347c84995f32a166e2c2efecb862981f455814dd07af99bc3489e42fe3fd8bc6191
 DIST abseil_cpp-720c017e30339fd1786ce4aac68bc8559736e53f.tar.gz 529637 BLAKE2B fea7eceda492764613ffe944331e6b08af33d600036e9b2453f4c09e892f22f79a95b00a29a9bdf9e705d11502027d88659e19aa484cf4a02158209b058cec13 SHA512 3ac70cb924518627dfc6ec2eb5f65bc0e1235898eefebb0d0410867270065aa745d21456f1212b916e732b3f5dada18b03e526e02d09a09f445531798219006e
@@ -41,5 +42,5 @@ DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B 7384c2cf742fb5a8b4e266e95080ae2513
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
-EBUILD tensorflow-1.8.0.ebuild 12716 BLAKE2B 8545a75b7378b08f666cbdc0aa85d156f57b5995315c419c5f704cf9574987c2e7e61ba21a28f0f46c2824ba46c7b97662d0e998607c6967fdee9af326651653 SHA512 2d5f71375c8080f2c0103a442ab21dc4e55404b79cc6c3bdb27831ad905c9bd301821c33706c2949b400370e90ef70a8c4f5c6466a1aa1a1359162000981945f
+EBUILD tensorflow-1.8.0-r1.ebuild 12704 BLAKE2B 09da9048917ec2a5919179791fe0ef6607d2453e8a0e16ea0809820629a10002fbb157b96a9aad2c4999a78a8cfe75f4d43db8d1ed428741188fa12932ed0f15 SHA512 d6ec346fa14febaefe985c428d151477243cf7f1d4f21ecc24ea19204acaf2ff28fb192879206e46bbb771bfe10958cc0c460d351c9dc9ea5798b9211a40d84e
 MISC metadata.xml 640 BLAKE2B 144684ba7084f37fabe0f6f89b18f75577ab847de50c4c42ea4ca74076f57f8e37469c45ed07001c537e079285cb4ed26eac0bd0169a7513576501ce53925555 SHA512 c57fa522651341c8bf9838ca7afc9dac6ae1597dc850382b255aab7e9b50d4b4eb92cdd0408d20dd9f737c1ee9b1ed7102e477c86693f7eeb498e75e51e19343
diff --git a/sci-libs/tensorflow/files/tensorflow-1.8.0-0002-dont-strip.patch b/sci-libs/tensorflow/files/tensorflow-1.8.0-0002-dont-strip.patch
new file mode 100644
index 000000000000..9f828f3c8efc
--- /dev/null
+++ b/sci-libs/tensorflow/files/tensorflow-1.8.0-0002-dont-strip.patch
@@ -0,0 +1,29 @@
+diff --git a/tensorflow/BUILD b/tensorflow/BUILD
+index cfafffdd13..8ed22ccfea 100644
+--- a/tensorflow/BUILD
++++ b/tensorflow/BUILD
+@@ -470,7 +470,7 @@ tf_cc_shared_object(
+ # excludes all but a subset of function names.
+ # On MacOS, the linker does not support version_script, but has an
+ # an "-exported_symbols_list" command.  -z defs disallows undefined
+-# symbols in object files and -s strips the output.
++# symbols in object files.
+ 
+ tf_cc_shared_object(
+     name = "libtensorflow.so",
+@@ -484,7 +484,6 @@ tf_cc_shared_object(
+         "//tensorflow:windows_msvc": [],
+         "//conditions:default": [
+             "-z defs",
+-            "-s",
+             "-Wl,--version-script",  #  This line must be directly followed by the version_script.lds file
+             "$(location //tensorflow/c:version_script.lds)",
+         ],
+@@ -510,7 +509,6 @@ tf_cc_shared_object(
+         "//tensorflow:windows_msvc": [],
+         "//conditions:default": [
+             "-z defs",
+-            "-s",
+             "-Wl,--version-script",  #  This line must be directly followed by the version_script.lds file
+             "$(location //tensorflow:tf_version_script.lds)",
+         ],
diff --git a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild b/sci-libs/tensorflow/tensorflow-1.8.0-r1.ebuild
index c12a3e04ae05..98643e5d2ceb 100644
--- a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
@@ -101,6 +101,7 @@ S="${WORKDIR}/${MY_P}"
 DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
 PATCHES=(
 	"${FILESDIR}/0001-pip_package-modularize-build-script-to-allow-distros.patch"
+	"${FILESDIR}/tensorflow-1.8.0-0002-dont-strip.patch"
 )
 
 bazel-get-cpu-flags() {
@@ -140,24 +141,32 @@ setup_bazelrc() {
 	# https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
 	addpredict /proc
 
-	echo "startup --batch" > "${T}/bazelrc" || die
+	mkdir -p "${T}/bazel-cache" || die
+	mkdir -p "${T}/bazel-distdir" || die
+
+	cat > "${T}/bazelrc" <<-EOF
+	startup --batch
+
+	# dont strip HOME, portage sets a temp per-package dir
+	build --action_env HOME
 
-	# make bazel respect $MAKEOPTS
-	echo "build --jobs=$(makeopts_jobs) $(bazel-get-flags)" >> "${T}/bazelrc" || die
-	echo "build --compilation_mode=opt --host_compilation_mode=opt" >> "${T}/bazelrc" || die
+	# make bazel respect MAKEOPTS
+	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+	build --compilation_mode=opt --host_compilation_mode=opt
 
 	# Use standalone strategy to deactivate the bazel sandbox, since it
 	# conflicts with FEATURES=sandbox.
-	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" >> "${T}/bazelrc" || die
-	echo "build --noshow_loading_progress" >> "${T}/bazelrc" || die
-	echo "test --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" >> "${T}/bazelrc" || die
-	echo "test --verbose_test_summary --noshow_loading_progress" >> "${T}/bazelrc" || die
+	build --spawn_strategy=standalone --genrule_strategy=standalone
+	test --spawn_strategy=standalone --genrule_strategy=standalone
+
+	build --strip=never
+	build --verbose_failures --noshow_loading_progress
+	test --verbose_test_summary --verbose_failures --noshow_loading_progress
 
 	# make bazel only fetch distfiles from the cache
-	mkdir -p "${T}/bazel-cache" || die
-	mkdir -p "${T}/bazel-distdir" || die
-	echo "fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/" >> "${T}/bazelrc" || die
-	echo "build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/" >> "${T}/bazelrc" || die
+	fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
+	build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
+	EOF
 }
 
 bazel_multibuild_wrapper() {
@@ -170,8 +179,8 @@ bazel_multibuild_wrapper() {
 ebazel() {
 	setup_bazelrc
 
-	echo Running: bazel --bazelrc="${T}/bazelrc" --output_base="${BAZEL_OUTPUT_BASE}" "$@"
-	bazel --bazelrc="${T}/bazelrc" --output_base="${BAZEL_OUTPUT_BASE}" $@ || die
+	echo Running: bazel --output_base="${BAZEL_OUTPUT_BASE}" "$@"
+	bazel --output_base="${BAZEL_OUTPUT_BASE}" $@ || die
 }
 
 load_distfiles() {
@@ -235,6 +244,9 @@ src_configure() {
 		export PYTHON_BIN_PATH="${PYTHON}"
 		export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
 
+		# only one bazelrc is read, import our one before configure sets its options
+		echo "import ${T}/bazelrc" >> ./.bazelrc
+
 		# this is not autoconf
 		./configure || die
 	}