commit: 48bf8e0e0cc4bfaf66d4be81e495dac38de1eb6d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 9 15:07:56 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 15:11:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48bf8e0e
dev-python/scikit*: Revert invalid moves and dependent commits
The old names are burned already and can not be used either as target
of package moves, or for new packages. Revert the renames
and (hopefully) everything depending on them.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../nltk/{nltk-3.5-r1.ebuild => nltk-3.5.ebuild} | 2 +-
dev-python/scikit-image/scikit-image-0.17.2.ebuild | 42 ----------------------
dev-python/scikit-learn/Manifest | 2 --
dev-python/scikit-optimize/Manifest | 1 -
dev-python/scikit-optimize/metadata.xml | 16 ---------
.../scikit-optimize/scikit-optimize-0.8.1.ebuild | 26 --------------
dev-python/sktime/Manifest | 1 -
dev-python/sktime/metadata.xml | 16 ---------
dev-python/sktime/sktime-0.4.2.ebuild | 34 ------------------
profiles/package.mask | 7 ----
profiles/updates/2Q-2020 | 1 +
profiles/updates/4Q-2020 | 2 --
.../scikits_image}/Manifest | 1 -
.../scikits_image}/metadata.xml | 0
.../scikits_image/scikits_image-0.13.0-r1.ebuild | 0
sci-libs/scikits_learn/Manifest | 2 ++
.../scikits_learn}/metadata.xml | 0
.../scikits_learn-0.22.2_p1-r1.ebuild | 0
.../scikits_learn/scikits_learn-0.23.2.ebuild | 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 +-
23 files changed, 10 insertions(+), 153 deletions(-)
diff --git a/dev-python/nltk/nltk-3.5-r1.ebuild
b/dev-python/nltk/nltk-3.5.ebuild
similarity index 97%
rename from dev-python/nltk/nltk-3.5-r1.ebuild
rename to dev-python/nltk/nltk-3.5.ebuild
index f00468f89f2..3cf78bba0f1 100644
--- a/dev-python/nltk/nltk-3.5-r1.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}]
- dev-python/scikit-learn[${PYTHON_USEDEP}]
+ sci-libs/scikits_learn[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
)"
PDEPEND="dev-python/nltk-data"
diff --git a/dev-python/scikit-image/scikit-image-0.17.2.ebuild
b/dev-python/scikit-image/scikit-image-0.17.2.ebuild
deleted file mode 100644
index a071cd5c522..00000000000
--- a/dev-python/scikit-image/scikit-image-0.17.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# 8,9 not on dev-python/pyamg
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="https://scikit-image.org/";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- dev-python/imageio[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pywavelets[${PYTHON_USEDEP}]
- dev-python/scipy[sparse,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( CONTRIBUTORS.txt RELEASE.txt )
-
-pkg_postinst() {
- optfeature "FITS io capability" dev-python/astropy
- optfeature "GTK" dev-python/pygtk
- optfeature "Parallel computation" dev-python/dask
- optfeature "io plugin providing most standard formats" dev-python/imread
- # not in portage yet
- #optfeature "io plugin providing a wide variety of formats, including
specialized formats using in medical imaging." dev-python/simpleitk
-}
diff --git a/dev-python/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest
deleted file mode 100644
index 0a578c3504c..00000000000
--- a/dev-python/scikit-learn/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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/dev-python/scikit-optimize/Manifest
b/dev-python/scikit-optimize/Manifest
deleted file mode 100644
index e5c7a49776e..00000000000
--- a/dev-python/scikit-optimize/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scikit-optimize-0.8.1.tar.gz 278751 BLAKE2B
c53b921ed47a2146510a041e34129918cc1b9118e8ae3614f39cc16c87ba5a749e268b9694ade9d95132ec4fb11777f2ef2ec509b1be59c8864ff7b6edde2250
SHA512
8ffacb62869810e1812bdbd2f9f3fe83cad2be03cd795ae2e9aa4e1143ed613c3901ae06be85aecd63c1e3e5b4805e88331d2d8848cc9953988fddfbe62a0287
diff --git a/dev-python/scikit-optimize/metadata.xml
b/dev-python/scikit-optimize/metadata.xml
deleted file mode 100644
index 11fe5dcb02d..00000000000
--- a/dev-python/scikit-optimize/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>[email protected]</email>
- <name>Aisha Tammy</name>
- </maintainer>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <upstream>
- <remote-id type="pypi">scikit-optimize</remote-id>
- <remote-id type="github">scikit-optimize/scikit-optimize</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-python/scikit-optimize/scikit-optimize-0.8.1.ebuild
b/dev-python/scikit-optimize/scikit-optimize-0.8.1.ebuild
deleted file mode 100644
index 6a2ad715f4b..00000000000
--- a/dev-python/scikit-optimize/scikit-optimize-0.8.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit distutils-r1
-
-DESCRIPTION="Sequential model-based optimization library"
-HOMEPAGE="https://scikit-optimize.github.io/";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pyaml[${PYTHON_USEDEP}]
- dev-python/scikit-learn[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sktime/Manifest b/dev-python/sktime/Manifest
deleted file mode 100644
index fbfa59cf30d..00000000000
--- a/dev-python/sktime/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sktime-0.4.2.tar.gz 9662976 BLAKE2B
248c2a9868f9199caab5c4c724ddcad61301a75ce1425baaabb2185da37d80a68332bf5c2d2d64a10e0b844bea9226be5291005d9893705eb0ff8f2018c6493d
SHA512
855b33f42f938c671e99b8fa58ff6adbf67144daf53dd883ac041fe9b8cd5400cfbb8e27169d491c6bea2d76a53c035bae08d9e4f8a1c6f5f444c08bcd65c4f4
diff --git a/dev-python/sktime/metadata.xml b/dev-python/sktime/metadata.xml
deleted file mode 100644
index a88194c685d..00000000000
--- a/dev-python/sktime/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>[email protected]</email>
- <name>Aisha Tammy</name>
- </maintainer>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <upstream>
- <remote-id type="pypi">sktime</remote-id>
- <remote-id type="github">alan-turing-institute/sktime</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-python/sktime/sktime-0.4.2.ebuild
b/dev-python/sktime/sktime-0.4.2.ebuild
deleted file mode 100644
index ebc4bd2ab47..00000000000
--- a/dev-python/sktime/sktime-0.4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-DESCRIPTION="scikit-learn toolbox for working with time series"
-HOMEPAGE="https://sktime.org";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pandas[${PYTHON_USEDEP}]
- dev-python/scikit-learn[${PYTHON_USEDEP}]
- dev-python/statsmodels[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_compile() {
- distutils-r1_python_compile bdist_egg egg_info bdist_wheel
-}
-
-python_install() {
- distutils-r1_python_install
- python_optimize
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 30e125d486a..96006e3d1a8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -50,13 +50,6 @@ dev-python/cheetah
# supported by upstream. See: https://jira.mongodb.org/browse/SERVER-52687
<dev-db/mongodb-4.2.8
-# Benda Xu <[email protected]> (2020-11-09)
-# dead packages with latest releases before 2013 these are superseded
-# by other scikit packages scikit-optimize, sktime Removal in 30 days
-# (Bug #749297)
-sci-libs/scikits_optimization
-sci-libs/scikits_timeseries
-
# Benda Xu <[email protected]> (2020-11-09)
# sci-libs/mkl-rt is now subsumed by the updated sci-libs/mkl package
# which also provides development header files and pkgconfig files
diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020
index 2bbf947be5f..41f95c93bbe 100644
--- a/profiles/updates/2Q-2020
+++ b/profiles/updates/2Q-2020
@@ -1,4 +1,5 @@
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 44b73424672..650f10040e2 100644
--- a/profiles/updates/4Q-2020
+++ b/profiles/updates/4Q-2020
@@ -2,5 +2,3 @@ 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
-move sci-libs/scikits_image dev-python/scikit-image
diff --git a/dev-python/scikit-image/Manifest b/sci-libs/scikits_image/Manifest
similarity index 50%
rename from dev-python/scikit-image/Manifest
rename to sci-libs/scikits_image/Manifest
index a9303cfafc7..ef33ed7e630 100644
--- a/dev-python/scikit-image/Manifest
+++ b/sci-libs/scikits_image/Manifest
@@ -1,2 +1 @@
DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B
c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9
SHA512
923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
-DIST scikit-image-0.17.2.tar.gz 22682646 BLAKE2B
acfa38caff7aa2e1f724e173f544610e643976a40feb752040d2f20d49d871d19dddb34790bf846476932c771c260ad9bd210781439707d7c5f693c9a8fa021c
SHA512
3e57d8bea2fd41270eb17e8489c477f58ed98e56cef0192b0b2d455f27f7a2d705161afd61c7bfd556ec938a9a2bf5663ec1aa7b79609a8e5946806356364e82
diff --git a/dev-python/scikit-image/metadata.xml
b/sci-libs/scikits_image/metadata.xml
similarity index 100%
rename from dev-python/scikit-image/metadata.xml
rename to sci-libs/scikits_image/metadata.xml
diff --git a/dev-python/scikit-image/scikit-image-0.13.0-r1.ebuild
b/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
similarity index 100%
rename from dev-python/scikit-image/scikit-image-0.13.0-r1.ebuild
rename to sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
new file mode 100644
index 00000000000..d89024ada31
--- /dev/null
+++ b/sci-libs/scikits_learn/Manifest
@@ -0,0 +1,2 @@
+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/dev-python/scikit-learn/metadata.xml
b/sci-libs/scikits_learn/metadata.xml
similarity index 100%
rename from dev-python/scikit-learn/metadata.xml
rename to sci-libs/scikits_learn/metadata.xml
diff --git a/dev-python/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild
similarity index 100%
rename from dev-python/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
rename to sci-libs/scikits_learn/scikits_learn-0.22.2_p1-r1.ebuild
diff --git a/dev-python/scikit-learn/scikit-learn-0.23.2.ebuild
b/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
similarity index 97%
rename from dev-python/scikit-learn/scikit-learn-0.23.2.ebuild
rename to sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
index f7705b6294b..55d42a949aa 100644
--- a/dev-python/scikit-learn/scikit-learn-0.23.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.23.2.ebuild
@@ -12,6 +12,8 @@ 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/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
index 93994b624ae..35c24e6a41d 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})
)
- dev-python/scikit-learn[${PYTHON_USEDEP}]
+ sci-libs/scikits_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 725942e9d4c..09fdd24959d 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})
)
- dev-python/scikit-learn[${PYTHON_USEDEP}]
+ sci-libs/scikits_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 31d939d3a5b..5a32d2f3787 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})
)
- dev-python/scikit-learn[${PYTHON_USEDEP}]
+ sci-libs/scikits_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 e00e7570e0c..ace42c44650 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})
)
- dev-python/scikit-learn[${PYTHON_USEDEP}]
+ sci-libs/scikits_learn[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
)
"
