gentoo resync : 13.11.2021

3 files changed, 2 insertions, 51 deletions

diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 4349c90bfbc4..8978f32e6686 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,5 +1,3 @@
-DIST joblib-1.0.1.tar.gz 347176 BLAKE2B 046ec87d446eb3075d867e41bb87039062531294d9b6c0be8d3cb42ccdf47dd58f1bc46a599ade64fc210e93fcad6e3007af82dbc670e1eaec1c67b425f87712 SHA512 39b1579efad44d6e51db501dbaa8378e7c8a423822ee3264a8bed44b720f59e6d08993a00f995c45beada3dd59b8e4101c47e587c9bf72027b01723838b533ab
 DIST joblib-1.1.0.tar.gz 350428 BLAKE2B 6b9b449e012752e561b267c8e27475252fee8d56406430bc570abc6da22b913bb09b7ad8708c29c7d7c338e4f541144b4514976a9f4ce017c3764b4d717eaba8 SHA512 5efcf9fc6dd4e2cf30599dc50373e40580be38fa15c2295519eb8c3b94a07b0fe2d1a9960ec4a67846aa3176335a2634b21107664032966166b973dcbded0cea
-EBUILD joblib-1.0.1.ebuild 1173 BLAKE2B 4f82f452f67f405d4a6456a906e5aef4aa305ac6165c673335f5e98c72f0adf7b68c33b05501f1ad602c73ea1bbca87cc6d93e371359b3a12654391bbcd31a73 SHA512 f356c8a2d6db0be3249f548adb9a2bf0bfc9db5b2d022e54e9f08a0ecdc7d4e89916e70a417c382c3ff7e96dda1b00260fea80d4adb59d5c233b2264fc6d8c81
-EBUILD joblib-1.1.0.ebuild 1175 BLAKE2B 63733aff3305252d465427abb2974d7ed8ef63607f964a79c93cb86d6b09413b673135b42e93925d7a5159bcb7b4f81428f147e39093526db742b5db6090e700 SHA512 aa1fc469094f37a62d839b5c1a75f6b5780e6b03b7c9af3961f67475ee1faf3c26e97bb2cb9003b39ade562a5865c56671941987128eab90691765d82e3a9749
+EBUILD joblib-1.1.0.ebuild 1172 BLAKE2B 31b9955285921c40e7fca248d8d43bf9b7a400f6327bdee203c7fe02f74068c85f19fcfe448f2c711e9a6d18afa8365af06718ad85533dbded0bd2d104cbfdfc SHA512 c26e1f0ce7bb48101a42c7744511e23a4a866e4278cc170b6f35924c85a3b3423c6ad42526149c8f587f93919d40c109f6632a2bb6b01069094d661eb5c502a9
 MISC metadata.xml 858 BLAKE2B e141cefc3f64a2d853994352590d9edb2dfcf8406e64de688b5ee077e7577ec255f214134ff04cccdd90bb08410495ca0c39081b9f530763735c12214e66c871 SHA512 4938b0a8200be169056c19816c9f6753fb19e2d89a5799de9ee9e04e48d815aec84049c480a0844e391aef1647af8b3ea70186d5a6b10be1b3dbffc13711d3ba
diff --git a/dev-python/joblib/joblib-1.0.1.ebuild b/dev-python/joblib/joblib-1.0.1.ebuild
deleted file mode 100644
index 1087a620abc0..000000000000
--- a/dev-python/joblib/joblib-1.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~riscv 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.1.0.ebuild b/dev-python/joblib/joblib-1.1.0.ebuild
index 4f96b96a5b16..b21627ed4cbe 100644
--- a/dev-python/joblib/joblib-1.1.0.ebuild
+++ b/dev-python/joblib/joblib-1.1.0.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]