From: Patrick McLean <chutzpah@gentoo.org>
Date: Fri, 3 Apr 2020 03:29:44 +0000 (-0700)
Subject: Move dev-python/scikit-learn to sci-libs/scikits_learn
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c6ad913cdf923a0d87a87893b7b87fda450bd7a;p=gentoo.git

Move dev-python/scikit-learn to sci-libs/scikits_learn

Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
---

diff --git a/dev-python/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest
deleted file mode 100644
index 8e745c89f4d1..000000000000
--- a/dev-python/scikit-learn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scikit-learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b
diff --git a/dev-python/scikit-learn/metadata.xml b/dev-python/scikit-learn/metadata.xml
deleted file mode 100644
index 56cae167d372..000000000000
--- a/dev-python/scikit-learn/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/scikit-learn/scikit-learn-0.22.2_p1.ebuild b/dev-python/scikit-learn/scikit-learn-0.22.2_p1.ebuild
deleted file mode 100644
index c67f8b4796ed..000000000000
--- a/dev-python/scikit-learn/scikit-learn-0.22.2_p1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 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
-
-MY_PV="${PV//_p/.post}"
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="https://scikit-learn.org/stable/
-	https://github.com/scikit-learn/scikit-learn"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pushd "${TEST_DIR}/lib" >/dev/null || die
-	pytest -vv || die "testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020
index a56d939ff3e3..d449f2ca1553 100644
--- a/profiles/updates/2Q-2020
+++ b/profiles/updates/2Q-2020
@@ -1 +1,2 @@
 move dev-libs/yaml-cpp dev-cpp/yaml-cpp
+move dev-python/scikit-learn sci-libs/scikits_learn
diff --git a/sys-cluster/ceph/ceph-15.2.0.ebuild b/sys-cluster/ceph/ceph-15.2.0.ebuild
index d3c354015a03..f90131848b09 100644
--- a/sys-cluster/ceph/ceph-15.2.0.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.0.ebuild
@@ -150,7 +150,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/routes[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
-		dev-python/scikit-learn[${PYTHON_USEDEP}]
+		sci-libs/scikits_learn[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
 "