commit: c86bb949ca134f8c656ab572e107fbca127ae010 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Thu Oct 15 15:16:29 2020 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Mon Nov 9 14:01:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c86bb949
dev-python/scikit-learn: moved sci-libs/scikits_learn Cancel the previous move in 2Q2020. Closes: https://bugs.gentoo.org/665482 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> dev-python/nltk/{nltk-3.5.ebuild => nltk-3.5-r1.ebuild} | 2 +- dev-python/scikit-learn/Manifest | 2 ++ {sci-libs/scikits_learn => dev-python/scikit-learn}/metadata.xml | 0 .../scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild | 0 .../scikit-learn/scikit-learn-0.23.2.ebuild | 2 -- profiles/updates/2Q-2020 | 1 - profiles/updates/4Q-2020 | 1 + sci-libs/scikits_learn/Manifest | 2 -- sys-cluster/ceph/ceph-14.2.11-r1.ebuild | 2 +- sys-cluster/ceph/ceph-14.2.11.ebuild | 2 +- sys-cluster/ceph/ceph-15.2.4-r3.ebuild | 2 +- sys-cluster/ceph/ceph-15.2.5-r1.ebuild | 2 +- 12 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5-r1.ebuild similarity index 97% rename from dev-python/nltk/nltk-3.5.ebuild rename to dev-python/nltk/nltk-3.5-r1.ebuild index 3cf78bba0f1..f00468f89f2 100644 --- a/dev-python/nltk/nltk-3.5.ebuild +++ b/dev-python/nltk/nltk-3.5-r1.ebuild @@ -31,7 +31,7 @@ BDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/pyparsing[${PYTHON_USEDEP}] dev-python/twython[${PYTHON_USEDEP}] - sci-libs/scikits_learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/scipy[${PYTHON_USEDEP}] )" PDEPEND="dev-python/nltk-data" diff --git a/dev-python/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest new file mode 100644 index 00000000000..0a578c3504c --- /dev/null +++ b/dev-python/scikit-learn/Manifest @@ -0,0 +1,2 @@ +DIST scikit-learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b +DIST scikit-learn-0.23.2.tar.gz 7190564 BLAKE2B db90e3d05d9b563c6cd98a6820c27b541e757e3fb6c25262b720842811b9e26d41a4a9c1d73e675714573d84dab799a0c450e768f4a41a39a6a61f6930c4c79a SHA512 e9797185b1b9def3ee5525e9b72742784aeb78fe8b069bb5aeab1d0f4513cf738c4489ed894274606dea9d6a32ccd3df26170ce1951e443dc77f9287c372e8c5 diff --git a/sci-libs/scikits_learn/metadata.xml b/dev-python/scikit-learn/metadata.xml similarity index 100% rename from sci-libs/scikits_learn/metadata.xml rename to dev-python/scikit-learn/metadata.xml diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild b/dev-python/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild similarity index 100% rename from sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild rename to dev-python/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild diff --git a/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild b/dev-python/scikit-learn/scikit-learn-0.23.2.ebuild similarity index 97% rename from sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild rename to dev-python/scikit-learn/scikit-learn-0.23.2.ebuild index 55d42a949aa..f7705b6294b 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild +++ b/dev-python/scikit-learn/scikit-learn-0.23.2.ebuild @@ -12,8 +12,6 @@ HOMEPAGE="https://scikit-learn.org/stable/ https://github.com/scikit-learn/scikit-learn"; SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/scikit-learn-${PV}" - LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020 index 41f95c93bbe..2bbf947be5f 100644 --- a/profiles/updates/2Q-2020 +++ b/profiles/updates/2Q-2020 @@ -1,5 +1,4 @@ move dev-libs/yaml-cpp dev-cpp/yaml-cpp -move dev-python/scikit-learn sci-libs/scikits_learn move dev-python/rnc2rng app-text/rnc2rng move games-puzzle/world-of-goo games-puzzle/world-of-goo-hb slotmove =dev-ruby/shoulda-matchers-4.3.0* 3 4 diff --git a/profiles/updates/4Q-2020 b/profiles/updates/4Q-2020 index 650f10040e2..8df417391f8 100644 --- a/profiles/updates/4Q-2020 +++ b/profiles/updates/4Q-2020 @@ -2,3 +2,4 @@ move acct-group/openldap acct-group/ldap move acct-user/openldap acct-user/ldap move x11-apps/copyq x11-misc/copyq slotmove media-gfx/gimp 2 0 +move sci-libs/scikits_learn dev-python/scikit-learn diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest deleted file mode 100644 index d89024ada31..00000000000 --- a/sci-libs/scikits_learn/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST scikits_learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b -DIST scikits_learn-0.23.2.tar.gz 7190564 BLAKE2B db90e3d05d9b563c6cd98a6820c27b541e757e3fb6c25262b720842811b9e26d41a4a9c1d73e675714573d84dab799a0c450e768f4a41a39a6a61f6930c4c79a SHA512 e9797185b1b9def3ee5525e9b72742784aeb78fe8b069bb5aeab1d0f4513cf738c4489ed894274606dea9d6a32ccd3df26170ce1951e443dc77f9287c372e8c5 diff --git a/sys-cluster/ceph/ceph-14.2.11-r1.ebuild b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild index 35c24e6a41d..93994b624ae 100644 --- a/sys-cluster/ceph/ceph-14.2.11-r1.ebuild +++ b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild @@ -151,7 +151,7 @@ RDEPEND="${DEPEND} diskprediction? ( $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) ) - sci-libs/scikits_learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ) " diff --git a/sys-cluster/ceph/ceph-14.2.11.ebuild b/sys-cluster/ceph/ceph-14.2.11.ebuild index 09fdd24959d..725942e9d4c 100644 --- a/sys-cluster/ceph/ceph-14.2.11.ebuild +++ b/sys-cluster/ceph/ceph-14.2.11.ebuild @@ -150,7 +150,7 @@ RDEPEND="${DEPEND} diskprediction? ( $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) ) - sci-libs/scikits_learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ) " diff --git a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild index 5a32d2f3787..31d939d3a5b 100644 --- a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild +++ b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild @@ -155,7 +155,7 @@ RDEPEND="${DEPEND} diskprediction? ( $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) ) - sci-libs/scikits_learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ) " diff --git a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild index ace42c44650..e00e7570e0c 100644 --- a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild +++ b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild @@ -156,7 +156,7 @@ RDEPEND="${DEPEND} diskprediction? ( $(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7}) ) - sci-libs/scikits_learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ) "
