gentoo resync : 20.03.2021

3 files changed, 2 insertions, 50 deletions

diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index b362fdef2884..a9096e967707 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,5 +1,3 @@
-DIST joblib-1.0.0.tar.gz 346996 BLAKE2B 6f31dba31e451fe1d05e7a34bc211b641e10a6dda21cc6a4d283a594744caa3434748a2c2c661c468931e509d815596db18ce1cbed287ae6b0da287490256dec SHA512 3fad2f3d4d6651d2c0376403b3658defc9ae1acf08b2e187f77b440040ad414bf723241d685df862c08b88d784ded915f5794d0e0c29841d9acae4db200d7213
 DIST joblib-1.0.1.tar.gz 347176 BLAKE2B 046ec87d446eb3075d867e41bb87039062531294d9b6c0be8d3cb42ccdf47dd58f1bc46a599ade64fc210e93fcad6e3007af82dbc670e1eaec1c67b425f87712 SHA512 39b1579efad44d6e51db501dbaa8378e7c8a423822ee3264a8bed44b720f59e6d08993a00f995c45beada3dd59b8e4101c47e587c9bf72027b01723838b533ab
-EBUILD joblib-1.0.0.ebuild 1164 BLAKE2B 7d15901db467c24fadd5f2fa9a7b39b467da5a3301a2833049fa8626709631f3b9e35a7bfd08343c3cda3e4b5bc950871a45bf055e730de0f6ff5ccea9b3c92e SHA512 359e2fb992cd3136904a39c4821e7839c535ab78b4025f6b067084cb1d8cf0219214fa042415088f7bfb4fabc8bfa9f6f9d4022bc3d78ad45bb7bab1ab3b58b9
-EBUILD joblib-1.0.1.ebuild 1167 BLAKE2B 38bb93fce3235dc2fa170188629092b6dbac8284e513cc07bdce24aca0c2337e15215c6c729acef9498051ef520a39c11c4a2a87eb29037da9aa69b742123e13 SHA512 5f5e403bca9c84346285a9413d00ba0ac2190caca9859e0c3af0b811d30f3f25842e2502fc69a5ccba00da2198c1b8cf894d125e64fccd48d2c7ae1d7f879966
+EBUILD joblib-1.0.1.ebuild 1164 BLAKE2B 7d15901db467c24fadd5f2fa9a7b39b467da5a3301a2833049fa8626709631f3b9e35a7bfd08343c3cda3e4b5bc950871a45bf055e730de0f6ff5ccea9b3c92e SHA512 359e2fb992cd3136904a39c4821e7839c535ab78b4025f6b067084cb1d8cf0219214fa042415088f7bfb4fabc8bfa9f6f9d4022bc3d78ad45bb7bab1ab3b58b9
 MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-1.0.0.ebuild b/dev-python/joblib/joblib-1.0.0.ebuild
deleted file mode 100644
index 6066ffdcf33f..000000000000
--- a/dev-python/joblib/joblib-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-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="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/loky[${PYTHON_USEDEP}]
-"
-# joblib is imported by setup.py so we need ${RDEPEND}
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/threadpoolctl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unbundle
-	rm -r joblib/externals || die
-	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
-	find -name '*.py' -exec \
-		sed -e 's:\(joblib\)\?\.externals\.::' \
-			-e 's:from \.externals ::' \
-			-i {} + || die
-
-	# https://github.com/joblib/joblib/issues/1115
-	sed -e 's:test_parallel_call_cached_function_defined_in_jupyter:_&:' \
-		-i joblib/test/test_memory.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/joblib/joblib-1.0.1.ebuild b/dev-python/joblib/joblib-1.0.1.ebuild
index 3a8beae1a370..6066ffdcf33f 100644
--- a/dev-python/joblib/joblib-1.0.1.ebuild
+++ b/dev-python/joblib/joblib-1.0.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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]