gentoo auto-resync : 11:06:2023 - 20:18:01

3 files changed, 2 insertions, 51 deletions

diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index f3f32af8f5d9..22a207c6b815 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,5 +1,3 @@
-DIST joblib-1.1.0.tar.gz 350428 BLAKE2B 6b9b449e012752e561b267c8e27475252fee8d56406430bc570abc6da22b913bb09b7ad8708c29c7d7c338e4f541144b4514976a9f4ce017c3764b4d717eaba8 SHA512 5efcf9fc6dd4e2cf30599dc50373e40580be38fa15c2295519eb8c3b94a07b0fe2d1a9960ec4a67846aa3176335a2634b21107664032966166b973dcbded0cea
 DIST joblib-1.2.0.gh.tar.gz 345345 BLAKE2B e18be536054829057ff320eda320a7548434108b3fc6c92a03df73dc68e093d039c656c1d674ea26fb6419bdfc39d26cfc28236a6bfbf0dcbf3ace7e52b0c829 SHA512 de882f2ff8dd936b4f98352b9ee1cc56c3a734f215a74257cf90a25736afd9e6b93e6538929b7a29f5956e6fccbdfcbf8b39c8fd68035a8857721f7a76066133
-EBUILD joblib-1.1.0-r1.ebuild 1204 BLAKE2B c30c53164bbb9b9b1fd13170cdcc77b40b816992dbfcaa5ea910206160d2799e8af281ca832b1adf232068fc2dcbf235b7f7f7480cf078445d7868c925e2dcc8 SHA512 7d6c4e30b68e5cc290d7f24d00a0cac4469f7b8efe957cf5bc057a8509332d5fe1baeddbe37906982bec9867e776a6ed6e9874e079828be8176b16890a8007f5
-EBUILD joblib-1.2.0.ebuild 1210 BLAKE2B 5520af315b202677ecd92f078586d8b80d295b076147e92bf4233c19a79199c101d79ac2a1afdb7b41daac176664e3d52b68ba640216f327b33d95fd68b4731f SHA512 34b518638423f96994aa6af0d464bed60ec2f7df9af6db2ce6d5e10d30b17744e962710193f6a0344e860999494738ca0ff621eac3e5c9c3d7e0b1c98ffc6e99
+EBUILD joblib-1.2.0.ebuild 1207 BLAKE2B bd0a35aae8c896189a6488582943893eada958b0efb36af7479dae83a1b94aae139e7778c58235d7e9240f9185dfb32f91efcf3aa0c9016d319eee4fe08f800f SHA512 ffa0d185db3c3bc826b5ffa85949b5263c395dc85c077a9854ed1e9ae9b02146b9c0d77618a1ab96fd573852605526ca0769586dc56af26d46fb998d3b610264
 MISC metadata.xml 858 BLAKE2B e141cefc3f64a2d853994352590d9edb2dfcf8406e64de688b5ee077e7577ec255f214134ff04cccdd90bb08410495ca0c39081b9f530763735c12214e66c871 SHA512 4938b0a8200be169056c19816c9f6753fb19e2d89a5799de9ee9e04e48d815aec84049c480a0844e391aef1647af8b3ea70186d5a6b10be1b3dbffc13711d3ba
diff --git a/dev-python/joblib/joblib-1.1.0-r1.ebuild b/dev-python/joblib/joblib-1.1.0-r1.ebuild
deleted file mode 100644
index 0564a64a7661..000000000000
--- a/dev-python/joblib/joblib-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-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.2.0.ebuild b/dev-python/joblib/joblib-1.2.0.ebuild
index 8a4cce5b3458..e97c038a7f9a 100644
--- a/dev-python/joblib/joblib-1.2.0.ebuild
+++ b/dev-python/joblib/joblib-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.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}]