sci-libs/tensorflow: bump 2.1.0

Closes: https://bugs.gentoo.org/701334
Closes: https://bugs.gentoo.org/704490
Closes: https://bugs.gentoo.org/701342
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jason Zaman <perfinion@gentoo.org>

4 files changed, 7 insertions, 47 deletions

diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 22bc344ccf23..297457526e4d 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -28,4 +28,5 @@ 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
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