diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-04-19 08:46:18 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-04-19 08:46:18 +0100 |
commit | 9e65a38a260a44292ceb8a0bf4fea5f0b5666826 (patch) | |
tree | 40c907f5d72cda463e42d2ee5d5434b3790e06df /sci-mathematics | |
parent | cf1a411e806b434c96329401a6ff0901ec7f0d5c (diff) |
gentoo auto-resync : 19:04:2025 - 08:46:17edge
Diffstat (limited to 'sci-mathematics')
17 files changed, 41 insertions, 402 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz Binary files differindex 607e5d50e82d..c5a078efc586 100644 --- a/sci-mathematics/Manifest.gz +++ b/sci-mathematics/Manifest.gz diff --git a/sci-mathematics/boolector/Manifest b/sci-mathematics/boolector/Manifest index 35495146d492..84a37f8931df 100644 --- a/sci-mathematics/boolector/Manifest +++ b/sci-mathematics/boolector/Manifest @@ -1,6 +1,5 @@ AUX boolector-3.2.3-cmake-std.patch 350 BLAKE2B bcdc394f1f1c9ef17605f0c12c2279d7842a4c106d70132760ed7c3fe215d41ba25551ae18e9d29f5697fb2c7546cef96b3a1c3ebb5b79da6c6ed4ada98d1dbb SHA512 6345feda413d4959cd95af0708f522d3569bea66ceab524b6f2378e473f1a64417b5fbcfbd865c10c14c0dfb0cd11c585db6ffa7c79d930b90aaf47693d47aa8 -DIST boolector-3.2.3.tar.gz 1566566 BLAKE2B 1c9adb1272c2289af6afce0149b11ce36a42aef47f1b3353f5f9dbaf12287718f29e45415b82b723bd37fb0438517c48d64a12f0c038105edeb6036f49189ac7 SHA512 a85c10edf05455e2911614f9d8f2b214a136470852b31a631c96247416dab822efcc6d9047f3a85c85aff499e8eb62fb36e52f2633511c5b42d287c4962c4239 +AUX boolector-3.2.4-cmake_minimum_required.patch 316 BLAKE2B 0063759b217caab374d4920e9747fd3361bc8004fb6b3a49efb2759246a117e54d8be37f5944c596e668302807840adc282bee450d7947d69817e330f5164f1c SHA512 e5dd9d51bdb0f2dd05275a60d2bb654abba6b70e1126ad50ce07f3745af580c9c30f8191be85dd837b62e0cd8fb4a27bd62bd9a216bf389d7e20547fc7c82c6a DIST boolector-3.2.4.tar.gz 1567983 BLAKE2B c74e6b7be2931ae164b3cde5ff3c9b60b12ad49b4be23ddb2931f5a71ffbfb5bb98a29ea46780275414bbe2e3e65b6108e489254251f8fd820a89162dc6eaae5 SHA512 57ba34264abd1d4350403b45995b040bd792dbea7d07a1c64d067ddbddeb3944d8515ce667ae4ffef70d35b5be68cfc5938acd6a8a7b242a09f218474024b821 -EBUILD boolector-3.2.3.ebuild 1899 BLAKE2B 0856b67a9ce86a78b00b556d087c8d2ccfecddf25899e57da146d3698233c8edd773d8d553d77741afa3488fa8669bc042ee787e7d0a89c2b889238b4d9b0982 SHA512 642e7323639f49f97a613ed9f15ebabcd51969b0b5b75fc2530fe73cb36000b5baf7adb30a000d143de14d8957f78cce506d9f0bd92d50b3ff4da4a401b08839 -EBUILD boolector-3.2.4.ebuild 1899 BLAKE2B 4b5db04d6c7739096eea5baa44040a68e9b1d9c74da3fb273fe4277956c63e7d5da66b379452101636f6afb3b05bdc7563ed08ee5251dab689a3cbc245abca4e SHA512 a9feb0a9f0c2c731dd04710d1c8ab9567463a66cea089b3c2e984fe73c805c65a8852b952aa7b653ff6d53519f97d95ae0d5652bc8c69e6ee657bbe034276805 +EBUILD boolector-3.2.4.ebuild 1964 BLAKE2B 22afb18fd5006f777a2419e7c708f9566baad901478fbfa6c6fa32d39fc8e0e04fb2dcbb9c561261ad4c3e32c80d9e1d0378d9495f56d56e2ae71b2c6079933a SHA512 e1c88d76360f032265b80a662451922ae61b2d1b439db415f952ebf203f715cc3110d6f82192667f4ccfe530248da8db59a0ae23844152bffb8fde2e7c97189d MISC metadata.xml 1245 BLAKE2B a04e1e5a6af857100b8b569f57f4d2610593e9eb741513e4e6405a8fa9828471b92aaa1ad57a3163dc2f251b5664493692f92477b7191621ff8fd76eed9f57e7 SHA512 81257f7be3b21bf10caad654d5747ef2d978c0df5a05049b890420e2d170b7a4fa06151da0604a8b1b6e7daf2fb01344003c9243205a94b4040c580beb414836 diff --git a/sci-mathematics/boolector/boolector-3.2.3.ebuild b/sci-mathematics/boolector/boolector-3.2.3.ebuild deleted file mode 100644 index 6b8f8f0d0d56..000000000000 --- a/sci-mathematics/boolector/boolector-3.2.3.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit python-single-r1 cmake - -DESCRIPTION="Fast SMT solver for bit-vectors, arrays and uninterpreted functions" -HOMEPAGE="https://boolector.github.io/ - https://github.com/Boolector/boolector/" - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/Boolector/${PN}.git" -else - SRC_URI="https://github.com/Boolector/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="cryptominisat examples +gmp minisat +picosat python test" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - || ( cryptominisat minisat picosat ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - sci-mathematics/btor2tools:= - cryptominisat? ( sci-mathematics/cryptominisat:= ) - gmp? ( dev-libs/gmp:= ) - minisat? ( sci-mathematics/minisat:= ) - picosat? ( sci-mathematics/picosat:= ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - test? ( dev-cpp/gtest ) -" - -PATCHES=( "${FILESDIR}/${PN}-3.2.3-cmake-std.patch" ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local -a mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DBtor2Tools_LIBRARIES=/usr/$(get_libdir)/libbtor2parser.so - -DUSE_PYTHON2=OFF - -DPYTHON=$(usex python) - -DTESTING=$(usex test) - -DUSE_GMP=$(usex gmp) - -DUSE_PYTHON3=$(usex python) - - # Integration with other SMT solvers - -DUSE_LINGELING=OFF # Not packaged yet. - -DUSE_CADICAL=OFF # Fails to link. - -DUSE_CMS=$(usex cryptominisat) - -DUSE_MINISAT=$(usex minisat) - -DUSE_PICOSAT=$(usex picosat) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use examples ; then - dodoc -r examples - fi - - if [[ "$(get_libdir)" != lib ]] ; then - dodir "/usr/$(get_libdir)" - mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die - fi -} diff --git a/sci-mathematics/boolector/boolector-3.2.4.ebuild b/sci-mathematics/boolector/boolector-3.2.4.ebuild index 2a1d832b43c3..e8d430b07a39 100644 --- a/sci-mathematics/boolector/boolector-3.2.4.ebuild +++ b/sci-mathematics/boolector/boolector-3.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -46,7 +46,10 @@ BDEPEND=" test? ( dev-cpp/gtest ) " -PATCHES=( "${FILESDIR}/${PN}-3.2.3-cmake-std.patch" ) +PATCHES=( + "${FILESDIR}/boolector-3.2.3-cmake-std.patch" + "${FILESDIR}/boolector-3.2.4-cmake_minimum_required.patch" +) pkg_setup() { use python && python-single-r1_pkg_setup diff --git a/sci-mathematics/boolector/files/boolector-3.2.4-cmake_minimum_required.patch b/sci-mathematics/boolector/files/boolector-3.2.4-cmake_minimum_required.patch new file mode 100644 index 000000000000..096aeadfbc2a --- /dev/null +++ b/sci-mathematics/boolector/files/boolector-3.2.4-cmake_minimum_required.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,7 +5,7 @@ + # This file is part of Boolector. + # See COPYING for more information on using this software. + # +-cmake_minimum_required(VERSION 3.3) ++cmake_minimum_required(VERSION 3.20) + + #-----------------------------------------------------------------------------# + diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest index 0fb539de8e92..41982e6129cc 100644 --- a/sci-mathematics/eclib/Manifest +++ b/sci-mathematics/eclib/Manifest @@ -1,7 +1,3 @@ -DIST eclib-20231212.tar.bz2 926463 BLAKE2B 8105ac4014f9e44545d1d1e1cd5e18e36e467131b57a04a02d7e4f2390b0b0f78d0bac60dfbc0403a6681816a64a6e81c8d6a198f83bef991f697c2756a6d048 SHA512 692aa6bc2a52cd9496700990172b5a807abbd3f8bf8e931de14c48a401d1d383f95fa5def68bbf9a1aee08dfabac608604c0fd6f8bb49b813e6c6c909a2f27a7 -DIST eclib-20240408.tar.bz2 918771 BLAKE2B e9f4a37973b40e73a111330800fcfebae91251613902b35ff29a45bdf3e7cd8cc49b061af121eff6aaa657d28b24b20ec00b77bad468504e545b3810852a50d2 SHA512 d93c724fa5816ce45a661d50000309e148fdbd0e287fbdbbf30bd6b3c6a7225846d90f11bc4d86c4b96111cbe8429b174e7d81ea0be1eef1a8acaa43287c09cf DIST eclib-20250122.tar.bz2 956727 BLAKE2B b3a8c2458a7379d3763865e0adbb8bc13b2a19aeb239179a1e7788b16c7c5a6db68e862c3bf40b1f047af225c324d2a8a277274edaaaa52773b941fe608acf50 SHA512 f5112c131298be44b3aeef516b629c4be405233992f4dc4207107bb4da798c5c727affe60ef691378574294c7ac1efe477ffdd93a9a0cdd253d14803ef3762f2 -EBUILD eclib-20231212.ebuild 1392 BLAKE2B 6cd0aa487c046e92e0c6e09620d5e010fcff89ce747949c8a5ba6e33aed4c00bca39188195e31ec768312bd1e1f7ca3ccd75f87db4f038f6ee557a4c526dab71 SHA512 d902ea983a3acaab8f5ce4ba59d72de7e24016ac7ca8aab38bc64efc97867cfb40ed4158919c3212bf66091a0efe47c92ab4950831f37d83642da835d793a673 -EBUILD eclib-20240408.ebuild 1400 BLAKE2B 974a16648861d3520bfa5aefe3aa6276c8d9de701b2ba4ae3d7cc6ce16709ea590928120cabfac18906fd0fea46d4da5474cef0c5d85d77636cfadfc01d5a9d0 SHA512 1f4135e0951eb8a83decd9b9f4103811c8f82d5b4b047dbb90122e3eb195b4a8942c4e9b40802f1d6037f8e8e64d152658185135a49969a06d53eed5907449e4 -EBUILD eclib-20250122.ebuild 909 BLAKE2B 2c630a7fba1546276ef01d9f5737928f355155f973da52bb30a50354b715a7ce9fc7c6b951b760bf074df950df8d417ac6e3ada86ffbe2ffb848cbba8a7b08d3 SHA512 ae77e59d11ba0f5a631cd9595903d5f189266bbe5f37d1db228d90e45276630c4095bf60b19ba4e88092c4305cf60c1dd5ca4ba70398a7e09ebbcc1256b1a15f +EBUILD eclib-20250122.ebuild 908 BLAKE2B a872a6751bde08c605ad4876ae12c6c2f537bb9c5a1da15e4821c65fdbf2933cd7efbf00a29572146245ef3de0ae424416772d624b570309a3026367a9a6d25b SHA512 c2b853e00a7501703fb909eb66d5cd49feb8bc5f9f87d308b9c29f323424c683c4c55728fee042c721436bfb29ce9c44d23f0dc7ab8fa7855fec4ee45fec47c1 MISC metadata.xml 1089 BLAKE2B d10f9af5634478f0f13595abd10d9eefc437c27955cd3f504165beb4219e55c3997f16271148c1c2fbb5c9ae71e08665000836658bb954b83db06aeffa2b4098 SHA512 7111f3231464624d356611372934d0604fdd7a05c3531342a372979292a068dfa2edf49c4de5840cbf07b6f4819c22b8d87d54d7cacefb28ce0f53576d4620fd diff --git a/sci-mathematics/eclib/eclib-20231212.ebuild b/sci-mathematics/eclib/eclib-20231212.ebuild deleted file mode 100644 index fef4e290e963..000000000000 --- a/sci-mathematics/eclib/eclib-20231212.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Programs for elliptic curves defined over the rational numbers" -HOMEPAGE="https://github.com/JohnCremona/eclib" -SRC_URI="https://github.com/JohnCremona/${PN}/releases/download/v${PV}/${P}.tar.bz2" - -# COPYING is GPL-2 but the file headers say "or ... any later version" -# LGPL-2.1+ is for bundled GetOpt.cc -LICENSE="GPL-2+ LGPL-2.1+" - -# Subslot is from the soname, (LT_CURRENT - LT_AGE) in configure.ac. -# (But for now, see src_prepare below.) -SLOT="0/12" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="boost flint minimal test" -RESTRICT="!test? ( test )" - -RDEPEND="sci-mathematics/pari:= - dev-libs/ntl:= - boost? ( dev-libs/boost:= ) - flint? ( sci-mathematics/flint:= )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - # LT_CURRENT was bumped to 12 in the 20230424 release but LT_AGE was - # left at two despite an interface being removed. Subsequent releases - # have propagated the off-by-two error. This isn't strictly necessary - # but it's nice to have the soname match the subslot. - sed -e 's/LT_AGE=3/LT_AGE=1/' -i configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - $(usex minimal --disable-allprogs "" "" "") \ - $(use_with boost) \ - $(use_with flint) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-mathematics/eclib/eclib-20240408.ebuild b/sci-mathematics/eclib/eclib-20240408.ebuild deleted file mode 100644 index a8b4b73b14eb..000000000000 --- a/sci-mathematics/eclib/eclib-20240408.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Programs for elliptic curves defined over the rational numbers" -HOMEPAGE="https://github.com/JohnCremona/eclib" -SRC_URI="https://github.com/JohnCremona/${PN}/releases/download/v${PV}/${P}.tar.bz2" - -# COPYING is GPL-2 but the file headers say "or ... any later version" -# LGPL-2.1+ is for bundled GetOpt.cc -LICENSE="GPL-2+ LGPL-2.1+" - -# Subslot is from the soname, (LT_CURRENT - LT_AGE) in configure.ac. -# (But for now, see src_prepare below.) -SLOT="0/12" -KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="boost flint minimal test" -RESTRICT="!test? ( test )" - -RDEPEND="sci-mathematics/pari:= - dev-libs/ntl:= - boost? ( dev-libs/boost:= ) - flint? ( sci-mathematics/flint:= )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - # LT_CURRENT was bumped to 12 in the 20230424 release but LT_AGE was - # left at two despite an interface being removed. Subsequent releases - # have propagated the off-by-two error. This isn't strictly necessary - # but it's nice to have the soname match the subslot. - sed -e 's/LT_AGE=3/LT_AGE=1/' -i configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - $(usex minimal --disable-allprogs "" "" "") \ - $(use_with boost) \ - $(use_with flint) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-mathematics/eclib/eclib-20250122.ebuild b/sci-mathematics/eclib/eclib-20250122.ebuild index e4401e9eab5c..8704f253f3ca 100644 --- a/sci-mathematics/eclib/eclib-20250122.ebuild +++ b/sci-mathematics/eclib/eclib-20250122.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/JohnCremona/${PN}/releases/download/${PV}/${P}.tar.b LICENSE="GPL-2+ LGPL-2.1+" SLOT="0/14" -KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="boost flint minimal test" RESTRICT="!test? ( test )" diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest index 29d246fcdb60..d0a76ce00fa0 100644 --- a/sci-mathematics/gmp-ecm/Manifest +++ b/sci-mathematics/gmp-ecm/Manifest @@ -2,6 +2,6 @@ DIST ecm-7.0.5.tar.gz 1159568 BLAKE2B 7fb8d78a6bc8423c9890b9d6e334f8c4317b68cde7 DIST ecm-7.0.6.tar.gz 971656 BLAKE2B 313197ea8a93e55eef82b24ff54b0f8661e4006ad8d9f3a43fbba0b04d3c5727f68595cb12dcf7e925650c141648294582bf99807145b862bbadce6ef28af827 SHA512 20d152055dda4020d2ccdcc93539a63b10140c63db4441a33a15f45c352e09e116fc1a400617065f2b49ae2f070da82708e22c79b41f709819b24c41d1258fff DIST gmp-ecm-7.0.6.tar.bz2 609323 BLAKE2B 30255322bd8e8d49393044bcc55fd05905cb5b6b374c5f2ea59fa9b02864b22fc2b6f14fda2271a4148a2ec361fd524551cafd136bbbdf025137ce101c776def SHA512 7ad262e78c59d33218e1d783ffa79114c04fe4ddac57e4059577aecebbfe3af975c2e1ba6049452c1c96488660ed79fcb546237966489fc2edc03bf7710495c0 EBUILD gmp-ecm-7.0.5-r1.ebuild 1583 BLAKE2B a26660813145878658cfe888f320dfde424a3f112d558c4d2b6a29ad69d0cb7f126cf871b5145b9cb4e9c4ab972ad31ee54cc063177220b11ce91d643a37b310 SHA512 8dd5647f4a25fbd5f3d79c11925fc3b6ce56d54e0f4d76b5e8033cf4c6aa73799798b36bbab38c2363f154f5c34891e3870e1bab39b1bf7c523afaec2a0e95ea -EBUILD gmp-ecm-7.0.6-r1.ebuild 1588 BLAKE2B d2a426c7e7613f81d076cc02eda7cdcf754de811e51b8cb0cac94f0ec58796fcc53cbb9173d7d1e3146cffbf8d75422dcab03f0980c8c42a9ad7a8595f6dffa5 SHA512 6b28ffb647350e18f78aefc3ed103375cdac7ebc74723c92d7fd665a6d118194c2057d9d41ca96b086c4f0c2f66d6a3887cd62b35db1d7735b7677cfd8c7db64 +EBUILD gmp-ecm-7.0.6-r1.ebuild 1587 BLAKE2B 68a2af668f16ed38ef395aa81bb2d64a1f2830354b53e47a2549ad431f5b6702da9132a35c99a9db149e5ba4df3bb92b363c0364f41545b21c29635458135a2a SHA512 1f46443eee42e18fb54985cc2212e757ce004d537a9077aa90e7eae82711fc6ff23a0c92c6b8886ac276bf538faff9c5269bcdf0175ac3b8db3872e3d74c1ee6 EBUILD gmp-ecm-7.0.6.ebuild 1649 BLAKE2B 6891fb0bfbb1c64f43d3bffeb8e1931e94d8b92a667a9d6d9eb7b9bbe4b39499372662149ca9fad9613cecdf6ffd3211c5ca61b761007b6b932fc26566e8e194 SHA512 f610819af09d78029762645f20a0db8873fb39d0f70a0e4f98e03196e3479a73d4d5991341fc8c93ccc16ac76de9bfaddba7a35f1d8da4594a8fdd884d9626db MISC metadata.xml 643 BLAKE2B 90da8b09f30dd8bd8d4df3dcc388663e52d57ea7b2974becede9ed0c592eaacb33958d202cee33988b79364e058ef84676e995b9d8467beb1f7d89ad8b177136 SHA512 e2f0d6f286440543ed15531183671b30f0044c38685e58617d004286b596ba1b898c470dc39e2ebe95db10c83be9430f1a010539ba2b0231883fe6bf4b0b97a8 diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.6-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.6-r1.ebuild index aac9fb107188..ffcdd1c3b4cf 100644 --- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.6-r1.ebuild +++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.6-r1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos" +KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos" IUSE="+custom-tune openmp cpu_flags_x86_sse2" DEPEND="dev-libs/gmp:=" diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest index 2cee9bf54818..51898473f235 100644 --- a/sci-mathematics/polymake/Manifest +++ b/sci-mathematics/polymake/Manifest @@ -1,7 +1,4 @@ -AUX polymake-4.11-barycentric-subdiv.patch 807 BLAKE2B e2e632146e6d96e5966444283a0226caf26dfd7dab482a35289e2b6f9acaa791db015787b4b91f5c2f3abc47323227377dd296dfc21b777315979e58d2e36af8 SHA512 f5332d3a558a0b3dc1b0cc0846131210857d2a6ad11647fd64cd5366c04c349752d06e30da3f93568ff5d2f04f8419b8c9ef6e71460e997c295cb6959a8964e1 -AUX polymake-4.11-singular-sat.patch 2212 BLAKE2B 659d07040141617f7ac6cb8572c44bf4d9ba332f1f4ddb5434987ea900009ef2b3ebefa27ead63a60c6048b58c3a853c797d82af1f3c8793f2c506f09dfd43f0 SHA512 fc46ec6753ddf14d389b9e03421a909bf572e4e7d6acf3dec7319d3bf704ba7710ba1c4719bf6b9153599f523e36cf83ac8b8218141f72a43343c94373fc5b57 -DIST polymake-4.11-minimal.tar.bz2 7325783 BLAKE2B 87e62741e4e44c5fea7454d5cc8cb205cf13f8ee743c1d72100f937d0677505ce0c5c8f5b37c118f89079ca88f313991eaefb2ea02c49b6c7b45c438c6f9e13b SHA512 94adf3fcec21de50451091a04ca17010f5e71b44e3dcd4e2d52b9f952b94ee0cf3f6df15657b761b0bda20eb47cbdc0cb2481bb440c7243442be34f913292246 +AUX polymake-4.13-cstdint.patch 416 BLAKE2B 10da829044398c11a979d2178fea9c35b83684b7675875835168f3b7a1ea27251e006953ba2c036fdf54032304195eb81f9c3bda879d873481954d5a41c690a0 SHA512 89ccb8bab9ebd81dab41c4267e99ae8d9c10f8dcf404418f006d68429a5194e8ab5252466e8044d7124f7a687334c6eb64c260be9381e26bda8a9c65494de4d7 DIST polymake-4.13-minimal.tar.bz2 7338096 BLAKE2B c4d60ab48cb4fd21e6ea38ccdf85086e92c1ad2b80434180c07da036de9e462439e73f05d271d1c0aa150a8eeda59b20d5314fbf8fd7b17c2eb3f0e0b0384c78 SHA512 cd281a1f293434d96efceeb02e25d23fb334fa0c0ecdf5af10489d12850dca43c05eaa36e86fbd4a0b1fab9e83b03ad694d655a8710ea5ed9f000297a4d86d50 -EBUILD polymake-4.11.ebuild 3921 BLAKE2B 6fb8ae61e88443c185c577fcb3888e5cc4d77c22d827c2f495a4c5b61f1af1165ee14b18fbedd920ce40b1fa4b13f407214519ef55328721a56f50b890e8d551 SHA512 38e33377dcb6e100bf918409a4f926b2597fa49fc4c6f1c6a04babad8c251d2e7eb9aac924f998e351908b72dbd7094b1aafb24b6d1e443ef2357daa69b5398f -EBUILD polymake-4.13.ebuild 3827 BLAKE2B 177c9c6bb2ccfa739086921314e84657493fb42e7851b1479246b445ac14bd5e3c0b31a7a27e5902e46c8f0cf0799d4cbb773d45638d4e597387fc096a5aa0cd SHA512 47f6a14d7abad026c0bb6e15c8120b76e8e7ce4acb7249e3ba69d4bbdc40a65f61135a8b2a65f4d80826b0c3aa47a7d4c3a421a433c0bac77781b77a13bf735d +EBUILD polymake-4.13.ebuild 3872 BLAKE2B b6bd68325627136c59359853a97912744753cb8b42e72c74755b2c61690769a8954b0755e1041f001d6b2ec67bb6a34a14b1fee95d7d6451c39af762a2bb01c5 SHA512 3de45cc21b719a147c9808a9992ff9290302d76e9920cf8e44f0fba3e79a3de9e0ae90439a071c320c3d72332e0ca3f5d574a9137a13abb2b0e5275d2c60ca3f MISC metadata.xml 1765 BLAKE2B 4e13dfb267c8100df81d8be89e7915ba850f55fea4256882264b13a0307c60cd8346ff46bf972018b334bf2d0dc387761244c1e0c3b8c7a1f4613a2a87458538 SHA512 7fd8af42bccc7710bd7c4159759b42ace43f638365a83defee96568e6ab4d6c186f49e71cbf68291fcd3b8b30fd7f883e8096c001c6bbf233d6f7336fa266f7c diff --git a/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch b/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch deleted file mode 100644 index 2f58b0f76299..000000000000 --- a/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit d55dc6bd7f2da9245884f86706cb96e2d11fa83a -Author: Benjamin Lorenz <lorenz@math.tu-berlin.de> -Date: Tue Nov 7 16:49:33 2023 +0100 - - barycentric_subdivision: dont call back on empty strings - - thanks jamesjer - - @Jenkins: merge - -diff --git a/apps/topaz/src/barycentric_subdivision.cc b/apps/topaz/src/barycentric_subdivision.cc -index 753afb4040..e2d4130bc3 100644 ---- a/apps/topaz/src/barycentric_subdivision.cc -+++ b/apps/topaz/src/barycentric_subdivision.cc -@@ -139,7 +139,7 @@ bs_data2Object(const bool realize, - else - desc << k << "th "; - desc << "barycentric subdivision of " << description; -- if (description.back() != '\n') -+ if (description.empty() || description.back() != '\n') - desc << endl; - p_out.set_description() << desc.str(); - return p_out; diff --git a/sci-mathematics/polymake/files/polymake-4.11-singular-sat.patch b/sci-mathematics/polymake/files/polymake-4.11-singular-sat.patch deleted file mode 100644 index 739e503ac246..000000000000 --- a/sci-mathematics/polymake/files/polymake-4.11-singular-sat.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 4ce0549f510d246c8f69c85c509fc2d13d882442 -Author: Benjamin Lorenz <lorenz@math.tu-berlin.de> -Date: Thu Nov 9 11:15:06 2023 +0100 - - singular: support new return types for saturation command - - This was changed from (ideal, exponent) to just the ideal in singular 4-3-2p5. - To allow older versions we keep using sat but support both return types - instead of switching to the new sat_with_exp. - -diff --git a/bundled/singular/apps/ideal/src/singularIdeal.cc b/bundled/singular/apps/ideal/src/singularIdeal.cc -index 4cbc00a6f4..bdade5c29d 100644 ---- a/bundled/singular/apps/ideal/src/singularIdeal.cc -+++ b/bundled/singular/apps/ideal/src/singularIdeal.cc -@@ -236,22 +236,24 @@ public: - arg.next->data=(void *)idCopy(J); - // call primdecSY - BOOLEAN res=iiMake_proc(sathdl, nullptr ,&arg); -- if(!res && (iiRETURNEXPR.Typ() == LIST_CMD)){ -- lists L = (lists)iiRETURNEXPR.Data(); -- SingularIdeal_wrap* result; -- if(L->m[0].Typ() == IDEAL_CMD){ -- result = new SingularIdeal_impl((::ideal) (L->m[0].Data()),singRing); -- } else { -- throw std::runtime_error("Something went wrong for the primary decomposition"); -+ if(!res) { -+ ::ideal iddata = nullptr; -+ if (iiRETURNEXPR.Typ() == LIST_CMD) { -+ lists L = (lists)iiRETURNEXPR.Data(); -+ if(L->m[0].Typ() == IDEAL_CMD) -+ iddata = (::ideal) L->m[0].Data(); -+ } else if (iiRETURNEXPR.Typ() == IDEAL_CMD) { -+ iddata = (::ideal) iiRETURNEXPR.Data(); -+ } -+ if (iddata != nullptr) { -+ SingularIdeal_wrap* result = new SingularIdeal_impl(iddata, singRing); -+ iiRETURNEXPR.CleanUp(); -+ iiRETURNEXPR.Init(); -+ return result; - } -- iiRETURNEXPR.CleanUp(); -- iiRETURNEXPR.Init(); -- return result; -- } else { -- iiRETURNEXPR.Init(); -- throw std::runtime_error("Something went wrong for the saturation"); - } -- -+ iiRETURNEXPR.Init(); -+ throw std::runtime_error("saturation: unable to parse ideal from return value"); - } - - Array<SingularIdeal_wrap*> primary_decomposition() const diff --git a/sci-mathematics/polymake/files/polymake-4.13-cstdint.patch b/sci-mathematics/polymake/files/polymake-4.13-cstdint.patch new file mode 100644 index 000000000000..a5734cdbf9ad --- /dev/null +++ b/sci-mathematics/polymake/files/polymake-4.13-cstdint.patch @@ -0,0 +1,13 @@ +diff --git a/lib/core/include/internal/comparators.h b/lib/core/include/internal/comparators.h +index 57e3f14..3486f80 100644 +--- a/lib/core/include/internal/comparators.h ++++ b/lib/core/include/internal/comparators.h +@@ -17,6 +17,8 @@ + + #pragma once + ++#include <cstdint> ++ + #include "polymake/internal/comparators_ops.h" + #include "polymake/internal/matrix_rows_cols.h" + #include "polymake/TransformedContainer.h" diff --git a/sci-mathematics/polymake/polymake-4.11.ebuild b/sci-mathematics/polymake/polymake-4.11.ebuild deleted file mode 100644 index afcd2acf56a5..000000000000 --- a/sci-mathematics/polymake/polymake-4.11.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic ninja-utils toolchain-funcs - -DESCRIPTION="Tool for polyhedral geometry and combinatorics" -SRC_URI="https://polymake.org/lib/exe/fetch.php/download/${P}-minimal.tar.bz2" -HOMEPAGE="https://polymake.org/" - -# polymake itself is GPL-2, but even the minimal tarball bundles a lot -# of other code. I've included everything that turns up with a -# -# find ./ -name 'LICENSE' -o -name 'COPYING' -# -# in the list below. If any of these bother you, you may want to take a -# closer look at how (or even if) the corresponding code is being used. -LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2" -SLOT="0" -KEYWORDS="amd64 ~riscv ~amd64-linux" -IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular" - -REQUIRED_USE="^^ ( bliss nauty )" - -# The "configure" script isn't autotools; it basically exists just to -# exec some other perl script but using the familiar name. -BDEPEND="dev-lang/perl - ${NINJA_DEPEND}" - -DEPEND=" - libpolymake? ( dev-lang/perl ) - dev-libs/boost:= - dev-libs/gmp:= - dev-libs/libxml2:2= - dev-libs/libxslt:= - dev-libs/mpfr:= - sys-libs/readline:= - bliss? ( sci-libs/bliss:=[gmp] ) - cdd? ( sci-libs/cddlib:= ) - flint? ( sci-mathematics/flint:= ) - lrs? ( >=sci-libs/lrslib-051:=[gmp] ) - nauty? ( sci-mathematics/nauty:= ) - normaliz? ( >=sci-mathematics/normaliz-3.8:= ) - ppl? ( dev-libs/ppl:= ) - singular? ( sci-mathematics/singular:= )" - -RDEPEND="${DEPEND} - dev-lang/perl - dev-perl/JSON - dev-perl/Term-ReadLine-Gnu - dev-perl/TermReadKey - dev-perl/XML-SAX - dev-perl/XML-Writer" - -PATCHES=( - "${FILESDIR}/${P}-singular-sat.patch" - "${FILESDIR}/${P}-barycentric-subdiv.patch" -) - -src_configure() { - # Without this, the build system tries to use "the highest possible" - # optimization level and will override what's in your CXXFLAGS. - export CXXOPT="" - - tc-export CC CXX - - # We need to define BLISS_USE_GMP if bliss was built with gmp support. - # Therefore we require gmp support on bliss, so that the package - # manager can prevent rebuilds with changed gmp flag. Yes, this should - # be append-cppflags; but the build system doesn't respect CPPFLAGS. - use bliss && append-cxxflags -DBLISS_USE_GMP - - # This isn't an autotools ./configure script, so a lot of things - # don't work the way you'd expect. We disable openmp unconditionally - # because it's only supposedly only used for building the bundled - # libnormaliz (we unbundle it) and for something called to_simplex - # that I can't find anywhere in the polymake source. - ./configure --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --libexecdir="${EPREFIX}/usr/$(get_libdir)/polymake" \ - $(usev !libpolymake "--without-callable") \ - --without-java \ - --without-javaview \ - --without-native \ - --without-scip \ - --without-soplex \ - --without-openmp \ - $(use_with bliss bliss "${EPREFIX}/usr") \ - $(use_with cdd cdd "${EPREFIX}/usr") \ - $(use_with flint flint "${EPREFIX}/usr") \ - $(use_with lrs lrs "${EPREFIX}/usr") \ - $(use_with nauty nauty "${EPREFIX}/usr") \ - $(use_with normaliz libnormaliz "${EPREFIX}/usr") \ - $(use_with ppl ppl "${EPREFIX}/usr") \ - $(use_with singular singular "${EPREFIX}/usr") \ - || die -} - -# There is a backwards-compatible Makefile that would call ninja for us -# in src_compile/src_install, but it doesn't handle MAKEOPTS correctly. -src_compile() { - eninja -C build/Opt -} - -src_install() { - # DESTDIR needs to find its way into the real install script, - # support/install.pl. - export DESTDIR="${D}" - eninja -C build/Opt install -} - -src_test() { - perl/polymake --script run_testcases --emacs-style \ - || die "test suite failed" -} - -pkg_postinst() { - elog "Additional features for polymake are available through external" - elog "software such as sci-mathematics/4ti2 and sci-mathematics/topcom." - elog "After installing new external software run 'polymake --reconfigure'." -} diff --git a/sci-mathematics/polymake/polymake-4.13.ebuild b/sci-mathematics/polymake/polymake-4.13.ebuild index a58117a18828..e7f06938aa0e 100644 --- a/sci-mathematics/polymake/polymake-4.13.ebuild +++ b/sci-mathematics/polymake/polymake-4.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ SRC_URI="https://polymake.org/lib/exe/fetch.php/download/${P}-minimal.tar.bz2" # closer look at how (or even if) the corresponding code is being used. LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2" SLOT="0" -KEYWORDS="~amd64 ~riscv ~amd64-linux" +KEYWORDS="amd64 ~riscv ~amd64-linux" IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular" REQUIRED_USE="^^ ( bliss nauty )" @@ -53,6 +53,8 @@ RDEPEND="${DEPEND} dev-perl/XML-SAX dev-perl/XML-Writer" +PATCHES=( "${FILESDIR}/${P}-cstdint.patch" ) + src_configure() { # Without this, the build system tries to use "the highest possible" # optimization level and will override what's in your CXXFLAGS. |