gentoo resync : 15.12.2019

6 files changed, 5 insertions, 282 deletions

diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index 7497cd30fce2..14d3ae11cfff 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -1,10 +1,5 @@
-AUX 0001-pip_package-modularize-build-script-to-allow-distros.patch 4250 BLAKE2B 79702d82e629e2159cbe33efe8dd91536d904536f4bbf3d4ad02186916a09786cde6ce29a63acaafe3169dbd7904448461f2b557f33218651351fd87d42ed613 SHA512 42bb57433f61b3a9b1a93c897202bacdf44a8277ea0e64257ac3b60c9b964a6441345c9b222fb26afb1d66a53323fe38c29811adfd6354032cb5d3f85dde0816
-DIST tensorflow-estimator-1.13.0.tar.gz 530871 BLAKE2B 4f208ed20e10fa68e06d21c9865cd07623e14362bdcff456bc9b412431c8f12f289c8a8f8ad89cb1f0ec98b1432844632d7e1097ea29d40bf6f67b90b4968f93 SHA512 e4be92b805776d2be5f391f737f1043b994f42721173c4d4a7dbf3fac9b00121cb072091a474bf71c7dcd952fc8b330cf9254c7a5ad9d096ba1cdc12ba12078b
-DIST tensorflow-estimator-1.14.0.tar.gz 670750 BLAKE2B d24bba87131605f965be05cd76103e77c45c606af685f08d478cf4acaf2975aba6134bfe9ea51d1837297cf4ce5339bad761af6c00077193ccbae3f1bbcaa667 SHA512 65d21f4d275edc57feb0b36775f275d7b7adc1f5c2958b8269dcf61bed0189570adcb2eaf981e2ae4ba7e6ccec6d4d467384a267a6a29c325dc8126b1bdced5a
-DIST tensorflow-estimator-1.15.0.tar.gz 696331 BLAKE2B 67aac4adb05149de13d68595e3520f4b843dedd48b58b0b0bea920767f04f64291842b9931f2540b6c6e997bbd01f8e23f64da9ea02ee295f57c777186e5ab19 SHA512 ea0f0c9f74db3d7bed5ee2b38a8eafbeae8fddd824c410461a88ecebc3e11ad6f885cc7404b3af8c7751562bbc2b71fb7e0e5627cb5dea05617ec1a383279bee
+DIST tensorflow-estimator-1.15.1.tar.gz 696316 BLAKE2B 7797ae13fa5f56920df912f7d0eaef214a381acb25632dc2d21c6bbf5744bcc36b32f21e30b18be16d37f7a1deb30b2139d58c2c0f97a1de7a5f767a8a5462d8 SHA512 ae42057870cfb0e19d45ee59bd99c110ecfb3ae43cd5a5536711c7d2528b429c433b0f594e462eae9c40b34dd7813f3b14b1282cbf2edc725e13c45e93da818d
 DIST tensorflow-estimator-2.0.0.tar.gz 618578 BLAKE2B e7e13b6a38f9d23350510aaef689761bc8459556db487572da0ee07d5ae0f1b0ec62517037ecd2f6b109f9657d42127a149405b7780dba4c1086f87319d77ad6 SHA512 99bbdb4be9cd9f46128657b262fc6daa61a1dbfad6c430c43bb62ef99cefec10b10bf03090adcb21bdac0404e00084b4e5c4961761a52462afdeb105ef1e0c73
-EBUILD tensorflow-estimator-1.13.0.ebuild 1336 BLAKE2B 8cb7993e004e31435ee8878335696befd20dc7e90f9156dc2c17a3e3668bdd63c14891b4960ace13d1c2e1da66f3580c4634f75de69ef2095d0f6566bfacc5f5 SHA512 9d7b99123345ae85268b8676d91aa34f62ba4e2fd8131630f26b1dc3bb969cbd40e37c2ac054800f48fd1df02a77cfd724d50bef9e787bbe1316225c9c484cc9
-EBUILD tensorflow-estimator-1.14.0.ebuild 1245 BLAKE2B 4d7a31587186446be9d72524801d95c193db6561558403c0c5b5b8e694b84955792c96e6fc81b2bbba3df2db88f1ffd954d2a028692375549639bb8bfcfd8eb3 SHA512 42259cdced6aabddc930dc07121e9b5f87639e4fb3fb9223c8123dc02f508f5393345873ee11f866b3c859466fdcec2b402d2f303fb8fb4c643edb2c93275e6f
-EBUILD tensorflow-estimator-1.15.0.ebuild 1342 BLAKE2B dc05278c1422a7f7bb51ef7a27e71074593c4e89fd12b0be5ac89b52dfa38ea33c3a109744a398a41c05c27f1112df8dc86be3d5f60e6757298a3e46eec0d205 SHA512 4c3ae397917543760fb2677760c50c556671739717f779340335abc6b3c7f7ce6c37cd7cdb293a0266ee62586b7c594ef8abf6006e69cfd1285a2a0fca5dcd0d
-EBUILD tensorflow-estimator-2.0.0.ebuild 1245 BLAKE2B 4d7a31587186446be9d72524801d95c193db6561558403c0c5b5b8e694b84955792c96e6fc81b2bbba3df2db88f1ffd954d2a028692375549639bb8bfcfd8eb3 SHA512 42259cdced6aabddc930dc07121e9b5f87639e4fb3fb9223c8123dc02f508f5393345873ee11f866b3c859466fdcec2b402d2f303fb8fb4c643edb2c93275e6f
+EBUILD tensorflow-estimator-1.15.1.ebuild 1332 BLAKE2B bf1f8f5d0bbc0dd5f64990d0cd84c02d7c392740dad223d1b67d6f85680ada645bcf32caf15313211f76769126075cda289bf0a99cd951d0af074bf4d694e2e0 SHA512 299e555bbb858dfdf34ae79ab52fe057e448f3e0661c22b7b2a35ce24e4240f675e36eeaf0d53b95ab91d1d535366c5bd26a22333c497b3048bb27a83f7933c3
+EBUILD tensorflow-estimator-2.0.0.ebuild 1235 BLAKE2B a72f3e514a0b095401cc573e70647d5d054493ed7878588822580f52a757e2b05d0aaece5271666d1ded81d81c2befbedaf4743800d041730448861ce020a527 SHA512 4f2434ce286bcfbcc63892542ab73f6313e6e86aa5074f76e8c98add54453a94d79cb23d43237ab97dba824959a44d02360f789b762624493524602bc7ba6736
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/files/0001-pip_package-modularize-build-script-to-allow-distros.patch b/sci-libs/tensorflow-estimator/files/0001-pip_package-modularize-build-script-to-allow-distros.patch
deleted file mode 100644
index 140e23c84bb5..000000000000
--- a/sci-libs/tensorflow-estimator/files/0001-pip_package-modularize-build-script-to-allow-distros.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 897b25418ae0f77bcee7fdd7070d5c22677dc218 Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Sat, 2 Feb 2019 15:19:44 +0800
-Subject: [PATCH] pip_package: modularize build script to allow distros to
- install more flexibly
-
-Gentoo Linux handles python modules slightly differently and packaging
-wheels is complicated. We prefer to run setup.py directly ourselves
-rather than build a wheel and then install from there.
-
-This modularizes build_pip_package.sh to allow running parts separately.
-using --src srcdir will prepare the package in a known dir so the distro
-package can take it from there. If only dstdir is given (either with
---dst or as the only argument to preserve backwards compat) then
-behaviour is the same as before, the sources are prepared and the wheel
-is built and placed in dstdir.
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- .../tools/pip_package/build_pip_package.sh    | 73 +++++++++++++++++--
- 1 file changed, 66 insertions(+), 7 deletions(-)
-
-diff --git a/tensorflow_estimator/tools/pip_package/build_pip_package.sh b/tensorflow_estimator/tools/pip_package/build_pip_package.sh
-index 5d06dd6..1667169 100755
---- a/tensorflow_estimator/tools/pip_package/build_pip_package.sh
-+++ b/tensorflow_estimator/tools/pip_package/build_pip_package.sh
-@@ -23,10 +23,8 @@ function real_path() {
-   is_absolute "$1" && echo "$1" || echo "$PWD/${1#./}"
- }
- 
--function build_wheel() {
-+function prepare_src() {
-   TMPDIR="$1"
--  DEST="$2"
--  PROJECT_NAME="$3"
- 
-   mkdir -p "$TMPDIR"
-   echo $(date) : "=== Preparing sources in dir: ${TMPDIR}"
-@@ -67,6 +65,17 @@ function build_wheel() {
-     touch "${TMPDIR}/tensorflow_estimator/contrib/estimator/python/__init__.py"
-     touch "${TMPDIR}/tensorflow_estimator/contrib/estimator/python/estimator/__init__.py"
-   fi
-+}
-+
-+function build_wheel() {
-+  if [ $# -lt 2 ] ; then
-+    echo "No src and dest dir provided"
-+    exit 1
-+  fi
-+
-+  TMPDIR="$1"
-+  DEST="$2"
-+  PROJECT_NAME="$3"
- 
-   pushd ${TMPDIR} > /dev/null
-   echo $(date) : "=== Building wheel"
-@@ -75,15 +84,39 @@ function build_wheel() {
-   cp dist/* ${DEST}
-   popd > /dev/null
-   echo $(date) : "=== Output wheel file is in: ${DEST}"
--  rm -rf "${TMPDIR}"
-+}
-+
-+function usage() {
-+  echo "Usage:"
-+  echo "$0 [--src srcdir] [--dst dstdir] [options]"
-+  echo "$0 dstdir [options]"
-+  echo ""
-+  echo "    --src                 prepare sources in srcdir"
-+  echo "                              will use temporary dir if not specified"
-+  echo ""
-+  echo "    --dst                 build wheel in dstdir"
-+  echo "                              if dstdir is not set do not build, only prepare sources"
-+  echo ""
-+  echo "  Options:"
-+  echo "    --project_name <name> set project name to name"
-+  echo "    --nightly             build tensorflow_estimator nightly"
-+  echo ""
-+  exit 1
- }
- 
- function main() {
-   NIGHTLY_BUILD=0
-+  PROJECT_NAME=""
-+  SRCDIR=""
-+  DSTDIR=""
-+  CLEANSRC=1
- 
-   while true; do
-     if [[ -z "$1" ]]; then
-       break
-+    elif [[ "$1" == "--help" ]]; then
-+      usage
-+      exit 1
-     elif [[ "$1" == "--nightly" ]]; then
-       NIGHTLY_BUILD=1
-     elif [[ "$1" == "--project_name" ]]; then
-@@ -92,6 +125,19 @@ function main() {
-         break
-       fi
-       PROJECT_NAME="$1"
-+    elif [[ "$1" == "--src" ]]; then
-+      shift
-+      if [[ -z "$1" ]]; then
-+        break
-+      fi
-+      SRCDIR="$(real_path $1)"
-+      CLEANSRC=0
-+    elif [[ "$1" == "--dst" ]]; then
-+      shift
-+      if [[ -z "$1" ]]; then
-+        break
-+      fi
-+      DSTDIR="$(real_path $1)"
-     else
-       DSTDIR="$(real_path $1)"
-     fi
-@@ -105,16 +151,29 @@ function main() {
-     fi
-   fi
- 
--  SRCDIR="$(mktemp -d -t tmp.XXXXXXXXXX)"
--
--  if [[ -z "$DSTDIR" ]]; then
-+  if [[ -z "$DSTDIR" ]] && [[ -z "$SRCDIR" ]]; then
-     echo "No destination dir provided"
-+    usage
-     exit 1
-   fi
- 
-+  if [[ -z "$SRCDIR" ]]; then
-+    # make temp srcdir if none set
-+    SRCDIR="$(mktemp -d -t tmp.XXXXXXXXXX)"
-+  fi
- 
-+  prepare_src "$SRCDIR"
-+
-+  if [[ -z "$DSTDIR" ]]; then
-+      # only want to prepare sources
-+      exit
-+  fi
- 
-   build_wheel "$SRCDIR" "$DSTDIR" "$PROJECT_NAME"
-+
-+  if [[ $CLEANSRC -ne 0 ]]; then
-+    rm -rf "${TMPDIR}"
-+  fi
- }
- 
- main "$@"
--- 
-2.19.2
-
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0.ebuild
deleted file mode 100644
index 07240632c5d9..000000000000
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
-MY_PN="estimator"
-MY_PV=${PV/_rc/-rc}
-MY_P=${MY_PN}-${MY_PV}
-
-inherit bazel distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-java/java-config"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/0001-pip_package-modularize-build-script-to-allow-distros.patch"
-)
-DOCS=( CONTRIBUTING.md README.md )
-
-src_prepare() {
-	bazel_setup_bazelrc
-	default
-}
-
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home)
-
-	ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
-	ebazel shutdown
-
-	local srcdir="${T}/src"
-	mkdir -p "${srcdir}" || die
-	bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
-}
-
-src_install() {
-	do_install() {
-		cd "${T}/src" || die
-		esetup.py install
-		python_optimize
-	}
-	python_foreach_impl do_install
-
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.14.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.14.0.ebuild
deleted file mode 100644
index 4d6fbccd5074..000000000000
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.14.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
-MY_PN="estimator"
-MY_PV=${PV/_rc/-rc}
-MY_P=${MY_PN}-${MY_PV}
-
-inherit bazel distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-java/java-config"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_prepare() {
-	bazel_setup_bazelrc
-	default
-}
-
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home)
-
-	ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
-	ebazel shutdown
-
-	local srcdir="${T}/src"
-	mkdir -p "${srcdir}" || die
-	bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
-}
-
-src_install() {
-	do_install() {
-		cd "${T}/src" || die
-		esetup.py install
-		python_optimize
-	}
-	python_foreach_impl do_install
-
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild
index 736ba39f9e55..7913f44ba2cf 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 MY_PN="estimator"
 MY_PV=${PV/_rc/-rc}
 MY_P=${MY_PN}-${MY_PV}
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.0.ebuild
index 4d6fbccd5074..fbd9ccf1cd27 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 MY_PN="estimator"
 MY_PV=${PV/_rc/-rc}
 MY_P=${MY_PN}-${MY_PV}