gentoo resync : 25.08.2020

5 files changed, 6 insertions, 63 deletions

diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index fcbee69aeefd..95827cbcfeba 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -2,7 +2,6 @@ DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20
 DIST joblib-0.15.1.tar.gz 342550 BLAKE2B c8ccf0b6d2e229a780939d9c4f39265bd18b5a452d014056001072b7daf7e46a5961c6d80f768c30ba7463aa36c5ec09959bb1e891028bf6f7862a9a265079aa SHA512 a0b0bde5b034af3eee0bce2875199fc9ac232a34a49c14daf6fbddd9bf3ad8fa0d77192827b7531704b81db7bdfbaf76c4755b8fc1035eaf73b2e08f9e6d8828
 DIST joblib-0.16.0.tar.gz 345002 BLAKE2B 0336fcbe95204141a0b04dfbf8949ba509792402eefbb86b3dc02375e7e3eb5c76d548d4ad01238307c0334ce4299fd9e763765d92722819894ea26ab6144032 SHA512 9f1f2e7f2e293e1c53e9752907f4ba25d52a5c4895eebfa423c8e3bc64146ab20a490e1db0cfa39596c9bbc47ea1cc491b0576bf8da9a1f68b58e91ba09ead34
 EBUILD joblib-0.14.1.ebuild 1148 BLAKE2B c1d2b4eae9bea3d2bd1f3f23519f7504e43f3592ddca6217fd9b936989029c2a982a79875eb32f5dc40d7087ae82cf1b5f18cc7257e753f4ec696eeb2fa48eec SHA512 210e793e79ac3d74968105278c5550ebaef4716abd4a6873e152de6f373e672ab39e4d223a4973b7730eb867945dd7242788b2b7d8c411b8c433deccef98cd88
-EBUILD joblib-0.15.1-r1.ebuild 1408 BLAKE2B 5a48b7c4e23c3a035c69230c73364cfefd07ec68b6469c676afcfe455f6a3011a3278c9d9e7e3a6c002046a95a2f0032eb0c623ccdf71488cedda979c2b46d1d SHA512 5b035c5424cc5342b0713b62f07e55f1da5630c2de162b26575b7b8d18886e0e320a22e6ff28c96cd3e5412501f5a261f5f0facba2998e4c8848466a33060f97
-EBUILD joblib-0.15.1.ebuild 1150 BLAKE2B f1c0c586328977f4953818ec205ee4d4702fc2118f64a6c60dc248d1ecf115e6b2207764243805262a998616648b4014791d467d443d5769118ab6da9a6ab889 SHA512 051ee65d697022daf61083db84c88666c3f43bdb8c2572b6440ae5d59336f32b5447f7636beddc6487f87e8592f79bed06f90f790d39ae95e8860dfdcb2f0b51
-EBUILD joblib-0.16.0.ebuild 1407 BLAKE2B a2f59b500f59a1aab4ad76ceb42ce324c7b122b6cea2075a7f57e570a1dd5fd7a161b57614a81eae0093108f7d20e996d8cfc51d4085a17d09f5a373b8ac0c91 SHA512 2885a36041aa07f0df9267ad76c74911a7a2898d597d407cbca7428a852057c90598ad1c5012e2a700acef6fc6a0837f6b2ec20d0588fb027391532b63aabe64
-MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
+EBUILD joblib-0.15.1.ebuild 1149 BLAKE2B e709f488c7fca5f6c292be9be23aad64e770dddfde15ef70f0ed8981dc96fc728f14bfb359f9de86f8c5594b9d61973f4cd37d25c294ff8f58e7a8a8148e5dc0 SHA512 0c5f8ba7e79646eb12418bae0b50a0a252547339e781c4d24fc93a07f370c8349edfa0c238b22f277aed92e004d3c7b988939f6e28051d8a5de6284e72317fdd
+EBUILD joblib-0.16.0.ebuild 1411 BLAKE2B 5149186a07a23d3b1bb74c325772f6c83ffe7ae7ee7cecc82b91d211af4c5976f65d399a793e59bd4ce17d135aaa25bb7a8f1468b6e1dde9c7027fe03d03d708 SHA512 31f125a0f98751656404299c42099eb693eede55f445ca88ed989f1cf2726552d9a5a667765689a02b4b1d6c5e9248e3da38f4d271183e17d9e995b73e9cfe65
+MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-0.15.1-r1.ebuild b/dev-python/joblib/joblib-0.15.1-r1.ebuild
deleted file mode 100644
index 23ccee52ebed..000000000000
--- a/dev-python/joblib/joblib-0.15.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/loky[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/threadpoolctl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc \
-	'dev-python/numpy' \
-	'dev-python/matplotlib' \
-	'dev-python/pillow' \
-	'dev-python/sphinx-gallery' \
-	'dev-python/numpydoc' \
-	'dev-python/pandas' \
-	'dev-python/lz4' \
-	'dev-python/distributed'
-
-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
-
-	sed -e "s:'_static/joblib_logo_examples.png':'doc/_static/joblib_logo_examples.png':" \
-		-i doc/conf.py || die
-
-	# tries to fetch from the internet
-	rm examples/compressors_comparison.py \
-		examples/parallel/distributed_backend_simple.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/joblib/joblib-0.15.1.ebuild b/dev-python/joblib/joblib-0.15.1.ebuild
index a9d0d5360f06..e046b8ed957a 100644
--- a/dev-python/joblib/joblib-0.15.1.ebuild
+++ b/dev-python/joblib/joblib-0.15.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 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/joblib/joblib-0.16.0.ebuild b/dev-python/joblib/joblib-0.16.0.ebuild
index 392bb96fc6a8..f3d3f19a592c 100644
--- a/dev-python/joblib/joblib-0.16.0.ebuild
+++ b/dev-python/joblib/joblib-0.16.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 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/joblib/metadata.xml b/dev-python/joblib/metadata.xml
index 3875b1287e55..e1e3569d81b8 100644
--- a/dev-python/joblib/metadata.xml
+++ b/dev-python/joblib/metadata.xml
@@ -15,6 +15,7 @@
   Joblib is optimized to be fast and robust in particular on large,
   long-running functions and has specific optimizations for numpy arrays.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">joblib</remote-id>
     <remote-id type="github">joblib/joblib</remote-id>