* [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/, sci-libs/scikit-learn/, profiles/updates/, ...
@ 2020-11-13 21:32 Aaron Bauman
0 siblings, 0 replies; only message in thread
From: Aaron Bauman @ 2020-11-13 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 6229bdc8c39660607a4f11c4d1624587c33cc932
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon Nov 9 18:25:04 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 21:32:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6229bdc8
sci-libs/scikit-learn: renamed sci-libs/scikits_learn
Closes: https://bugs.gentoo.org/665482
Closes: https://bugs.gentoo.org/717454
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
dev-python/nltk/nltk-3.5.ebuild | 2 +-
profiles/updates/2Q-2020 | 1 -
profiles/updates/4Q-2020 | 2 ++
sci-libs/scikit-learn/Manifest | 2 ++
sci-libs/{scikits_learn => scikit-learn}/metadata.xml | 0
.../scikit-learn-0.22.2_p1-r1.ebuild} | 5 ++---
.../scikit-learn-0.23.2.ebuild} | 3 ---
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-14.2.13.ebuild | 2 +-
sys-cluster/ceph/ceph-15.2.4-r3.ebuild | 2 +-
sys-cluster/ceph/ceph-15.2.5-r1.ebuild | 2 +-
13 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
index 3cf78bba0f1..523700571ee 100644
--- a/dev-python/nltk/nltk-3.5.ebuild
+++ b/dev-python/nltk/nltk-3.5.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}]
+ sci-libs/scikit-learn[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
)"
PDEPEND="dev-python/nltk-data"
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..e6eaafa053f 100644
--- a/profiles/updates/4Q-2020
+++ b/profiles/updates/4Q-2020
@@ -2,3 +2,5 @@ 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 dev-python/scikit-learn sci-libs/scikit-learn
+move sci-libs/scikits_learn sci-libs/scikit-learn
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
new file mode 100644
index 00000000000..0a578c3504c
--- /dev/null
+++ b/sci-libs/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/sci-libs/scikit-learn/metadata.xml
similarity index 100%
rename from sci-libs/scikits_learn/metadata.xml
rename to sci-libs/scikit-learn/metadata.xml
diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild b/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
similarity index 91%
rename from sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild
rename to sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
index d191b819ec3..517c34f0eb7 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild
+++ b/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
@@ -7,14 +7,13 @@ PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
MY_PV="${PV//_p/.post}"
-MY_PN="${PN//s_/-}"
DESCRIPTION="Machine learning library for Python"
HOMEPAGE="https://scikit-learn.org/stable/
https://github.com/scikit-learn/scikit-learn"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+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}/${MY_PN}-${MY_PV}"
+S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="BSD"
SLOT="0"
diff --git a/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild b/sci-libs/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 sci-libs/scikit-learn/scikit-learn-0.23.2.ebuild
index 8a8db3923d0..7b14c41b7a1 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
+++ b/sci-libs/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 ~arm64 ~x86"
@@ -66,5 +64,4 @@ python_install_all() {
if use examples; then
dodoc -r examples
fi
-
}
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..43094784627 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}]
+ sci-libs/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..e1920626c41 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}]
+ sci-libs/scikit-learn[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
)
"
diff --git a/sys-cluster/ceph/ceph-14.2.13.ebuild b/sys-cluster/ceph/ceph-14.2.13.ebuild
index 56971678154..5983452b966 100644
--- a/sys-cluster/ceph/ceph-14.2.13.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.13.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}]
+ sci-libs/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..3c6f8a003fc 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}]
+ sci-libs/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..eef323fd614 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}]
+ sci-libs/scikit-learn[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
)
"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-11-13 21:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-13 21:32 [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/, sci-libs/scikit-learn/, profiles/updates/, Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox