From 653393f53ed95df4532968f271881ab8b223cbe4 Mon Sep 17 00:00:00 2001 From: Marcin Deranek Date: Mon, 11 Mar 2024 15:43:26 +0100 Subject: sci-libs/scikit-learn package move --- dev-python/nltk/Manifest | 4 +- dev-python/nltk/nltk-3.7.ebuild | 2 +- dev-python/nltk/nltk-3.8.1.ebuild | 2 +- dev-python/scikit-learn/Manifest | 2 + .../scikit-learn/scikit-learn-1.4.1_p1.ebuild | 66 ++++++++++++++++++++++ sci-libs/scikit-learn/Manifest | 2 - sci-libs/scikit-learn/scikit-learn-1.4.1_p1.ebuild | 66 ---------------------- www-apps/paperless-ngx/Manifest | 6 +- www-apps/paperless-ngx/paperless-ngx-1.17.4.ebuild | 2 +- www-apps/paperless-ngx/paperless-ngx-2.4.3.ebuild | 2 +- www-apps/paperless-ngx/paperless-ngx-2.6.2.ebuild | 2 +- 11 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 dev-python/scikit-learn/Manifest create mode 100644 dev-python/scikit-learn/scikit-learn-1.4.1_p1.ebuild delete mode 100644 sci-libs/scikit-learn/Manifest delete mode 100644 sci-libs/scikit-learn/scikit-learn-1.4.1_p1.ebuild diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest index 20e240f..dfbb06b 100644 --- a/dev-python/nltk/Manifest +++ b/dev-python/nltk/Manifest @@ -1,5 +1,5 @@ DIST nltk-3.7.gh.tar.gz 2851947 BLAKE2B 4cd4fed9f26de7996bcabbd71d500c072489e79ae0edb29f09577e465227c948efa7130af6975b029e77fb79db015437a9e3311eb28048d02dcc2356441d0908 SHA512 66d79afa59f18f2bf7d086dcb22813c7b92239c05669daa62866dbda06c0ca22367317749cf19db3e41a7bdb405d4f87f72b695aa58fd0669bf36de64f1f9888 DIST nltk-3.8.1.gh.tar.gz 2867926 BLAKE2B 54de1d3ae7cfe0b71ac0f5a62ed3e81e489fa4d322cd32eb4aa4ef60617eb96767a0f3a92c7e5a16e71836cb0d3a1076ae3598b6bcf0af5925c95e1a0ccf70f8 SHA512 5b13eff5d8e628173f5321c293d896919d369bcd586861a7e09bf6fdca2b09f2580902da98ec647bcf9cdc2b33a87c830dda3793de20c31c8bc38c86df8f7930 -EBUILD nltk-3.7.ebuild 1745 BLAKE2B be894e9f994e63cca23e07592ef1a598ca1cfff02193b7daa9d7383287f6dba19b201dadf5e2f91fef1fd15b76537fb9a7d88cc75745a4280d0b7a2913547570 SHA512 260fc70a6be5c14ebf835d754677c484aa9785e90b395dff127c1cad0461d96f58631f7245f7a72765be2ac8b81dd5e93865c321bc0b92f1f6f1be6529441a6f -EBUILD nltk-3.8.1.ebuild 1346 BLAKE2B 5ac9ff3971ed9f1dadebcebc463ec6cb148fae8cb196a193bd1a1d221a9563e14f06593261cbeb5ce2d71d9e594fcfb291902f8ce5d9b3495ab28f0801aa469f SHA512 6a2ded86a944b348b27998be703c00e6dd3be46bf7a54b8793a40458e3bebc0e68b0be2d0d500ed250bda6a46e68386868bafed6e6328cfa4dcf5e0adb8a9dbe +EBUILD nltk-3.7.ebuild 1747 BLAKE2B ba7e28721bb9ed45e93552b6def4299f6bd139f197ff849cda59083f3ff51cf7fe035e10d4fc643d74e00a9a76951930475a91bae1e305afce90768bc4e4b4d4 SHA512 790ef13f1b57e887de26b745a8c03479ae8e38117380607936848f4a72eb113b456024fc2e47905fbc767b301cc5a36895520524a62d1ec2af6134dfcfedac26 +EBUILD nltk-3.8.1.ebuild 1348 BLAKE2B 9894b2066e8975e30186f05b4db9f85ff11ae1774addd378864ce5a9cf1a81da58f26d623610528abfd12eb8bee403739ca828fe70953b3b9ea92d38ce5e2d3a SHA512 20312c8b00088defbf7a9e6508f7c9ad7eb7101b21f7ed2263c197bc74328940d9c72b8b8bce8c2cd9e54834433995aafea634b09883ec31861dc49f0b526623 MISC metadata.xml 445 BLAKE2B 4bfcde721368b9c9354799863a7a78d2c04eb789672f52b5449bda3ef567448fa1b434dda9d150aa0ff360477c576ea2fd0bebce40bf80bb843393e245f85278 SHA512 89bb6d0ca2e268e3540cf36e91b57e834eb31f078a91bb7ed7218a17c1a9b63809ae77916822eabf6a3a86286d00ae4a311b33c52e40d9d2e61b6d242f4cef78 diff --git a/dev-python/nltk/nltk-3.7.ebuild b/dev-python/nltk/nltk-3.7.ebuild index 252f259..1abb630 100644 --- a/dev-python/nltk/nltk-3.7.ebuild +++ b/dev-python/nltk/nltk-3.7.ebuild @@ -32,7 +32,7 @@ BDEPEND=" dev-python/pyparsing[${PYTHON_USEDEP}] dev-python/pytest-mock[${PYTHON_USEDEP}] dev-python/twython[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/scipy[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] )" diff --git a/dev-python/nltk/nltk-3.8.1.ebuild b/dev-python/nltk/nltk-3.8.1.ebuild index 027a5d6..4421b60 100644 --- a/dev-python/nltk/nltk-3.8.1.ebuild +++ b/dev-python/nltk/nltk-3.8.1.ebuild @@ -32,7 +32,7 @@ BDEPEND=" dev-python/pyparsing[${PYTHON_USEDEP}] dev-python/pytest-mock[${PYTHON_USEDEP}] dev-python/twython[${PYTHON_USEDEP}] - sci-libs/scikit-learn[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/scipy[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] )" diff --git a/dev-python/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest new file mode 100644 index 0000000..60404ce --- /dev/null +++ b/dev-python/scikit-learn/Manifest @@ -0,0 +1,2 @@ +DIST scikit-learn-1.4.1_p1.gh.tar.gz 7886860 BLAKE2B d383553e312859e9ec4e79bf92cd087d54cc46e4c9b6692bd18596fbd3d4c0e07ad01a286b9a482002655ce77aca68b1b1fadc28089eeb97d3efb11f60c6836a SHA512 544709d7f7c877c71de49c55ce5d677e68a05b2b0dd5364d29dde1a42bc9a4ecc0ef13e984a33bf202df6353dd34047416f803573be571c82ebd05c30f1d4c7a +EBUILD scikit-learn-1.4.1_p1.ebuild 1686 BLAKE2B c28a3319cf349e676d74bbd64b2fed69b2dc447c0a6770aaccdd067ad8703574c9e250c8c557fa432311055aae6ef5b2caf5635ecc24ac13915c358d0e4946df SHA512 b513534f6a4ad3a046410ca511f47d1d21bbb9f528dac3f298a54460777dca129723cb1d37090e6969ef1145bcf55268930d1cadbd712909efdf5b34e24a9433 diff --git a/dev-python/scikit-learn/scikit-learn-1.4.1_p1.ebuild b/dev-python/scikit-learn/scikit-learn-1.4.1_p1.ebuild new file mode 100644 index 0000000..223d0e7 --- /dev/null +++ b/dev-python/scikit-learn/scikit-learn-1.4.1_p1.ebuild @@ -0,0 +1,66 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_p/.post} +MY_P="${PN}-${MY_PV}" + +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/" +SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos" +IUSE="examples" + +S="${WORKDIR}/${MY_P}" + +DEPEND=" + virtual/blas:= + virtual/cblas:= +" +RDEPEND=" + ${DEPEND} + dev-python/wheel[${PYTHON_USEDEP}] + >=dev-python/joblib-1.2.0[${PYTHON_USEDEP}] + >=dev-python/numpy-1.25[${PYTHON_USEDEP}] + >=dev-python/scipy-1.6.0[${PYTHON_USEDEP}] + >=dev-python/threadpoolctl-2.0.0[${PYTHON_USEDEP}] +" +BDEPEND=" + >=dev-python/pythran-0.14.0[${PYTHON_USEDEP}] + >=dev-python/cython-3.0.8[${PYTHON_USEDEP}] +" + +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() { + # This needs to be run in the install dir + cd "${WORKDIR}/${MY_P}-${EPYTHON//./_}/install/usr/lib/${EPYTHON}/site-packages/sklearn" || die + distutils-r1_python_test +} + +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-learn/Manifest b/sci-libs/scikit-learn/Manifest deleted file mode 100644 index 60404ce..0000000 --- a/sci-libs/scikit-learn/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST scikit-learn-1.4.1_p1.gh.tar.gz 7886860 BLAKE2B d383553e312859e9ec4e79bf92cd087d54cc46e4c9b6692bd18596fbd3d4c0e07ad01a286b9a482002655ce77aca68b1b1fadc28089eeb97d3efb11f60c6836a SHA512 544709d7f7c877c71de49c55ce5d677e68a05b2b0dd5364d29dde1a42bc9a4ecc0ef13e984a33bf202df6353dd34047416f803573be571c82ebd05c30f1d4c7a -EBUILD scikit-learn-1.4.1_p1.ebuild 1686 BLAKE2B c28a3319cf349e676d74bbd64b2fed69b2dc447c0a6770aaccdd067ad8703574c9e250c8c557fa432311055aae6ef5b2caf5635ecc24ac13915c358d0e4946df SHA512 b513534f6a4ad3a046410ca511f47d1d21bbb9f528dac3f298a54460777dca129723cb1d37090e6969ef1145bcf55268930d1cadbd712909efdf5b34e24a9433 diff --git a/sci-libs/scikit-learn/scikit-learn-1.4.1_p1.ebuild b/sci-libs/scikit-learn/scikit-learn-1.4.1_p1.ebuild deleted file mode 100644 index 223d0e7..0000000 --- a/sci-libs/scikit-learn/scikit-learn-1.4.1_p1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV=${PV/_p/.post} -MY_P="${PN}-${MY_PV}" - -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/" -SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos" -IUSE="examples" - -S="${WORKDIR}/${MY_P}" - -DEPEND=" - virtual/blas:= - virtual/cblas:= -" -RDEPEND=" - ${DEPEND} - dev-python/wheel[${PYTHON_USEDEP}] - >=dev-python/joblib-1.2.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.25[${PYTHON_USEDEP}] - >=dev-python/scipy-1.6.0[${PYTHON_USEDEP}] - >=dev-python/threadpoolctl-2.0.0[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/pythran-0.14.0[${PYTHON_USEDEP}] - >=dev-python/cython-3.0.8[${PYTHON_USEDEP}] -" - -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() { - # This needs to be run in the install dir - cd "${WORKDIR}/${MY_P}-${EPYTHON//./_}/install/usr/lib/${EPYTHON}/site-packages/sklearn" || die - distutils-r1_python_test -} - -python_install_all() { - find "${S}" -name \*LICENSE.txt -delete || die - distutils-r1_python_install_all - use examples && dodoc -r examples -} diff --git a/www-apps/paperless-ngx/Manifest b/www-apps/paperless-ngx/Manifest index fcea746..0aa3ec8 100644 --- a/www-apps/paperless-ngx/Manifest +++ b/www-apps/paperless-ngx/Manifest @@ -7,7 +7,7 @@ AUX paperless.tmpfiles 349 BLAKE2B 4a59f0a0c6a4abad23cba01e216909f45a7064e93911b DIST paperless-ngx-v1.17.4.tar.xz 16507140 BLAKE2B 34e67810dc9264cfcfec5a62557f5c102aedb82d8f31b27302e01675b84cb39cb22925339263cd8908e828d91b3469895732962e50c2b6bc62d266222b3072c4 SHA512 eb225244d51db0ba0db9fca259825ab542448f5f9904d2bf55ad581f16a9386696457593df2ad5eda6df5eefb296f0ee0c0f27e6fc0eff8956807aedf20e0094 DIST paperless-ngx-v2.4.3.tar.xz 60778612 BLAKE2B a048dee6f1e0853d37a5b4fc979d5624796efa5cc7414d08add9146994045217247794d4d2b0111830890de033932a46b4add9888b79fa66c428a3127537f0c5 SHA512 34ef0c09851b29d3279ff3a6bce261c7a3c68f80dbc1233ff5eea4ccf39371790d45f619cfdc0e68cd8e2553a7efa56fa2bc1061135cf44e86e4ad1777e6a6ec DIST paperless-ngx-v2.6.2.tar.xz 60537092 BLAKE2B f6c43b75b8b4ceab353040ef33a06974f14f8c905d05e256b613d7a74cd0bce293c0b77c65c0fbee49435963ed94c44722bab8417b5ac391679577db7dbaac25 SHA512 9d9bb7ed9f0eb7037f784049ff78685737589e9b846ca44b67d4f257b8362e70ffe86a0de458c40bed9639dc48dc01c8361e0e036a9a924556d99f9741e549b2 -EBUILD paperless-ngx-1.17.4.ebuild 4847 BLAKE2B 2273623881f11685890654ac7d16d33dacb55641d1f413679aa7f54b14b3e6fce79dde5c0e1ef54cb9c86583834ee29824e342e0f66931454b4cc68d1f7c591c SHA512 ddcb3eb462febb84c0adb9cf53d44e4d199ab4604ec6257419ec379dd89a735341ebfb6272496e6752caa9b80ddbac1370530377734dfe354d56f7980b31113c -EBUILD paperless-ngx-2.4.3.ebuild 6099 BLAKE2B db8bb2ad095ee41e5f130b07b4ed37c15dc5ac4174f90ca9bed1e1863040ead4e47d3b2197c83d5e89051f5ae39586cd29a04c5263e13a18df77d5a9ad837dcc SHA512 db72d867a17fec25b088b647cbb6dfd144c851ca5105743cb5239c42c8fd545d9c7f782f0feb829d5347ba7f6f5ccbd325bf3a5bcffb0b7da7b27528f904794a -EBUILD paperless-ngx-2.6.2.ebuild 6146 BLAKE2B cd0f7d96faa8865ce2eb6612c58ff3c100eb44599f65205d94e9efc0db7b383e2238f3b59aade576c32bfe35a6dd90779f853133ae648ee6e21e1bddba58b392 SHA512 900e29960093d4192a187b0d49eb556121a9eb1ba85e94f27729df2e4a91f29bfcc993bb5543500edf74903a15a3d2d1777cfd840c1e5d6e230df9248d25f59d +EBUILD paperless-ngx-1.17.4.ebuild 4849 BLAKE2B d8488abffb7a222e4d9cf2088c0aa4ef7b099cfd822033b419d6261abb312a02a866c28155b3443ca2836c71c25173b5ef0c947471b023f3fd74521b3f055e97 SHA512 8aed5b3c47a5cb5a896e404ddd50c86634c07b0afb637c24edd1985ef22903e5f568b27ff128d28db9e4b0d74316f61c1388fa601a4783c49af540ceac064ce5 +EBUILD paperless-ngx-2.4.3.ebuild 6102 BLAKE2B 3f5d1c4617ca23d98f0d342a69384e3760e958b6f45f51996e9579a15a0cec2f402a864bbc505ef58352c6404ac2fade1fee56c3264cae2fdaa2f7f589dfcb2d SHA512 4e6e4a5f8fae3e8df6bbc6de30d905c6e901ec832b92fea0bfa54a712307760ad9dffd5a87e924f8577fde5486ec90901c953bd683f8214c72aa39e94dc6deb1 +EBUILD paperless-ngx-2.6.2.ebuild 6149 BLAKE2B 393d7991ded93b77fb3558e46288fdd2eee903a9d1f60dd7e2c0c000c8d7b179fff424f21b7136d2d73fa266c62c6baac3c54cbbc42a3b9818646da3a14d833e SHA512 ae5d62e80482f81585eb777192912c7c5d7b0ac7ea6f1193e21bc1cfc5c17c597c201d4e22a68747ed6601746c31f5426a7a0bc7567001b49ad08e3cf44267c7 MISC metadata.xml 851 BLAKE2B dfb395b418d92c0c7318c4862dfbce74a312222b3a2848334806c2f8063bb63947a4c0315c289f1db83987d5e7649483efb484944afd6963b3f74c1a488877f5 SHA512 e7622cfe74bee71e3698241cb234221d9d40c9a41eca4f8b3e5e3c7338940652f5c5652cd72a675339cc6620d777e858fe5310f29cf7f87f5585eb8742b58405 diff --git a/www-apps/paperless-ngx/paperless-ngx-1.17.4.ebuild b/www-apps/paperless-ngx/paperless-ngx-1.17.4.ebuild index 59f4f62..f695adb 100644 --- a/www-apps/paperless-ngx/paperless-ngx-1.17.4.ebuild +++ b/www-apps/paperless-ngx/paperless-ngx-1.17.4.ebuild @@ -64,6 +64,7 @@ DEPEND=" dev-python/rapidfuzz dev-python/redis dev-python/reportlab + >=dev-python/scikit-learn-1.3 dev-python/tqdm =dev-python/watchdog-3.0 @@ -72,7 +73,6 @@ DEPEND=" media-gfx/imagemagick media-gfx/optipng media-libs/jbig2enc - >=sci-libs/scikit-learn-1.3 www-servers/gunicorn compression? ( dev-python/django-compression-middleware ) mysql? ( dev-python/mysqlclient ) diff --git a/www-apps/paperless-ngx/paperless-ngx-2.4.3.ebuild b/www-apps/paperless-ngx/paperless-ngx-2.4.3.ebuild index 79f8279..c852eb3 100644 --- a/www-apps/paperless-ngx/paperless-ngx-2.4.3.ebuild +++ b/www-apps/paperless-ngx/paperless-ngx-2.4.3.ebuild @@ -73,6 +73,7 @@ DEPEND=" dev-python/pyzbar[${PYTHON_USEDEP}] dev-python/rapidfuzz[${PYTHON_USEDEP}] dev-python/redis[${PYTHON_USEDEP}] + >=dev-python/scikit-learn-1.3 dev-python/tqdm[${PYTHON_USEDEP}] =dev-python/watchdog-3.0[${PYTHON_USEDEP}] @@ -81,7 +82,6 @@ DEPEND=" media-gfx/imagemagick[xml] media-gfx/optipng media-libs/jbig2enc - >=sci-libs/scikit-learn-1.3 www-servers/gunicorn audit? ( $(python_gen_cond_dep ' dev-python/django-auditlog[${PYTHON_USEDEP}]') ) diff --git a/www-apps/paperless-ngx/paperless-ngx-2.6.2.ebuild b/www-apps/paperless-ngx/paperless-ngx-2.6.2.ebuild index 6ef0f40..745ecec 100644 --- a/www-apps/paperless-ngx/paperless-ngx-2.6.2.ebuild +++ b/www-apps/paperless-ngx/paperless-ngx-2.6.2.ebuild @@ -74,6 +74,7 @@ DEPEND=" dev-python/pyzbar[${PYTHON_USEDEP}] dev-python/rapidfuzz[${PYTHON_USEDEP}] dev-python/redis[${PYTHON_USEDEP}] + >=dev-python/scikit-learn-1.4 dev-python/tqdm[${PYTHON_USEDEP}] =dev-python/watchdog-4.0[${PYTHON_USEDEP}] @@ -82,7 +83,6 @@ DEPEND=" media-gfx/imagemagick[xml] media-gfx/optipng media-libs/jbig2enc - >=sci-libs/scikit-learn-1.4 www-servers/gunicorn audit? ( $(python_gen_cond_dep ' dev-python/django-auditlog[${PYTHON_USEDEP}]') ) -- cgit v1.2.3