From 7608be1fa4d2695e95b14341a3de6f346b87682f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 10 Mar 2024 19:44:16 +0100 Subject: [PATCH] =?UTF-8?q?Move=20{sci-libs=20=E2=86=92=20dev-python}/scik?= =?UTF-8?q?it-learn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild | 6 +++--- .../paperwork-backend/paperwork-backend-2.2.1-r1.ebuild | 4 ++-- app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild | 6 +++--- dev-python/qiskit-terra/qiskit-terra-0.46.0.ebuild | 2 +- dev-python/qiskit-terra/qiskit-terra-0.46.1.ebuild | 2 +- {sci-libs => dev-python}/scikit-learn/Manifest | 0 {sci-libs => dev-python}/scikit-learn/metadata.xml | 0 .../scikit-learn/scikit-learn-1.3.2-r1.ebuild | 0 profiles/updates/1Q-2024 | 1 + profiles/updates/4Q-2020 | 3 +-- sci-chemistry/mdtraj/mdtraj-1.9.7.ebuild | 4 ++-- sci-libs/datasets/datasets-2.18.0.ebuild | 2 +- sci-libs/scikit-optimize/scikit-optimize-0.9.0-r1.ebuild | 4 ++-- sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild | 6 +++--- sci-libs/seqeval/seqeval-1.2.2-r3.ebuild | 4 ++-- sys-cluster/ceph/ceph-16.2.14-r1.ebuild | 2 +- sys-cluster/ceph/ceph-16.2.15.ebuild | 2 +- sys-cluster/ceph/ceph-17.2.6-r8.ebuild | 2 +- sys-cluster/ceph/ceph-17.2.7.ebuild | 2 +- sys-cluster/ceph/ceph-18.2.1.ebuild | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) rename {sci-libs => dev-python}/scikit-learn/Manifest (100%) rename {sci-libs => dev-python}/scikit-learn/metadata.xml (100%) rename {sci-libs => dev-python}/scikit-learn/scikit-learn-1.3.2-r1.ebuild (100%) diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild index 2e602b216a834..6bfad6df712f8 100644 --- a/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild +++ b/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 pypi @@ -29,9 +29,9 @@ RDEPEND=" dev-python/pycountry[${PYTHON_USEDEP}] dev-python/pyenchant[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/termcolor[${PYTHON_USEDEP}] dev-python/whoosh[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} diff --git a/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild index bb7a9c75061b3..bedb4d1adafbe 100644 --- a/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild +++ b/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -30,9 +30,9 @@ RDEPEND=" dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pycountry[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/termcolor[${PYTHON_USEDEP}] dev-python/whoosh[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} diff --git a/app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild index e38955fb7d3ff..210c3d2fb541e 100644 --- a/app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild +++ b/app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -30,9 +30,9 @@ RDEPEND=" dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pycountry[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/termcolor[${PYTHON_USEDEP}] dev-python/whoosh[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} diff --git a/dev-python/qiskit-terra/qiskit-terra-0.46.0.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.46.0.ebuild index 46706c76a9d9e..136069e07dbe5 100644 --- a/dev-python/qiskit-terra/qiskit-terra-0.46.0.ebuild +++ b/dev-python/qiskit-terra/qiskit-terra-0.46.0.ebuild @@ -140,7 +140,7 @@ BDEPEND=" >=dev-python/networkx-2.2[${PYTHON_USEDEP}] dev-python/pytest-xdist[${PYTHON_USEDEP}] =sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}] + >=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}] ) " diff --git a/dev-python/qiskit-terra/qiskit-terra-0.46.1.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.46.1.ebuild index 922260acb3d53..db3f4620e6b20 100644 --- a/dev-python/qiskit-terra/qiskit-terra-0.46.1.ebuild +++ b/dev-python/qiskit-terra/qiskit-terra-0.46.1.ebuild @@ -140,7 +140,7 @@ BDEPEND=" >=dev-python/networkx-2.2[${PYTHON_USEDEP}] dev-python/pytest-xdist[${PYTHON_USEDEP}] =sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}] + >=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}] ) " diff --git a/sci-libs/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest similarity index 100% rename from sci-libs/scikit-learn/Manifest rename to dev-python/scikit-learn/Manifest diff --git a/sci-libs/scikit-learn/metadata.xml b/dev-python/scikit-learn/metadata.xml similarity index 100% rename from sci-libs/scikit-learn/metadata.xml rename to dev-python/scikit-learn/metadata.xml diff --git a/sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild b/dev-python/scikit-learn/scikit-learn-1.3.2-r1.ebuild similarity index 100% rename from sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild rename to dev-python/scikit-learn/scikit-learn-1.3.2-r1.ebuild diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index b94fb943187c0..e189ed0edab0f 100644 --- a/profiles/updates/1Q-2024 +++ b/profiles/updates/1Q-2024 @@ -88,3 +88,4 @@ slotmove kde-apps/kdesdk-meta 5 0 slotmove kde-apps/kdeutils-meta 5 0 move media-libs/oneVPL media-libs/libvpl move sys-auth/AusweisApp2 sys-auth/AusweisApp +move sci-libs/scikit-learn dev-python/scikit-learn diff --git a/profiles/updates/4Q-2020 b/profiles/updates/4Q-2020 index c271affd55ae3..5fd5a758b7dae 100644 --- a/profiles/updates/4Q-2020 +++ b/profiles/updates/4Q-2020 @@ -2,7 +2,6 @@ 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 +move sci-libs/scikits_learn dev-python/scikit-learn move sci-libs/scikits_image dev-python/scikit-image move dev-python/httpstat net-misc/httpstat diff --git a/sci-chemistry/mdtraj/mdtraj-1.9.7.ebuild b/sci-chemistry/mdtraj/mdtraj-1.9.7.ebuild index a626da0dc6f46..75356685592ca 100644 --- a/sci-chemistry/mdtraj/mdtraj-1.9.7.ebuild +++ b/sci-chemistry/mdtraj/mdtraj-1.9.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,7 +28,7 @@ DEPEND="${RDEPEND} dev-python/ipykernel[${PYTHON_USEDEP}] dev-python/jupyter-client[${PYTHON_USEDEP}] dev-python/nbformat[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] ) " # =dev-python/scipy-1.4.0[${PYTHON_USEDEP}] ) - sci-libs/scikit-learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ) selinux? ( sec-policy/selinux-ceph ) diff --git a/sys-cluster/ceph/ceph-16.2.15.ebuild b/sys-cluster/ceph/ceph-16.2.15.ebuild index 0c8bb2c4f2804..0a7e20f913c07 100644 --- a/sys-cluster/ceph/ceph-16.2.15.ebuild +++ b/sys-cluster/ceph/ceph-16.2.15.ebuild @@ -159,7 +159,7 @@ RDEPEND=" diskprediction? ( >=dev-python/scipy-1.4.0[${PYTHON_USEDEP}] ) - sci-libs/scikit-learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ) selinux? ( sec-policy/selinux-ceph ) diff --git a/sys-cluster/ceph/ceph-17.2.6-r8.ebuild b/sys-cluster/ceph/ceph-17.2.6-r8.ebuild index d6e758a0b622e..e9d12ff1cf46e 100644 --- a/sys-cluster/ceph/ceph-17.2.6-r8.ebuild +++ b/sys-cluster/ceph/ceph-17.2.6-r8.ebuild @@ -167,7 +167,7 @@ RDEPEND=" diskprediction? ( >=dev-python/scipy-1.4.0[${PYTHON_USEDEP}] ) - sci-libs/scikit-learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ) selinux? ( sec-policy/selinux-ceph ) diff --git a/sys-cluster/ceph/ceph-17.2.7.ebuild b/sys-cluster/ceph/ceph-17.2.7.ebuild index 7513a424410b9..ea040dd6b53a1 100644 --- a/sys-cluster/ceph/ceph-17.2.7.ebuild +++ b/sys-cluster/ceph/ceph-17.2.7.ebuild @@ -168,7 +168,7 @@ RDEPEND=" diskprediction? ( >=dev-python/scipy-1.4.0[${PYTHON_USEDEP}] ) - sci-libs/scikit-learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ) selinux? ( sec-policy/selinux-ceph ) diff --git a/sys-cluster/ceph/ceph-18.2.1.ebuild b/sys-cluster/ceph/ceph-18.2.1.ebuild index 444ddb7e37ba5..3e68bf06a4e75 100644 --- a/sys-cluster/ceph/ceph-18.2.1.ebuild +++ b/sys-cluster/ceph/ceph-18.2.1.ebuild @@ -170,7 +170,7 @@ RDEPEND=" diskprediction? ( >=dev-python/scipy-1.4.0[${PYTHON_USEDEP}] ) - sci-libs/scikit-learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ) selinux? ( sec-policy/selinux-ceph )