gentoo resync : 29.06.2021

3 files changed, 2 insertions, 75 deletions

diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
index ab48a5117475..d5e4de96805f 100644
--- a/sci-libs/scikit-learn/Manifest
+++ b/sci-libs/scikit-learn/Manifest
@@ -1,6 +1,4 @@
 AUX scikit-learn-0.24.2-no-O3.patch 2346 BLAKE2B b4186a3e6a242ac964f4970adf227d2c6512141faf89828df60626aef73ab3d3de9fdeaf5fd31e230d196293b45feb11ff599a31b882ef86e1e563ff9209d7e6 SHA512 a6f2b74c424a000675ad838d95c71e459ca392f600875839cc5a740249a5db08e3d7968f87ae587398259d8dbf5ece91fe114f7c59581a32a03f3e9d183f81e8
-DIST scikit-learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b
 DIST scikit-learn-0.24.2.tar.gz 7589697 BLAKE2B a5a32db690e76d6ecfcb12d57a7f84ebcc7e67ecb73258c1d923f9b98a9d87c46aac96918ef7c3d8741f5dbeb46f169c73a7744fb7b92e6ab5cf42101a6bc2f1 SHA512 2159baf63414b9594918b40e1b72af2ab47349335ad4e3afd9756921f786737ed41d6deb333881e8c5c6e1f7ce9cfa10691b966dc2476c48c051621f9049d2ee
-EBUILD scikit-learn-0.22.2_p1-r1.ebuild 1636 BLAKE2B c0a9c93eff797279d36a47d6990b76dd290c6b170c982a7179557043d0a7f84b8eea598c925166ded61ab4acc8ea2d5ec2ddf61d0549b51170e7626521694d3c SHA512 08f222a4c3d0e250e6a2ddd73fb1073898812c29f3728618ca1a33b9c559a69bd84e2d949df8bd15b8066909677292e0ee2c13815efbd8fe33a06a8ebe8c0c02
-EBUILD scikit-learn-0.24.2.ebuild 1807 BLAKE2B d3208c01ce56f170091968c3c7c5b9a017b895135d349691f04d26a590d3525cbb0b979cdaefa263dc8c0648a4421c5f18c532f6425eaf5188ddd3f55b386940 SHA512 6e2758fe1dc095f5f23ef85d748839563015884512391ba6127b9ac50e9c5bd37b73dde9924af91dd369fe1719f6d5cd0162e12a8f0a09753ff51f919cb333af
+EBUILD scikit-learn-0.24.2.ebuild 1805 BLAKE2B 7068a1538013068d72b41fd0fdceee3a548a4f099276d8e83d61b326c6672fe30136de1452ade265f54e4ac70e5ef5cc80e35031be8f99fc799262b8e90464bc SHA512 56412248e6cd41865537eaf2b2d3606a850a8c58df3d816157ea9880bba4ada721bab09f70974a399a9adebe7910670faeb397e8575ce70247ca3ab41cbc9876
 MISC metadata.xml 736 BLAKE2B eb5c07231e185d9f9bd985209815f8515abf6bcff68e38563524542c8f591c1625711238b0d1b028776c8d658c32df3de4052a9dc88627a009eef5b8a7e68b5a SHA512 ee09304bdd96093bac49584a10b71650a3c764c28f03b851e197c31f8bbb6529b40433ad70f8100f33901b5b7fac8d349aad83ea10ad4770e16574484223af56
diff --git a/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild b/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
deleted file mode 100644
index 65589e8274da..000000000000
--- a/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-MY_PV="${PV//_p/.post}"
-
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="https://scikit-learn.org/stable/"
-SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-#ffhttps://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	virtual/blas:=
-	virtual/cblas:=
-"
-DEPEND="
-	virtual/blas:=
-	virtual/cblas:=
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# remove bundled cblas
-	rm -rf sklearn/src || die "failed to remove bundled cblas"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	pushd "${TEST_DIR}/lib" >/dev/null || die
-	pytest -vv || die "testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-}
diff --git a/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild b/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
index 7fe7e3be3a4f..c8cd5f268027 100644
--- a/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
+++ b/sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="examples"
 
 DEPEND="