gentoo resync : 14.05.2020

3 files changed, 2 insertions, 49 deletions

diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index ba024047169b..0365ad61f550 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,5 +1,3 @@
-DIST joblib-0.12.2.tar.gz 289249 BLAKE2B 247a8bce753ece235877540b829bdc9546b3a6d7610b09592217bf9d47fd038a5e75f649224b76832825e77d76ae46443984de3d83558cdbd4d816d8f610e8b0 SHA512 9bf93c89681f59d17e735c228d3379df5dff67b4365b59ddea1a062f9547c376e5870e4ece83af8e7cda1ae30e2a2893a4a009e03b7fec798d3574e8ab060267
 DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20571805501972d162d4b076c1fe144a9790b8132821f0acd439c8859873038813c7bdd4163d0535eca36a1a8fa SHA512 079eb4321ed95c8f05399abca2a1c46ecb7c28fe9a3a50b6eb106a2bd2f3566fb25bca59022fafbfcee5069f078921421d799eeb29a796f8f98881491cf9be08
-EBUILD joblib-0.12.2.ebuild 1148 BLAKE2B aae3982a2bc02c954a4b2c094fa292c2437de7771da9cbe2fc8aebb55b8cc7b96bc0e08b56ac0a89306c7eb56a1633976cc43f18f93d85d34907d46e705624e6 SHA512 649979fa9645e68c6cc2b407a53564ce70b57333cad498e5b3c4a8b812ac4f18560ba599c543c3818a2d616491f63babf0cff12d23710a5fd46fad136a85e4c5
-EBUILD joblib-0.14.1.ebuild 1143 BLAKE2B b244a1a6dc8867620cb8e88fb94d56a7650faeb2899a259f16907d9ade8480055044b6957812a6fe4a15bd114ea14d74a7bc647585a0ccc4febae70b7e5c38c2 SHA512 69b8e8d487e005765ede388426dc859c1380258ef8ac553aacd8598360bdb4793aae4d793db7100d38c5fc28fc26a7e4a6b4fdb7cb08cc885019b0aeda2486f4
+EBUILD joblib-0.14.1.ebuild 1141 BLAKE2B 73f3223e49c6db50cbc5f0f4136e37ff0a005c6592e50b5d75134275826e8816f44054187f8c9c9f0fabc98d473e187bea44ebc69cf171f5541f0764b7696203 SHA512 d3e5b12a3b13189a378dd4fdad906e1c777402281ffbb526bd04ba3d5962923a30f3a5d65137b03b1a829ad0636d77a1b6c80134d32d0e754ee7c6723100b4d6
 MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
diff --git a/dev-python/joblib/joblib-0.12.2.ebuild b/dev-python/joblib/joblib-0.12.2.ebuild
deleted file mode 100644
index 93796a110918..000000000000
--- a/dev-python/joblib/joblib-0.12.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to provide lightweight pipelining in Python"
-HOMEPAGE="https://joblib.readthedocs.io/en/latest/
-	https://github.com/joblib/joblib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/ doc/ doc/html || die "docs failed installation"
-	fi
-}
-
-python_test() {
-	# https://github.com/joblib/joblib/issues/143
-	if [[ "${EPYTHON}" == pypy ]]; then
-		sed -e 's:test_func_inspect_errors:_&:' -i ${PN}/test/test_func_inspect.py || die
-		sed -e 's:test_parallel_pickling:_&:' -i ${PN}/test/test_parallel.py || die
-	fi
-
-	py.test -v
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/joblib/joblib-0.14.1.ebuild b/dev-python/joblib/joblib-0.14.1.ebuild
index ccc27ee14fb0..bca16a0ef343 100644
--- a/dev-python/joblib/joblib-0.14.1.ebuild
+++ b/dev-python/joblib/joblib-0.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"