gentoo resync : 05.02.2020

4 files changed, 8 insertions, 50 deletions

diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 18144a86e375..1148129c7740 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -1,8 +1,6 @@
 AUX tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch 1188 BLAKE2B dcebed9a89be6ff70f073c432e5e02ab80c0fc9e69cea2b1255a5620d456eec39f717fef3dec062a7dee5d33ce2eb45712d578de9f5ecb00360bb26004cc949c SHA512 d47a98015c424fd61adea6c8f5ed5115ca35c807636530e737963f002f02380d80d30e0f0cf3c6cf3e00914157fce62739da60ae30a4fb533321822a4fa45b2d
 AUX tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch 2370 BLAKE2B 87c60e70e929ade64cae24ae6f6d2d9168b0f5b93093206755fb66033b198e7226b7157a6aa15cb051cd9cd42bec8743ec7b96334ea3b9184445afff5e61c257 SHA512 2469fc0f9c9365c2e1191c68b61ba9ed54f0d240e34bb431ba6efadb9a4a63ae5b579e22b693df41fbbee55e4119bf8dcbdcdec6d7be81e36d1b48da8ff88c7b
 AUX tensorflow-2.1.0-cuda_10.2_support_bin2c.patch 518 BLAKE2B 945a7e2a4b0379c05a274bbc2582fabf37b3447282d14dc28725b8d3b4e8d0a17bada117775e22697f9c2ba5549223a89c4849c49cf007e10ab9da3933255051 SHA512 01f4e5a02b2c68bc39b5be251257a2a484aa66aabaeca33a3e4ab9d434928cb63fb3846fa8870c565a40706acc686d3522e953ae3cc9fbd41d49d27c27838d8d
-AUX tensorflow-2.1.0-external_libs.patch 1024 BLAKE2B ab7bbe1f041f25f3d7cf29140d19e07d3c5af83d556895f01cf022c0191dd4fe7ae0e181f01cb94dbf69bb7e6e4a4dfb3765ce7c62d54746189a5e01b7dba460 SHA512 81118b3478925cb163ed3b1b5395247c0528b349a6f0d78535f09ce693e64bb776ddf94a33b4d959bed9c91a030bcf9084bd5b07d2aa4a72b8d4bacc72d93cfb
-AUX tensorflow-2.1.0-python3.8-pywrap_tensor.patch 666 BLAKE2B 7d261c297e800872030bbaf279b50ba854464c1d90babd10a1baadd2a19a33192bcb77718abe4fdd11829ea657f0e061ca0b2d19ac0bbbb68fe1d7274eb39bff SHA512 4e5ac3b6cb4be5de2a21f5cd1dfb84c04ceb1046b7aefd200a2326469c256abe3f0f3514463658b3be902a146145017874c0ba150df9d6e711e2e9cca21934c2
 DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9
 DIST abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz 1281523 BLAKE2B 955802c74ed9baf222dcd824d2940147ae89edbc88f12bb8f54839776fe18bb18c0fde23b0d3142bb3be65a57930c96d03fdd243e8da07435eeb04329c31483d SHA512 c2ae1bd789251ec70cd0baafd92521e48fb1648aee8d9d84a8269436300848b6a9d7aead6bef8a12d3a9040f19535ac725ae961f12566500d309bc13dfee26a4
 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
@@ -33,8 +31,9 @@ DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
 DIST tensorflow-1.15.0.tar.gz 46183168 BLAKE2B 5ccd87d5b53d6c543728e9c7ef96f12149bd8729620838b07a28f752fd5c57ef88350c2b62e8c44ec3561469eda38d8a64cbfca5e1ac7850674e1dd2c4d605d6 SHA512 f8683a950be6a3fa234d42e0f46bd9e049280e0c1d203c5c00ad44cf4728d894f2c301939d6d71203f815130a1ead53127adcc7565009589ff5aafc878b4dba7
 DIST tensorflow-2.0.0.tar.gz 46176997 BLAKE2B 761e91a774f61b50459240a83fe52f723a76c2cc3eaf7c371684849cb7365b94fb3743ab8de9adffe64bef0f70da2bb0b7e6426a3f402e436eff841d3edefe8d SHA512 c3a2cb9673d2ade8e83961f7d944165123d0e4d94e6ca4d8fdee4f02f536893b879bbbf78d3ad5e557467b58f97f7194f2d9cfc64d7d05540969be732070eecc
-DIST tensorflow-2.1.0_rc2.tar.gz 41641498 BLAKE2B 1ab001f6804cd6b2b3122cd5bf84905d81b1632f363134dc30aee92869077da2420799d0e70ea050004ac854a7e887a44176806b8cdfab5f12b9c8f7440d22be SHA512 7b8c9a83b5c25b36f680cfdaeefdc932cab93ecfc25622cd46ac14b2f5582eea4f04c6bdd5d63058266d5e0bf2cd9e1fb7a0647be62fb4ec4b910b0e7b4214e0
+DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6
+DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed
 EBUILD tensorflow-1.15.0.ebuild 11926 BLAKE2B db5054d61568b6b3f1843d553c5957ad8ec30a08aca20b134dd62c8fc9978823eaae41e8ae6118c7899693fb591cdce536d67b6cd197ebb4fe528f5bd407b243 SHA512 b47db814bde146455cbede7516b7aeb972d32e557c62684aa33be1a01f3a5e09f8eee6107ca151aab93f296ad3042778c71e1a1590e697bacdd42f1447890e93
 EBUILD tensorflow-2.0.0.ebuild 11982 BLAKE2B 1cf285381b1c9a90abd4880cb1d2a370fa16ab668597e2cc13bfb97237a8585d61774b2b97e39cab7d0dddb1b02b9b476a9ca6ffaa28557d822758c12f08f2ed SHA512 a02758690fd3aaef021dba985f714d584b16920c6226e8adc504c69ca2d04646495550a00166a8e3b408074baed08959cf4ac5e16a5917c1e09ac99e0805b06e
-EBUILD tensorflow-2.1.0_rc2.ebuild 12622 BLAKE2B 62628804cb269e13b6f45e480fc41a07d2fa5beb40ab389e4f7dce1347d90686a0531c7c674cfd92cefa58950b00d196bdbf52716ce5965adfc3e23f2e031d73 SHA512 2eb32be0f01ca0d623c95f797194f72c20d7b6587fd117eda690c2d84306b54f5c96bafbf24b7fc77598e13b89fec6daec53435cc81c8c3be32eedfcca22b5d8
+EBUILD tensorflow-2.1.0.ebuild 12435 BLAKE2B 12688e6060086531910518a2a13d706181757ac022061b71cde2da690d6e3ba3c6d55d485034db36c627803e292a7343b3ecab8ede704c6525299d16474e5edc SHA512 da9cdb6678f80d918d266610cdf907e45ccc335ab861b9c272b83106f1c56b142a0adf58098810573b639c8602b5c46ef40fa4840a92840d1a11f9afd0e58ffb
 MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30
diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch
deleted file mode 100644
index 194cdc166510..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/WORKSPACE b/WORKSPACE
-index babb14b509..bcdd4f46e2 100644
---- a/WORKSPACE
-+++ b/WORKSPACE
-@@ -67,7 +67,7 @@ http_archive(
- http_archive(
-     name = "bazel_skylib",
-     sha256 = "1dde365491125a3db70731e25658dfdd3bc5dbdfd11b840b3e987ecf043c7ca0",
--    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel-skylib.0.9.0.tar.gz"],
-+    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz"],
- )  # https://github.com/bazelbuild/bazel-skylib/releases
- http_archive(
-     name = "com_github_apple_swift_swift_protobuf",
-diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl
-index 8619cddfdd..4b57df0cbe 100644
---- a/third_party/systemlibs/syslibs_configure.bzl
-+++ b/third_party/systemlibs/syslibs_configure.bzl
-@@ -27,7 +27,7 @@ VALID_LIBS = [
-     "grpc",
-     "hwloc",
-     "icu",
--    "jpeg",
-+    "libjpeg_turbo",
-     "jsoncpp_git",
-     "keras_applications_archive",
-     "lmdb",
diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch
deleted file mode 100644
index bc53750b0701..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tensorflow/python/eager/pywrap_tensor.cc.ORIG	2019-09-27 23:56:33.000000000 +0200
-+++ b/tensorflow/python/eager/pywrap_tensor.cc	2019-11-27 16:39:00.996713385 +0100
-@@ -839,7 +839,7 @@
-     sizeof(EagerTensor),                /* tp_basicsize */
-     0,                                  /* tp_itemsize */
-     (destructor)EagerTensor_dealloc,    /* tp_dealloc */
--    nullptr,                            /* tp_print */
-+    0,                                  /* tp_vectorcall_offset */
-     nullptr,                            /* tp_getattr */
-     nullptr,                            /* tp_setattr */
-     nullptr,                            /* tp_compare */
diff --git a/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild
index 8ae81ea41a8b..5a87c8ff00d5 100644
--- a/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild
@@ -52,6 +52,7 @@ bazel_external_uris="
 	)"
 
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
 		${bazel_external_uris}"
 
 RDEPEND="
@@ -60,7 +61,7 @@ RDEPEND="
 	dev-db/sqlite
 	dev-libs/double-conversion
 	dev-libs/icu
-	~dev-libs/jsoncpp-1.9.1
+	>=dev-libs/jsoncpp-1.9.2
 	dev-libs/libpcre
 	dev-libs/nsync
 	dev-libs/openssl:0=
@@ -127,11 +128,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch"
-	"${FILESDIR}/tensorflow-2.1.0-external_libs.patch"
-	"${FILESDIR}/tensorflow-2.1.0-python3.8-pywrap_tensor.patch"
-)
 DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
 CHECKREQS_MEMORY="5G"
 CHECKREQS_DISK_BUILD="10G"
@@ -166,6 +162,7 @@ pkg_setup() {
 src_unpack() {
 	# Only unpack the main distfile
 	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
 	bazel_load_distfiles "${bazel_external_uris}"
 }
 
@@ -175,9 +172,7 @@ src_prepare() {
 	append-flags $(get-cpu-flags)
 	bazel_setup_bazelrc
 
-	if ver_test "$(cuda_toolkit_version)" -ge "10.2"; then
-		eapply "${FILESDIR}/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch"
-	fi
+	eapply "${WORKDIR}"/patches/*.patch
 
 	default
 	use python && python_copy_sources
@@ -262,6 +257,7 @@ src_configure() {
 			pasta
 			pcre
 			png
+			pybind11
 			six_archive
 			snappy
 			swig