gentoo auto-resync : 11:03:2024 - 00:45:38

11 files changed, 12 insertions, 110 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f6741c7ece1e..437b817a7ffd 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/datasets/Manifest b/sci-libs/datasets/Manifest
index ce2768e6ac52..e3fb33c67187 100644
--- a/sci-libs/datasets/Manifest
+++ b/sci-libs/datasets/Manifest
@@ -1,4 +1,4 @@
 AUX datasets-2.17.1-tests.patch 13819 BLAKE2B 7581ae4ad336f8f8ecf6b47defa5b2d33da246d60e7159136803ceb4ad20a4f66025ec7aa3a1910ad4a79408ba7cb0de49621d56d13eaf64958c6770e1dc02e2 SHA512 96d344ef84cdc4cd1ee1cf3dd51be0ffb499839a74ba26bfb3aec3b87b459ff81c9c7f89d1704eb628f1a6f81e0a5f6770fd7316e5b0cdd3ad0df919254ed625
 DIST datasets-2.18.0.gh.tar.gz 2169179 BLAKE2B 8a0daa0e8995b3fa5480d8aa892a26d1b6ba90f252ef7c7ca62f4afc2efa61a8ed2efbf48a40381f07178b826bde62af0f0cb8cbf80d470d5d4dfb1ba25f6cb8 SHA512 b1fb0e6636417683fa79679286505b921a7ba00b1cabd6a23e60d5804eb098527c5283058799a0776a7f1e93972fdbb948882f153a10557bcc6b6b22ab861292
-EBUILD datasets-2.18.0.ebuild 2412 BLAKE2B 7484d59f25c6967606f93405501f75ba30d994d941095656c74bb3d47239d0c05bb06f596b789111b4a82df6453d5d8fc1c6bf43e3db4460659e17bc46dd7d4a SHA512 4a7ba2af5b55d1dacf3780cdfda61b16ad5cffd361ce74b1970fe5451917aeb6c66ab866f829935e5bd28f35e6ba98f653e9ceb29f7785beaad0909204e59ae6
+EBUILD datasets-2.18.0.ebuild 2414 BLAKE2B 2fa6f46eaedbe8ccd4985f0717a6f599e22ba05578d847acbfeb569771d9eb0089fd935716a58f24c9970d0988f54a8c88056311e3ca04d9d8cca9c8d5949bbc SHA512 e641b306fe18c7e960b5010106e8fb6a42bac950e8c6aed2278b75687ffdef35d69f374e4c0caef71d968e9a97ea9d8514759cdc07a4a59af271a55d64ed3103
 MISC metadata.xml 379 BLAKE2B 48ebb9e7bfa8b58b0d15b82c4146def465e08cf3212ab4af04129d09c153b67b00d0fa05b94d6af54f643ec3a202f2335d3254b966f49d1394d3c7b9e5da56a5 SHA512 99560decfaa0e438980f372d99257695e9ca9585167d9aba091e0b775c2f8384657ddc017841c8f06f8b568017a54fb9e31da736f3c875da717e154cdce876d1
diff --git a/sci-libs/datasets/datasets-2.18.0.ebuild b/sci-libs/datasets/datasets-2.18.0.ebuild
index a5ffd9689033..71e6cd37d0a0 100644
--- a/sci-libs/datasets/datasets-2.18.0.ebuild
+++ b/sci-libs/datasets/datasets-2.18.0.ebuild
@@ -37,11 +37,11 @@ RDEPEND="
 		dev-python/pyarrow[${PYTHON_USEDEP},parquet,snappy]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/scikit-learn[${PYTHON_USEDEP}]
 		dev-python/tqdm[${PYTHON_USEDEP}]
 		dev-python/xxhash[${PYTHON_USEDEP}]
 		dev-python/zstandard[${PYTHON_USEDEP}]
 		sci-libs/huggingface_hub[${PYTHON_USEDEP}]
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
deleted file mode 100644
index 93c832da8178..000000000000
--- a/sci-libs/scikit-learn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scikit-learn-1.3.2.gh.tar.gz 7650823 BLAKE2B 170699917f46d6d3f4b9ebc314bc1ec45687dad0a4aec5d2cee6e288b5dbe508bad6dd80406501f289a33593c6482067393e9dc28155f85a4872a34523bf4199 SHA512 a3799e9b39b755a50ba225f836904a378f7d83a08274c614d0485e4d4d4a7b0c7adba2dbb6612f2ccb4e5167f872214a2853eff69d767dc70f52369bda7a230b
-EBUILD scikit-learn-1.3.2-r1.ebuild 1937 BLAKE2B 633a70b5f27f2ad9a3e1ccbc0f560aa3e4e41768827d2fe7f89009712c105829a545de79b2acdb7e45d7ff4f83d555ba138f4bbff76038474996e2fa8eec3b78 SHA512 b09e1c642450e0bc10b213a3171962dd262f550926424c10de11711597c70c0915a140a30ffe6f255c5751bce9938b7874a0b9feebc51d71d042830f1991e7b6
-MISC metadata.xml 614 BLAKE2B b5425c2d022592581647c9b97c0ab22bfc2afe347b2e5ea22f141245238f145322f39406c62318ba1e6af1462b2691267b39976bfde38faaf1d28b1d29c4e015 SHA512 74ac79123848bc385c29fcfdc4a1e780529dda685c1deb5eb722f5d4919ee6ac9d80798d52c4af0be0cc8dbbaea3784963dd97e2b7c1258cc2f5605b0bc8907a
diff --git a/sci-libs/scikit-learn/metadata.xml b/sci-libs/scikit-learn/metadata.xml
deleted file mode 100644
index 8700c73ecc29..000000000000
--- a/sci-libs/scikit-learn/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    sklearn is a python library for machine learning. It aims to
-    implement classic machine learning algorithms while remaining simple
-    and efficient.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">scikit-learn</remote-id>
-    <remote-id type="github">scikit-learn/scikit-learn</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild b/sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild
deleted file mode 100644
index 1f42ebe8f21a..000000000000
--- a/sci-libs/scikit-learn/scikit-learn-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="
-	https://scikit-learn.org/stable/
-	https://github.com/scikit-learn/scikit-learn/
-	https://pypi.org/project/scikit-learn/
-"
-SRC_URI="
-	https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-DEPEND="
-	virtual/blas:=
-	virtual/cblas:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/wheel[${PYTHON_USEDEP}]
-	>=dev-python/joblib-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.22.3[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/threadpoolctl-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pythran-0.14.0[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-# For some reason this wants to use urllib to fetch things from the internet
-# distutils_enable_sphinx doc \
-# 	dev-python/matplotlib \
-# 	dev-python/memory-profiler \
-# 	dev-python/numpydoc \
-# 	dev-python/pandas \
-# 	dev-python/pillow \
-# 	dev-python/seaborn \
-# 	dev-python/sphinx-gallery \
-# 	dev-python/sphinx-prompt \
-# 	dev-python/scikit-image
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# test broken with newer scipy, fixed upstream
-		# https://github.com/scikit-learn/scikit-learn/issues/27578
-		manifold/tests/test_locally_linear.py::test_singular_matrix
-		# TODO
-		gaussian_process/kernels.py::sklearn.gaussian_process.kernels.ExpSineSquared
-	)
-
-	rm -rf sklearn || die
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs sklearn
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete || die
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/sci-libs/scikit-optimize/Manifest b/sci-libs/scikit-optimize/Manifest
index b8d2f5462f1d..18610eb13f62 100644
--- a/sci-libs/scikit-optimize/Manifest
+++ b/sci-libs/scikit-optimize/Manifest
@@ -1,6 +1,6 @@
 AUX scikit-optimize-0.9.0-numpy-1.24.patch 892 BLAKE2B c06e68b47aa051546ede619ef5cb910b15ae2eb4f8b3a79058759ad6d7b0f29fe357670e2b6ec46d519e5e5dd1dce934336eee2dceec11cde471ed99d569049b SHA512 0d8d037b8a27e44709b27780f49089c17273d43bb90b102e62427c8847e3cd2b0020379e072c525540a3316d6fa7af0e9566880cb9826531213dda96cdded972
 AUX scikit-optimize-0.9.0-scikit-learn-1.2.0.patch 5047 BLAKE2B eb393b5a3f82478da2d58997dc0a8521a8c3f37c3de05df76d583b9bb6f0d18a149f14b90cc885cacd458c0aeb7e8de55cd1accfe8f16f85491423005fbc8830 SHA512 b501680cf6722ec60fea590f9ea966767108411c22b0ded6f3eb15e5f29d95e57f1f8842e91815b08403fb1e27424cbb2bcfc343ff7e5641a075e1217d8fb19e
 DIST scikit-optimize-0.9.0.tar.gz 275570 BLAKE2B ab481bf1cfc2b8c7cff213ae0ce2fa937de8f6269b491cf63ae115eea5c936c8a5c26b7fb339fa6cd2927c5105068635c008d6dc8b3f99b4b5d3abfed1a1c5a2 SHA512 a4c1bd589686dbbabcc5de38a4eb581c040cc2c3f83bc250ddcbe66314f03fc68b7b12d7679049da34c42445b446e1af3873f7ce90bec2a5361f0077ff3e9b74
-EBUILD scikit-optimize-0.9.0-r1.ebuild 1072 BLAKE2B 22c2666059968510416e9b3b8323829cddcc7107d94ba52e54ef5984b676f558067d103e75cc3741346c2f6e465700c061dd4eb8de0075b4f745166195a44323 SHA512 a5705395464c4c000ea9ef8a6fa917de831eb8d4339eabd7e7ef6073d737366c57e3c2a0db60051362107c3d5de89c3877aa5a36597d6a92c37d1dbf2bdc6beb
-EBUILD scikit-optimize-0.9.0.ebuild 810 BLAKE2B 4547d60f4efbb1a35da5b878ee2de8ba956dbb84ddad8d23f8deb9c61b9b47221aa169b42b96d582c6aca9ffdb8027ea99d1631704cc90aa458a45e5e166b73d SHA512 8c31bc0322d7ba807a3cf09a59d33b877e043cbf8be6aa841165166a8729d25b68e507a8525b51e47c617a74316e79bb1213a7e80db96c7f160cd3dcd835ebcd
+EBUILD scikit-optimize-0.9.0-r1.ebuild 1074 BLAKE2B 3705e6e663546491a7cc05404d615045bc9558ee1a4df1efa1813d1f2ff69c67c5b6d1a40f8daffd64eb0e2506508e20ade14e93aedb66f56b6ba9d9bef9fccb SHA512 4866d5b725d5e2ac2fcef1288785d048afc647ee00eef3d13beabb75a720372b955af8d7a3e8190873fcda2a789872d5b0830af56275635b72f16566d88974f1
+EBUILD scikit-optimize-0.9.0.ebuild 813 BLAKE2B f3a355cd566b554578f6e8ce7c1e43afc07bd978b445bc1f77ae6afaa065ecc4cfa6b4973f5e0d3c1928fd5db8e929175780429f8518f237232356e4bf43fb4b SHA512 effb37ec8483a40617eacdc53a942012d417994f9eed7bc936cef72e5f8bbbf391e624b366aaf15c331e2f632231035e30464cd2ea7afae1c665654c1a928e0f
 MISC metadata.xml 415 BLAKE2B 3bfa58da8f117a7b62399a17e5259dbfb0e74b9b9acd16e4515bcceaafc2928733f047f229c58bc437907cddf3b8a93c9576a9645e0c910129900072bed94aff SHA512 6343c76ca9a28f321c3fd8c94dfbb912f305ce43025ab6d666ed0aa5a496f08f258e1ab4e11c14844baa3c04c63a43c1d79bc8067a0d02a4eccf0e37c0c686f7
diff --git a/sci-libs/scikit-optimize/scikit-optimize-0.9.0-r1.ebuild b/sci-libs/scikit-optimize/scikit-optimize-0.9.0-r1.ebuild
index 694cd3ffafeb..e908335940a8 100644
--- a/sci-libs/scikit-optimize/scikit-optimize-0.9.0-r1.ebuild
+++ b/sci-libs/scikit-optimize/scikit-optimize-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,8 +20,8 @@ RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
+	>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
 	>=dev-python/scipy-0.19.1[${PYTHON_USEDEP}]
-	>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
diff --git a/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild b/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild
index 644fcd2382dc..b712b3f5252d 100644
--- a/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild
+++ b/sci-libs/scikit-optimize/scikit-optimize-0.9.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Sequential model-based optimization library"
@@ -19,8 +19,8 @@ RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
+	>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
 	>=dev-python/scipy-0.19.1[${PYTHON_USEDEP}]
-	>=sci-libs/scikit-learn-0.20.0[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/sci-libs/seqeval/Manifest b/sci-libs/seqeval/Manifest
index 15c706e55ebf..456307117c42 100644
--- a/sci-libs/seqeval/Manifest
+++ b/sci-libs/seqeval/Manifest
@@ -1,4 +1,4 @@
 AUX seqeval-1.2.2-gentoo.patch 450 BLAKE2B fd44e8b8d6b421e7790ac7b7c32d260db1ff20ddec6c1c15f8bf244458776b1e201204405bfb718fa2ab12bd602de548b16228b1f7968ce3eebb6ec6c4b55742 SHA512 b26c0c01e4285f683e16da8da0be96161c3e697725dda75d9daa0b5e89294099eab0af8c3a501f33525e7fc0e5c698060f1fe4228d95ef3216dcba919da4853a
 DIST seqeval-1.2.2.gh.tar.gz 42187 BLAKE2B c0ae8b71fab3d29381d5e2bc70f733b5d176b8a447ee7803a8b4681a1fbd9d197e288c1e3c1239454b5c669addc4977d8a3274c63884529d8c682bf584f2cd3a SHA512 794b817dcd19bc60ecc1c3c3f188bb17b2786dd3629691c43a594443b6dd2a3298b398309d5f14817ff1e0e37859fe109175b8bd48d0d30243de0ea4845c381a
-EBUILD seqeval-1.2.2-r3.ebuild 865 BLAKE2B 588ad35d05ddc25a4d653ef24f216e9fc8e30d0585eea6c9348e257b390cd89d02cd72cdc66a2c4e6e4aacf096bf73755cdc67065a3c710c2a521e2bc153c1e7 SHA512 c307e7bd1fb6a337082f5b9b406be0e0a5c7c470b5783a921806147a4a88537c5a204c7eda212fa2a2acf524a724d68fe11530b93b6829c162ebde21d31d36dc
+EBUILD seqeval-1.2.2-r3.ebuild 868 BLAKE2B 4d03c3ea5f0d627b9b1469c18138a54ed0b11b65f20e6fcff78982829a7f9991b0299c3b96ab1e3fa9af4c0316f40a96d54198592dec322f8df320f109a15c15 SHA512 a10dd9920a491b034d9cc5b79b4d6df8c50dd35993bcb9075193b43b52d8b3fad654a4e58fd25d415b2ba52a87fb6d89637b866a5dbf7b06e68e1b9cdeeacb56
 MISC metadata.xml 378 BLAKE2B 3f985472075cf2a650e8e2851d63fb69fcae8bba196b04809cea8158922aea385320d813a7ca18c96b33242b7c4e154ba92b1ff0a26e37450112df3c3e5e9484 SHA512 d227df0c4c1735b8bca799e4bdec447a15d532e63d1c6a6eb2ad634a63a13baee62f403c87db4fbe1b36ea0b1b34fda3b95b5781a7432ccae2904b0c92005664
diff --git a/sci-libs/seqeval/seqeval-1.2.2-r3.ebuild b/sci-libs/seqeval/seqeval-1.2.2-r3.ebuild
index 884fcc8f754c..15490e06935d 100644
--- a/sci-libs/seqeval/seqeval-1.2.2-r3.ebuild
+++ b/sci-libs/seqeval/seqeval-1.2.2-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
 DESCRIPTION="Python framework for sequence labeling evaluation"
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scikit-learn[${PYTHON_USEDEP}]
+	dev-python/scikit-learn[${PYTHON_USEDEP}]
 "
 BDEPEND="test? (
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]