diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest deleted file mode 100644 index 7fd6e9b2d..000000000 --- a/dev-python/gmpy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gmpy2-2.2.0a1.gh.tar.gz 2196248 BLAKE2B 2d8c81a4545398f810b31f3be8f2b16e17830ceec7d4ee2bfebafe4475f212cb5796c3e1089a025325efc3393484785cdbd9eb61009180802d8795e11e4f95a5 SHA512 3259a0c069ef314eb8ae432c53ab88c39b2cbbbbddcbe0475ec5711cf5a4f7d199b31d0fec4a3815bf11be4c741af8e99e83593a58434a70689e619291ad18a7 diff --git a/dev-python/gmpy/gmpy-2.2.0_alpha1.ebuild b/dev-python/gmpy/gmpy-2.2.0_alpha1.ebuild deleted file mode 100644 index 4add2c21f..000000000 --- a/dev-python/gmpy/gmpy-2.2.0_alpha1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYPI_PN="gmpy2" -MY_PV="${PV:0:5}a1" -MY_P="${PYPI_PN}-${MY_PV}" -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries" -HOMEPAGE=" - https://github.com/aleaxit/gmpy/ - https://pypi.org/project/gmpy2/ -" -SRC_URI="https://github.com/aleaxit/gmpy/archive/refs/tags/${MY_P}.tar.gz -> ${MY_P}.gh.tar.gz" - -LICENSE="LGPL-3+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -DEPEND=" - >=dev-libs/mpc-1.0.2:= - >=dev-libs/mpfr-3.1.2:= - dev-libs/gmp:0= -" -RDEPEND=" - ${DEPEND} - dev-python/mpmath[${PYTHON_USEDEP}] -" - -S="${WORKDIR}/gmpy-${MY_P}" - -distutils_enable_sphinx docs - -python_test() { - cd test || die - "${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}" -} diff --git a/dev-python/gmpy/metadata.xml b/dev-python/gmpy/metadata.xml deleted file mode 100644 index a7066d521..000000000 --- a/dev-python/gmpy/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - frp.bissey@gmail.com - François Bissey - - - gmpy2 is a C-coded Python extension module that supports - multiple-precision arithmetic. gmpy2 supports the GMP multi-precision - library, the MPFR (correctly rounded real floating-point arithmetic) and MPC - (correctly rounded complex floating-point arithmetic) libraries. - - - gmpy2 - aleaxit/gmpy - - diff --git a/dev-python/jupyter-sphinx/Manifest b/dev-python/jupyter-sphinx/Manifest index ed280add8..407fa14f6 100644 --- a/dev-python/jupyter-sphinx/Manifest +++ b/dev-python/jupyter-sphinx/Manifest @@ -1,2 +1 @@ -DIST jupyter_sphinx-0.4.0.tar.gz 18010 BLAKE2B bcb4a49244c5b83d405f335a50e4f863797532b20b085be1b3c5434d3477a4649d3e002c6bbf8b67f9e21b26f8350e604b42d0b87c8542a25a879e3d4b850725 SHA512 2f05f289f3d9e0a2a1e348eb14f7ea924c839e44df9ab0dc53c00aa71b33886cc0aba959917d553077f4a0468dd804b7678bb2f80117af0cec937266ac0d17ea DIST jupyter_sphinx-0.5.3.tar.gz 17532 BLAKE2B 82588c92d4e414f882036bd5fec7a82d35e71696c207dc837d391f4405d49b37bb8f39066d81e115d1951ae952d2bdf577a2fe0384cc66a39f01044becccef03 SHA512 b07b51118931a4b025ceeff6fbcc513336f69da618d0ed114b88f181d2e0913de2282dbb379a3e772affbf8ce021394be885cc03e7a043ed0321e1a7af05d17a diff --git a/dev-python/jupyter-sphinx/jupyter-sphinx-0.4.0.ebuild b/dev-python/jupyter-sphinx/jupyter-sphinx-0.4.0.ebuild deleted file mode 100644 index fe9954716..000000000 --- a/dev-python/jupyter-sphinx/jupyter-sphinx-0.4.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 pypi - -DESCRIPTION="Jupyter sphinx extensions" -HOMEPAGE="https://jupyter.org" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -# pypi tarball do not include tests -RESTRICT="test" - -RDEPEND=" - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] - dev-python/ipython[${PYTHON_USEDEP}] - dev-python/nbconvert[${PYTHON_USEDEP}] - dev-python/nbformat[${PYTHON_USEDEP}] -" diff --git a/dev-python/jupyter-threejs-sage/jupyter-threejs-sage-122.ebuild b/dev-python/jupyter-threejs-sage/jupyter-threejs-sage-122.ebuild index 77f88c42b..8422f9850 100644 --- a/dev-python/jupyter-threejs-sage/jupyter-threejs-sage-122.ebuild +++ b/dev-python/jupyter-threejs-sage/jupyter-threejs-sage-122.ebuild @@ -12,11 +12,10 @@ MY_PV="${PV}b1" DESCRIPTION="Custom build of Three.js for SageMath" HOMEPAGE="https://github.com/sagemath/threejs-sage" SRC_URI="$(pypi_sdist_url --no-normalize "${PN}" "${MY_PV}")" +S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/amd/Manifest +++ b/sci-libs/amd/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/amd/amd-3.3.1.ebuild b/sci-libs/amd/amd-3.3.2.ebuild similarity index 98% rename from sci-libs/amd/amd-3.3.1.ebuild rename to sci-libs/amd/amd-3.3.2.ebuild index f8f7e90fa..ab83adb25 100644 --- a/sci-libs/amd/amd-3.3.1.ebuild +++ b/sci-libs/amd/amd-3.3.2.ebuild @@ -6,12 +6,13 @@ EAPI=8 FORTRAN_NEEDED="fortran" inherit cmake fortran-2 -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="BSD" SLOT="0/3" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -22,8 +23,6 @@ DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" RDEPEND="${DEPEND}" BDEPEND="doc? ( virtual/latex-base )" -S="${WORKDIR}/${Sparse_P}/${PN^^}" - src_configure() { # Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take # the value suitesparse, and the include directory would be set to diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/btf/Manifest +++ b/sci-libs/btf/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/btf/btf-2.3.1.ebuild b/sci-libs/btf/btf-2.3.2.ebuild similarity index 98% rename from sci-libs/btf/btf-2.3.1.ebuild rename to sci-libs/btf/btf-2.3.2.ebuild index 974b9fdea..3903fb720 100644 --- a/sci-libs/btf/btf-2.3.1.ebuild +++ b/sci-libs/btf/btf-2.3.2.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Algorithm for matrix permutation into block triangular form" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="LGPL-2.1" SLOT="0/2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -18,8 +19,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" RDEPEND="${DEPEND}" -S="${WORKDIR}/${Sparse_P}/${PN^^}" - src_configure() { # Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take # the value suitesparse, and the include directory would be set to diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/camd/Manifest +++ b/sci-libs/camd/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/camd/camd-3.3.1.ebuild b/sci-libs/camd/camd-3.3.2.ebuild similarity index 98% rename from sci-libs/camd/camd-3.3.1.ebuild rename to sci-libs/camd/camd-3.3.2.ebuild index 019e8252c..9aa9beec6 100644 --- a/sci-libs/camd/camd-3.3.1.ebuild +++ b/sci-libs/camd/camd-3.3.2.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="BSD" SLOT="0/3" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -21,8 +22,6 @@ DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" RDEPEND="${DEPEND}" BDEPEND="doc? ( virtual/latex-base )" -S="${WORKDIR}/${Sparse_P}/${PN^^}" - src_configure() { # Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take # the value suitesparse, and the include directory would be set to diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/ccolamd/Manifest +++ b/sci-libs/ccolamd/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/ccolamd/ccolamd-3.3.2.ebuild b/sci-libs/ccolamd/ccolamd-3.3.3.ebuild similarity index 98% rename from sci-libs/ccolamd/ccolamd-3.3.2.ebuild rename to sci-libs/ccolamd/ccolamd-3.3.3.ebuild index a0a566109..258cdeea0 100644 --- a/sci-libs/ccolamd/ccolamd-3.3.2.ebuild +++ b/sci-libs/ccolamd/ccolamd-3.3.3.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Constrained Column approximate minimum degree ordering algorithm" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="BSD" SLOT="0/3" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -20,8 +21,6 @@ RESTRICT="!test? ( test )" DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" RDEPEND="${DEPEND}" -S="${WORKDIR}/${Sparse_P}/${PN^^}" - src_configure() { # Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take # the value suitesparse, and the include directory would be set to diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/cholmod/Manifest +++ b/sci-libs/cholmod/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/cholmod/cholmod-5.2.0.ebuild b/sci-libs/cholmod/cholmod-5.2.1.ebuild similarity index 99% rename from sci-libs/cholmod/cholmod-5.2.0.ebuild rename to sci-libs/cholmod/cholmod-5.2.1.ebuild index d8ad2464b..c7efdcf8b 100644 --- a/sci-libs/cholmod/cholmod-5.2.0.ebuild +++ b/sci-libs/cholmod/cholmod-5.2.1.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake toolchain-funcs -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Sparse Cholesky factorization and update/downdate library" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )" SLOT="0/5" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -36,8 +37,6 @@ REQUIRED_USE="supernodal? ( cholesky ) modify? ( cholesky ) test? ( cholesky matrixops supernodal )" -S="${WORKDIR}/${Sparse_P}/${PN^^}" - pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/colamd/Manifest +++ b/sci-libs/colamd/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/colamd/colamd-3.3.2.ebuild b/sci-libs/colamd/colamd-3.3.3.ebuild similarity index 98% rename from sci-libs/colamd/colamd-3.3.2.ebuild rename to sci-libs/colamd/colamd-3.3.3.ebuild index 6dbcf76cd..787e9d453 100644 --- a/sci-libs/colamd/colamd-3.3.2.ebuild +++ b/sci-libs/colamd/colamd-3.3.3.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Column approximate minimum degree ordering algorithm" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="BSD" SLOT="0/3" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -20,8 +21,6 @@ RESTRICT="!test? ( test )" DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" RDEPEND="${DEPEND}" -S="${WORKDIR}/${Sparse_P}/${PN^^}" - src_configure() { # Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take # the value suitesparse, and the include directory would be set to diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/cxsparse/Manifest +++ b/sci-libs/cxsparse/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/cxsparse/cxsparse-4.3.1.ebuild b/sci-libs/cxsparse/cxsparse-4.4.0.ebuild similarity index 99% rename from sci-libs/cxsparse/cxsparse-4.3.1.ebuild rename to sci-libs/cxsparse/cxsparse-4.4.0.ebuild index 18f6d9ee5..418ae2b34 100644 --- a/sci-libs/cxsparse/cxsparse-4.3.1.ebuild +++ b/sci-libs/cxsparse/cxsparse-4.4.0.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Extended sparse matrix package" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/CXSparse" LICENSE="LGPL-2.1" SLOT="0/4" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -20,8 +21,6 @@ RESTRICT="!test? ( test )" DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" RDEPEND="${DEPEND}" -S="${WORKDIR}/${Sparse_P}/CXSparse" - src_configure() { # Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take # the value suitesparse, and the include directory would be set to diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/klu/Manifest +++ b/sci-libs/klu/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/klu/klu-2.3.2.ebuild b/sci-libs/klu/klu-2.3.3.ebuild similarity index 98% rename from sci-libs/klu/klu-2.3.2.ebuild rename to sci-libs/klu/klu-2.3.3.ebuild index 8ca1213a3..c732781db 100644 --- a/sci-libs/klu/klu-2.3.2.ebuild +++ b/sci-libs/klu/klu-2.3.3.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Sparse LU factorization for circuit simulation" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="LGPL-2.1+" SLOT="0/2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -25,8 +26,6 @@ DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV} RDEPEND="${DEPEND}" BDEPEND="doc? ( virtual/latex-base )" -S="${WORKDIR}/${Sparse_P}/${PN^^}" - src_configure() { # Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take # the value suitesparse, and the include directory would be set to diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/ldl/Manifest +++ b/sci-libs/ldl/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/ldl/ldl-3.3.1.ebuild b/sci-libs/ldl/ldl-3.3.2.ebuild similarity index 98% rename from sci-libs/ldl/ldl-3.3.1.ebuild rename to sci-libs/ldl/ldl-3.3.2.ebuild index 5d0997ced..0398063d6 100644 --- a/sci-libs/ldl/ldl-3.3.1.ebuild +++ b/sci-libs/ldl/ldl-3.3.2.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Simple but educational LDL^T matrix factorization algorithm" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="LGPL-2.1+" SLOT="0/3" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -22,8 +23,6 @@ DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV} RDEPEND="${DEPEND}" BDEPEND="doc? ( virtual/latex-base )" -S="${WORKDIR}/${Sparse_P}/${PN^^}" - src_configure() { # Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take # the value suitesparse, and the include directory would be set to diff --git a/sci-libs/rbio/Manifest b/sci-libs/rbio/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/rbio/Manifest +++ b/sci-libs/rbio/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/rbio/rbio-4.3.1.ebuild b/sci-libs/rbio/rbio-4.3.2.ebuild similarity index 98% rename from sci-libs/rbio/rbio-4.3.1.ebuild rename to sci-libs/rbio/rbio-4.3.2.ebuild index bf234266e..a403f624f 100644 --- a/sci-libs/rbio/rbio-4.3.1.ebuild +++ b/sci-libs/rbio/rbio-4.3.2.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Sparse matrices Rutherford/Boeing format tools" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/RBio" LICENSE="GPL-2+" SLOT="0/4" KEYWORDS="~amd64" @@ -20,8 +21,6 @@ RESTRICT="!test? ( test )" DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV}" RDEPEND="${DEPEND}" -S="${WORKDIR}/${Sparse_P}/RBio" - src_configure() { # Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take # the value suitesparse, and the include directory would be set to diff --git a/sci-libs/spex/Manifest b/sci-libs/spex/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/spex/Manifest +++ b/sci-libs/spex/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/spex/files/spex-2.0.0-demo_location.patch b/sci-libs/spex/files/spex-2.0.0-demo_location.patch deleted file mode 100644 index 805cfff10..000000000 --- a/sci-libs/spex/files/spex-2.0.0-demo_location.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/SPEX_Left_LU/Demo/example2.c b/SPEX_Left_LU/Demo/example2.c -index 955a6830d..3dfca888d 100644 ---- a/SPEX_Left_LU/Demo/example2.c -+++ b/SPEX_Left_LU/Demo/example2.c -@@ -43,8 +43,8 @@ int main (int argc, char **argv) - // Get matrix and right hand side file names - //-------------------------------------------------------------------------- - char *mat_name, *rhs_name; -- mat_name = "../ExampleMats/10teams_mat.txt"; -- rhs_name = "../ExampleMats/10teams_v.txt"; -+ mat_name = "ExampleMats/10teams_mat.txt"; -+ rhs_name = "ExampleMats/10teams_v.txt"; - if (argc > 2) - { - mat_name = argv[1]; -diff --git a/SPEX_Left_LU/Demo/spexlu_demo.c b/SPEX_Left_LU/Demo/spexlu_demo.c -index b6ca44fa5..b38e4aaf2 100644 ---- a/SPEX_Left_LU/Demo/spexlu_demo.c -+++ b/SPEX_Left_LU/Demo/spexlu_demo.c -@@ -132,8 +132,8 @@ int main (int argc, char* argv[]) - // Extra parameters used to obtain A, b, etc - char *mat_name, *rhs_name; - SPEX_type rat; -- mat_name = "../ExampleMats/10teams_mat.txt";// Set demo matrix and RHS name -- rhs_name = "../ExampleMats/10teams_v.txt"; -+ mat_name = "ExampleMats/10teams_mat.txt";// Set demo matrix and RHS name -+ rhs_name = "ExampleMats/10teams_v.txt"; - - //-------------------------------------------------------------------------- - // After initializing memory, we process the command line for this function. diff --git a/sci-libs/spex/spex-2.3.2.ebuild b/sci-libs/spex/spex-3.1.0.ebuild similarity index 60% rename from sci-libs/spex/spex-2.3.2.ebuild rename to sci-libs/spex/spex-3.1.0.ebuild index 002e82fcd..529fdc90c 100644 --- a/sci-libs/spex/spex-2.3.2.ebuild +++ b/sci-libs/spex/spex-3.1.0.ebuild @@ -5,14 +5,15 @@ EAPI=8 inherit cmake -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="a software package for SParse EXact algebra" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="BSD" -SLOT="0/2" +SLOT="0/3" KEYWORDS="~amd64" IUSE="doc test" RESTRICT="!test? ( test )" @@ -25,12 +26,6 @@ DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV} RDEPEND="${DEPEND}" BDEPEND="doc? ( virtual/latex-base )" -PATCHES=( - "${FILESDIR}/${PN}-2.0.0-demo_location.patch" - ) - -S="${WORKDIR}/${Sparse_P}/${PN^^}" - src_configure() { # Define SUITESPARSE_INCLUDEDIR_POSTFIX to "" otherwise it take # the value suitesparse, and the include directory would be set to @@ -48,12 +43,16 @@ src_test() { # Because we are not using cmake_src_test, # we have to manually go to BUILD_DIR cd "${BUILD_DIR}" || die - # Programs expect to find ExampleMats - ln -s "${S}/SPEX_Left_LU/ExampleMats" # Run demo files - ./example || die "failed testing" - ./example2 || die "failed testing" - ./spexlu_demo || die "failed testing" + ./spex_demo_lu_simple1 + ./spex_demo_lu_simple2 "${S}"/ExampleMats/10teams.mat.txt "${S}"/ExampleMats/10teams.rhs.txt + ./spex_demo_lu_extended f "${S}"/ExampleMats/10teams.mat.txt "${S}"/ExampleMats/10teams.rhs.txt + ./spex_demo_lu_doub f "${S}"/ExampleMats/10teams.mat.txt "${S}"/ExampleMats/10teams.rhs.txt + ./spex_demo_backslash f "${S}"/ExampleMats/10teams.mat.txt "${S}"/ExampleMats/10teams.rhs.txt + ./spex_demo_cholesky_simple f "${S}"/ExampleMats/494_bus.mat.txt "${S}"/ExampleMats/494_bus.rhs.txt + ./spex_demo_cholesky_extended f "${S}"/ExampleMats/494_bus.mat.txt "${S}"/ExampleMats/494_bus.rhs.txt + ./spex_demo_threaded f "${S}"/ExampleMats/10teams.mat.txt "${S}"/ExampleMats/10teams.rhs.txt + ./spex_demo_backslash f "${S}"/ExampleMats/Trefethen_500.mat.txt "${S}"/ExampleMats/Trefethen_500.rhs.txt } src_install() { diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/spqr/Manifest +++ b/sci-libs/spqr/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/spqr/spqr-4.3.2.ebuild b/sci-libs/spqr/spqr-4.3.3.ebuild similarity index 99% rename from sci-libs/spqr/spqr-4.3.2.ebuild rename to sci-libs/spqr/spqr-4.3.3.ebuild index 6b411b722..6672102df 100644 --- a/sci-libs/spqr/spqr-4.3.2.ebuild +++ b/sci-libs/spqr/spqr-4.3.3.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake toolchain-funcs -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Multithreaded multifrontal sparse QR factorization library" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="GPL-2+" SLOT="0/4" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -25,8 +26,6 @@ DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV} RDEPEND="${DEPEND}" BDEPEND="doc? ( virtual/latex-base )" -S="${WORKDIR}/${Sparse_P}/${PN^^}" - pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/suitesparseconfig/Manifest +++ b/sci-libs/suitesparseconfig/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-7.6.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-7.7.0.ebuild similarity index 99% rename from sci-libs/suitesparseconfig/suitesparseconfig-7.6.0.ebuild rename to sci-libs/suitesparseconfig/suitesparseconfig-7.7.0.ebuild index feb662c21..f69966bd9 100644 --- a/sci-libs/suitesparseconfig/suitesparseconfig-7.6.0.ebuild +++ b/sci-libs/suitesparseconfig/suitesparseconfig-7.7.0.ebuild @@ -11,6 +11,7 @@ DESCRIPTION="Common configurations for all packages in suitesparse" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/SuiteSparse_config" LICENSE="BSD" SLOT="0/7" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -21,8 +22,6 @@ IUSE="openmp" DEPEND="virtual/blas" RDEPEND="${DEPEND}" -S="${WORKDIR}/${Sparse_P}/SuiteSparse_config" - pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest index d76880970..b25a58582 100644 --- a/sci-libs/umfpack/Manifest +++ b/sci-libs/umfpack/Manifest @@ -1 +1 @@ -DIST SuiteSparse-7.6.0.gh.tar.gz 85507721 BLAKE2B 80dc6b4b5deb4b747aa3b63a91017134a5a1f0c663156b2f43ff10379cba2a2ce23ea3661f5af7af8b19c5430b89353f35acfb739f7cf76665d15f8aeaf34fa0 SHA512 6cffb283e7620afd31c6f7517ca9d28c2927515af582680d346e0e8a4ee1289daec0b4d83660f88f309e53e54a87403291fc4b0b45fe50dffd59781ec0129a8f +DIST SuiteSparse-7.7.0.gh.tar.gz 85876065 BLAKE2B 04b18b281f2a44208322df9202633764ead458236c1333e5a12c48f37032994a34764d5f9ce7d9915a85e58fa5b68473c54f2fb8fe66fe4241684f663d5e2c96 SHA512 aa62dae81ae423ce7162ae83b46e5cf606d95482e6c6bb7ae6d61e15987761119d9418ef3a96648e6ba2327871a2847eef8ace197aa375279d71c80329d6f451 diff --git a/sci-libs/umfpack/umfpack-6.3.2.ebuild b/sci-libs/umfpack/umfpack-6.3.3.ebuild similarity index 99% rename from sci-libs/umfpack/umfpack-6.3.2.ebuild rename to sci-libs/umfpack/umfpack-6.3.3.ebuild index 2f8a985e7..c12d18d00 100644 --- a/sci-libs/umfpack/umfpack-6.3.2.ebuild +++ b/sci-libs/umfpack/umfpack-6.3.3.ebuild @@ -5,12 +5,13 @@ EAPI=8 inherit cmake toolchain-funcs -Sparse_PV="7.6.0" +Sparse_PV="7.7.0" Sparse_P="SuiteSparse-${Sparse_PV}" DESCRIPTION="Unsymmetric multifrontal sparse LU factorization library" HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html" SRC_URI="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${Sparse_PV}.tar.gz -> ${Sparse_P}.gh.tar.gz" +S="${WORKDIR}/${Sparse_P}/${PN^^}" LICENSE="GPL-2+" SLOT="0/6" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -24,8 +25,6 @@ DEPEND=">=sci-libs/suitesparseconfig-${Sparse_PV} RDEPEND="${DEPEND}" BDEPEND="doc? ( virtual/latex-base )" -S="${WORKDIR}/${Sparse_P}/${PN^^}" - pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/sci-mathematics/cu2/cu2-20060223.ebuild b/sci-mathematics/cu2/cu2-20060223.ebuild index b6b6c6b9b..571bcc1f2 100644 --- a/sci-mathematics/cu2/cu2-20060223.ebuild +++ b/sci-mathematics/cu2/cu2-20060223.ebuild @@ -11,14 +11,13 @@ DESCRIPTION="An non-optimal 2x2x2 rubik's cube solver" HOMEPAGE="https://web.archive.org/web/20121212175710/http://www.wrongway.org/?rubiksource" SRC_URI="mirror://sagemath/${MY_PN}.zip" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" DEPEND="app-arch/unzip" -S="${WORKDIR}/${PN}" - src_compile() { emake \ CPP="$(tc-getCXX)" \ diff --git a/sci-mathematics/cubex/cubex-20060128.ebuild b/sci-mathematics/cubex/cubex-20060128.ebuild index b44add504..82a5c3b1e 100644 --- a/sci-mathematics/cubex/cubex-20060128.ebuild +++ b/sci-mathematics/cubex/cubex-20060128.ebuild @@ -11,6 +11,7 @@ DESCRIPTION="An non-optimal 3x3x3 rubik's cube solver" HOMEPAGE="https://web.archive.org/web/20121212175710/http://www.wrongway.org/?rubiksource" SRC_URI="mirror://sagemath/${P}.tar.xz" +S="${WORKDIR}/${MY_PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" @@ -19,8 +20,6 @@ PATCHES=( "${FILESDIR}"/${P}-fix-missing-include.patch ) -S="${WORKDIR}/${MY_PN}" - src_compile() { emake CC="$(tc-getCXX)" LINK="$(tc-getCXX)" CFLAGS="${CFLAGS}" \ LFLAGS="${LDFLAGS}" diff --git a/sci-mathematics/database_cubic_hecke/database_cubic_hecke-2022.4.4.ebuild b/sci-mathematics/database_cubic_hecke/database_cubic_hecke-2022.4.4.ebuild index a65beb869..f48d89413 100644 --- a/sci-mathematics/database_cubic_hecke/database_cubic_hecke-2022.4.4.ebuild +++ b/sci-mathematics/database_cubic_hecke/database_cubic_hecke-2022.4.4.ebuild @@ -9,12 +9,11 @@ DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 pypi DESCRIPTION="data for the representations of the Cubic Hecke Algebra" -KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" HOMEPAGE="https://pypi.org/project/database_cubic_hecke/" -IUSE="test" - LICENSE="GPL-3" SLOT="0" +KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="test" DEPEND="test? ( >=sci-mathematics/sagemath-standard-10.3 )" diff --git a/sci-mathematics/database_knotinfo/Manifest b/sci-mathematics/database_knotinfo/Manifest index 583a9d9b8..c02f71e97 100644 --- a/sci-mathematics/database_knotinfo/Manifest +++ b/sci-mathematics/database_knotinfo/Manifest @@ -1,2 +1 @@ -DIST database_knotinfo-2024.2.1.tar.gz 14057457 BLAKE2B b9bdf6b3280177491fb2291aa22f9a1885d87af8b913d59b206d210d96c1f477bf5e0d307c09a6aa3e47d92409e0de2838cbfe8e120589f75073302e0abbd06a SHA512 9258527bcd66298e83b597cecbf616cc0548829e3d3da9c1d2d54d6f57fa7296f92a1e7e85cc3a4f8da763c14c25238e212b8bcad50a91d91c1a8a7acfdede97 DIST database_knotinfo-2024.5.1.tar.gz 14763125 BLAKE2B 91141bb46802e45dcca44c437eb5989990ee90d381d70e5c8298af478ae7108bdfe1ed848e343791025a0b7c253e92e4b54b07da61078b79c7b923761c0f4d7e SHA512 1ee363d7bd7df04b7d89e76146d3046c3f4a78a1241348d0d07c14b0b765221d4707d87a20d595cc93ae514841afb45cecfb1c096852bce65b0126890e054594 diff --git a/sci-mathematics/database_knotinfo/database_knotinfo-2024.2.1.ebuild b/sci-mathematics/database_knotinfo/database_knotinfo-2024.2.1.ebuild deleted file mode 100644 index b3665c43e..000000000 --- a/sci-mathematics/database_knotinfo/database_knotinfo-2024.2.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 pypi - -DESCRIPTION="Content of the KnotInfo & LinkInfo databases as lists of dictionaries" -KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -HOMEPAGE="https://pypi.org/project/database-knotinfo/" -IUSE="test" - -LICENSE="GPL-3" -SLOT="0" - -DEPEND="test? ( >=sci-mathematics/sagemath-standard-10.3 )" - -RESTRICT="!test? ( test )" diff --git a/sci-mathematics/database_knotinfo/database_knotinfo-2024.5.1.ebuild b/sci-mathematics/database_knotinfo/database_knotinfo-2024.5.1.ebuild index b3665c43e..164b52ac0 100644 --- a/sci-mathematics/database_knotinfo/database_knotinfo-2024.5.1.ebuild +++ b/sci-mathematics/database_knotinfo/database_knotinfo-2024.5.1.ebuild @@ -9,12 +9,11 @@ DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 pypi DESCRIPTION="Content of the KnotInfo & LinkInfo databases as lists of dictionaries" -KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" HOMEPAGE="https://pypi.org/project/database-knotinfo/" -IUSE="test" - LICENSE="GPL-3" SLOT="0" +KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="test" DEPEND="test? ( >=sci-mathematics/sagemath-standard-10.3 )" diff --git a/sci-mathematics/dikcube/dikcube-20070912-r1.ebuild b/sci-mathematics/dikcube/dikcube-20070912-r1.ebuild index e072e04af..c7ed2150d 100644 --- a/sci-mathematics/dikcube/dikcube-20070912-r1.ebuild +++ b/sci-mathematics/dikcube/dikcube-20070912-r1.ebuild @@ -11,6 +11,7 @@ DESCRIPTION="Dik T. Winter's rubik's cube solver and related tools" HOMEPAGE="https://www.sagemath.org" SRC_URI="mirror://sageupstream/rubiks/${MY_P}.tar.bz2" +S="${WORKDIR}"/${MY_P}/dik LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" @@ -20,8 +21,6 @@ PATCHES=( "${FILESDIR}"/${PN}-20070912_p10-fix-LDFLAGS.patch ) -S="${WORKDIR}"/${MY_P}/dik - src_compile() { append-cflags -DLARGE_MEM -DVERBOSE diff --git a/sci-mathematics/knot_floer_homology/knot_floer_homology-1.1.ebuild b/sci-mathematics/knot_floer_homology/knot_floer_homology-1.1.ebuild index ef713ee00..dbb2b5f57 100644 --- a/sci-mathematics/knot_floer_homology/knot_floer_homology-1.1.ebuild +++ b/sci-mathematics/knot_floer_homology/knot_floer_homology-1.1.ebuild @@ -14,6 +14,7 @@ HOMEPAGE="https://github.com/3-manifolds/knot_floer_homology https://pypi.org/project/knot-floer-homology/" # Not using pypi. Ship with cythonized files without the sources. SRC_URI="https://github.com/3-manifolds/${PN}/archive/refs/tags/${PV}_as_released.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${P}_as_released" LICENSE="GPL-2+" SLOT="0" @@ -21,8 +22,6 @@ KEYWORDS="~amd64 ~x86" BDEPEND="dev-python/cython[${PYTHON_USEDEP}]" -S="${WORKDIR}/${P}_as_released" - python_test() { "${EPYTHON}" -m knot_floer_homology.test } diff --git a/sci-mathematics/latte-int/latte-int-1.7.6.ebuild b/sci-mathematics/latte-int/latte-int-1.7.6.ebuild index f2d784c4c..65c70f425 100644 --- a/sci-mathematics/latte-int/latte-int-1.7.6.ebuild +++ b/sci-mathematics/latte-int/latte-int-1.7.6.ebuild @@ -6,9 +6,8 @@ EAPI=8 DESCRIPTION="latte-int(egrale) consists of tools for lattice point enumeration" HOMEPAGE="https://github.com/latte-int/latte" SRC_URI="https://github.com/${PN}/latte/releases/download/version_$(ver_rs 1-2 _)/${P}.tar.gz" - -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="~amd64" DEPEND=" diff --git a/sci-mathematics/lie/lie-2.2.2.ebuild b/sci-mathematics/lie/lie-2.2.2.ebuild index 4d2f8caef..81c150beb 100644 --- a/sci-mathematics/lie/lie-2.2.2.ebuild +++ b/sci-mathematics/lie/lie-2.2.2.ebuild @@ -8,6 +8,7 @@ inherit toolchain-funcs DESCRIPTION="A Computer algebra package for Lie group computations" HOMEPAGE="http://www-math.univ-poitiers.fr/~maavl/LiE/" SRC_URI="http://www-math.univ-poitiers.fr/~maavl/LiE/conLiE.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/LiE" #### Remove the following line when moving this ebuild to the main tree! LICENSE="LGPL-2.1" ##### See https://packages.debian.org/changelogs/pool/main/l/lie/lie_2.2.2+dfsg-1/lie.copyright @@ -22,7 +23,6 @@ DEPEND=" RDEPEND="sys-libs/readline:= sys-libs/ncurses" -S="${WORKDIR}/LiE" DOCS=( "README" ) PATCHES=( diff --git a/sci-mathematics/matroid-database/matroid-database-0.3.ebuild b/sci-mathematics/matroid-database/matroid-database-0.3.ebuild index 00a9cb011..7bbbe7535 100644 --- a/sci-mathematics/matroid-database/matroid-database-0.3.ebuild +++ b/sci-mathematics/matroid-database/matroid-database-0.3.ebuild @@ -10,12 +10,11 @@ PYPI_NO_NORMALIZE=NO inherit distutils-r1 pypi DESCRIPTION="Yoshitake Matsumoto, Database of Matroids" -KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" HOMEPAGE="https://pypi.org/project/matroid-database/" -IUSE="test" - LICENSE="GPL-3" SLOT="0" +KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="test" DEPEND="test? ( >=sci-mathematics/sagemath-standard-10.3 )" diff --git a/sci-mathematics/mcube/mcube-20051209.ebuild b/sci-mathematics/mcube/mcube-20051209.ebuild index a7e1d3672..cd59d6a70 100644 --- a/sci-mathematics/mcube/mcube-20051209.ebuild +++ b/sci-mathematics/mcube/mcube-20051209.ebuild @@ -10,6 +10,7 @@ MY_PN="${PN}10-src" DESCRIPTION="An non-optimal 4x4x4 rubik's cube solver" HOMEPAGE="https://web.archive.org/web/20121212175710/http://www.wrongway.org/?rubiksource" SRC_URI="mirror://sagemath/${MY_PN}.zip" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" @@ -17,8 +18,6 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" DEPEND="app-arch/unzip" -S="${WORKDIR}/${PN}" - src_compile() { emake CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" CPP="$(tc-getCXX)" \ LINK="$(tc-getCXX)" diff --git a/sci-mathematics/modular_resolution/modular_resolution-1.1-r1.ebuild b/sci-mathematics/modular_resolution/modular_resolution-1.1-r1.ebuild index bee17f59e..e5698a810 100644 --- a/sci-mathematics/modular_resolution/modular_resolution-1.1-r1.ebuild +++ b/sci-mathematics/modular_resolution/modular_resolution-1.1-r1.ebuild @@ -11,6 +11,7 @@ Parent_P="${Parent_PN}-${Parent_PV}" DESCRIPTION="p_group_cohomology helper library" HOMEPAGE="https://users.fmi.uni-jena.de/cohomology/" SRC_URI="https://github.com/sagemath/${Parent_PN}/releases/download/v${Parent_PV}/${Parent_P}.tar.xz" +S="${WORKDIR}/${Parent_P}/${P}" LICENSE="GPL-2+" SLOT="0" @@ -25,8 +26,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.1-dbinstall.patch ) -S="${WORKDIR}/${Parent_P}/${P}" - src_prepare(){ default diff --git a/sci-mathematics/optimal/optimal-20040603-r1.ebuild b/sci-mathematics/optimal/optimal-20040603-r1.ebuild index e21e76dcc..43cfa40c1 100644 --- a/sci-mathematics/optimal/optimal-20040603-r1.ebuild +++ b/sci-mathematics/optimal/optimal-20040603-r1.ebuild @@ -10,12 +10,11 @@ HOMEPAGE="https://www.permutationpuzzles.org/rubik/" #SRC_URI="https://www.permutationpuzzles.org/rubik/software/${PN}.tar.gz -> ${P}.tar.gz" SRC_URI="mirror://sagemath/${P}.tar.gz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -S="${WORKDIR}/${PN}" - src_compile() { $(tc-getCC) ${CFLAGS} -c optimal.c -o optimal.o $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o optimal optimal.o diff --git a/sci-mathematics/sage-data-combinatorial_designs/sage-data-combinatorial_designs-20140630.ebuild b/sci-mathematics/sage-data-combinatorial_designs/sage-data-combinatorial_designs-20140630.ebuild index 0e15f4688..e0d0ae848 100644 --- a/sci-mathematics/sage-data-combinatorial_designs/sage-data-combinatorial_designs-20140630.ebuild +++ b/sci-mathematics/sage-data-combinatorial_designs/sage-data-combinatorial_designs-20140630.ebuild @@ -9,13 +9,12 @@ MY_P="${MY_PN}-$(ver_rs 1 '.')" DESCRIPTION="Data for Combinatorial Designs" HOMEPAGE="https://www.sagemath.org" SRC_URI="mirror://sageupstream/${MY_PN}/${MY_P}.tar.bz2" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -S="${WORKDIR}"/${MY_P} - src_install() { insinto /usr/share/sage/combinatorial_designs doins * diff --git a/sci-mathematics/sage-data-elliptic_curves/sage-data-elliptic_curves-0.8.ebuild b/sci-mathematics/sage-data-elliptic_curves/sage-data-elliptic_curves-0.8.ebuild index 50889986f..8c7dba8a4 100644 --- a/sci-mathematics/sage-data-elliptic_curves/sage-data-elliptic_curves-0.8.ebuild +++ b/sci-mathematics/sage-data-elliptic_curves/sage-data-elliptic_curves-0.8.ebuild @@ -13,6 +13,7 @@ MY_P="elliptic_curves-${PV}" DESCRIPTION="Sage's elliptic curves databases" HOMEPAGE="https://www.sagemath.org" SRC_URI="mirror://sageupstream/elliptic_curves/${MY_P}.tar.bz2" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" @@ -20,8 +21,6 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" DEPEND="${PYTHON_DEPS}" -S="${WORKDIR}"/${MY_P} - src_prepare(){ # copy a slightly modified spkg-install. We used to have it in the tarball # but when we changed to new style git spkg tarball we lost the file diff --git a/sci-mathematics/sage-data-graphs/sage-data-graphs-20210214.ebuild b/sci-mathematics/sage-data-graphs/sage-data-graphs-20210214.ebuild index cfb5f6738..71bff1208 100644 --- a/sci-mathematics/sage-data-graphs/sage-data-graphs-20210214.ebuild +++ b/sci-mathematics/sage-data-graphs/sage-data-graphs-20210214.ebuild @@ -9,13 +9,12 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Sage's graph database" HOMEPAGE="https://www.sagemath.org" SRC_URI="mirror://sageupstream/${MY_PN}/${MY_P}.tar.bz2" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -S="${WORKDIR}"/${MY_P} - src_install() { insinto /usr/share/sage/graphs doins * diff --git a/sci-mathematics/sage-data-polytopes_db/sage-data-polytopes_db-20170220.ebuild b/sci-mathematics/sage-data-polytopes_db/sage-data-polytopes_db-20170220.ebuild index 448061119..230056adc 100644 --- a/sci-mathematics/sage-data-polytopes_db/sage-data-polytopes_db-20170220.ebuild +++ b/sci-mathematics/sage-data-polytopes_db/sage-data-polytopes_db-20170220.ebuild @@ -9,13 +9,12 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Sage's polytopes database" HOMEPAGE="https://www.sagemath.org" SRC_URI="mirror://sageupstream/${MY_PN}/${MY_P}.tar.bz2" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -S="${WORKDIR}"/${MY_P} - src_install() { insinto /usr/share/sage/reflexive_polytopes doins -r * diff --git a/sci-mathematics/sage-flatsurf/Manifest b/sci-mathematics/sage-flatsurf/Manifest index bd59b6986..f39fd6681 100644 --- a/sci-mathematics/sage-flatsurf/Manifest +++ b/sci-mathematics/sage-flatsurf/Manifest @@ -1 +1 @@ -DIST sage_flatsurf-0.4.6.tar.gz 186118 BLAKE2B 4662b747b8e633b78e94822bcc0d163318eb84e289f15e08f74aa4c02ab82026bb2ff29288764239dc2c8c8b8f646629082d1d1a19fd96bdb82fe19d32fd69d5 SHA512 f9b79281a11c7ea89e480e60a6c25a14c6128a8c50d0f50b1c3fe1c3347da779ea413b84b14b9dfba3f5a4a7957dc21d1bd561cf202580d7bf1542f3fe487060 +DIST sage_flatsurf-0.5.2.tar.gz 339259 BLAKE2B 49d09fd1435c1e477b95797ebc36c482640c7235cba8225c015db4c6546a56064851268134138b4f9372ce9df03444facf6c3e9985cb9dc868de9cba3d5223d9 SHA512 c1aa5195c5ab3a58603e23b1852369ec2f15dfdb70da51c76624a044f79738625d916fc811ed415aa0f587a5409a728a9dc9f15a36c32a821ce58998505418ee diff --git a/sci-mathematics/sage-flatsurf/files/152.patch b/sci-mathematics/sage-flatsurf/files/152.patch deleted file mode 100644 index 5309b49ba..000000000 --- a/sci-mathematics/sage-flatsurf/files/152.patch +++ /dev/null @@ -1,271 +0,0 @@ -From bdd8eab9e9b8cbd79273c715ba82bed1aad62631 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Julian=20R=C3=BCth?= -Date: Mon, 21 Mar 2022 17:10:05 -0600 -Subject: [PATCH 1/2] Remove unused methods - -fixes #151. ---- - doc/news/unused-matrix.rst | 4 + - flatsurf/geometry/matrix_2x2.py | 136 +----------------------- - flatsurf/geometry/similarity_surface.py | 22 +--- - 3 files changed, 12 insertions(+), 150 deletions(-) - create mode 100644 doc/news/unused-matrix.rst - -diff --git a/doc/news/unused-matrix.rst b/doc/news/unused-matrix.rst -new file mode 100644 -index 0000000..0389d42 ---- /dev/null -+++ b/doc/news/unused-matrix.rst -@@ -0,0 +1,4 @@ -+**Removed:** -+ -+* Removed unused functions from matrix_2x2, namely, `number_field_to_AA`, -+ `homothety_rotation_decomposition`, `is_similarity`, `rotation_matrix_angle`. -diff --git a/flatsurf/geometry/matrix_2x2.py b/flatsurf/geometry/matrix_2x2.py -index 2d01b49..357bf2c 100644 ---- a/flatsurf/geometry/matrix_2x2.py -+++ b/flatsurf/geometry/matrix_2x2.py -@@ -6,7 +6,7 @@ - # This file is part of sage-flatsurf. - # - # Copyright (C) 2016-2020 Vincent Delecroix --# 2020 Julian Rüth -+# 2020-2022 Julian Rüth - # - # sage-flatsurf is free software: you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -22,87 +22,14 @@ - # along with sage-flatsurf. If not, see . - ###################################################################### - from __future__ import absolute_import, print_function, division --from six.moves import range, map, filter, zip - --from sage.misc.cachefunc import cached_function -+from sage.rings.all import AA, QQbar, RR - --from sage.rings.all import ZZ, QQ, AA, QQbar, RR, CC, RDF, CDF, RIF, CIF --from sage.rings.rational import Rational --from sage.rings.complex_interval_field import ComplexIntervalField -- --from math import pi as pi_float -- --from sage.symbolic.constants import pi - from sage.matrix.constructor import matrix, identity_matrix - from sage.modules.free_module_element import vector - --def number_field_to_AA(a): -- r""" -- It is a mess to convert an element of a number field to the algebraic field -- ``AA``. This is a temporary fix. -- """ -- try: -- return AA(a) -- except TypeError: -- return AA.polynomial_root(a.minpoly(), RIF(a)) - --def is_similarity(m): -- r""" -- Return ``True`` if ``m`` is a similarity and ``False`` otherwise. -- -- EXAMPLES:: -- -- sage: from flatsurf.geometry.matrix_2x2 import is_similarity -- -- sage: is_similarity(matrix([[0,1],[1,0]])) -- True -- sage: is_similarity(matrix([[0,-2],[2,0]])) -- True -- sage: is_similarity(matrix([[1,1],[0,1]])) -- False -- """ -- n = m * m.transpose() -- return n[0,1].is_zero() and n[1,0].is_zero() -- --def homothety_rotation_decomposition(m): -- r""" -- Return a couple composed of the homothety and a rotation matrix. -- -- The coefficients of the returned pair are either in the ground field of -- ``m`` or in the algebraic field ``AA``. -- -- EXAMPLES:: -- -- sage: from flatsurf.geometry.matrix_2x2 import homothety_rotation_decomposition -- -- sage: R. = PolynomialRing(QQ) -- sage: K. = NumberField(x^2 - 2, embedding=1.4142) -- sage: m = matrix([[sqrt2, -sqrt2],[sqrt2,sqrt2]]) -- sage: a,rot = homothety_rotation_decomposition(m) -- sage: a -- 2 -- sage: rot -- [ 1/2*sqrt2 -1/2*sqrt2] -- [ 1/2*sqrt2 1/2*sqrt2] -- """ -- if not is_similarity(m): -- raise ValueError("the matrix must be a similarity") -- -- det = m.det() -- -- if not det.is_square(): -- if not AA.has_coerce_map_from(m.base_ring()): -- l = map(number_field_to_AA,m.list()) -- M = MatrixSpace(AA,2) -- m = M(l) -- else: -- m = m.change_ring(AA) -- -- sqrt_det = det.sqrt() -- -- return sqrt_det, m / sqrt_det -- --def similarity_from_vectors(u,v): -+def similarity_from_vectors(u, v): - r""" - Return the unique similarity matrix that maps ``u`` to ``v``. - -@@ -183,62 +110,6 @@ def similarity_from_vectors(u,v): - return matrix([[cos_uv, -sin_uv],[sin_uv, cos_uv]]) - - --def rotation_matrix_angle(r, check=False): -- r""" -- Return the angle of the rotation matrix ``r`` divided by ``2 pi``. -- -- EXAMPLES:: -- -- sage: from flatsurf.geometry.matrix_2x2 import rotation_matrix_angle -- -- sage: def rot_matrix(p, q): -- ....: z = QQbar.zeta(q) ** p -- ....: c = z.real() -- ....: s = z.imag() -- ....: return matrix(AA, 2, [c,-s,s,c]) -- sage: [rotation_matrix_angle(rot_matrix(i, 5)) for i in range(1,5)] -- [1/5, 2/5, 3/5, 4/5] -- sage: [rotation_matrix_angle(rot_matrix(i, 5)) for i in range(1,5)] -- [1/5, 2/5, 3/5, 4/5] -- sage: [rotation_matrix_angle(rot_matrix(i,7)) for i in range(1,7)] -- [1/7, 2/7, 3/7, 4/7, 5/7, 6/7] -- -- Some random tests:: -- -- sage: for _ in range(100): -- ....: r = QQ.random_element(x=0,y=500) -- ....: r -= r.floor() -- ....: m = rot_matrix(r.numerator(), r.denominator()) -- ....: assert rotation_matrix_angle(m) == r -- -- .. NOTE:: -- -- This is using floating point arithmetic and might be wrong. -- """ -- e0,e1 = r.change_ring(CDF).eigenvalues() -- m0 = (e0.log() / 2 / CDF.pi()).imag() -- m1 = (e1.log() / 2 / CDF.pi()).imag() -- r0 = RR(m0).nearby_rational(max_denominator=10000) -- r1 = RR(m1).nearby_rational(max_denominator=10000) -- if r0 != -r1: -- raise RuntimeError -- r0 = r0.abs() -- if r[0][1] > 0: -- return QQ.one() - r0 -- else: -- return r0 -- -- if check: -- e = r.change_ring(AA).eigenvalues()[0] -- if e.minpoly() != ZZ['x'].cyclotomic_polynomial()(r.denominator()): -- raise RuntimeError -- z = QQbar.zeta(r.denominator()) -- if z**r.numerator() != e: -- raise RuntimeError -- -- return r -- -- - def is_cosine_sine_of_rational(c, s): - r""" - Check whether the given pair is a cosine and sine of a same rational angle. -@@ -278,6 +149,7 @@ def is_cosine_sine_of_rational(c, s): - """ - return (QQbar(c) + QQbar.gen() * QQbar(s)).minpoly().is_cyclotomic() - -+ - def angle(u, v, numerical=False, assume_rational=False): - r""" - Return the angle between the vectors ``u`` and ``v`` divided by `2 \pi`. -diff --git a/flatsurf/geometry/similarity_surface.py b/flatsurf/geometry/similarity_surface.py -index 0ddfee8..8c9ec6b 100644 ---- a/flatsurf/geometry/similarity_surface.py -+++ b/flatsurf/geometry/similarity_surface.py -@@ -6,7 +6,7 @@ - # This file is part of sage-flatsurf. - # - # Copyright (C) 2016-2020 Vincent Delecroix --# 2020-2021 Julian Rüth -+# 2020-2022 Julian Rüth - # - # sage-flatsurf is free software: you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -23,35 +23,21 @@ - #********************************************************************* - - from __future__ import absolute_import, print_function, division --from six.moves import range, map, filter, zip -+from six.moves import range - from six import iteritems - --import itertools -- --from sage.misc.cachefunc import cached_method - from sage.misc.sage_unittest import TestSuite - - from sage.structure.sage_object import SageObject - - from sage.rings.infinity import Infinity - --from sage.rings.all import ZZ, QQ, AA, RIF, RR, NumberField -+from sage.rings.all import ZZ, QQ, AA, NumberField - - from sage.modules.free_module_element import vector - --from sage.matrix.constructor import matrix, identity_matrix --from sage.modules.free_module import VectorSpace -- --from sage.all import FreeModule -- --from .matrix_2x2 import (is_similarity, -- homothety_rotation_decomposition, -- similarity_from_vectors, -- rotation_matrix_angle, -- is_cosine_sine_of_rational) -- - from .similarity import SimilarityGroup --from .polygon import ConvexPolygons, wedge_product, triangulate, build_faces -+from .polygon import ConvexPolygons, wedge_product - - from .surface import Surface, Surface_dict, Surface_list, LabelComparator - from .surface_objects import Singularity, SaddleConnection, SurfacePoint - -From 44bdb08b859e2fe2bf34fb15f3e902635a6fc6f5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Julian=20R=C3=BCth?= -Date: Mon, 21 Mar 2022 17:20:10 -0600 -Subject: [PATCH 2/2] Fix missing import - ---- - flatsurf/geometry/similarity_surface.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/flatsurf/geometry/similarity_surface.py b/flatsurf/geometry/similarity_surface.py -index 8c9ec6b..ce2e02e 100644 ---- a/flatsurf/geometry/similarity_surface.py -+++ b/flatsurf/geometry/similarity_surface.py -@@ -42,6 +42,7 @@ - from .surface import Surface, Surface_dict, Surface_list, LabelComparator - from .surface_objects import Singularity, SaddleConnection, SurfacePoint - from .circle import Circle -+from .matrix_2x2 import similarity_from_vectors - - ZZ_1 = ZZ.one() - ZZ_2 = ZZ_1 + ZZ_1 diff --git a/sci-mathematics/sage-flatsurf/sage-flatsurf-0.4.6.ebuild b/sci-mathematics/sage-flatsurf/sage-flatsurf-0.5.2.ebuild similarity index 74% rename from sci-mathematics/sage-flatsurf/sage-flatsurf-0.4.6.ebuild rename to sci-mathematics/sage-flatsurf/sage-flatsurf-0.5.2.ebuild index 96aca2dd7..0383b2da4 100644 --- a/sci-mathematics/sage-flatsurf/sage-flatsurf-0.4.6.ebuild +++ b/sci-mathematics/sage-flatsurf/sage-flatsurf-0.5.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 pypi @@ -15,13 +15,9 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -DEPEND=">=sci-mathematics/sagemath-standard-9.7[${PYTHON_USEDEP}] +DEPEND=">=sci-mathematics/sagemath-standard-10.4[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND} sci-mathematics/surface-dynamics[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/152.patch - ) python_test(){ sage -t --long flatsurf || die "test failed" diff --git a/sci-mathematics/sage_docbuild/files/sphinx-8.patch b/sci-mathematics/sage_docbuild/files/sphinx-8.patch new file mode 100644 index 000000000..752da4ed0 --- /dev/null +++ b/sci-mathematics/sage_docbuild/files/sphinx-8.patch @@ -0,0 +1,22 @@ +diff --git a/sage_docbuild/ext/sage_autodoc.py b/sage_docbuild/ext/sage_autodoc.py +index d60d5ef..96883b7 100644 +--- a/sage_docbuild/ext/sage_autodoc.py ++++ b/sage_docbuild/ext/sage_autodoc.py +@@ -47,7 +47,6 @@ from docutils.statemachine import StringList + + import sphinx + from sphinx.config import ENUM, Config +-from sphinx.deprecation import RemovedInSphinx80Warning + from sphinx.ext.autodoc.importer import get_class_members, import_module, import_object + from sphinx.ext.autodoc.mock import ismock, mock, undecorate + from sphinx.locale import _, __ +@@ -336,9 +335,6 @@ class ObjectMember: + self.class_ = class_ + + def __getitem__(self, index: int) -> Any: +- warnings.warn('The tuple interface of ObjectMember is deprecated. ' +- 'Use (obj.__name__, obj.object) instead.', +- RemovedInSphinx80Warning, stacklevel=2) + return (self.__name__, self.object)[index] + + diff --git a/sci-mathematics/sage_docbuild/sage_docbuild-9999.ebuild b/sci-mathematics/sage_docbuild/sage_docbuild-9999.ebuild index bf1141da5..d0fd0384e 100644 --- a/sci-mathematics/sage_docbuild/sage_docbuild-9999.ebuild +++ b/sci-mathematics/sage_docbuild/sage_docbuild-9999.ebuild @@ -31,5 +31,6 @@ RDEPEND=" PDEPEND="~sci-mathematics/sagemath-standard-${PV}[${PYTHON_USEDEP}]" PATCHES=( + "${FILESDIR}"/sphinx-8.patch "${FILESDIR}"/sage-9.3-linguas.patch ) diff --git a/sci-mathematics/surface-dynamics/Manifest b/sci-mathematics/surface-dynamics/Manifest index 3571f9fad..aae0c9281 100644 --- a/sci-mathematics/surface-dynamics/Manifest +++ b/sci-mathematics/surface-dynamics/Manifest @@ -1 +1 @@ -DIST surface_dynamics-0.4.7.tar.gz 8343328 BLAKE2B f072a2521c18609b7cba380273c90d3716b0895075a35707ca1e8dae895808ee5b17a75f1d8e3b3fc5e61ae09323c738546e389324398686e10fb07647d9ea37 SHA512 7680103e0f74f55c65700dd53b02cc909e5def0f3733a43263e783a60cc4fd6a3ff62d4a1444a2ca83baff4bf45e87b57a8be6d35d8dae8f1a2a34ffcfc3fccb +DIST surface-dynamics-0.5.0.tar.gz 8372233 BLAKE2B c1c7fe7d6f1054b8bd9a73e7aa230376e05630a432344e529638dcb801f7093afdab057dee84cd6ac962a7937eb4a7e4067a1fbf8c0f84532545e6a8c1830c16 SHA512 fb8164b0d5e4f2bacdb91f916bb2fdb4574a6ebd2d5cc533ea86538a47439541fc48943d49661f158ffb25ccc31d1ac65c0f20d6ac0b1a565909f0541f5b5b41 diff --git a/sci-mathematics/surface-dynamics/files/surface-dynamics-0.4.7-sage9.7compat.patch b/sci-mathematics/surface-dynamics/files/surface-dynamics-0.4.7-sage9.7compat.patch deleted file mode 100644 index 8e4ed66f2..000000000 --- a/sci-mathematics/surface-dynamics/files/surface-dynamics-0.4.7-sage9.7compat.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/setup.py b/setup.py -index 28d9ccc..f25e1dd 100755 ---- a/setup.py -+++ b/setup.py -@@ -14,6 +14,7 @@ except ImportError: - - import sys, os - import numpy as np -+import cypari2 - - from distutils.core import setup - from distutils.extension import Extension -@@ -50,13 +51,6 @@ except ImportError: - else: - WITH_PPL = True - --try: -- import sage.modular.multiple_zeta --except ImportError: -- sys.stderr.write('Warning: multiple_zeta not available in Sage\n') -- WITH_MZV = False --else: -- WITH_MZV = True - - extensions_data = { - 'origamis': { -@@ -108,19 +102,15 @@ for name, data in extensions_data.items(): - source_files.extend(sources) - source_files.extend(headers) - --class build_py(_build_py): -- r""" -- Custom build_py command to not install generalized_multiple_zeta_values when -- corresponding sage module not present. -- """ -- def find_package_modules(self, package, package_dir): -- modules = _build_py.find_package_modules(self, package, package_dir) -- if not WITH_MZV and package == 'surface_dynamics/misc': -- modules = [ -- (pkg, mod, file) -- for (pkg, mod, file) in modules -- if mod != 'generalized_multiple_zeta_values'] -- return modules -+# Work around changes in SageMath 9.7, see https://trac.sagemath.org/wiki/ReleaseTours/sage-9.7#Packagessagesage.rings...arenownamespaces -+try: -+ from sage.misc.package_dir import cython_namespace_package_support -+except (ImportError, ModuleNotFoundError): -+ from contextlib import nullcontext as cython_namespace_package_support -+ -+with cython_namespace_package_support(): -+ extensions = cythonize(extensions) -+ - - setup(name='surface_dynamics', - version=version, -@@ -143,7 +133,7 @@ setup(name='surface_dynamics', - 'surface_dynamics/databases': ['cylinder_diagrams/cyl_diags*', 'generalized_permutation_twins/twins*'], - 'surface_dynamics/flat_surfaces/origamis': ['origamis.db'], - }, -- ext_modules=cythonize(extensions), -+ ext_modules=extensions, - classifiers=[ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Science/Research', -@@ -156,5 +146,4 @@ setup(name='surface_dynamics', - 'Topic :: Scientific/Engineering :: Mathematics', - ], - keywords='surfaces, dynamics, geometry, flat surfaces, Abelian differentials, quadratic differentials, Riemann surfaces', -- cmdclass={'build_py':build_py} - ) diff --git a/sci-mathematics/surface-dynamics/surface-dynamics-0.4.7.ebuild b/sci-mathematics/surface-dynamics/surface-dynamics-0.5.0.ebuild similarity index 63% rename from sci-mathematics/surface-dynamics/surface-dynamics-0.4.7.ebuild rename to sci-mathematics/surface-dynamics/surface-dynamics-0.5.0.ebuild index 9170b9352..f46b205b9 100644 --- a/sci-mathematics/surface-dynamics/surface-dynamics-0.4.7.ebuild +++ b/sci-mathematics/surface-dynamics/surface-dynamics-0.5.0.ebuild @@ -3,9 +3,11 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 +PYPI_NO_NORMALIZE=1 inherit distutils-r1 pypi DESCRIPTION="This sagemath package adds various functionality" @@ -19,9 +21,14 @@ KEYWORDS="~amd64" DEPEND=">=sci-mathematics/sagemath-standard-9.7[${PYTHON_USEDEP}] dev-python/pplpy[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" -BDEPEND="dev-python/cython[${PYTHON_USEDEP}] -