Merge branch 'void-linux:master' into jenkins

2025-04-23 01:27:02 +02:00 · 2025-04-09 19:28:57 +05:30 · 2025-04-09 19:28:57 +05:30 · bf48ab0452
commit bf48ab0452
parent 56571e78d0 6be5794ed6
112 changed files with 700 additions and 4302 deletions
--- a/common/shlibs
+++ b/common/shlibs
@ -4198,7 +4198,7 @@ libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libxcvt.so.0 libxcvt-0.1.1_1
 libgf2x.so.3 gf2x-1.3.0_1
 libntl.so.44 ntl-11.5.1_1
-libflint.so.19 flintlib-3.1.0_1
+libflint.so.20 flintlib-3.2.1_1
 libec.so.14 eclib-20241112_1
 libsymmetrica.so.3 symmetrica-3.1.0_1
 libLfunction.so.2 lcalc-2.1.0_1
--- a/srcpkgs/QLC+/template
+++ b/srcpkgs/QLC+/template
@ -1,18 +1,19 @@
 # Template file for 'QLC+'
 pkgname=QLC+
-version=4.12.7
+version=4.14.1
 revision=1
-build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
-makedepends="eudev-libudev-devel qt5-devel qt5-multimedia-devel
- qt5-script-devel alsa-lib-devel libftdi1-devel libusb-compat-devel
- libsndfile-devel libmad-devel"
+build_style=cmake
+hostmakedepends="cmake ninja pkg-config qt5-qmake qt5-host-tools"
+makedepends="eudev-libudev-devel qt5-devel qt5-declarative-devel
+ qt5-multimedia-devel qt5-script-devel qt5-websockets-devel
+ qt5-serialport-devel qt5-svg-devel qt5-tools-devel alsa-lib-devel
+ libftdi1-devel libusb-compat-devel libsndfile-devel libmad-devel"
 short_desc="Q Lighting Controller"
 maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
 license="Apache-2.0"
 homepage="https://www.qlcplus.org/"
 distfiles="https://github.com/mcallegari/qlcplus/archive/QLC+_$version.tar.gz"
-checksum=6ad8c66860041a54064a22d951e2a76799feaa02821ca774ac0de4bba717ab91
+checksum=5a8ca95208e8d91715b77c47d9011e2e9d2b1129656a94d2bf1425e5477ada51

 pre_build() {
 	vsed -i 's/QMAKE_CXXFLAGS/#QMAKE_CXXFLAGS/' variables.pri
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=7.8.3
+version=7.10.1
 revision=1
 build_style=cmake
 hostmakedepends="cmake gcc-fortran"
@ -12,7 +12,7 @@ license="custom:multiple"
 homepage="https://people.engr.tamu.edu/davis/suitesparse.html"
 changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog"
 distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz"
-checksum=ce39b28d4038a09c14f21e02c664401be73c0cb96a9198418d6a98a7db73a259
+checksum=9e2974e22dba26a3cffe269731339ae8e01365cfe921b06be6359902bd05862c

 build_options="openblas"

--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@ -1,6 +1,6 @@
 # Template file for 'aide'
 pkgname=aide
-version=0.18.8
+version=0.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@ -10,13 +10,13 @@ make_dirs="/var/lib/aide 0750 root root
 /var/log/aide 0750 root root"
 hostmakedepends="flex pkg-config"
 makedepends="pcre2-devel mhash-devel acl-devel e2fsprogs-devel elfutils-devel
- zlib-devel"
+ zlib-devel nettle-devel"
 short_desc="File and directory integrity checker"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://aide.github.io/"
 distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=16662dc632d17e2c5630b801752f97912a8e22697c065ebde175f1cc37b83a60
+checksum=e7fba0214be01299d76359bff2975233ed241332e4cfcfff59cd1b6a89aba5e4

 export MHASH_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include"
 export MHASH_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lmhash"
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@ -1,13 +1,13 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20250225
+version=20250330
 revision=1
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=cc19b15438b454e334a23a8c91e3b87fd4b8be08c6fd9500d48e55cc683bba10
+checksum=e012a34b0a8b4fe03ed4d0e2452580391c66a4076d7a0aa1016d2c0a096eb9b3
 python_version=3
 CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"

--- a/srcpkgs/cargo-update/template
+++ b/srcpkgs/cargo-update/template
@ -1,6 +1,6 @@
 # Template file for 'cargo-update'
 pkgname=cargo-update
-version=16.1.0
+version=16.2.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config go-md2man"
@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/nabijaczleweli/cargo-update"
 changelog="https://github.com/nabijaczleweli/cargo-update/releases"
 distfiles="https://github.com/nabijaczleweli/cargo-update/archive/refs/tags/v${version}.tar.gz"
-checksum=9173e0354eea95f5f6419c710467710b88c0b0a4562953bdfc4a82bfb125b8e1
+checksum=2436675baff66da3cbcab1126427f7a9d52375bc77041000d047a805cb24b244

 post_patch() {
 	# Upstream does not ship a lockfile and is very vocal about that being
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.61.0
+version=2.62.0
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@ -13,7 +13,7 @@ license="MIT"
 homepage="https://chezmoi.io/"
 changelog="https://github.com/twpayne/chezmoi/releases"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=7a2a5ab782b2d6cd521451a258d9ffc6965a1541a4bbe10c6b9a4fd87dd700be
+checksum=d8f553d871d35caf3d446b6f1032f4cad81a75fc41955bd3d71216a2aa6e17a4

 pre_build() {
 	local _date
--- a/srcpkgs/console-setup/template
+++ b/srcpkgs/console-setup/template
@ -1,6 +1,6 @@
 # Template file for 'console-setup'
 pkgname=console-setup
-version=1.235
+version=1.236
 revision=1
 hostmakedepends="perl"
 depends="kbd ckbcomp"
@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/console-setup"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=b5af81e9e8bf924b043c28bdefcbc03f91f91facea896457a69cd1635f9eb243
+checksum=fd291181cc3bda0f95201199da71edc7cc6f1e9cac3acaa8ae3510ffe5cb4526
 conf_files="/etc/console-setup/console-setup
 /etc/console-setup/keyboard"

--- a/srcpkgs/courier-unicode/template
+++ b/srcpkgs/courier-unicode/template
@ -1,6 +1,6 @@
 # Template file for 'courier-unicode'
 pkgname=courier-unicode
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.courier-mta.org/unicode/"
 distfiles="${SOURCEFORGE_SITE}/courier/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=b83ee646a47c2a9d692fb6efb938564668c32ec179d4fac0c07eace8a1b8fc91
+checksum=b645d2f00aabbc682320ede696ca50201266f710a1bcec4ac5042695c99e7f69

 courier-unicode-devel_package() {
 	short_desc+=" - development files"
--- a/srcpkgs/eclib/template
+++ b/srcpkgs/eclib/template
@ -1,7 +1,7 @@
 # Template file for 'eclib'
 pkgname=eclib
 version=20250122
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-flint --with-boost"
 makedepends="pari-devel ntl-devel flintlib-devel boost-devel"
--- a/srcpkgs/erofs-utils/template
+++ b/srcpkgs/erofs-utils/template
@ -1,6 +1,6 @@
 # Template file for 'erofs-utils'
 pkgname=erofs-utils
-version=1.8.5
+version=1.8.6
 revision=1
 build_style=gnu-configure
 configure_args="
@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"
 changelog="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/plain/ChangeLog"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz"
-checksum=cd8611270e9c86fe062f647103ca6ada9ed710e4430fdd5960d514777919200d
+checksum=5b221dc3fd6d151425b30534ede46fb7a90dc233a8659cba0372796b0a066547

 pre_configure() {
 	autoreconf -fi
--- a/srcpkgs/extra-cmake-modules/patches/cross.patch
+++ b/srcpkgs/extra-cmake-modules/patches/cross.patch
@ -1,8 +1,6 @@
-diff --git a/modules/ECMQueryQt.cmake b/modules/ECMQueryQt.cmake
-index 89e7d4f..798a561 100644
 --- a/modules/ECMQueryQt.cmake
 +++ b/modules/ECMQueryQt.cmake
-@@ -57,7 +57,7 @@ if (QT_MAJOR_VERSION STREQUAL "5")
+@@ -56,7 +56,7 @@ if (QT_MAJOR_VERSION STREQUAL "5")
     endif()
 elseif(QT_MAJOR_VERSION STREQUAL "6")
     # QUIET to accommodate the TRY option
--- a/srcpkgs/extra-cmake-modules/patches/libexecdir.patch
+++ b/srcpkgs/extra-cmake-modules/patches/libexecdir.patch
@ -11,7 +11,7 @@
     [``CMAKECONFIG_INSTALL_PREFIX``]
 --- a/kde-modules/KDEInstallDirs6.cmake
 +++ b/kde-modules/KDEInstallDirs6.cmake
-@@ -46,7 +46,7 @@ where ``<dir>`` is one of (default value
+@@ -43,7 +43,7 @@ where ``<dir>`` is one of (default value
     ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian)
 ``LIBEXECDIR``
     executables for internal use by programs and libraries (``BINDIR`` on
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@ -1,7 +1,7 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
 version=6.12.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON -DBUILD_TESTING=ON"
 hostmakedepends="python3-Sphinx qt6-base qt6-tools qt6-plugin-sqlite
--- a/srcpkgs/fastfetch/template
+++ b/srcpkgs/fastfetch/template
@ -1,6 +1,6 @@
 # Template file for 'fastfetch'
 pkgname=fastfetch
-version=2.40.2
+version=2.40.3
 revision=1
 build_style=cmake
 configure_args="-DENABLE_SYSTEM_YYJSON=ON -DBUILD_FLASHFETCH=OFF"
@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/fastfetch-cli/fastfetch"
 changelog="https://github.com/fastfetch-cli/fastfetch/raw/dev/CHANGELOG.md"
 distfiles="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${version}.tar.gz"
-checksum=b4bc551ef2ec48cb0a14d21e266d16ea0469d55524b221464df1a7619bb339cc
+checksum=e79984a4a6d233c6a2d1f5341e272580bcfb59de2b6e48b0d7631a3f65d4c1d2

 if [ -n "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"
--- a/srcpkgs/flintlib/patches/2027.patch
+++ b/srcpkgs/flintlib/patches/2027.patch
@ -1,322 +0,0 @@
-See: https://github.com/flintlib/flint/pull/2027
-
-From 1b93e73d00881be12e04b7f13e070214a3c9e1cc Mon Sep 17 00:00:00 2001
-From: Dima Pasechnik <dima@pasechnik.info>
-Date: Wed, 19 Jun 2024 22:16:34 +0100
-Subject: [PATCH] ensure C99 compliance in headers, as 'I' is reserved
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Note that the following code
---- cut here: save as t.c
---- cut here
-
-fails to compile with a suffciently new compiler, e.g. clang 16 or gcc 14.
-
-$ gcc -c t.c
-In file included from t.c:1:
-/usr/include/flint/mpoly.h:1319:43: error: expected ‘)’ before ‘__extension__’
- 1319 | void mpoly_gcd_info_init(mpoly_gcd_info_t I, slong nvars);
-      |                                           ^
-In file included from /usr/include/flint/fmpz_types.h:15,
-                 from /usr/include/flint/fmpz_mod_types.h:15,
-                 from /usr/include/flint/mpoly_types.h:15,
-                 from /usr/include/flint/mpoly.h:23,
-                 from t.c:2:
-/usr/include/flint/mpoly.h:1319:46: error: expected ‘;’, ‘,’ or ‘)’ before ‘mp_limb_signed_t’
- 1319 | void mpoly_gcd_info_init(mpoly_gcd_info_t I, slong nvars);
-
-...
---
- src/fft_small.h             |  6 +++---
- src/fmpz_mod_mpoly_factor.h |  8 ++++----
- src/fmpz_mpoly.h            |  2 +-
- src/fmpz_mpoly_factor.h     | 18 +++++++++---------
- src/fq_nmod_mpoly_factor.h  |  6 +++---
- src/fq_zech_mpoly_factor.h  |  6 +++---
- src/mpoly.h                 | 18 +++++++++---------
- src/nmod_mpoly.h            |  4 ++--
- src/nmod_mpoly_factor.h     |  6 +++---
- 9 files changed, 37 insertions(+), 37 deletions(-)
-
-diff --git a/src/fft_small.h b/src/fft_small.h
-index 3f62f2e988..b7404f196d 100644
--- a/src/fft_small.h
-+++ b/src/fft_small.h
-@@ -242,10 +242,10 @@ FLINT_INLINE double sd_fft_ctx_get_fft_index(double* d, ulong i)
- }
- 
- /* sd_fft.c */
-void sd_fft_trunc(const sd_fft_lctx_t Q, ulong I, ulong S, ulong k, ulong j, ulong itrunc, ulong otrunc);
-+void sd_fft_trunc(const sd_fft_lctx_t Q, ulong Iv, ulong S, ulong k, ulong j, ulong itrunc, ulong otrunc);
- 
- /* sd_ifft.c */
-void sd_ifft_trunc(const sd_fft_lctx_t Q, ulong I, ulong S, ulong k, ulong j, ulong z, ulong n, int f);
-+void sd_ifft_trunc(const sd_fft_lctx_t Q, ulong Iv, ulong S, ulong k, ulong j, ulong z, ulong n, int f);
- 
- /* sd_fft_ctx.c */
- void sd_fft_ctx_clear(sd_fft_ctx_t Q);
-@@ -428,7 +428,7 @@ typedef struct {
- 
- typedef mpn_ctx_struct mpn_ctx_t[1];
- 
-void _convert_block(ulong* Xs, sd_fft_ctx_struct* Rffts, double* d, ulong dstride, ulong np, ulong I);
-+void _convert_block(ulong* Xs, sd_fft_ctx_struct* Rffts, double* d, ulong dstride, ulong np, ulong Iv);
- ulong flint_mpn_nbits(const ulong* a, ulong an);
- int flint_mpn_cmp_ui_2exp(const ulong* a, ulong an, ulong b, ulong e);
- unsigned char flint_mpn_add_inplace_c(ulong* z, ulong zn, ulong* a, ulong an, unsigned char cf);
-diff --git a/src/fmpz_mod_mpoly_factor.h b/src/fmpz_mod_mpoly_factor.h
-index 359fdd1e3d..460695dd23 100644
--- a/src/fmpz_mod_mpoly_factor.h
-+++ b/src/fmpz_mod_mpoly_factor.h
-@@ -1203,15 +1203,15 @@ typedef struct {
- typedef fmpz_mod_mpoly_pfrac_struct fmpz_mod_mpoly_pfrac_t[1];
- 
- 
-int fmpz_mod_mpoly_pfrac_init(fmpz_mod_mpoly_pfrac_t I,
-+int fmpz_mod_mpoly_pfrac_init(fmpz_mod_mpoly_pfrac_t Iv,
-     flint_bitcnt_t bits, slong l, slong r, const fmpz_mod_mpoly_struct * betas,
-                           const fmpz * alpha, const fmpz_mod_mpoly_ctx_t ctx);
- 
-void fmpz_mod_mpoly_pfrac_clear(fmpz_mod_mpoly_pfrac_t I,
-+void fmpz_mod_mpoly_pfrac_clear(fmpz_mod_mpoly_pfrac_t Iv,
-                                               const fmpz_mod_mpoly_ctx_t ctx);
- 
- int fmpz_mod_mpoly_pfrac(slong r, fmpz_mod_mpoly_t t, const slong * deg,
-                     fmpz_mod_mpoly_pfrac_t I, const fmpz_mod_mpoly_ctx_t ctx);
-+                     fmpz_mod_mpoly_pfrac_t Iv, const fmpz_mod_mpoly_ctx_t ctx);
- 
- int fmpz_mod_mpoly_hlift(slong m, fmpz_mod_mpoly_struct * f, slong r,
-             const fmpz * alpha, const fmpz_mod_mpoly_t A, const slong * degs,
-@@ -1290,7 +1290,7 @@ int fmpz_mod_mpolyn_gcd_brown_smprime(
-     fmpz_mod_mpolyn_t B,
-     slong var,
-     const fmpz_mod_mpoly_ctx_t ctx,
-    const mpoly_gcd_info_t I,
-+    const mpoly_gcd_info_t Iv,
-     fmpz_mod_poly_polyun_mpolyn_stack_t St);
- 
- int fmpz_mod_mpolyl_gcdp_zippel(
-diff --git a/src/fmpz_mpoly.h b/src/fmpz_mpoly.h
-index b7c9677915..4be3d05c56 100644
--- a/src/fmpz_mpoly.h
-+++ b/src/fmpz_mpoly.h
-@@ -1084,7 +1084,7 @@ void fmpz_mpoly_vec_randtest_not_zero(fmpz_mpoly_vec_t vec, flint_rand_t state,
- 
- void fmpz_mpoly_spoly(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_t g, const fmpz_mpoly_ctx_t ctx);
- void fmpz_mpoly_vec_set_primitive_unique(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx);
-void fmpz_mpoly_reduction_primitive_part(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_vec_t I, const fmpz_mpoly_ctx_t ctx);
-+void fmpz_mpoly_reduction_primitive_part(fmpz_mpoly_t res, const fmpz_mpoly_t f, const fmpz_mpoly_vec_t Iv, const fmpz_mpoly_ctx_t ctx);
- int fmpz_mpoly_vec_is_groebner(const fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx);
- void fmpz_mpoly_buchberger_naive(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F, const fmpz_mpoly_ctx_t ctx);
- int fmpz_mpoly_buchberger_naive_with_limits(fmpz_mpoly_vec_t G, const fmpz_mpoly_vec_t F,
-diff --git a/src/fmpz_mpoly_factor.h b/src/fmpz_mpoly_factor.h
-index 0da7c1052b..a04ef8021e 100644
--- a/src/fmpz_mpoly_factor.h
-+++ b/src/fmpz_mpoly_factor.h
-@@ -298,11 +298,11 @@ void fmpz_mpoly_from_mpolyl_perm_inflate(fmpz_mpoly_t A,
- 
- int fmpz_mpolyl_gcd_brown(fmpz_mpoly_t G,
-         fmpz_mpoly_t Abar, fmpz_mpoly_t Bbar, fmpz_mpoly_t A, fmpz_mpoly_t B,
-                         const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t I);
-+                         const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv);
- 
- int fmpz_mpolyl_gcd_brown_threaded_pool(fmpz_mpoly_t G,
-         fmpz_mpoly_t Abar, fmpz_mpoly_t Bbar, fmpz_mpoly_t A, fmpz_mpoly_t B,
-                         const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t I,
-+                         const fmpz_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv,
-                         const thread_pool_handle * handles, slong num_handles);
- 
- int fmpz_mpolyl_gcd_zippel(fmpz_mpoly_t G, fmpz_mpoly_t Abar,
-@@ -340,15 +340,15 @@ typedef struct {
- 
- typedef fmpz_poly_pfrac_struct fmpz_poly_pfrac_t[1];
- 
-void fmpz_poly_pfrac_init(fmpz_poly_pfrac_t I);
-+void fmpz_poly_pfrac_init(fmpz_poly_pfrac_t Iv);
- 
-void fmpz_poly_pfrac_clear(fmpz_poly_pfrac_t I);
-+void fmpz_poly_pfrac_clear(fmpz_poly_pfrac_t Iv);
- 
-int fmpz_poly_pfrac_precompute(fmpz_poly_pfrac_t I,
-+int fmpz_poly_pfrac_precompute(fmpz_poly_pfrac_t Iv,
-                                           const fmpz_poly_struct * b, slong r);
- 
- int fmpz_poly_pfrac_precomp(fmpz_poly_struct * c,
-                                     const fmpz_poly_t A, fmpz_poly_pfrac_t I);
-+                                     const fmpz_poly_t A, fmpz_poly_pfrac_t Iv);
- 
- typedef struct {
-     flint_bitcnt_t bits;
-@@ -372,15 +372,15 @@ typedef struct {
- 
- typedef fmpz_mpoly_pfrac_struct fmpz_mpoly_pfrac_t[1];
- 
-int fmpz_mpoly_pfrac_init(fmpz_mpoly_pfrac_t I, flint_bitcnt_t bits,
-+int fmpz_mpoly_pfrac_init(fmpz_mpoly_pfrac_t Iv, flint_bitcnt_t bits,
-                             slong r, slong w, const fmpz_mpoly_struct * betas,
-                                const fmpz * alpha, const fmpz_mpoly_ctx_t ctx);
- 
-void fmpz_mpoly_pfrac_clear(fmpz_mpoly_pfrac_t I,
-+void fmpz_mpoly_pfrac_clear(fmpz_mpoly_pfrac_t Iv,
-                                                    const fmpz_mpoly_ctx_t ctx);
- 
- int fmpz_mpoly_pfrac(slong l, fmpz_mpoly_t t, const slong * degs,
-                             fmpz_mpoly_pfrac_t I, const fmpz_mpoly_ctx_t ctx);
-+                             fmpz_mpoly_pfrac_t Iv, const fmpz_mpoly_ctx_t ctx);
- 
- int fmpz_mpoly_hlift(slong m, fmpz_mpoly_struct * f, slong r,
-                 const fmpz * alpha, const fmpz_mpoly_t A, const slong * degs,
-diff --git a/src/fq_nmod_mpoly_factor.h b/src/fq_nmod_mpoly_factor.h
-index 6289d3f1c5..29caa99aa4 100644
--- a/src/fq_nmod_mpoly_factor.h
-+++ b/src/fq_nmod_mpoly_factor.h
-@@ -427,7 +427,7 @@ typedef fq_nmod_mpoly_pfrac_struct fq_nmod_mpoly_pfrac_t[1];
- 
- 
- int fq_nmod_mpoly_pfrac_init(
-    fq_nmod_mpoly_pfrac_t I,
-+    fq_nmod_mpoly_pfrac_t Iv,
-     flint_bitcnt_t bits,
-     slong l, slong r,
-     const fq_nmod_mpoly_struct * betas,
-@@ -435,14 +435,14 @@ int fq_nmod_mpoly_pfrac_init(
-     const fq_nmod_mpoly_ctx_t ctx);
- 
- void fq_nmod_mpoly_pfrac_clear(
-    fq_nmod_mpoly_pfrac_t I,
-+    fq_nmod_mpoly_pfrac_t Iv,
-     const fq_nmod_mpoly_ctx_t ctx);
- 
- int fq_nmod_mpoly_pfrac(
-     slong r,
-     fq_nmod_mpoly_t t,
-     const slong * deg,
-    fq_nmod_mpoly_pfrac_t I,
-+    fq_nmod_mpoly_pfrac_t Iv,
-     const fq_nmod_mpoly_ctx_t ctx);
- 
- int fq_nmod_mpoly_hlift(
-diff --git a/src/fq_zech_mpoly_factor.h b/src/fq_zech_mpoly_factor.h
-index 06f31369f9..3d3c51419f 100644
--- a/src/fq_zech_mpoly_factor.h
-+++ b/src/fq_zech_mpoly_factor.h
-@@ -652,7 +652,7 @@ typedef fq_zech_mpoly_pfrac_struct fq_zech_mpoly_pfrac_t[1];
- 
- 
- int fq_zech_mpoly_pfrac_init(
-    fq_zech_mpoly_pfrac_t I,
-+    fq_zech_mpoly_pfrac_t Iv,
-     flint_bitcnt_t bits,
-     slong l, slong r,
-     const fq_zech_mpoly_struct * betas,
-@@ -660,14 +660,14 @@ int fq_zech_mpoly_pfrac_init(
-     const fq_zech_mpoly_ctx_t ctx);
- 
- void fq_zech_mpoly_pfrac_clear(
-    fq_zech_mpoly_pfrac_t I,
-+    fq_zech_mpoly_pfrac_t Iv,
-     const fq_zech_mpoly_ctx_t ctx);
- 
- int fq_zech_mpoly_pfrac(
-     slong r,
-     fq_zech_mpoly_t t,
-     const slong * deg,
-    fq_zech_mpoly_pfrac_t I,
-+    fq_zech_mpoly_pfrac_t Iv,
-     const fq_zech_mpoly_ctx_t ctx);
- 
- int fq_zech_mpoly_hlift(
-diff --git a/src/mpoly.h b/src/mpoly.h
-index b0950e3a48..fe0ccbe7c4 100644
--- a/src/mpoly.h
-+++ b/src/mpoly.h
-@@ -1363,9 +1363,9 @@ typedef struct
- 
- typedef mpoly_gcd_info_struct mpoly_gcd_info_t[1];
- 
-void mpoly_gcd_info_init(mpoly_gcd_info_t I, slong nvars);
-+void mpoly_gcd_info_init(mpoly_gcd_info_t Iv, slong nvars);
- 
-void mpoly_gcd_info_clear(mpoly_gcd_info_t I);
-+void mpoly_gcd_info_clear(mpoly_gcd_info_t Iv);
- 
- void mpoly_gcd_info_limits(ulong * Amax_exp, ulong * Amin_exp,
-                        slong * Amax_exp_count, slong * Amin_exp_count,
-@@ -1378,25 +1378,25 @@ void mpoly_gcd_info_stride(ulong * strides,
-                              const ulong * Bmax_exp, const ulong * Bmin_exp,
-                                                        const mpoly_ctx_t mctx);
- 
-void mpoly_gcd_info_set_perm(mpoly_gcd_info_t I,
-+void mpoly_gcd_info_set_perm(mpoly_gcd_info_t Iv,
-                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
- 
-slong mpoly_gcd_info_get_brown_upper_limit(const mpoly_gcd_info_t I,
-+slong mpoly_gcd_info_get_brown_upper_limit(const mpoly_gcd_info_t Iv,
-                                                        slong var, slong bound);
- 
-void mpoly_gcd_info_measure_hensel(mpoly_gcd_info_t I,
-+void mpoly_gcd_info_measure_hensel(mpoly_gcd_info_t Iv,
-                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
- 
-void mpoly_gcd_info_measure_brown(mpoly_gcd_info_t I,
-+void mpoly_gcd_info_measure_brown(mpoly_gcd_info_t Iv,
-                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
- 
-void mpoly_gcd_info_measure_bma(mpoly_gcd_info_t I,
-+void mpoly_gcd_info_measure_bma(mpoly_gcd_info_t Iv,
-                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
- 
-void mpoly_gcd_info_measure_zippel(mpoly_gcd_info_t I,
-+void mpoly_gcd_info_measure_zippel(mpoly_gcd_info_t Iv,
-                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
- 
-void mpoly_gcd_info_measure_zippel2(mpoly_gcd_info_t I,
-+void mpoly_gcd_info_measure_zippel2(mpoly_gcd_info_t Iv,
-                          slong Alength, slong Blength, const mpoly_ctx_t mctx);
- 
- int mpoly_monomial_cofactors(fmpz * Abarexps, fmpz * Bbarexps,
-diff --git a/src/nmod_mpoly.h b/src/nmod_mpoly.h
-index 2a8136e6eb..716ac9669a 100644
--- a/src/nmod_mpoly.h
-+++ b/src/nmod_mpoly.h
-@@ -1619,13 +1619,13 @@ int nmod_mpolyn_gcd_brown_smprime_bivar(
- int nmod_mpolyn_gcd_brown_smprime(nmod_mpolyn_t G,
-                                   nmod_mpolyn_t Abar, nmod_mpolyn_t Bbar,
-                                  nmod_mpolyn_t A, nmod_mpolyn_t B, slong var,
-                         const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t I,
-+                         const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv,
-                                                          nmod_poly_stack_t Sp);
- 
- int nmod_mpolyn_gcd_brown_smprime_threaded_pool(nmod_mpolyn_t G,
-                                 nmod_mpolyn_t Abar, nmod_mpolyn_t Bbar,
-                                nmod_mpolyn_t A, nmod_mpolyn_t B, slong var,
-                         const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t I,
-+                         const nmod_mpoly_ctx_t ctx, const mpoly_gcd_info_t Iv,
-                         const thread_pool_handle * handles, slong num_workers);
- 
- int nmod_mpolyn_gcd_brown_lgprime(nmod_mpolyn_t G,
-diff --git a/src/nmod_mpoly_factor.h b/src/nmod_mpoly_factor.h
-index a46afc860f..b16c802b9b 100644
--- a/src/nmod_mpoly_factor.h
-+++ b/src/nmod_mpoly_factor.h
-@@ -362,15 +362,15 @@ typedef struct {
- typedef nmod_mpoly_pfrac_struct nmod_mpoly_pfrac_t[1];
- 
- 
-int nmod_mpoly_pfrac_init(nmod_mpoly_pfrac_t I, flint_bitcnt_t bits,
-+int nmod_mpoly_pfrac_init(nmod_mpoly_pfrac_t Iv, flint_bitcnt_t bits,
-                          slong l, slong r, const nmod_mpoly_struct * betas,
-                           const mp_limb_t * alpha, const nmod_mpoly_ctx_t ctx);
- 
-void nmod_mpoly_pfrac_clear(nmod_mpoly_pfrac_t I,
-+void nmod_mpoly_pfrac_clear(nmod_mpoly_pfrac_t Iv,
-                                                    const nmod_mpoly_ctx_t ctx);
- 
- int nmod_mpoly_pfrac(slong r, nmod_mpoly_t t, const slong * deg,
-                             nmod_mpoly_pfrac_t I, const nmod_mpoly_ctx_t ctx);
-+                             nmod_mpoly_pfrac_t Iv, const nmod_mpoly_ctx_t ctx);
- 
- int nmod_mpoly_hlift(slong m, nmod_mpoly_struct * f, slong r,
-             const mp_limb_t * alpha, const nmod_mpoly_t A, const slong * degs,
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@ -1,10 +1,11 @@
 # Template file for 'flintlib'
 pkgname=flintlib
-version=3.1.3+p1
+version=3.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr --disable-arch $(vopt_with ntl)
 $(vopt_if openblas --with-blas-include=${XBPS_CROSS_BASE}/usr/include/openblas)"
+hostmakedepends="m4"
 makedepends="mpfr-devel $(vopt_if ntl ntl-devel)
 $(vopt_if openblas openblas-devel)"
 short_desc="Fast Library for Number Theory"
@ -13,7 +14,7 @@ license="LGPL-3.0-or-later"
 homepage="https://flintlib.org"
 changelog="https://raw.githubusercontent.com/flintlib/flint/refs/heads/main/doc/source/history.rst"
 distfiles="https://github.com/flintlib/flint/releases/download/v${version/+/-}/flint-${version/+/-}.tar.xz"
-checksum=8d75df8f2347534bd3245ef6f43cb91e43abd152572c6fe0bfffda55ec014920
+checksum=518248b9cd523fab8d84a010b892047dfc97908489ae15199472648165d2a118

 build_options="ntl openblas"
 desc_option_ntl="enable NTL support"
@ -34,7 +35,6 @@ flintlib-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
--- a/srcpkgs/foliate/template
+++ b/srcpkgs/foliate/template
@ -1,6 +1,6 @@
 # Template file for 'foliate'
 pkgname=foliate
-version=3.2.1
+version=3.3.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel
@ -13,5 +13,5 @@ maintainer="Saksham <voidisnull@duck.com>"
 license="GPL-3.0-or-later"
 homepage="https://johnfactotum.github.io/foliate/"
 distfiles="https://github.com/johnfactotum/foliate/releases/download/${version}/com.github.johnfactotum.Foliate-${version}.tar.xz"
-checksum=01c27a8c481a9ebc4a3237e2947c3e86ef36cc0fac2f4199e7a79e554d676ea4
+checksum=09d0cc0a34426a2e57af25d67147dfe9b77ebf638a5a041b9f5c42499c4db672
 python_version=3
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.24.1
+version=1.24.2
 revision=1
 _bootstrap="1.22.6"
 create_wrksrc=yes
@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=8244ebf46c65607db10222b5806aeb31c1fcf8979c1b6b12f60c677e9a3c0656
+checksum=9dc77ffadc16d837a1bf32d99c624cb4df0647cee7b119edd9e7b1bcc05f2e00
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
--- a/srcpkgs/halloy/template
+++ b/srcpkgs/halloy/template
@ -1,6 +1,6 @@
 # Template file for 'halloy'
 pkgname=halloy
-version=2025.3
+version=2025.4
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/squidowl/halloy"
 changelog="https://raw.githubusercontent.com/squidowl/halloy/main/CHANGELOG.md"
 distfiles="https://github.com/squidowl/halloy/archive/refs/tags/${version}.tar.gz"
-checksum=317b130239ae2ae33fadfa9e39e2be3ff755c9903d5fba57e5a7a57ed8cd19fb
+checksum=f19f01f0e31739bfbafaaf63e7d01e9d1de2813127715f6243a1bcb4e041a8c1

 post_install() {
 	vinstall assets/linux/org.squidowl.halloy.appdata.xml 644 usr/share/metainfo
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@ -1,6 +1,6 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=11.0.0
+version=11.0.1
 revision=1
 build_style=meson
 build_helper="gir qemu"
@ -21,7 +21,7 @@ license="MIT"
 homepage="https://harfbuzz.github.io/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=f16351bafe214725fe2c1d5b59f0d93e49905a4b247899fb90d70cff953a2b9b
+checksum=4a7890090538136db64742073af4b4d776ab8b50e6855676a8165eb8b7f60b7a

 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=enabled"
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@ -1,6 +1,6 @@
 # Template file for 'jujutsu'
 pkgname=jujutsu
-version=0.28.1
+version=0.28.2
 revision=1
 build_style=cargo
 build_helper=qemu
@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://github.com/martinvonz/jj"
 changelog="https://github.com/martinvonz/jj/blob/main/CHANGELOG.md"
 distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz"
-checksum=d59b5c0ba6fe207b42299247ef47bedf4f9dbed0171b0c61bb6dece705b7507b
+checksum=dae80d2629a9f430a9ea795c8cd378ced6ce1c870ab9ffe3b61f64cdd636a2bc
 conflicts="jj>=0"

 do_install() {
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@ -1,7 +1,7 @@
 # Template file for 'kismet'
 pkgname=kismet
-version=2023.07.R1
-revision=4
+version=2023.07.R2
+revision=1
 _realver="${version//./-}"
 build_style=gnu-configure
 configure_args="--disable-python-tools"
@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kismetwireless.net/"
 distfiles="http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.xz"
-checksum=f08548e26ca65fa1e567b1debbea1ca4d0e7206bddb96a4f639c90171873e8f7
+checksum=138ed680b057eab531c23ebae6d295a6137e26726454ce43a89daaec28b7443f
 system_groups="kismet"

 post_install() {
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@ -1,12 +1,12 @@
 # Template file for 'kup'
 pkgname=kup
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DQT_MAJOR_VERSION=6"
 hostmakedepends="qt6-base qt6-tools extra-cmake-modules gettext kf6-kcmutils
 kf6-kpackage-devel"
-makedepends="qt6-declarative kf6-kidletime-devel libgit2-devel
+makedepends="qt6-declarative kf6-kidletime-devel libgit2-1.9-devel
 libplasma-devel plasma5support-devel kf6-kio-devel kf6-kxmlgui-devel
 kf6-kcmutils-devel"
 depends="rsync"
--- a/srcpkgs/ldapdomaindump/template
+++ b/srcpkgs/ldapdomaindump/template
@ -1,7 +1,7 @@
 # Template file for 'ldapdomaindump'
 pkgname=ldapdomaindump
-version=0.9.4
-revision=3
+version=0.10.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-future python3-ldap3 python3-dnspython"
@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dirkjanm/ldapdomaindump"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=43a0822c96d06b8f7a3e3f044deb1591344c84d273c9d7f5815347c88af300fa
+checksum=e5d879d10685140912b7ca7b2a6c403bee0819a3ffda1ef6ec58fecfb583fd59
 make_check=no # no tests implemented

 post_install() {
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@ -15,6 +15,8 @@ changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/libcap-${version}.tar.xz"
 checksum=b7006c9af5168315f35fc734bf1a8d2aa70766bd8b8c4340962e05b19c35b900

+subpackages="libcap-devel libcap-progs"
+
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
 fi
@ -23,6 +25,7 @@ if [ "$CHROOT_READY" ]; then
 	hostmakedepends="gperf"
 	makedepends="pam-devel"
 	make_build_args+=" PAM_CAP=yes"
+	subpackages+=" libcap-pam"
 else
 	make_build_args+=" PAM_CAP=no"
 fi
--- a/srcpkgs/libreoffice-dictionaries/template
+++ b/srcpkgs/libreoffice-dictionaries/template
@ -1,6 +1,6 @@
 # Template file for 'libreoffice-dictionaries'
 pkgname=libreoffice-dictionaries
-version=25.2.1.2
+version=25.2.2.2
 revision=1
 build_style=meta
 hostmakedepends="mythes perl"
@ -11,7 +11,7 @@ homepage="https://www.libreoffice.org/"
 distfiles="https://download.documentfoundation.org/libreoffice/src/${version%.*}/${pkgname}-${version}.tar.xz"
 # distfiles="https://download.nus.edu.sg/mirror/tdf/libreoffice/src/${version%.*}/${pkgname}-${version}.tar.xz"
 # distfiles="https://mirrors.nju.edu.cn/tdf/libreoffice/src/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10ecf3a02bed8ef72c167552c65d23e484181c6b657d668c47dc9e2c735e5375
+checksum=18460f0ae1140b2faed8e513e83e796fb86570f5ab8a727679ccb0c1ed9f7838

 depends="hunspell-af hyphen-af
 hunspell-an
--- a/srcpkgs/libreoffice/patches/002-libjvm-path-musl.patch
+++ b/srcpkgs/libreoffice/patches/002-libjvm-path-musl.patch
@ -11,5 +11,5 @@
 +        "/lib/native_threads",
 +        "/lib",
     };
-     *size = SAL_N_ELEMENTS(ar);
+     *size = std::size(ar);
     return ar;
--- a/srcpkgs/libreoffice/patches/003-musl-java.patch
+++ b/srcpkgs/libreoffice/patches/003-musl-java.patch
@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -9139,7 +9139,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
+@@ -9421,7 +9421,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
         test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
         ;;
 
@ -9,7 +9,7 @@
         JAVAINC="-I$JAVA_HOME/include"
         JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
         test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -15386,7 +15386,7 @@ else
+@@ -15751,7 +15751,7 @@ else
 
     case "$host_os" in
 
@ -20,7 +20,7 @@
         fi
 --- a/configure
 +++ b/configure
-@@ -23269,7 +23269,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
+@@ -23873,7 +23873,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN
         test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
         ;;
 
@ -29,7 +29,7 @@
         JAVAINC="-I$JAVA_HOME/include"
         JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
         test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -48847,7 +48847,7 @@ else
+@@ -49566,7 +49566,7 @@ else
 
     case "$host_os" in
 
--- a/srcpkgs/libreoffice/patches/006-cross-flag.patch
+++ b/srcpkgs/libreoffice/patches/006-cross-flag.patch
@ -5,7 +5,7 @@ Description: Perhaps cleanup a bit and submit to upstream
 environment during build.
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5836,10 +5836,11 @@ if test "$cross_compiling" = "yes"; then
+@@ -6046,10 +6046,11 @@ if test "$cross_compiling" = "yes"; then
     test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
     (
     unset COM USING_X11 OS CPUNAME
@ -18,7 +18,7 @@ Description: Perhaps cleanup a bit and submit to upstream
     unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
     if test -n "$CC_FOR_BUILD"; then
         export CC="$CC_FOR_BUILD"
-@@ -5849,6 +5850,12 @@ if test "$cross_compiling" = "yes"; then
+@@ -6059,6 +6060,12 @@ if test "$cross_compiling" = "yes"; then
         export CXX="$CXX_FOR_BUILD"
         CXX_BASE=`first_arg_basename "$CXX"`
     fi
--- a/srcpkgs/libreoffice/patches/007-cross-python.patch
+++ b/srcpkgs/libreoffice/patches/007-cross-python.patch
@ -2,7 +2,7 @@ Upstream: no
 Description: In VoidLinux, we always have same version of python in build and host
 --- a/configure.ac
 +++ b/configure.ac
-@@ -10034,8 +10034,6 @@ if test "$build_os" != "cygwin" -a "$ena
+@@ -10316,8 +10316,6 @@ if test "$build_os" != "cygwin" -a "$ena
     else
         # This allows a lack of system python with no error, we use internal one in that case.
         AM_PATH_PYTHON([3.3],, [:])
--- a/srcpkgs/libreoffice/patches/008-zxing.patch
+++ b/srcpkgs/libreoffice/patches/008-zxing.patch
@ -5,7 +5,7 @@ Description: we should always check for full path
 Perhap we should changes the file hierarchy of zxing-cpp project instead?
 --- a/configure.ac
 +++ b/configure.ac
-@@ -11483,35 +11483,16 @@ else
+@@ -11777,35 +11777,16 @@ else
         SYSTEM_ZXING=TRUE
         ZXING_CFLAGS=
         AC_LANG_PUSH([C++])
@ -46,7 +46,7 @@ Description: we should always check for full path
         FilterLibs "${ZXING_LIBS}"
         ZXING_LIBS="${filteredlibs}"
     else
-@@ -11528,8 +11509,8 @@ else
+@@ -11822,8 +11803,8 @@ else
     save_CXXFLAGS=$CXXFLAGS
     CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 $ZXING_CFLAGS"
     AC_COMPILE_IFELSE([AC_LANG_SOURCE([
--- a/srcpkgs/libreoffice/patches/010-gpgmepp.patch
+++ b/srcpkgs/libreoffice/patches/010-gpgmepp.patch
@ -20,7 +20,7 @@ Description: we should always use full path
 using ::com::sun::star::uno::Sequence;
 --- a/comphelper/source/misc/storagehelper.cxx
 +++ b/comphelper/source/misc/storagehelper.cxx
-@@ -59,10 +59,10 @@
+@@ -60,10 +60,10 @@
 #include <o3tl/string_view.hxx>
 
 #if HAVE_FEATURE_GPGME
@ -37,7 +37,7 @@ Description: we should always use full path
 using namespace ::com::sun::star;
 --- a/configure.ac
 +++ b/configure.ac
-@@ -12890,7 +12890,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
+@@ -13184,7 +13184,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
         SYSTEM_GPGMEPP=TRUE
 
         # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
@ -48,9 +48,9 @@ Description: we should always use full path
             [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
 --- a/xmlsecurity/source/gpg/CertificateImpl.cxx
 +++ b/xmlsecurity/source/gpg/CertificateImpl.cxx
-@@ -16,8 +16,8 @@
- #include <officecfg/Office/Common.hxx>
+@@ -17,8 +17,8 @@
 #include <svl/sigstruct.hxx>
+ #include <svl/cryptosign.hxx>
 
 -#include <context.h>
 -#include <data.h>
--- a/srcpkgs/libreoffice/patches/100-poppler-25.02.diff
+++ b/srcpkgs/libreoffice/patches/100-poppler-25.02.diff
@ -1,16 +0,0 @@
-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-index ebed120..9b63559 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-@@ -110,7 +110,11 @@
- 
-     /* Get data directory location */
- #ifdef SYSTEM_POPPLER
-+#if POPPLER_CHECK_VERSION(25, 0, 2)
-+    const std::string datadir = "";
-+#else
-     const char* datadir = nullptr;
-+#endif
- #else
-     /* Creates an absolute path to the poppler_data directory, by taking the path
-      * to the xpdfimport executable (provided in argv[0], and concatenating a
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@ -1,6 +1,6 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=25.2.1.2
+version=25.2.2.2
 revision=1
 build_style=meta
 build_helper="gir"
@ -96,9 +96,9 @@ distfiles="
 ${_addurl}/Java-WebSocket-1.6.0.tar.gz
 ${_addurl}/zxcvbn-c-2.5.tar.gz
 "
-checksum="8001ae2477c504c558194ea31c159afa7174781fa6ec72ceee7df2fc2fd5b75d
- ae710f11de6a4c3eb9c5a31c401a18afeda39d6f1dfb4ac594daf68f225cd064
- 89bdc0ca5526f5e5bce6449139cfc4fd4a1415649652776aee91cbb64510cc4b
+checksum="01a14580c15a5b14153fa46c28e90307f6683e0d0326727a4ad13e9545dfe6ac
+ 5a7c9fcc43afad674c3883f90c46f5e4fde728801a0d19e37e518bdc488a5f9e
+ a74b05873778a47961c2fc44f85b300ab820c9b333e1be921ca6cbac6fef5430
 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
 e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00
@ -377,13 +377,6 @@ post_patch() {
 		-e "s|.1.gz|.1|g"
 	chmod +x bin/unpack-sources

-	case "$XBPS_TARGET_MACHINE" in
-		i686*)	# Don't run broken tests
-			vsed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
-			vsed -i "/CPPUNIT_TEST(testTdf111798);/d" sd/qa/unit/export-tests-ooxml2.cxx
-			;;
-	esac
-
 	if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
 		vsed -i "s/bootstrap: check-if-root compilerplugins/bootstrap: compilerplugins/" Makefile.in
 	fi
--- a/srcpkgs/libxcrypt/template
+++ b/srcpkgs/libxcrypt/template
@ -1,7 +1,7 @@
 # Template file for 'libxcrypt'
 pkgname=libxcrypt
-version=4.4.36
-revision=3
+version=4.4.38
+revision=1
 archs="~*-musl"
 build_style=gnu-configure
 configure_args="--enable-hashes=all --disable-failure-tokens --enable-obsolete-api=no"
@ -9,11 +9,11 @@ make_cmd="make -C build"
 hostmakedepends="perl-bootstrap"
 checkdepends="python3-passlib"
 short_desc="Modern library for one-way hashing of passwords"
-maintainer="oreo639 <oreo639@gmail.com>"
+maintainer="oreo639 <oreo6391@gmail.com>"
 license="LGPL-2.1-or-later, BSD-3-Clause, BSD-2-Clause, 0BSD, Public Domain"
 homepage="https://github.com/besser82/libxcrypt"
 distfiles="https://github.com/besser82/libxcrypt/releases/download/v${version}/libxcrypt-${version}.tar.xz"
-checksum=e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943
+checksum=80304b9c306ea799327f01d9a7549bdb28317789182631f1b54f4511b4206dd6

 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	broken="musl already provides libcrypt"
--- a/srcpkgs/linux6.14/template
+++ b/srcpkgs/linux6.14/template
@ -1,6 +1,6 @@
 # Template file for 'linux6.14'
 pkgname=linux6.14
-version=6.14.0
+version=6.14.1
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@ -17,7 +17,8 @@ rc*) distfiles="https://git.kernel.org/torvalds/t/linux-${version%.*}-${version#
 	fi
 esac

-checksum=a294b683e7b161bb0517bb32ec7ed1d2ea7603dfbabad135170ed12d00c47670
+checksum="a294b683e7b161bb0517bb32ec7ed1d2ea7603dfbabad135170ed12d00c47670
+ 7b546d56dae0a112c5c6ec853c447d79ecb97c8155f8e42474b2a49da1dda905"

 python_version=3

@ -208,7 +209,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware

 	for i in acpi asm-generic clocksource config crypto drm generated linux vdso \
-		math-emu media net pcmcia scsi sound trace uapi video xen dt-bindings; do
+		math-emu media net pcmcia scsi sound trace uapi video xen dt-bindings hyperv; do
 		if [ -d include/$i ]; then
 			cp -a include/$i ${hdrdest}/include
 		fi
--- a/srcpkgs/llvm17/patches/0001-Clang-Fix-build-with-GCC-14-on-ARM.patch
+++ b/srcpkgs/llvm17/patches/0001-Clang-Fix-build-with-GCC-14-on-ARM.patch
@ -0,0 +1,67 @@
+Source: https://src.fedoraproject.org/rpms/clang17/blob/f42/f/0001-Clang-Fix-build-with-GCC-14-on-ARM.patch
+
+From bd2e848f15c0f25231126eb10cb0ab350717dfc0 Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov@redhat.com>
+Date: Fri, 19 Jan 2024 12:09:13 +0100
+Subject: [PATCH] [Clang] Fix build with GCC 14 on ARM
+
+GCC 14 defines `__arm_streaming` as a macro expanding to
+`[[arm::streaming]]`. Due to the nested macro use, this gets
+expanded prior to concatenation.
+
+It doesn't look like C++ has a really clean way to prevent
+macro expansion. The best I have found is to use `EMPTY ## X` where
+`EMPTY` is an empty macro argument, so this is the hack I'm
+implementing here.
+
+Fixes https://github.com/llvm/llvm-project/issues/78691.
+---
+ clang/include/clang/Basic/TokenKinds.def  | 3 ++-
+ clang/include/clang/Basic/TokenKinds.h    | 2 +-
+ clang/utils/TableGen/ClangAttrEmitter.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/clang/include/clang/Basic/TokenKinds.def b/clang/include/clang/Basic/TokenKinds.def
+index ef0dad0f2dcd..3add13c079f3 100644
+--- a/clang/include/clang/Basic/TokenKinds.def
+++ b/clang/include/clang/Basic/TokenKinds.def
+@@ -752,8 +752,9 @@ KEYWORD(__builtin_available              , KEYALL)
+ KEYWORD(__builtin_sycl_unique_stable_name, KEYSYCL)
+ 
+ // Keywords defined by Attr.td.
+// The "EMPTY ## X" is used to prevent early macro-expansion of the keyword.
+ #ifndef KEYWORD_ATTRIBUTE
+-#define KEYWORD_ATTRIBUTE(X) KEYWORD(X, KEYALL)
+#define KEYWORD_ATTRIBUTE(X, EMPTY) KEYWORD(EMPTY ## X, KEYALL)
+ #endif
+ #include "clang/Basic/AttrTokenKinds.inc"
+ 
+diff --git a/clang/include/clang/Basic/TokenKinds.h b/clang/include/clang/Basic/TokenKinds.h
+index e4857405bc7f..ff117bd5afc5 100644
+--- a/clang/include/clang/Basic/TokenKinds.h
+++ b/clang/include/clang/Basic/TokenKinds.h
+@@ -109,7 +109,7 @@ bool isPragmaAnnotation(TokenKind K);
+ 
+ inline constexpr bool isRegularKeywordAttribute(TokenKind K) {
+   return (false
+-#define KEYWORD_ATTRIBUTE(X) || (K == tok::kw_##X)
+#define KEYWORD_ATTRIBUTE(X, ...) || (K == tok::kw_##X)
+ #include "clang/Basic/AttrTokenKinds.inc"
+   );
+ }
+diff --git a/clang/utils/TableGen/ClangAttrEmitter.cpp b/clang/utils/TableGen/ClangAttrEmitter.cpp
+index b5813c6abc2b..79db17501b64 100644
+--- a/clang/utils/TableGen/ClangAttrEmitter.cpp
+++ b/clang/utils/TableGen/ClangAttrEmitter.cpp
+@@ -3430,7 +3430,7 @@ void EmitClangAttrTokenKinds(RecordKeeper &Records, raw_ostream &OS) {
+                      "RegularKeyword attributes with arguments are not "
+                      "yet supported");
+         OS << "KEYWORD_ATTRIBUTE("
+-           << S.getSpellingRecord().getValueAsString("Name") << ")\n";
+           << S.getSpellingRecord().getValueAsString("Name") << ", )\n";
+       }
+   OS << "#undef KEYWORD_ATTRIBUTE\n";
+ }
+-- 
+2.43.0
+
--- a/srcpkgs/make-ca/template
+++ b/srcpkgs/make-ca/template
@ -1,7 +1,7 @@
 # Template file for 'make-ca'
 pkgname=make-ca
-version=1.7
-revision=2
+version=1.16
+revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=/usr/bin"
 hostmakedepends="help2man"
@ -9,6 +9,6 @@ depends="p11-kit"
 short_desc="PKI setup script for LFS (and others)"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/djlucas/make-ca/"
-distfiles="https://github.com/djlucas/make-ca/releases/download/v${version}/make-ca-${version}.tar.xz"
-checksum=6db8b96c961790507c5e36e0ed75a079ae95300f520cd88ac061cf44a4733c2f
+homepage="https://github.com/lfs-book/make-ca/"
+distfiles="https://github.com/lfs-book/make-ca/archive/refs/tags/v${version}.tar.gz"
+checksum=44f100e2e10f920df5323e0da6393160cbaf185454a87548eca61336787b2088
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.22.3
+version=2.22.4
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=aa8aa5bc43048ccff2f3a07ecd5048cddaf8b35cd82928bb3319b0df777007f0
+checksum=4c68c7beeb77aed36f5637f9bc0f85dc8b79d4a820bb4593ae63ff92f9b31454

 post_install() {
 	vlicense LICENSE
--- a/srcpkgs/nautilus-python/template
+++ b/srcpkgs/nautilus-python/template
@ -1,7 +1,7 @@
 # Template file for 'nautilus-python'
 pkgname=nautilus-python
-version=4.0
-revision=3
+version=4.0.1
+revision=1
 build_style=meson
 configure_args="$(vopt_feature gtk_doc docs)"
 hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
@ -11,8 +11,8 @@ short_desc="Python bindings for the Nautilus extension framework"
 maintainer="Nafis <mnabid.25@outlook.com>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/nautilus-python/${version}/nautilus-python-${version}.tar.xz"
-checksum=17243d62eb7d7d839a9461ab8d0701688805c7161a6705e61413a58ec268281a
+distfiles="${GNOME_SITE}/nautilus-python/${version%.${version#*.*.}}/nautilus-python-${version}.tar.xz"
+checksum=fc49c104fb32a0ad195a66b0136784cd19d10d8b3e8d59d5ee7f73e8f94e928f

 build_options="gtk_doc"
 build_options_default="gtk_doc"
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@ -1,6 +1,6 @@
 # Template file for 'newsboat'
 pkgname=newsboat
-version=2.37
+version=2.39
 revision=1
 build_style=configure
 build_helper="rust"
@ -17,7 +17,7 @@ license="MIT"
 homepage="https://newsboat.org/"
 changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
 distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz"
-checksum=4f54dea385c25b95e8ce0df1107f0336db41b18c645368e6164ce1070efba77c
+checksum=62551a7d574d7fb3af7a87f9dbd0795e4d9420ca7136abc2265b4b06663be503
 python_version=3

 # tests fail when run by superuser
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@ -3,7 +3,7 @@
 _nsprver=4.36

 pkgname=nss
-version=3.109
+version=3.110
 revision=1
 hostmakedepends="perl which"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0, MIT, BSD-3-Clause"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=bea46c256118cd8910202f05339627d75291f13b80054527df58419b9d29c18b
+checksum=9cd610c40422a07771b9b45166be2d052ea2f00b605a7928129e1f2071b3ae27

 export NS_USE_GCC=1
 export LIBRUNPATH=
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@ -28,7 +28,7 @@ configure_args="
 make_build_args="images static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca"
+ openssl zlib-devel which p11-kit"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel"
@ -113,11 +113,10 @@ do_configure() {
 do_install() {
 	vmkdir $_jdk_home
 	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+
 	vmkdir $_jdk_home/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
-	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
-	chmod -R ugo+rw ./ca
-	rm -Rf ./ca
+	trust extract --overwrite --filter=ca-anchors --format=java-cacerts --purpose server-auth "${DESTDIR}/${_jdk_home}/lib/security/cacerts"
+
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@ -30,7 +30,7 @@ configure_args="--disable-warnings-as-errors
 make_build_args="images"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca openjdk11"
+ openssl zlib-devel which openjdk11"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel"
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@ -30,7 +30,7 @@ configure_args="--disable-warnings-as-errors
 make_build_args="images"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca openjdk12-bootstrap"
+ openssl zlib-devel which openjdk12-bootstrap"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel"
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@ -30,7 +30,7 @@ configure_args="--disable-warnings-as-errors
 make_build_args="images"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca openjdk13-bootstrap"
+ openssl zlib-devel which openjdk13-bootstrap"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel openjdk13-bootstrap"
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@ -33,7 +33,7 @@ configure_args="--disable-warnings-as-errors
 make_build_args="images"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca openjdk14-bootstrap"
+ openssl zlib-devel which openjdk14-bootstrap"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk14-bootstrap"
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@ -33,7 +33,7 @@ make_build_args="images"
 make_install_args="INSTALL_PREFIX=\"${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib\""
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca openjdk15-bootstrap"
+ openssl zlib-devel which openjdk15-bootstrap"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk15-bootstrap"
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@ -32,7 +32,7 @@ make_build_args="images static-libs-image $(vopt_if docs docs)"
 make_install_args="INSTALL_PREFIX=\"${DESTDIR}/usr/lib\""
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca"
+ openssl zlib-devel which p11-kit"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel"
@ -132,10 +132,7 @@ post_install() {
 	mv ${DESTDIR}/usr/lib/jvm/openjdk-${_base_version} ${DESTDIR}/$_jdk_home
 	vcopy build/*-release/images/static-libs/lib $_jdk_home
 	vmkdir $_jdk_home/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/$_jdk_home/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/$_jdk_home/lib/security/
-	chmod -R ugo+rw ./ca
-	rm -rf ./ca
+	trust extract --overwrite --filter=ca-anchors --format=java-cacerts --purpose server-auth "${DESTDIR}/${_jdk_home}/lib/security/cacerts"
 }

 subpackages="openjdk17-static-libs openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods"
--- a/srcpkgs/openjdk18-bootstrap/template
+++ b/srcpkgs/openjdk18-bootstrap/template
@ -34,7 +34,7 @@ configure_args="--disable-warnings-as-errors
 make_build_args="images"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca openjdk17"
+ openssl zlib-devel which openjdk17"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel"
--- a/srcpkgs/openjdk19-bootstrap/template
+++ b/srcpkgs/openjdk19-bootstrap/template
@ -34,7 +34,7 @@ configure_args="--disable-warnings-as-errors
 make_build_args="images"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca openjdk$(( _java_ver - 1 ))-bootstrap"
+ openssl zlib-devel which openjdk$(( _java_ver - 1 ))-bootstrap"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel"
--- a/srcpkgs/openjdk20-bootstrap/template
+++ b/srcpkgs/openjdk20-bootstrap/template
@ -34,7 +34,7 @@ configure_args="--disable-warnings-as-errors
 make_build_args="images"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca openjdk$(( _java_ver - 1 ))-bootstrap"
+ openssl zlib-devel which openjdk$(( _java_ver - 1 ))-bootstrap"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel"
--- a/srcpkgs/openjdk21/template
+++ b/srcpkgs/openjdk21/template
@ -32,7 +32,7 @@ make_build_args="images static-libs-image $(vopt_if docs docs)"
 make_install_args="INSTALL_PREFIX=\"${DESTDIR}/usr/lib\""
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- openssl zlib-devel which make-ca"
+ openssl zlib-devel which p11-kit"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
 fontconfig-devel zlib-devel lcms2-devel"
@ -123,10 +123,7 @@ post_install() {
 	mv ${DESTDIR}/usr/lib/jvm/openjdk-${_base_version} ${DESTDIR}/$_jdk_home
 	vcopy build/*-release/images/static-libs/lib $_jdk_home
 	vmkdir $_jdk_home/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/$_jdk_home/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/$_jdk_home/lib/security/
-	chmod -R ugo+rw ./ca
-	rm -rf ./ca
+	trust extract --overwrite --filter=ca-anchors --format=java-cacerts --purpose server-auth "${DESTDIR}/${_jdk_home}/lib/security/cacerts"
 }

 subpackages="openjdk21-static-libs openjdk21-src openjdk21-jre openjdk21-doc openjdk21-jmods"
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@ -31,7 +31,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs) COMPILER_WARNINGS_FATAL=false GIT=true"
 make_install_args="GIT=true"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- zlib-devel make-ca which"
+ zlib-devel p11-kit which"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 giflib-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel
 zlib-devel"
@ -154,10 +154,7 @@ post_install() {
 	done

 	vmkdir ${_jdk_home}/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_jdk_home}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_jdk_home}/lib/security/
-	chmod -R ugo+rw ./ca
-	rm -Rf ./ca
+	trust extract --overwrite --filter=ca-anchors --format=java-cacerts --purpose server-auth "${DESTDIR}/${_jdk_home}/lib/security/cacerts"

 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@ -1,6 +1,6 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.17.1
+version=2.17.2
 revision=1
 build_style=configure
 build_helper=qemu
@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 changelog="https://pari.math.u-bordeaux.fr/cgi-bin/sgitweb.cgi?p=pari.git;a=blob_plain;f=CHANGES;hb=refs/heads/pari-${version%.*}"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-${version}.tar.gz"
-checksum=67ba6f3071233725258541e4f174b5efbc64c65ae5115bade9edfc45f1fde5dc
+checksum=7d30578f5cf97b137a281f4548d131aafc0cde86bcfd10cc1e1bd72a81e65061

 build_options="x11 pthreads"
 build_options_default="x11 pthreads"
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=2.3.2
+version=2.3.3
 revision=1
 build_style=meson
 configure_args="-Dlibudev=true -Dlibsystemd=false -Dpolkit=false"
@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=83cbc1189a3e12ec8675ae49f522d980c3a38e6e0dc6f3a7b25b31bbe167b0dd
+checksum=b56a3bf59d2fdafdf5e901834330ebb3245d299ccf741ef8bbc2191130903fb8

 post_install() {
 	vsv pcscd
--- a/srcpkgs/perl-CPAN-Meta-Requirements-Range/template
+++ b/srcpkgs/perl-CPAN-Meta-Requirements-Range/template
@ -1,21 +0,0 @@
-# Template file for 'perl-CPAN-Meta-Requirements-Range'
-# This is a hack as core Perl ships with a part of this library.
-pkgname=perl-CPAN-Meta-Requirements-Range
-version=2.143
-revision=1
-build_style=perl-module
-hostmakedepends="perl"
-makedepends="${hostmakedepends}"
-depends="${makedepends}"
-short_desc="CPAN::Meta::Requirements::Range - a set of version requirements for a CPAN dist"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Artistic-1.0-Perl, GPL-1.0-or-later"
-homepage="https://metacpan.org/release/CPAN-Meta-Requirements"
-distfiles="${CPAN_SITE}/CPAN/CPAN-Meta-Requirements-${version}.tar.gz"
-checksum=6ec7e4697bb5a8cea0ee3c8bd5d4b20ce086168a8084778d6e7a4c37356fdf8b
-
-post_install() {
-	# remove parts packaged in core perl
-	rm -f ${DESTDIR}/usr/share/man/man3/CPAN::Meta::Requirements.3p
-	rm -f ${DESTDIR}/usr/share/perl5/vendor_perl/CPAN/Meta/Requirements.pm
-}
--- a/srcpkgs/perl-CPAN-Requirements-Dynamic/template
+++ b/srcpkgs/perl-CPAN-Requirements-Dynamic/template
@ -1,10 +1,9 @@
 # Template file for 'perl-CPAN-Requirements-Dynamic'
 pkgname=perl-CPAN-Requirements-Dynamic
-version=0.001
+version=0.002
 revision=1
 build_style=perl-module
-hostmakedepends="perl perl-CPAN-Meta-Requirements-Range
- perl-ExtUtils-Config perl-ExtUtils-HasCompiler"
+hostmakedepends="perl perl-ExtUtils-Config perl-ExtUtils-HasCompiler"
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
 checkdepends="${depends}"
@ -13,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/CPAN-Requirements-Dynamic"
 distfiles="${CPAN_SITE}/CPAN/${pkgname/perl-/}-${version}.tar.gz"
-checksum=4b590e712b9aca680c3631855ee16a50b84fa0227c362e13b237a75a01489ef5
+checksum=9e290179fd1ab8574f7a2297baf015ea4fef3703a99d48798f61ec9347b4905b
--- a/srcpkgs/primecount/template
+++ b/srcpkgs/primecount/template
@ -1,6 +1,6 @@
 # Template file for 'primecount'
 pkgname=primecount
-version=7.14
+version=7.16
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTS=ON -DBUILD_LIBPRIMESIEVE=OFF
@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/kimwalisch/primecount/"
 changelog="https://raw.githubusercontent.com/kimwalisch/primecount/master/ChangeLog"
 distfiles="https://github.com/kimwalisch/primecount/archive/refs/tags/v${version}.tar.gz"
-checksum=d867ac18cc52c0f7014682169988a76f39e4cd56f8ce78fb56e064499b1d66bb
+checksum=437cde8198fbfed3a16510786d99edb22da2766f0f0376450690d55a74ea5cf3

 post_install() {
 	vlicense COPYING
--- a/srcpkgs/primesieve/template
+++ b/srcpkgs/primesieve/template
@ -1,6 +1,6 @@
 # Template file for 'primesieve'
 pkgname=primesieve
-version=12.6
+version=12.7
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF"
@ -10,7 +10,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/kimwalisch/primesieve"
 changelog="https://raw.githubusercontent.com/kimwalisch/primesieve/master/ChangeLog"
 distfiles="https://github.com/kimwalisch/primesieve/archive/refs/tags/v${version}.tar.gz"
-checksum=677c1c5046e666a25e6248f3242c0b27a09953f2775fc4507e4a017a47059345
+checksum=c29d5173266f39804fa607783163c823eb1112132d4c68884e20a54b1a30f9f5

 post_install() {
 	vlicense COPYING
--- a/srcpkgs/python3-Babel/template
+++ b/srcpkgs/python3-Babel/template
@ -1,18 +1,18 @@
 # Template file for 'python3-Babel'
 pkgname=python3-Babel
-version=2.16.0
-revision=2
+version=2.17.0
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools"
 depends="python3"
-checkdepends="$depends python3-pytest python3-freezegun python3-pytz"
-short_desc="Tools for internationalizing Python applications (Python3)"
+checkdepends="$depends python3-pytest-xdist python3-freezegun python3-pytz"
+short_desc="Tools for internationalizing Python applications"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-3-Clause"
 homepage="https://babel.pocoo.org"
 changelog="https://raw.githubusercontent.com/python-babel/babel/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/B/Babel/babel-${version}.tar.gz"
-checksum=d1f3554ca26605fe173f3de0c65f750f5a42f924499bf134de6423582298e316
+checksum=0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d

 post_install() {
 	vlicense LICENSE
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@ -1,28 +1,33 @@
 # Template file for 'python3-Sphinx'
 pkgname=python3-Sphinx
-version=8.1.3
+version=8.3.0
 revision=1
 build_style=python3-pep517
-hostmakedepends="python3-flit_core python3-pyproject-hooks"
-depends="python3-Jinja2 python3-docutils python3-Pygments
- python3-snowballstemmer python3-Babel python3-alabaster python3-imagesize
- python3-requests python3-packaging python3-sphinxcontrib-applehelp
- python3-sphinxcontrib-devhelp python3-sphinxcontrib-htmlhelp
- python3-sphinxcontrib-jsmath python3-sphinxcontrib-qthelp
- python3-sphinxcontrib-serializinghtml"
+_depends="python3-sphinxcontrib-htmlhelp python3-imagesize python3-alabaster
+ python3-requests python3-sphinxcontrib-jsmath python3-roman-numerals-py
+ python3-sphinxcontrib-applehelp python3-Babel
+ python3-sphinxcontrib-serializinghtml python3-docutils python3-Jinja2
+ python3-sphinxcontrib-devhelp python3-sphinxcontrib-qthelp
+ python3-Pygments python3-snowballstemmer"
+hostmakedepends="python3-flit_core python3-pyproject-hooks $_depends"
+depends="$_depends python3-packaging"
 checkdepends="$depends python3-html5lib python3-mypy ImageMagick gettext
- python3-pytest python3-setuptools python3-filelock python3-defusedxml
+ python3-pytest-xdist python3-setuptools python3-filelock python3-defusedxml
 graphviz"
 short_desc="Python 3 documentation generator"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://sphinx-doc.org"
 changelog="https://github.com/sphinx-doc/sphinx/raw/master/CHANGES"
-# distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
 distfiles="${PYPI_SITE}/s/sphinx/sphinx-${version}.tar.gz"
-checksum=43c1911eecb0d3e161ad78611bc905d1ad0e523e4ddc202a58a821773dc4c927
+checksum=3bad4314a7fa72ce92344eaaa14c42ddf3177ee6a79c227e4ff8ae07d416f584
 replaces="python-Sphinx>=0"

+post_patch() {
+	# rename so it works with any python
+	mv -i tests/roots/test-ext-apidoc-duplicates/fish_licence/{halibut*.so,halibut.so}
+}
+
 post_install() {
 	vlicense LICENSE.rst
 }
--- a/srcpkgs/python3-alabaster/template
+++ b/srcpkgs/python3-alabaster/template
@ -1,17 +1,18 @@
 # Template file for 'python3-alabaster'
 pkgname=python3-alabaster
-version=0.7.12
-revision=8
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=1.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 depends="python3"
 short_desc="Configurable sidebar-enabled Sphinx theme (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://alabaster.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/sphinx-doc/alabaster/refs/heads/master/docs/changelog.rst"
 distfiles="${PYPI_SITE}/a/alabaster/alabaster-${version}.tar.gz"
-checksum=a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02
+checksum=c00dca57bca26fa62a6d7d0a9fcce65f3e026e9bfe33e9c538fd3fbb2144fd9e

 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.rst
 }
--- a/srcpkgs/python3-argcomplete/template
+++ b/srcpkgs/python3-argcomplete/template
@ -1,9 +1,9 @@
 # Template file for 'python3-argcomplete'
 pkgname=python3-argcomplete
-version=3.5.1
-revision=2
+version=3.6.2
+revision=1
 build_style=python3-pep517
-hostmakedepends="python3-setuptools_scm python3-wheel"
+hostmakedepends="hatchling hatch-vcs"
 depends="python3"
 checkdepends="python3-pexpect python3-pip zsh"
 short_desc="Bash tab completion for argparse"
@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/kislyuk/argcomplete"
 changelog="https://raw.githubusercontent.com/kislyuk/argcomplete/develop/Changes.rst"
 distfiles="${PYPI_SITE}/a/argcomplete/argcomplete-${version}.tar.gz"
-checksum=eb1ee355aa2557bd3d0145de7b06b2a45b0ce461e1e7813f5d066039ab4177b4
+checksum=d0519b1bc867f5f4f4713c41ad0aba73a4a5f007449716b16f385f2166dc6adf

 do_check() {
 	# pytest is not supported
--- a/srcpkgs/python3-docutils/patches/fix-test.patch
+++ b/srcpkgs/python3-docutils/patches/fix-test.patch
@ -0,0 +1,24 @@
+--- a/test/test_parsers/test_rst/test_directives/test_code.py
+++ b/test/test_parsers/test_rst/test_directives/test_code.py
+@@ -167,7 +167,8 @@
+              7 \n\
+         <inline classes="keyword">
+             def
+-         \n\
+        <inline classes="whitespace">
+             \n\
+         <inline classes="name function">
+             my_function
+         <inline classes="punctuation">
+--- a/test/test_parsers/test_rst/test_directives/test_code_long.py
+++ b/test/test_parsers/test_rst/test_directives/test_code_long.py
+@@ -62,7 +62,8 @@
+              7 \n\
+         <inline classes="keyword">
+             def
+-         \n\
+        <inline classes="whitespace">
+             \n\
+         <inline classes="name function">
+             my_function
+         <inline classes="punctuation">
--- a/srcpkgs/python3-docutils/template
+++ b/srcpkgs/python3-docutils/template
@ -1,9 +1,9 @@
 # Template file for 'python3-docutils'
 pkgname=python3-docutils
-version=0.20.1
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=0.21.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 # docutils/writers/odf_odt/pygmentsformatter.py
 depends="python3-Pygments"
 checkdepends="${depends} python3-pytest"
@ -12,21 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
 homepage="https://docutils.sourceforge.io"
 distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
+checksum=3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f

 post_install() {
 	vlicense COPYING.txt COPYING
--- a/srcpkgs/python3-pwntools/template
+++ b/srcpkgs/python3-pwntools/template
@ -1,6 +1,6 @@
 # Template file for 'python3-pwntools'
 pkgname=python3-pwntools
-version=4.14.0
+version=4.14.1
 revision=1
 build_style=python3-module
 make_install_args="--only-use-pwn-command"
@ -10,13 +10,13 @@ depends="capstone-python3 python3 python3-Mako python3-Pygments
 python3-dateutil python3-intervaltree python3-packaging python3-paramiko
 python3-psutil python3-pyelftools python3-pyserial python3-pysocks
 python3-requests python3-ropgadget python3-sortedcontainers
- python3-colored-traceback"
+ python3-colored-traceback python3-zstandard"
 short_desc="CTF framework and exploit development library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-2-Clause"
 homepage="https://github.com/Gallopsled/pwntools"
 distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz"
-checksum=83b3247de083dffafac3bf40f4d1455732f16e25ce3105fd09b55ac0f0d12e83
+checksum=60f04976d1722120d18b9d50553408a024664b5cf888f36f258afca4bf035cac

 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@ -1,7 +1,7 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=13.9.4
-revision=2
+version=14.0.0
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-poetry-core"
 depends="python3-Pygments python3-markdown-it"
@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=439594978a49a09530cff7ebc4b5c7103ef57baf48d5ea3184f21d9a2befa098
+checksum=82f1bc23a6a21ebca4ae0c45af9bdbc492ed20231dcb63f297d6d1021a9d5725
 make_check=extended # some checks only work on windows

 post_install() {
--- a/srcpkgs/python3-roman-numerals-py/template
+++ b/srcpkgs/python3-roman-numerals-py/template
@ -0,0 +1,19 @@
+# Template file for 'python3-roman-numerals-py'
+pkgname=python3-roman-numerals-py
+version=3.1.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Manipulate well-formed Roman numerals"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="0BSD OR CC0-1.0"
+homepage="https://pypi.org/project/roman-numerals-py/"
+changelog="https://github.com/AA-Turner/roman-numerals/blob/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/r/roman-numerals-py/roman_numerals_py-${version}.tar.gz"
+checksum=be4bf804f083a4ce001b5eb7e3c0862479d10f94c936f6c4e5f250aa5ff5bd2d
+
+post_install() {
+	vlicense LICENCE.rst
+}
--- a/srcpkgs/python3-sphinxcontrib-applehelp/template
+++ b/srcpkgs/python3-sphinxcontrib-applehelp/template
@ -1,7 +1,7 @@
 # Template file for 'python3-sphinxcontrib-applehelp'
 pkgname=python3-sphinxcontrib-applehelp
-version=1.0.4
-revision=3
+version=2.0.0
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-flit_core python3-pyproject-hooks python3-setuptools
 python3-wheel"
@ -10,10 +10,10 @@ short_desc="Sphinx extension which outputs Apple help book"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="http://sphinx-doc.org"
-distfiles="${PYPI_SITE}/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-${version}.tar.gz"
-checksum=828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e
+distfiles="${PYPI_SITE}/s/sphinxcontrib-applehelp/sphinxcontrib_applehelp-${version}.tar.gz"
+checksum=2f29ef331735ce958efa4734873f084941970894c6090408b079c61b2e1c06d1
 make_check=no # cyclic with Sphinx

 post_install() {
-	vlicense LICENSE
+	vlicense LICENCE.rst
 }
--- a/srcpkgs/python3-sphinxcontrib-devhelp/template
+++ b/srcpkgs/python3-sphinxcontrib-devhelp/template
@ -1,18 +1,18 @@
 # Template file for 'python3-sphinxcontrib-devhelp'
 pkgname=python3-sphinxcontrib-devhelp
-version=1.0.2
-revision=6
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=2.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 depends="python3"
-checkdepends="python3-Sphinx"
 short_desc="Sphinx extension which outputs Devhelp document"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="http://sphinx-doc.org"
-distfiles="${PYPI_SITE}/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-${version}.tar.gz"
-checksum=ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4
+distfiles="${PYPI_SITE}/s/sphinxcontrib-devhelp/sphinxcontrib_devhelp-${version}.tar.gz"
+checksum=411f5d96d445d1d73bb5d52133377b4248ec79db5c793ce7dbe59e074b4dd1ad
+make_check=no # cyclic with Sphinx

 post_install() {
-	vlicense LICENSE
+	vlicense LICENCE.rst
 }
--- a/srcpkgs/python3-sphinxcontrib-htmlhelp/template
+++ b/srcpkgs/python3-sphinxcontrib-htmlhelp/template
@ -1,7 +1,7 @@
 # Template file for 'python3-sphinxcontrib-htmlhelp'
 pkgname=python3-sphinxcontrib-htmlhelp
-version=2.0.1
-revision=3
+version=2.1.0
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-flit_core python3-pyproject-hooks python3-setuptools
 python3-wheel"
@ -10,10 +10,10 @@ short_desc="Sphinx extension which outputs HTML document"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="http://sphinx-doc.org"
-distfiles="${PYPI_SITE}/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-${version}.tar.gz"
-checksum=0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff
+distfiles="${PYPI_SITE}/s/sphinxcontrib-htmlhelp/sphinxcontrib_htmlhelp-${version}.tar.gz"
+checksum=c9e2916ace8aad64cc13a0d233ee22317f2b9025b9cf3295249fa985cc7082e9
 make_check=no # cyclic with Sphinx

 post_install() {
-	vlicense LICENSE
+	vlicense LICENCE.rst
 }
--- a/srcpkgs/python3-sphinxcontrib-qthelp/template
+++ b/srcpkgs/python3-sphinxcontrib-qthelp/template
@ -1,18 +1,18 @@
 # Template file for 'python3-sphinxcontrib-qthelp'
 pkgname=python3-sphinxcontrib-qthelp
-version=1.0.3
-revision=6
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=2.0.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 depends="python3"
-checkdepends="python3-Sphinx"
 short_desc="Sphinx extension which outputs QtHelp document"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="http://sphinx-doc.org"
-distfiles="${PYPI_SITE}/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-${version}.tar.gz"
-checksum=4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72
+distfiles="${PYPI_SITE}/s/sphinxcontrib-qthelp/sphinxcontrib_qthelp-${version}.tar.gz"
+checksum=4fe7d0ac8fc171045be623aba3e2a8f613f8682731f9153bb2e40ece16b9bbab
+make_check=no # cyclic with Sphinx

 post_install() {
-	vlicense LICENSE
+	vlicense LICENCE.rst
 }
--- a/srcpkgs/python3-sphinxcontrib-serializinghtml/template
+++ b/srcpkgs/python3-sphinxcontrib-serializinghtml/template
@ -1,18 +1,18 @@
 # Template file for 'python3-sphinxcontrib-serializinghtml'
 pkgname=python3-sphinxcontrib-serializinghtml
-version=1.1.9
-revision=2
+version=2.0.0
+revision=1
 build_style=python3-pep517
-hostmakedepends="python3-setuptools_scm python3-wheel python3-flit_core"
+hostmakedepends="python3-flit_core"
 depends="python3"
 short_desc="Sphinx extension which outputs serialized HTML document"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause"
 homepage="http://sphinx-doc.org"
 distfiles="${PYPI_SITE}/s/sphinxcontrib_serializinghtml/sphinxcontrib_serializinghtml-${version}.tar.gz"
-checksum=0c64ff898339e1fac29abd2bf5f11078f3ec413cfe9c046d3120d7ca65530b54
+checksum=e9d912827f872c029017a53f0ef2180b327c3f7fd23c87229f7a8e8b70031d4d
 make_check=no # cyclic Sphinx

 post_install() {
-	vlicense LICENSE
+	vlicense LICENCE.rst
 }
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=1.10.2
+version=1.10.3
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-wheel"
@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${PYPI_SITE}/y/ytmusicapi/ytmusicapi-${version}.tar.gz"
-checksum=8fb4e63dcedd753aa0d755d7b1891df75e720e6ee9753d0e57a4dc015e411bf1
+checksum=7235361ac9d5958d49a29f586eec55b1c83e90f7b063361e8a206e1cf4f76216

 post_install() {
 	vlicense LICENSE
--- a/srcpkgs/qemu-user/template
+++ b/srcpkgs/qemu-user/template
@ -1,7 +1,7 @@
 # Template file for 'qemu-user'
 # This package should be updated together with qemu
 pkgname=qemu-user
-version=9.2.2
+version=9.2.3
 revision=1
 build_style=meta
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@ -15,7 +15,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=29cdfb019c14f5669d16bb952d2a324daf715db82aa2d70569f125a8650669a0
+checksum=8035d5857d8605154d8cfc4c5d52f79cb8994a0f1a79114a29c075d7d04aaf19
 subpackages="qemu-user-static"

 if [ "$CROSS_BUILD" ]; then
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@ -1,8 +1,8 @@
 # Template file for 'qemu'
 # This package should be updated together with qemu-user
 pkgname=qemu
-version=9.2.2
-revision=2
+version=9.2.3
+revision=1
 build_style=meta
 configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
 --localstatedir=/var --enable-pie --disable-user
@ -26,7 +26,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=29cdfb019c14f5669d16bb952d2a324daf715db82aa2d70569f125a8650669a0
+checksum=8035d5857d8605154d8cfc4c5d52f79cb8994a0f1a79114a29c075d7d04aaf19
 ignore_elf_dirs="/usr/share/qemu"

 build_options="gtk3 iscsi jack numa opengl pulseaudio sdl2 smartcard spice virgl"
--- a/srcpkgs/qiv/template
+++ b/srcpkgs/qiv/template
@ -1,22 +1,22 @@
 # Template file for 'qiv'
 pkgname=qiv
-version=2.3.3
-revision=2
+version=3.0.1
+revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
-makedepends="file-devel gtk+-devel libexif-devel lcms2-devel imlib2-devel"
+makedepends="file-devel gtk+3-devel libexif-devel lcms2-devel"
 depends="file"
 short_desc="Quick Image Viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://spiegl.de/qiv/"
-distfiles="http://spiegl.de/qiv/download/$pkgname-$version.tgz"
-checksum=ef085ffde2d48b05b3665939e5ae1e359d3a381008fb827684f7d6fd4c533704
+distfiles="http://spiegl.de/qiv/download/${pkgname}-${version}.tgz"
+checksum=2b7455e63344b98e4db4ca50ff6982f5f81c309e563014d7401cccf2b3acc6bf

 do_configure() {
-	sed -i "s|\./qiv|echo &|" Makefile
-	sed -i "s|)/man/|)/share/man/|" Makefile
-	sed -i "s|install -s|install|" Makefile
+	vsed -i -e "s|\./qiv|echo &|" Makefile
+	vsed -i -e "s|)/man/|)/share/man/|" Makefile
+	vsed -i -e "s|install -s|install|" Makefile
 }

 pre_build() {
@ -24,5 +24,5 @@ pre_build() {
 }

 do_install() {
-	make install PREFIX=$DESTDIR/usr
+	make install PREFIX=${DESTDIR}/usr
 }
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@ -1,11 +1,11 @@
 # Template file for 'radicale'
 pkgname=radicale
-version=3.4.1
+version=3.5.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools"
 depends="python3-vobject python3-dateutil python3-passlib python3-bcrypt
- python3-defusedxml apache-htpasswd python3-pika"
+ python3-defusedxml apache-htpasswd python3-pika python3-requests"
 checkdepends="${depends} python3-pytest python3-pytest-flake8 python3-isort
 python3-pytest-cov python3-waitress"
 short_desc="Complete calendar and contact storing and manipulating solution"
@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://radicale.org"
 changelog="https://raw.githubusercontent.com/Kozea/Radicale/master/CHANGELOG.md"
 distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz"
-checksum=f714fe56eb01205497d1c4251a4a9fde2b0847a7889b2edaa89e8988abbaf8ac
+checksum=663f58016e95c6ab40a8ec47cb50707610f121d12b3d6c099e39ef614ab012a2
 conf_files="
 /etc/radicale/config
 /etc/radicale/rights"
--- a/srcpkgs/sagemath-giac/template
+++ b/srcpkgs/sagemath-giac/template
@ -0,0 +1,17 @@
+# Template file for 'sagemath-giac'
+pkgname=sagemath-giac
+version=0.1.1
+revision=1
+build_style=python3-pep517
+make_build_args="--skip-dependency-check"  # can remove after #54482 and #54495
+hostmakedepends="python3-meson-python python3-Cython"
+makedepends="python3-cysignals python3-gmpy2 sagemath libmpc-devel giac-devel"
+depends="sagemath"
+checkdepends="python3-pytest"
+short_desc="Support for using Giac within SageMath"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/sagemath/sagemath-giac/"
+changelog="https://github.com/sagemath/sagemath-giac/releases"
+distfiles="https://github.com/sagemath/sagemath-giac/releases/download/${version}/sagemath_giac-${version}.tar.gz"
+checksum=9bdf5a96a4ce3dd7e4551ac46ebbddcda7e163589be9a7f2173446a5b5943106
--- a/srcpkgs/sagemath/patches/38749-pari_2.17.patch
+++ b/srcpkgs/sagemath/patches/38749-pari_2.17.patch
--- a/srcpkgs/sagemath/patches/38940-fix_flaky_simplicial_set_test.patch
+++ b/srcpkgs/sagemath/patches/38940-fix_flaky_simplicial_set_test.patch
@ -1,73 +0,0 @@
-diff --git a/src/sage/categories/simplicial_sets.py b/src/sage/categories/simplicial_sets.py
-index 76030be831b..f30ed0ffeb2 100644
--- a/src/sage/categories/simplicial_sets.py
-+++ b/src/sage/categories/simplicial_sets.py
-@@ -444,29 +444,31 @@ def covering_map(self, character):
- 
-                     sage: # needs sage.graphs sage.groups
-                     sage: S1 = simplicial_sets.Sphere(1)
-                    sage: W = S1.wedge(S1)
-+                    sage: S1_ = simplicial_sets.Sphere(1)
-+                    sage: S1_.n_cells(1)[0].rename("sigma_1'")
-+                    sage: W = S1.wedge(S1_)
-                     sage: G = CyclicPermutationGroup(3)
-                     sage: a, b = W.n_cells(1)
-                     sage: C = W.covering_map({a : G.gen(0), b : G.one()}); C
-                     Simplicial set morphism:
-                       From: Simplicial set with 9 non-degenerate simplices
-                       To:   Wedge: (S^1 v S^1)
-                      Defn: [(*, ()), (*, (1,2,3)), (*, (1,3,2)), (sigma_1, ()),
-                             (sigma_1, ()), (sigma_1, (1,2,3)), (sigma_1, (1,2,3)),
-                             (sigma_1, (1,3,2)), (sigma_1, (1,3,2))]
-                            --> [*, *, *, sigma_1, sigma_1, sigma_1, sigma_1, sigma_1, sigma_1]
-+                      Defn: [(*, ()), (*, (1,2,3)), (*, (1,3,2)), (sigma_1', ()),
-+                             (sigma_1', (1,2,3)), (sigma_1', (1,3,2)), (sigma_1, ()),
-+                             (sigma_1, (1,2,3)), (sigma_1, (1,3,2))]
-+                            --> [*, *, *, sigma_1', sigma_1', sigma_1', sigma_1, sigma_1, sigma_1]
-                     sage: C.domain()
-                     Simplicial set with 9 non-degenerate simplices
-                     sage: C.domain().face_data()
-                     {(*, ()): None,
-                      (*, (1,2,3)): None,
-                      (*, (1,3,2)): None,
-+                     (sigma_1', ()): ((*, ()), (*, ())),
-+                     (sigma_1', (1,2,3)): ((*, (1,2,3)), (*, (1,2,3))),
-+                     (sigma_1', (1,3,2)): ((*, (1,3,2)), (*, (1,3,2))),
-                      (sigma_1, ()): ((*, (1,2,3)), (*, ())),
-                     (sigma_1, ()): ((*, ()), (*, ())),
-                      (sigma_1, (1,2,3)): ((*, (1,3,2)), (*, (1,2,3))),
-                     (sigma_1, (1,2,3)): ((*, (1,2,3)), (*, (1,2,3))),
-                     (sigma_1, (1,3,2)): ((*, ()), (*, (1,3,2))),
-                     (sigma_1, (1,3,2)): ((*, (1,3,2)), (*, (1,3,2)))}
-+                     (sigma_1, (1,3,2)): ((*, ()), (*, (1,3,2)))}
-                 """
-                 from sage.topology.simplicial_set import AbstractSimplex, SimplicialSet
-                 from sage.topology.simplicial_set_morphism import SimplicialSetMorphism
-@@ -530,7 +532,9 @@ def cover(self, character):
- 
-                     sage: # needs sage.graphs sage.groups
-                     sage: S1 = simplicial_sets.Sphere(1)
-                    sage: W = S1.wedge(S1)
-+                    sage: S1_ = simplicial_sets.Sphere(1)
-+                    sage: S1_.n_cells(1)[0].rename("sigma_1'")
-+                    sage: W = S1.wedge(S1_)
-                     sage: G = CyclicPermutationGroup(3)
-                     sage: (a, b) = W.n_cells(1)
-                     sage: C = W.cover({a : G.gen(0), b : G.gen(0)^2})
-@@ -538,12 +542,12 @@ def cover(self, character):
-                     {(*, ()): None,
-                      (*, (1,2,3)): None,
-                      (*, (1,3,2)): None,
-+                     (sigma_1', ()): ((*, (1,3,2)), (*, ())),
-+                     (sigma_1', (1,2,3)): ((*, ()), (*, (1,2,3))),
-+                     (sigma_1', (1,3,2)): ((*, (1,2,3)), (*, (1,3,2))),
-                      (sigma_1, ()): ((*, (1,2,3)), (*, ())),
-                     (sigma_1, ()): ((*, (1,3,2)), (*, ())),
-                      (sigma_1, (1,2,3)): ((*, (1,3,2)), (*, (1,2,3))),
-                     (sigma_1, (1,2,3)): ((*, ()), (*, (1,2,3))),
-                     (sigma_1, (1,3,2)): ((*, ()), (*, (1,3,2))),
-                     (sigma_1, (1,3,2)): ((*, (1,2,3)), (*, (1,3,2)))}
-+                     (sigma_1, (1,3,2)): ((*, ()), (*, (1,3,2)))}
-                     sage: C.homology(1)                                                 # needs sage.modules
-                     Z x Z x Z x Z
-                     sage: C.fundamental_group()
--- a/srcpkgs/sagemath/patches/38962-eclib_20241112.patch
+++ b/srcpkgs/sagemath/patches/38962-eclib_20241112.patch
@ -1,70 +0,0 @@
-diff --git a/src/sage/libs/eclib/__init__.pxd b/src/sage/libs/eclib/__init__.pxd
-index d44d4fba865..2673af0613f 100644
--- a/src/sage/libs/eclib/__init__.pxd
-+++ b/src/sage/libs/eclib/__init__.pxd
-@@ -55,7 +55,6 @@ cdef extern from "eclib/matrix.h":
-     cdef cppclass mat:
-         mat()
-         mat(mat m)
-        scalar* get_entries()
-         scalar sub(long, long)
-         long nrows()
-         long ncols()
-@@ -67,7 +66,6 @@ cdef extern from "eclib/smatrix.h":
-     cdef cppclass smat:
-         smat()
-         smat(smat m)
-        scalar* get_entries()
-         scalar sub(long, long)
-         long nrows()
-         long ncols()
-diff --git a/src/sage/libs/eclib/mat.pyx b/src/sage/libs/eclib/mat.pyx
-index bfdeb6ae5c1..989d9d1a70c 100644
--- a/src/sage/libs/eclib/mat.pyx
-+++ b/src/sage/libs/eclib/mat.pyx
-@@ -11,7 +11,6 @@ from sage.matrix.matrix_integer_sparse cimport Matrix_integer_sparse
- from sage.matrix.matrix_integer_dense cimport Matrix_integer_dense
- from sage.rings.integer cimport Integer
- 
-
- cdef class Matrix:
-     """
-     A Cremona Matrix.
-@@ -212,8 +211,7 @@ cdef class Matrix:
-             <class 'sage.matrix.matrix_integer_dense.Matrix_integer_dense'>
-         """
-         cdef long n = self.nrows()
-        cdef long i, j, k
-        cdef scalar* v = <scalar*> self.M.get_entries()   # coercion needed to deal with const
-+        cdef long i, j
- 
-         cdef Matrix_integer_dense Td
-         cdef Matrix_integer_sparse Ts
-@@ -221,21 +219,19 @@ cdef class Matrix:
-         # Ugly code...
-         if sparse:
-             Ts = MatrixSpace(ZZ, n, sparse=sparse).zero_matrix().__copy__()
-            k = 0
-             for i from 0 <= i < n:
-                 for j from 0 <= j < n:
-                    if v[k]:
-                        Ts.set_unsafe(i, j, Integer(v[k]))
-                    k += 1
-+                    Mij = Integer(self.M.sub(i+1,j+1))
-+                    if Mij:
-+                        Ts.set_unsafe(i, j, Mij)
-             return Ts
-         else:
-             Td = MatrixSpace(ZZ, n, sparse=sparse).zero_matrix().__copy__()
-            k = 0
-             for i from 0 <= i < n:
-                 for j from 0 <= j < n:
-                    if v[k]:
-                        Td.set_unsafe(i, j, Integer(v[k]))
-                    k += 1
-+                    Mij = Integer(self.M.sub(i+1,j+1))
-+                    if Mij:
-+                        Td.set_unsafe(i, j, Mij)
-             return Td
- 
- 
--- a/srcpkgs/sagemath/patches/39145-python_3.13_re.sub.patch
+++ b/srcpkgs/sagemath/patches/39145-python_3.13_re.sub.patch
@ -1,39 +0,0 @@
-diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py
-index d02ae43149f..447b548c1b8 100644
--- a/src/sage/interfaces/singular.py
-+++ b/src/sage/interfaces/singular.py
-@@ -1401,7 +1401,7 @@ def _repr_(self):
-             # this is our cue that singular uses `rp` instead of `ip`
-             if singular_name_mapping['invlex'] == 'rp' and 'doctest' in str(get_display_manager()):
-                 s = re.sub('^(// .*block.* : ordering )rp$', '\\1ip',
-                           s, 0, re.MULTILINE)
-+                           s, flags=re.MULTILINE)
-         return s
- 
-     def __copy__(self):
-diff --git a/src/sage/misc/cython.py b/src/sage/misc/cython.py
-index c542e0d1919..241078d5f2c 100644
--- a/src/sage/misc/cython.py
-+++ b/src/sage/misc/cython.py
-@@ -380,7 +380,7 @@ def cython(filename, verbose=0, compile_message=False,
-         cython_messages = re.sub(
-             "^.*The keyword 'nogil' should appear at the end of the function signature line. "
-             "Placing it before 'except' or 'noexcept' will be disallowed in a future version of Cython.\n",
-            "", cython_messages, 0, re.MULTILINE)
-+            "", cython_messages, flags=re.MULTILINE)
- 
-         sys.stderr.write(cython_messages)
-         sys.stderr.flush()
-diff --git a/src/sage/rings/ring_extension_morphism.pyx b/src/sage/rings/ring_extension_morphism.pyx
-index d4aad7f8253..7294e90c319 100644
--- a/src/sage/rings/ring_extension_morphism.pyx
-+++ b/src/sage/rings/ring_extension_morphism.pyx
-@@ -461,7 +461,7 @@ cdef class RingExtensionHomomorphism(RingMap):
-         if self.base_map() is not None:
-             s += "with map on base ring"
-             ss = self.base_map()._repr_defn()
-            ss = re.sub('\nwith map on base ring:?$', '', ss, 0, re.MULTILINE)
-+            ss = re.sub('\nwith map on base ring:?$', '', ss, flags=re.MULTILINE)
-             if ss != "": s += ":\n" + ss
-         if s != "" and s[-1] == "\n":
-             s = s[:-1]
--- a/srcpkgs/sagemath/patches/39147-python_3.13_doctest.patch
+++ b/srcpkgs/sagemath/patches/39147-python_3.13_doctest.patch
@ -1,58 +0,0 @@
-diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py
-index bf6d49906de..6c36ab47baf 100644
--- a/src/sage/doctest/forker.py
-+++ b/src/sage/doctest/forker.py
-@@ -553,6 +553,8 @@ def __init__(self, *args, **kwds):
-         self.total_walltime_skips = 0
-         self.total_performed_tests = 0
-         self.total_walltime = 0
-+        if sys.version_info < (3,13):
-+            self._stats = self._name2ft
- 
-     def _run(self, test, compileflags, out):
-         """
-@@ -830,7 +832,10 @@ def compiler(example):
-         self.optionflags = original_optionflags
- 
-         # Record and return the number of failures and tries.
-        self._DocTestRunner__record_outcome(test, failures, tries)
-+        if sys.version_info < (3,13):
-+            self._DocTestRunner__record_outcome(test, failures, tries)
-+        else:
-+            self._DocTestRunner__record_outcome(test, failures, tries, walltime_skips)
-         self.total_walltime_skips += walltime_skips
-         self.total_performed_tests += tries
-         return TestResults(failures, tries)
-@@ -931,7 +936,7 @@ def summarize(self, verbose=None):
-             sage: from sage.doctest.control import DocTestDefaults; DD = DocTestDefaults()
-             sage: import doctest, sys, os
-             sage: DTR = SageDocTestRunner(SageOutputChecker(), verbose=False, sage_options=DD, optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
-            sage: DTR._name2ft['sage.doctest.forker'] = (1,120)
-+            sage: DTR._stats['sage.doctest.forker'] = (1,120)
-             sage: results = DTR.summarize()
-             **********************************************************************
-             1 item had failures:
-@@ -946,8 +951,8 @@ def summarize(self, verbose=None):
-         passed = []
-         failed = []
-         totalt = totalf = 0
-        for x in self._name2ft.items():
-            name, (f, t) = x
-+        for x in self._stats.items():
-+            name, (f, t, *_) = x
-             assert f <= t
-             totalt += t
-             totalf += f
-@@ -972,10 +977,10 @@ def summarize(self, verbose=None):
-             print(self.DIVIDER, file=m)
-             print(count_noun(len(failed), "item"), "had failures:", file=m)
-             failed.sort()
-            for thing, (f, t) in failed:
-+            for thing, (f, t, *_) in failed:
-                 print(" %3d of %3d in %s" % (f, t, thing), file=m)
-         if verbose:
-            print(count_noun(totalt, "test") + " in " + count_noun(len(self._name2ft), "item") + ".", file=m)
-+            print(count_noun(totalt, "test") + " in " + count_noun(len(self._stats), "item") + ".", file=m)
-             print("%s passed and %s failed." % (totalt - totalf, totalf), file=m)
-             if totalf:
-                 print("***Test Failed***", file=m)
--- a/srcpkgs/sagemath/patches/39178-giac_1.9.0.998.patch
+++ b/srcpkgs/sagemath/patches/39178-giac_1.9.0.998.patch
@ -1,20 +0,0 @@
-diff --git a/src/sage/libs/giac/giac.pyx b/src/sage/libs/giac/giac.pyx
-index 65279b16504..7c32771bee8 100644
--- a/src/sage/libs/giac/giac.pyx
-+++ b/src/sage/libs/giac/giac.pyx
-@@ -382,13 +382,8 @@ def _giac(s):
-         sage: (1+2*sin(3*x)).solve(x).simplify()
-         ...list[-pi/18,7*pi/18]
- 
-        sage: libgiac.solve('sin(3*x)>2*sin(x)',x)
-        Traceback (most recent call last):
-        ...
-        RuntimeError: Unable to find numeric values solving equation. For
-        trigonometric equations this may be solved using assumptions, e.g.
-        assume(x>-pi && x<pi) Error: Bad Argument Value
-
-+        sage: libgiac.solve('x^3-x>x',x)
-+        list[((x>(-sqrt(2))) and (x<0)),x>(sqrt(2))]
- 
-     You can also add some hypothesis to a giac symbol::
- 
--- a/srcpkgs/sagemath/patches/39182-python_3.13_iter.patch
+++ b/srcpkgs/sagemath/patches/39182-python_3.13_iter.patch
@ -1,28 +0,0 @@
-diff --git a/src/sage/matroids/extension.pyx b/src/sage/matroids/extension.pyx
-index 778e6d6ef70..83b792e8d2b 100644
--- a/src/sage/matroids/extension.pyx
-+++ b/src/sage/matroids/extension.pyx
-@@ -211,6 +211,9 @@ cdef class LinearSubclassesIter:
- 
-         self._nodes = [first_cut]
- 
-+    def __iter__(self):
-+        return self
-+
-     def __next__(self):
-         """
-         Return the next linear subclass.
-diff --git a/src/sage/matroids/set_system.pyx b/src/sage/matroids/set_system.pyx
-index d9a2f631fbf..0bf9cb2b7fa 100644
--- a/src/sage/matroids/set_system.pyx
-+++ b/src/sage/matroids/set_system.pyx
-@@ -772,6 +772,9 @@ cdef class SetSystemIterator:
-         self._pointer = -1
-         self._len = len(H)
- 
-+    def __iter__(self):
-+        return self
-+
-     def __next__(self):
-         """
-         Return the next subset of a SetSystem.
--- a/srcpkgs/sagemath/patches/39184-python_3.13_produce_latex_macro.patch
+++ b/srcpkgs/sagemath/patches/39184-python_3.13_produce_latex_macro.patch
@ -1,54 +0,0 @@
-diff --git a/src/sage/misc/latex_macros.py b/src/sage/misc/latex_macros.py
-index fc389b32a72..1cce2fa6f14 100644
--- a/src/sage/misc/latex_macros.py
-+++ b/src/sage/misc/latex_macros.py
-@@ -43,6 +43,8 @@
- contain '\newcommand' lines for each of the entries in ``macros``.
- """
- 
-+import importlib
-+
- 
- def produce_latex_macro(name, *sample_args):
-     r"""
-@@ -69,7 +71,7 @@ def produce_latex_macro(name, *sample_args):
-          sage: produce_latex_macro('GF', 37)
-          '\\newcommand{\\GF}[1]{\\Bold{F}_{#1}}'
- 
-    If the Sage object is not in the global name space, describe it
-+    If the Sage object is not in the global namespace, describe it
-     like so::
- 
-          sage: produce_latex_macro('sage.rings.finite_rings.finite_field_constructor.FiniteField', 3)
-@@ -84,22 +86,16 @@ def produce_latex_macro(name, *sample_args):
-     else:
-         module, real_name = names_split
-     newcommand = '\\newcommand{\\' + real_name + '}'
-    count = 0
-    args = "("
-    for x in sample_args:
-        count += 1
-        args += str(x) + ','
-    args += ')'
-    exec('from ' + module + ' import ' + real_name)
-    if count:
-        defn = '[' + str(count) + ']{'
-        defn += eval('str(LatexCall()(' + real_name + args + '))') + '}'
-+    sage_object = getattr(importlib.import_module(module), real_name)
-+    if sample_args:
-+        defn = '[' + str(len(sample_args)) + ']{'
-+        defn += str(LatexCall()(sage_object(*sample_args))) + '}'
-     else:
-        defn = '{' + eval('str(LatexCall()(' + real_name + '))') + '}'
-    count = 0
-    for x in sample_args:
-        count += 1
-        defn = defn.replace(str(x), "#" + str(count))
-+        defn = '{' + str(LatexCall()(sage_object)) + '}'
-+    for i, x in enumerate(sample_args):
-+        s = str(x)
-+        assert s in defn
-+        defn = defn.replace(s, "#" + str(i+1))
-     return newcommand + defn
- 
- 
--- a/srcpkgs/sagemath/patches/39185-python_3.13_find_replacements.patch
+++ b/srcpkgs/sagemath/patches/39185-python_3.13_find_replacements.patch
@ -1,22 +0,0 @@
-diff --git a/src/sage/misc/replace_dot_all.py b/src/sage/misc/replace_dot_all.py
-index ea51a9b3159..a43d6c0a929 100644
--- a/src/sage/misc/replace_dot_all.py
-+++ b/src/sage/misc/replace_dot_all.py
-@@ -194,14 +194,15 @@ def find_replacements(location, package_regex=None, verbose=False):
-                     to_exec = to_exec.replace("'", '').replace('"', '')
-                     if (to_exec[-1] == ','):
-                         to_exec = to_exec[:-1]
-                    exec(to_exec)
-+                    glob = dict()
-+                    exec(to_exec, glob)
-                 except ModuleNotFoundError as err:
-                     print(f'ModuleNotFoundError: {err} found when trying to execute {to_exec}')
-                 except ImportError as err:
-                     print(f'ImportError: {err} found when trying to execute {to_exec}')
- 
-                 try:  # try to evaluate the list of module names to get a list of the modules themselves which we can call import_statements on
-                    modules = eval(to_eval)
-+                    modules = eval(to_eval, glob)
-                 except NameError as err:
-                     print(f'NameError: {err} found when trying to evaluate {to_eval} at {location}:{row_index + 1}')
-                 except SyntaxError as err:
--- a/srcpkgs/sagemath/patches/39187-python_3.13_tests_output.patch
+++ b/srcpkgs/sagemath/patches/39187-python_3.13_tests_output.patch
@ -1,142 +0,0 @@
-diff --git a/src/sage/categories/map.pyx b/src/sage/categories/map.pyx
-index 43e476847d0..0007555326a 100644
--- a/src/sage/categories/map.pyx
-+++ b/src/sage/categories/map.pyx
-@@ -275,7 +275,7 @@ cdef class Map(Element):
-         maps::
- 
-             sage: phi.domain                                                            # needs sage.rings.number_field
-            <weakref at ...; to 'NumberField_quadratic_with_category' at ...>
-+            <weakref at ...; to '...NumberField_quadratic_with_category' at ...>
-             sage: phi._make_strong_references()                                         # needs sage.rings.number_field
-             sage: print(phi.domain)                                                     # needs sage.rings.number_field
-             The constant function (...) -> Number Field in a
-@@ -343,7 +343,7 @@ cdef class Map(Element):
-         maps::
- 
-             sage: phi.domain                                                            # needs sage.rings.number_field
-            <weakref at ...; to 'NumberField_quadratic_with_category' at ...>
-+            <weakref at ...; to '...NumberField_quadratic_with_category' at ...>
-             sage: phi._make_strong_references()                                         # needs sage.rings.number_field
-             sage: print(phi.domain)                                                     # needs sage.rings.number_field
-             The constant function (...) -> Number Field in a
-diff --git a/src/sage/misc/bindable_class.py b/src/sage/misc/bindable_class.py
-index 743b5a19da6..c23ba0c2c43 100644
--- a/src/sage/misc/bindable_class.py
-+++ b/src/sage/misc/bindable_class.py
-@@ -113,7 +113,7 @@ class BindableClass(metaclass=ClasscallMetaclass):
-         Still, documentation works as usual::
- 
-             sage: outer.Inner.__doc__
-            ' some documentation '
-+            '...some documentation '
- 
-     TESTS::
- 
-diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
-index 0505f6039a9..6147ec4983b 100644
--- a/src/sage/misc/sagedoc.py
-+++ b/src/sage/misc/sagedoc.py
-@@ -694,7 +694,7 @@ def format(s, embedded=False):
-     We check that the todo Sphinx extension is correctly activated::
- 
-         sage: sage.misc.sagedoc.format(sage.combinat.ranker.on_fly.__doc__)             # needs sphinx
-        "   Return ...  Todo: add tests as in combinat::rankers\n"
-+        "...Return ...Todo: add tests as in combinat::rankers\n"
- 
-     In the following use case, the ``nodetex`` directive would have been ignored prior
-     to :issue:`11815`::
-@@ -1135,10 +1135,11 @@ def search_src(string, extra1='', extra2='', extra3='', extra4='',
-     The following produces an error because the string 'fetch(' is a
-     malformed regular expression::
- 
-        sage: print(search_src(" fetch(", "def", interact=False))
-        Traceback (most recent call last):
-        ...
-        error: missing ), unterminated subpattern at position 6
-+        sage: try:
-+        ....:     print(search_src(" fetch(", "def", interact=False))
-+        ....: except Exception as e:
-+        ....:     print(e)
-+        missing ), unterminated subpattern at position 6
- 
-     To fix this, *escape* the parenthesis with a backslash::
- 
-@@ -1186,7 +1187,6 @@ def search_src(string, extra1='', extra2='', extra3='', extra4='',
-         misc/sagedoc.py:... len(search_src("matrix", interact=False).splitlines())...
-         misc/sagedoc.py:... len(search_src("matrix", module="sage.calculus", interact=False).splitlines())...
-         misc/sagedoc.py:... len(search_src("matrix", path_re="calc"...
-        misc/sagedoc.py:... print(search_src(" fetch(", "def", interact=False))...
-         misc/sagedoc.py:... print(search_src(r" fetch\(", "def", interact=False))...
-         misc/sagedoc.py:... print(search_src(r" fetch\(", "def", "pyx", interact=False))...
-         misc/sagedoc.py:... s = search_src('Matrix', path_re='matrix', interact=False); s.find('x') > 0...
-@@ -1456,7 +1456,7 @@ class _sage_doc:
-         sage: browse_sage_doc._open("reference", testing=True)[0]                       # needs sagemath_doc_html
-         'http://localhost:8000/doc/live/reference/index.html'
-         sage: browse_sage_doc(identity_matrix, 'rst')[-107:-47]                         # needs sage.modules
-        'Full MatrixSpace of 3 by 3 sparse matrices over Integer Ring'
-+        '...Full MatrixSpace of 3 by 3 sparse matrices...'
-     """
-     def __init__(self):
-         """
-diff --git a/src/sage/misc/sageinspect.py b/src/sage/misc/sageinspect.py
-index 585112b5061..12f319fc8e3 100644
--- a/src/sage/misc/sageinspect.py
-+++ b/src/sage/misc/sageinspect.py
-@@ -1986,7 +1986,7 @@ def sage_getdoc(obj, obj_name='', embedded=False):
- 
-         sage: from sage.misc.sageinspect import sage_getdoc
-         sage: sage_getdoc(identity_matrix)[87:124]                                      # needs sage.modules
-        'Return the n x n identity matrix over'
-+        '...the n x n identity matrix...'
-         sage: def f(a, b, c, d=1): return a+b+c+d
-         ...
-         sage: import functools
-diff --git a/src/sage/modular/modsym/modsym.py b/src/sage/modular/modsym/modsym.py
-index fb46d0edafa..ed7c9285169 100644
--- a/src/sage/modular/modsym/modsym.py
-+++ b/src/sage/modular/modsym/modsym.py
-@@ -369,7 +369,7 @@ def ModularSymbols(group=1,
-         {}
-         sage: M = ModularSymbols(11,use_cache=True)
-         sage: sage.modular.modsym.modsym._cache
-        {(Congruence Subgroup Gamma0(11), 2, 0, Rational Field): <weakref at ...; to 'ModularSymbolsAmbient_wt2_g0_with_category' at ...>}
-+        {(Congruence Subgroup Gamma0(11), 2, 0, Rational Field): <weakref at ...; to '...ModularSymbolsAmbient_wt2_g0_with_category' at ...>}
-         sage: M is ModularSymbols(11,use_cache=True)
-         True
-         sage: M is ModularSymbols(11,use_cache=False)
-diff --git a/src/sage/repl/attach.py b/src/sage/repl/attach.py
-index b3e20fe61d8..b9997d8f2df 100644
--- a/src/sage/repl/attach.py
-+++ b/src/sage/repl/attach.py
-@@ -40,7 +40,7 @@
-     ....:     traceback.print_exc(file=sys.stdout)
-     Traceback (most recent call last):
-     ...
-        exec(preparse_file(f.read()) + "\n", globals)
-+        exec(preparse_file(f.read()) + "\n", globals)...
-       File "<string>", line 3, in <module>
-     ValueError: third
-     sage: detach(src)
-@@ -52,7 +52,7 @@
-     ....:     traceback.print_exc(file=sys.stdout)
-     Traceback (most recent call last):
-     ...
-        exec(code, globals)
-+        exec(code, globals)...
-       File ".../foobar...sage.py", line ..., in <module>
-         raise ValueError("third")   # this should appear in the source snippet...
-     ValueError: third
-diff --git a/src/sage/repl/rich_output/pretty_print.py b/src/sage/repl/rich_output/pretty_print.py
-index 93833e01cd8..8e00e3d70e4 100644
--- a/src/sage/repl/rich_output/pretty_print.py
-+++ b/src/sage/repl/rich_output/pretty_print.py
-@@ -160,7 +160,7 @@ def pretty_print(self):
-             sage: seq._concatenate_graphs().show(edge_labels=True)                      # needs sage.graphs sage.plot
-             Traceback (most recent call last):
-             ...
-            TypeError: ...matplotlib() got an unexpected keyword argument 'edge_labels'
-+            TypeError: ...matplotlib() got an unexpected keyword argument 'edge_labels'...
-         """
-         try:
-             from sage.plot.plot import Graphics
--- a/srcpkgs/sagemath/patches/39201-python_3.13_fix_spyx_tmp.patch
+++ b/srcpkgs/sagemath/patches/39201-python_3.13_fix_spyx_tmp.patch
@ -1,36 +0,0 @@
-diff --git a/src/sage/misc/temporary_file.py b/src/sage/misc/temporary_file.py
-index 998260be8eb..820d5cf2e95 100644
--- a/src/sage/misc/temporary_file.py
-+++ b/src/sage/misc/temporary_file.py
-@@ -32,7 +32,9 @@
- # as the parent for all temporary files & directories created by them.
- # This lets us clean up after those two functions when sage exits normally
- # using an atexit hook
-TMP_DIR_FILENAME_BASE = tempfile.TemporaryDirectory()
-+# Note that `TemporaryDirectory()` will cleanup on program exit;
-+# we keep the atexit hook to be redundant, in case that fails.
-+TMP_DIR_FILENAME_BASE = tempfile.TemporaryDirectory(prefix='sage_')
- atexit.register(lambda: TMP_DIR_FILENAME_BASE.cleanup())
- 
- 
-@@ -533,14 +535,15 @@ def spyx_tmp() -> str:
-     We cache the result of this function "by hand" so that the same
-     temporary directory will always be returned. A function is used to
-     delay creating a directory until (if) it is needed. The temporary
-    directory is removed when sage terminates by way of an atexit
-    hook.
-+    directory is automatically removed when sage terminates.
-     """
-     global _spyx_tmp
-     if _spyx_tmp:
-         return _spyx_tmp
- 
-    d = tempfile.TemporaryDirectory()
-    _spyx_tmp = os.path.join(d.name, 'spyx')
-    atexit.register(lambda: d.cleanup())
-+    # We don't use `tempfile.TemporaryDirectory()` here because it
-+    # will be cleaned up on child exit (e.g. for parallel testing)
-+    # For some reason this doesn't affect the `TemporaryDirectory`
-+    # stored in the global `TMP_DIR_FILENAME_BASE`.
-+    _spyx_tmp = tmp_dir(name='spyx_')
-     return _spyx_tmp
--- a/srcpkgs/sagemath/patches/39261-scipy_1.15.patch
+++ b/srcpkgs/sagemath/patches/39261-scipy_1.15.patch
@ -1,36 +0,0 @@
-diff --git a/src/sage/functions/special.py b/src/sage/functions/special.py
-index 308171af3cd..f511190aeff 100644
--- a/src/sage/functions/special.py
-+++ b/src/sage/functions/special.py
-@@ -216,11 +216,16 @@ class SphericalHarmonic(BuiltinFunction):
- 
-         sage: spherical_harmonic(1, 1, pi/2, pi).n()  # abs tol 1e-14                   # needs sage.symbolic
-         0.345494149471335
-        sage: from scipy.special import sph_harm  # NB: arguments x and y are swapped   # needs scipy
-         sage: import numpy as np                                                        # needs scipy
-         sage: if int(np.version.short_version[0]) > 1:                                  # needs scipy
-         ....:     np.set_printoptions(legacy="1.25")                                    # needs scipy
-        sage: sph_harm(1, 1, pi.n(), (pi/2).n())  # abs tol 1e-14                       # needs scipy sage.symbolic
-+        sage: import scipy.version
-+        sage: if scipy.version.version < '1.15.0':
-+        ....:     from scipy.special import sph_harm # NB: arguments x and y are swapped   # needs scipy
-+        ....:     sph_harm(1, 1, pi.n(), (pi/2).n())  # abs tol 1e-14                   # needs scipy sage.symbolic
-+        ....: else:
-+        ....:     from scipy.special import sph_harm_y                                  # needs scipy
-+        ....:     sph_harm_y(1, 1, (pi/2).n(), pi.n()).item()  # abs tol 1e-9           # needs scipy sage.symbolic
-         (0.3454941494713355-4.231083042742082e-17j)
- 
-     Note that this convention differs from the one in Maxima, as revealed by
-diff --git a/src/sage/matrix/matrix2.pyx b/src/sage/matrix/matrix2.pyx
-index dec25a76e54..31aaf8b8234 100644
--- a/src/sage/matrix/matrix2.pyx
-+++ b/src/sage/matrix/matrix2.pyx
-@@ -15901,7 +15901,7 @@ cdef class Matrix(Matrix1):
-             sage: a.exp()                                                               # needs sage.symbolic
-             [ 1/11882424341266*((11*sqrt(227345670387496707609) + 5941212170633)*e^(3/1275529100*sqrt(227345670387496707609)) - 11*sqrt(227345670387496707609) + 5941212170633)*e^(-3/2551058200*sqrt(227345670387496707609) + 101/200)                            445243650/75781890129165569203*(sqrt(227345670387496707609)*e^(3/1275529100*sqrt(227345670387496707609)) - sqrt(227345670387496707609))*e^(-3/2551058200*sqrt(227345670387496707609) + 101/200)]
-             [                                     10000/53470909535697*(sqrt(227345670387496707609)*e^(3/1275529100*sqrt(227345670387496707609)) - sqrt(227345670387496707609))*e^(-3/2551058200*sqrt(227345670387496707609) + 101/200) -1/11882424341266*((11*sqrt(227345670387496707609) - 5941212170633)*e^(3/1275529100*sqrt(227345670387496707609)) - 11*sqrt(227345670387496707609) - 5941212170633)*e^(-3/2551058200*sqrt(227345670387496707609) + 101/200)]
-            sage: a.change_ring(RDF).exp()  # rel tol 6e-14                             # needs sage.symbolic
-+            sage: a.change_ring(RDF).exp()  # rel tol 1e-13                             # needs sage.symbolic
-             [42748127.31532951 7368259.244159399]
-             [234538976.1381042 40426191.45156228]
- 
--- a/srcpkgs/sagemath/patches/39368-singular_4.4.1.patch
+++ b/srcpkgs/sagemath/patches/39368-singular_4.4.1.patch
@ -1,715 +0,0 @@
-diff --git a/src/sage/categories/pushout.py b/src/sage/categories/pushout.py
-index a2b5e910257..17f059f967f 100644
--- a/src/sage/categories/pushout.py
-+++ b/src/sage/categories/pushout.py
-@@ -3925,8 +3925,8 @@ class BlackBoxConstructionFunctor(ConstructionFunctor):
-         sage: FS = BlackBoxConstructionFunctor(singular)
-         sage: FS(QQ['t'])                                                               # needs sage.libs.singular
-         polynomial ring, over a field, global ordering
-        //   coefficients: QQ
-        //   number of vars : 1
-+        // coefficients: QQ...
-+        // number of vars : 1
-         //        block   1 : ordering lp
-         //                  : names    t
-         //        block   2 : ordering C
-diff --git a/src/sage/interfaces/expect.py b/src/sage/interfaces/expect.py
-index 91f8efcf651..ff424335d56 100644
--- a/src/sage/interfaces/expect.py
-+++ b/src/sage/interfaces/expect.py
-@@ -1328,8 +1328,8 @@ def _synchronize(self, cmd='1+%s;\n'):
-             sage: R.<x> = QQ[]; f = x^3 + x + 1;  g = x^3 - x - 1; r = f.resultant(g); gap(ZZ); singular(R)
-             Integers
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 1
-+            // coefficients: QQ...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    x
-             //        block   2 : ordering C
-diff --git a/src/sage/interfaces/interface.py b/src/sage/interfaces/interface.py
-index bd1095e8c70..22fb4b8487c 100644
--- a/src/sage/interfaces/interface.py
-+++ b/src/sage/interfaces/interface.py
-@@ -817,8 +817,8 @@ def __reduce__(self):
-             sage: S = singular.ring(0, ('x'))
-             sage: loads(dumps(S))
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 1
-+            // coefficients: QQ...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    x
-             //        block   2 : ordering C
-diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py
-index d110c17bf16..59d01f4493d 100644
--- a/src/sage/interfaces/singular.py
-+++ b/src/sage/interfaces/singular.py
-@@ -39,8 +39,8 @@
-     sage: R1 = singular.ring(0, '(x,y)', 'dp')
-     sage: R1
-     polynomial ring, over a field, global ordering
-    //   coefficients: QQ
-    //   number of vars : 2
-+    // coefficients: QQ...
-+    // number of vars : 2
-     //        block   1 : ordering dp
-     //                  : names    x y
-     //        block   2 : ordering C
-@@ -220,12 +220,12 @@
- 
-     sage: singular.lib('polylib.lib')
-     sage: singular.ring(32003, '(a,b,c,d,e,f)', 'lp')
-            polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/32003
-            //   number of vars : 6
-            //        block   1 : ordering lp
-            //                        : names    a b c d e f
-            //        block   2 : ordering C
-+    polynomial ring, over a field, global ordering
-+    // coefficients: ZZ/32003...
-+    // number of vars : 6
-+    //        block   1 : ordering lp
-+    //                        : names    a b c d e f
-+    //        block   2 : ordering C
-     sage: I = singular.ideal('cyclic(6)')
-     sage: g = singular('groebner(I)')
-     Traceback (most recent call last):
-@@ -1074,8 +1074,8 @@ def ring(self, char=0, vars='(x)', order='lp', check=None):
-             sage: R = singular.ring(0, '(x,y,z)', 'dp')
-             sage: R
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 3
-+            // coefficients: QQ...
-+            // number of vars : 3
-             //        block   1 : ordering dp
-             //                  : names    x y z
-             //        block   2 : ordering C
-@@ -1153,16 +1153,16 @@ def set_ring(self, R):
-             sage: S = singular.ring('real', '(a,b)', 'lp')
-             sage: singular.current_ring()
-             polynomial ring, over a field, global ordering
-            //   coefficients: Float()
-            //   number of vars : 2
-+            // coefficients: Float()...
-+            // number of vars : 2
-             //        block   1 : ordering lp
-             //                  : names    a b
-             //        block   2 : ordering C
-             sage: singular.set_ring(R)
-             sage: singular.current_ring()
-             polynomial ring, over a field, local ordering
-            //   coefficients: ZZ/7
-            //   number of vars : 2
-+            // coefficients: ZZ/7...
-+            // number of vars : 2
-             //        block   1 : ordering ds
-             //                  : names    a b
-             //        block   2 : ordering C
-@@ -1203,15 +1203,15 @@ def current_ring(self):
-             sage: r = PolynomialRing(GF(127),3,'xyz', order='invlex')
-             sage: r._singular_()
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/127
-            //   number of vars : 3
-+            // coefficients: ZZ/127...
-+            // number of vars : 3
-             //        block   1 : ordering ip
-             //                  : names    x y z
-             //        block   2 : ordering C
-             sage: singular.current_ring()
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/127
-            //   number of vars : 3
-+            // coefficients: ZZ/127...
-+            // number of vars : 3
-             //        block   1 : ordering ip
-             //                  : names    x y z
-             //        block   2 : ordering C
-@@ -1430,8 +1430,8 @@ def __copy__(self):
-             sage: cpQ.set_ring()
-             sage: cpQ
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 2
-+            // coefficients: QQ...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
-@@ -1996,8 +1996,8 @@ def _sage_(self, R=None):
- 
-             sage: singular('basering')
-             polynomial ring, over a domain, global ordering
-            //   coefficients: ZZ
-            //   number of vars : 3
-+            // coefficients: ZZ...
-+            // number of vars : 3
-             //        block   1 : ordering lp
-             //                  : names    x y z
-             //        block   2 : ordering C
-@@ -2087,16 +2087,16 @@ def set_ring(self):
-             sage: S = singular.ring('real', '(a,b)', 'lp')
-             sage: singular.current_ring()
-             polynomial ring, over a field, global ordering
-            //   coefficients: Float()
-            //   number of vars : 2
-+            // coefficients: Float()...
-+            // number of vars : 2
-             //        block   1 : ordering lp
-             //                  : names    a b
-             //        block   2 : ordering C
-             sage: R.set_ring()
-             sage: singular.current_ring()
-             polynomial ring, over a field, local ordering
-            //   coefficients: ZZ/7
-            //   number of vars : 2
-+            // coefficients: ZZ/7...
-+            // number of vars : 2
-             //        block   1 : ordering ds
-             //                  : names    a b
-             //        block   2 : ordering C
-diff --git a/src/sage/libs/singular/function.pyx b/src/sage/libs/singular/function.pyx
-index 67cadf5d35c..87f0b7bab69 100644
--- a/src/sage/libs/singular/function.pyx
-+++ b/src/sage/libs/singular/function.pyx
-@@ -276,8 +276,8 @@ cdef class RingWrap:
-             sage: l = ringlist(P)
-             sage: ring = singular_function("ring")
-             sage: ring(l, ring=P)._output()
-            //   coefficients: QQ
-            //   number of vars : 3
-+            // coefficients: QQ...
-+            // number of vars : 3
-             //        block   1 : ordering dp
-             //                  : names    x y z
-             //        block   2 : ordering C
-diff --git a/src/sage/libs/singular/ring.pyx b/src/sage/libs/singular/ring.pyx
-index 1d8dd844385..4f7e288e2ad 100644
--- a/src/sage/libs/singular/ring.pyx
-+++ b/src/sage/libs/singular/ring.pyx
-@@ -159,8 +159,13 @@ cdef ring *singular_ring_new(base_ring, n, names, term_order) except NULL:
-         sage: R.<x,y,z> = F[]
-         sage: from sage.libs.singular.function import singular_function
-         sage: sing_print = singular_function('print')
-        sage: sing_print(R)
-        'polynomial ring, over a field, global ordering\n// coefficients: ZZ/7(a, b)\n// number of vars : 3\n//        block   1 : ordering dp\n//                  : names    x y z\n//        block   2 : ordering C'
-+        sage: print(sing_print(R))
-+        polynomial ring, over a field, global ordering
-+        // coefficients: ZZ/7(a, b)...
-+        // number of vars : 3
-+        //        block   1 : ordering dp
-+        //                  : names    x y z
-+        //        block   2 : ordering C
- 
-     ::
- 
-@@ -168,8 +173,13 @@ cdef ring *singular_ring_new(base_ring, n, names, term_order) except NULL:
-         sage: R.<x,y,z> = F[]
-         sage: from sage.libs.singular.function import singular_function
-         sage: sing_print = singular_function('print')
-        sage: sing_print(R)
-        'polynomial ring, over a field, global ordering\n// coefficients: QQ(s, t)\n// number of vars : 3\n//        block   1 : ordering dp\n//                  : names    x y z\n//        block   2 : ordering C'
-+        sage: print(sing_print(R))
-+        polynomial ring, over a field, global ordering
-+        // coefficients: QQ(s, t)...
-+        // number of vars : 3
-+        //        block   1 : ordering dp
-+        //                  : names    x y z
-+        //        block   2 : ordering C
-     """
-     cdef long cexponent
-     cdef GFInfo* _param
-diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-index adf3df1cf95..bab5935004b 100644
--- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-+++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
-@@ -619,8 +619,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
- 
-             sage: P._singular_()
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 3
-+            // coefficients: QQ...
-+            // number of vars : 3
-             //        block   1 : ordering dp
-             //                  : names    x y z
-             //        block   2 : ordering C
-@@ -1182,8 +1182,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: P.<x,y,z> = QQ[]
-             sage: P._singular_()
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 3
-+            // coefficients: QQ...
-+            // number of vars : 3
-             //        block   1 : ordering dp
-             //                  : names    x y z
-             //        block   2 : ordering C
-@@ -1198,8 +1198,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: P.<x,y,z> = PolynomialRing(k, 3)                                      # needs sage.rings.finite_rings
-             sage: P._singular_()                                                        # needs sage.rings.finite_rings
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/3[a]/(a^3-a+1)
-            //   number of vars : 3
-+            // coefficients: ZZ/3[a]/(a^3-a+1)...
-+            // number of vars : 3
-             //        block   1 : ordering dp
-             //                  : names    x y z
-             //        block   2 : ordering C
-@@ -1215,8 +1215,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: P.<x> = QQ[]
-             sage: P._singular_()
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 1
-+            // coefficients: QQ...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    x
-             //        block   2 : ordering C
-@@ -1257,8 +1257,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: P.<x,y,z> = QQ[]
-             sage: P._singular_init_()
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 3
-+            // coefficients: QQ...
-+            // number of vars : 3
-             //        block   1 : ordering dp
-             //                  : names    x y z
-             //        block   2 : ordering C
-@@ -1272,8 +1272,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: R.<x,y> = PolynomialRing(NumberField(w^2 + 1,'s'))                    # needs sage.rings.number_field
-             sage: singular(R)                                                           # needs sage.rings.number_field
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ[s]/(s^2+1)
-            //   number of vars : 2
-+            // coefficients: QQ[s]/(s^2+1)...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
-@@ -1281,8 +1281,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: R = PolynomialRing(GF(2**8,'a'),10,'x', order='invlex')               # needs sage.rings.finite_rings
-             sage: singular(R)                                                           # needs sage.rings.finite_rings
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/2[a]/(a^8+a^4+a^3+a^2+1)
-            //   number of vars : 10
-+            // coefficients: ZZ/2[a]/(a^8+a^4+a^3+a^2+1)...
-+            // number of vars : 10
-             //        block   1 : ordering ip
-             //                  : names    x0 x1 x2 x3 x4 x5 x6 x7 x8 x9
-             //        block   2 : ordering C
-@@ -1290,8 +1290,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: R = PolynomialRing(GF(127),2,'x', order='invlex')
-             sage: singular(R)                                                           # needs sage.rings.finite_rings
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/127
-            //   number of vars : 2
-+            // coefficients: ZZ/127...
-+            // number of vars : 2
-             //        block   1 : ordering ip
-             //                  : names    x0 x1
-             //        block   2 : ordering C
-@@ -1299,8 +1299,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: R = PolynomialRing(QQ,2,'x', order='invlex')
-             sage: singular(R)                                                           # needs sage.rings.function_field
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 2
-+            // coefficients: QQ...
-+            // number of vars : 2
-             //        block   1 : ordering ip
-             //                  : names    x0 x1
-             //        block   2 : ordering C
-@@ -1308,8 +1308,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: R = PolynomialRing(QQ,2,'x', order='degneglex')
-             sage: singular(R)                                                           # needs sage.rings.function_field
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 2
-+            // coefficients: QQ...
-+            // number of vars : 2
-             //        block   1 : ordering a
-             //                  : names    x0 x1
-             //                  : weights   1  1
-@@ -1320,8 +1320,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: R = PolynomialRing(QQ,'x')
-             sage: singular(R)                                                           # needs sage.rings.function_field
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 1
-+            // coefficients: QQ...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    x
-             //        block   2 : ordering C
-@@ -1329,8 +1329,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: R = PolynomialRing(GF(127),'x')
-             sage: singular(R)                                                           # needs sage.rings.finite_rings
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/127
-            //   number of vars : 1
-+            // coefficients: ZZ/127...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    x
-             //        block   2 : ordering C
-@@ -1338,8 +1338,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: R = ZZ['x,y']
-             sage: singular(R)                                                           # needs sage.rings.function_field
-             polynomial ring, over a domain, global ordering
-            //   coefficients: ZZ
-            //   number of vars : 2
-+            // coefficients: ZZ...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
-@@ -1347,8 +1347,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: R = IntegerModRing(1024)['x,y']
-             sage: singular(R)                                                           # needs sage.rings.function_field
-             polynomial ring, over a ring (with zero-divisors), global ordering
-            //   coefficients: ZZ/(2^10)
-            //   number of vars : 2
-+            // coefficients: ZZ/(2^10)...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
-@@ -1356,8 +1356,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: R = IntegerModRing(15)['x,y']
-             sage: singular(R)                                                           # needs sage.rings.function_field
-             polynomial ring, over a ring (with zero-divisors), global ordering
-            //   coefficients: ZZ/...(15)
-            //   number of vars : 2
-+            // coefficients: ZZ/(15)...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
-@@ -1367,8 +1367,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
-             sage: P.<x> = QQ[]
-             sage: P._singular_init_()
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 1
-+            // coefficients: QQ...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    x
-             //        block   2 : ordering C
-diff --git a/src/sage/rings/polynomial/pbori/pbori.pyx b/src/sage/rings/polynomial/pbori/pbori.pyx
-index 14a929c3238..404771a2c85 100644
--- a/src/sage/rings/polynomial/pbori/pbori.pyx
-+++ b/src/sage/rings/polynomial/pbori/pbori.pyx
-@@ -1425,8 +1425,8 @@ cdef class BooleanPolynomialRing(BooleanPolynomialRing_base):
-             sage: B.<x,y> = BooleanPolynomialRing(2)
-             sage: B._singular_() # indirect doctest
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/2
-            //   number of vars : 2
-+            // coefficients: ZZ/2...
-+            // number of vars : 2
-             //        block   1 : ordering lp
-             //                  : names    x y
-             //        block   2 : ordering C
-diff --git a/src/sage/rings/polynomial/polynomial_quotient_ring.py b/src/sage/rings/polynomial/polynomial_quotient_ring.py
-index 115647adadf..627765cf8f0 100644
--- a/src/sage/rings/polynomial/polynomial_quotient_ring.py
-+++ b/src/sage/rings/polynomial/polynomial_quotient_ring.py
-@@ -749,8 +749,8 @@ def _singular_init_(self, S=None):
-             sage: Q = P.quo([(x^2 + 1)])
-             sage: singular(Q)        # indirect doctest                                 # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 1
-+            // coefficients: QQ...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    xbar
-             //        block   2 : ordering C
-diff --git a/src/sage/rings/polynomial/polynomial_singular_interface.py b/src/sage/rings/polynomial/polynomial_singular_interface.py
-index 60d2dd74b52..10bbc6d6ec0 100644
--- a/src/sage/rings/polynomial/polynomial_singular_interface.py
-+++ b/src/sage/rings/polynomial/polynomial_singular_interface.py
-@@ -62,7 +62,7 @@ def _do_singular_init_(singular, base_ring, char, _vars, order):
-         sage: from sage.rings.polynomial.polynomial_singular_interface import _do_singular_init_
-         sage: _do_singular_init_(singular, ZZ, 0, 'X', 'dp')                            # needs sage.libs.singular
-         (polynomial ring, over a domain, global ordering
-         // coefficients: ZZ
-+         // coefficients: ZZ...
-          // number of vars : 1
-          //        block   1 : ordering dp
-          //                  : names    X
-@@ -196,7 +196,7 @@ def _singular_(self, singular=None):
-             sage: R.<x,y> = PolynomialRing(CC)                                          # needs sage.rings.real_mpfr
-             sage: singular(R)                                                           # needs sage.libs.singular sage.rings.real_mpfr
-             polynomial ring, over a field, global ordering
-            // coefficients: real[I](complex:15 digits, additional 0 digits)/(I^2+1)
-+            // coefficients: real[I](complex:15 digits, additional 0 digits)/(I^2+1)...
-             // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-@@ -205,7 +205,7 @@ def _singular_(self, singular=None):
-             sage: R.<x,y> = PolynomialRing(RealField(100))                              # needs sage.rings.real_mpfr
-             sage: singular(R)                                                           # needs sage.libs.singular sage.rings.real_mpfr
-             polynomial ring, over a field, global ordering
-            // coefficients: Float()
-+            // coefficients: Float()...
-             // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-@@ -215,8 +215,8 @@ def _singular_(self, singular=None):
-             sage: R.<x> = PolynomialRing(NumberField(w^2 + 1, 's'))                     # needs sage.rings.number_field
-             sage: singular(R)                                                           # needs sage.libs.singular sage.rings.number_field
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ[s]/(s^2+1)
-            //   number of vars : 1
-+            // coefficients: QQ[s]/(s^2+1)...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    x
-             //        block   2 : ordering C
-@@ -224,8 +224,8 @@ def _singular_(self, singular=None):
-             sage: R = PolynomialRing(GF(127), 'x', implementation='singular')           # needs sage.libs.singular
-             sage: singular(R)                                                           # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/127
-            //   number of vars : 1
-+            // coefficients: ZZ/127...
-+            // number of vars : 1
-             //        block   1 : ordering dp
-             //                  : names    x
-             //        block   2 : ordering C
-@@ -233,8 +233,8 @@ def _singular_(self, singular=None):
-             sage: R = PolynomialRing(QQ, 'x', implementation='singular')                # needs sage.libs.singular
-             sage: singular(R)                                                           # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 1
-+            // coefficients: QQ...
-+            // number of vars : 1
-             //        block   1 : ordering dp
-             //                  : names    x
-             //        block   2 : ordering C
-@@ -242,8 +242,8 @@ def _singular_(self, singular=None):
-             sage: R = PolynomialRing(QQ,'x')
-             sage: singular(R)                                                           # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 1
-+            // coefficients: QQ...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    x
-             //        block   2 : ordering C
-@@ -251,8 +251,8 @@ def _singular_(self, singular=None):
-             sage: R = PolynomialRing(GF(127), 'x')
-             sage: singular(R)                                                           # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/127
-            //   number of vars : 1
-+            // coefficients: ZZ/127...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    x
-             //        block   2 : ordering C
-@@ -260,8 +260,8 @@ def _singular_(self, singular=None):
-             sage: R = Frac(ZZ['a,b'])['x,y']
-             sage: singular(R)                                                           # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ(a, b)
-            //   number of vars : 2
-+            // coefficients: QQ(a, b)...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
-@@ -270,8 +270,8 @@ def _singular_(self, singular=None):
-             sage: R = IntegerModRing(1024)['x,y']
-             sage: singular(R)                                                           # needs sage.libs.singular
-             polynomial ring, over a ring (with zero-divisors), global ordering
-            //   coefficients: ZZ/(2^10)
-            //   number of vars : 2
-+            // coefficients: ZZ/(2^10)...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
-@@ -279,8 +279,8 @@ def _singular_(self, singular=None):
-             sage: R = IntegerModRing(15)['x,y']
-             sage: singular(R)                                                           # needs sage.libs.singular
-             polynomial ring, over a ring (with zero-divisors), global ordering
-            //   coefficients: ZZ/...(15)
-            //   number of vars : 2
-+            // coefficients: ZZ/(15)...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
-@@ -288,8 +288,8 @@ def _singular_(self, singular=None):
-             sage: R = ZZ['x,y']
-             sage: singular(R)                                                           # needs sage.libs.singular
-             polynomial ring, over a domain, global ordering
-            //   coefficients: ZZ
-            //   number of vars : 2
-+            // coefficients: ZZ...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
-@@ -297,7 +297,7 @@ def _singular_(self, singular=None):
-             sage: R = ZZ['x']
-             sage: singular(R)                                                           # needs sage.libs.singular
-             polynomial ring, over a domain, global ordering
-            // coefficients: ZZ
-+            // coefficients: ZZ...
-             // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    x
-@@ -310,8 +310,8 @@ def _singular_(self, singular=None):
-             sage: S = K['y']
-             sage: singular(S)                                                           # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/5(x)
-            //   number of vars : 2
-+            // coefficients: ZZ/5(x)...
-+            // number of vars : 2
-             //        block   1 : ordering lp
-             //                  : names    a y
-             //        block   2 : ordering C
-@@ -353,8 +353,8 @@ def _singular_init_(self, singular=None):
- 
-             sage: PolynomialRing(QQ,'u_ba')._singular_init_()                           # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 1
-+            // coefficients: QQ...
-+            // number of vars : 1
-             //        block   1 : ordering lp
-             //                  : names    u_ba
-             //        block   2 : ordering C
-diff --git a/src/sage/rings/polynomial/term_order.py b/src/sage/rings/polynomial/term_order.py
-index a88568248ce..f8ddd0a9652 100644
--- a/src/sage/rings/polynomial/term_order.py
-+++ b/src/sage/rings/polynomial/term_order.py
-@@ -660,7 +660,7 @@ def __init__(self, name='lex', n=0, force=False):
-             sage: R.<x,y,z> = PolynomialRing(QQ, order=T)
-             sage: R._singular_()                                                        # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            // coefficients: QQ
-+            // coefficients: QQ...
-             // number of vars : 3
-             //        block   1 : ordering dp
-             //                  : names    x y z
-@@ -676,7 +676,7 @@ def __init__(self, name='lex', n=0, force=False):
-             False
-             sage: S._singular_()                                                        # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            // coefficients: QQ
-+            // coefficients: QQ...
-             // number of vars : 3
-             //        block   1 : ordering C
-             //        block   2 : ordering dp
-@@ -1661,8 +1661,8 @@ def singular_str(self):
-             '(lp(3),Dp(5),lp(2))'
-             sage: P._singular_()                                                        # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/127
-            //   number of vars : 10
-+            // coefficients: ZZ/127...
-+            // number of vars : 10
-             //        block   1 : ordering lp
-             //                  : names    x0 x1 x2
-             //        block   2 : ordering Dp
-@@ -1687,8 +1687,8 @@ def singular_str(self):
-             '(a(1:2),ls(2),a(1:2),ls(2))'
-             sage: P._singular_()                                                        # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 4
-+            // coefficients: QQ...
-+            // number of vars : 4
-             //        block   1 : ordering a
-             //                  : names    x0 x1
-             //                  : weights   1  1
-@@ -1709,7 +1709,7 @@ def singular_str(self):
-             sage: P = PolynomialRing(QQ, 4, names='x', order=T)
-             sage: P._singular_()                                                        # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            // coefficients: QQ
-+            // coefficients: QQ...
-             // number of vars : 4
-             //        block   1 : ordering C
-             //        block   2 : ordering a
-@@ -1727,7 +1727,7 @@ def singular_str(self):
-             sage: P = PolynomialRing(QQ, 4, names='y', order=T)
-             sage: P._singular_()                                                        # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            // coefficients: QQ
-+            // coefficients: QQ...
-             // number of vars : 4
-             //        block   1 : ordering c
-             //        block   2 : ordering a
-@@ -1745,7 +1745,7 @@ def singular_str(self):
-             sage: P = PolynomialRing(QQ, 4, names='z', order=T)
-             sage: P._singular_()                                                        # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            // coefficients: QQ
-+            // coefficients: QQ...
-             // number of vars : 4
-             //        block   1 : ordering a
-             //                  : names    z0 z1
-@@ -2183,7 +2183,7 @@ def termorder_from_singular(S):
-         sage: # needs sage.libs.singular
-         sage: singular.ring(0, '(x,y,z,w)', '(C,dp(2),lp(2))')
-         polynomial ring, over a field, global ordering
-        // coefficients: QQ
-+        // coefficients: QQ...
-         // number of vars : 4
-         //        block   1 : ordering C
-         //        block   2 : ordering dp
-@@ -2201,7 +2201,7 @@ def termorder_from_singular(S):
-         sage: # needs sage.libs.singular
-         sage: singular.ring(0, '(x,y,z,w)', '(c,dp(2),lp(2))')
-         polynomial ring, over a field, global ordering
-        // coefficients: QQ
-+        // coefficients: QQ...
-         // number of vars : 4
-         //        block   1 : ordering c
-         //        block   2 : ordering dp
-diff --git a/src/sage/rings/quotient_ring.py b/src/sage/rings/quotient_ring.py
-index 1043333a63e..45f8147cde9 100644
--- a/src/sage/rings/quotient_ring.py
-+++ b/src/sage/rings/quotient_ring.py
-@@ -1268,8 +1268,8 @@ def _singular_(self, singular=None):
-             sage: S = R.quotient_ring(x^2 + y^2)
-             sage: S._singular_()                                                        # needs sage.libs.singular
-             polynomial ring, over a field, global ordering
-            //   coefficients: QQ
-            //   number of vars : 2
-+            // coefficients: QQ...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
-diff --git a/src/sage/rings/quotient_ring_element.py b/src/sage/rings/quotient_ring_element.py
-index 6699ae9f74b..9f05c54f21c 100644
--- a/src/sage/rings/quotient_ring_element.py
-+++ b/src/sage/rings/quotient_ring_element.py
-@@ -813,8 +813,8 @@ def _singular_(self, singular=None):
-             sage: Q = P.quo(I)
-             sage: Q._singular_()
-             polynomial ring, over a field, global ordering
-            //   coefficients: ZZ/2
-            //   number of vars : 2
-+            // coefficients: ZZ/2...
-+            // number of vars : 2
-             //        block   1 : ordering dp
-             //                  : names    x y
-             //        block   2 : ordering C
--- a/srcpkgs/sagemath/patches/get_patches
+++ b/srcpkgs/sagemath/patches/get_patches
@ -19,7 +19,10 @@ get_pr() {
 	echo "curl -sL \"$url\" | filterdiff ... > \"$pr-$desc.patch\""
 	if [ -z "$dry" ]; then
 		curl -sL "$url" |
-			filterdiff -p1 -x src/setup.py -x build/* -x src/doc/* |
+			filterdiff -p1 -i src/* -x src/.* -x src/setup.py -x src/sage/meson.build \
+			-x src/sage/libs/meson.build -x src/sage/libs/giac/meson.build \
+			-x src/sage_setup/autogen/giacpy-mkkeywords.py \
+			-x src/sage_setup/autogen/flint/* -x src/doc/* |
 			cat > "$pr-$desc.patch"
 	fi
 }
@ -27,23 +30,5 @@ get_pr() {
 # run from patches dir
 cd $(dirname "$0")

-#get_pr 37645 "fix doctest"
-#get_pr 37885 "cython warnings"
-
-get_pr 39145 "python 3.13 re.sub"
-get_pr 39147 "python 3.13 doctest"
-get_pr 39182 "python 3.13 iter"
-get_pr 39184 "python 3.13 produce_latex_macro"
-get_pr 39185 "python 3.13 find_replacements"
-get_pr 39187 "python 3.13 tests output"
-get_pr 39201 "python 3.13 fix spyx_tmp"
-
-get_pr 38749 "pari 2.17"
-get_pr 38962 "eclib 20241112"
-get_pr 39178 "giac 1.9.0.998"
-get_pr 39261 "scipy 1.15"
-get_pr 39368 "singular 4.4.1"
-
-get_pr 38940 "fix flaky simplicial set test"
-
-#get_pr 39142 "fix alarm tests"
+#get_pr 39015 "sage cli"
+#get_pr 39616 "ipython 9.0"
--- a/srcpkgs/sagemath/patches/zz-32bit-test.patch
+++ b/srcpkgs/sagemath/patches/zz-32bit-test.patch
@ -1,30 +0,0 @@
-A couple of tests that give different (correct) output on 32-bit
-
-diff --git a/src/sage/rings/number_field/bdd_height.py b/src/sage/rings/number_field/bdd_height.py
-index 45f08aa4711..b88b315fd01 100644
--- a/src/sage/rings/number_field/bdd_height.py
-+++ b/src/sage/rings/number_field/bdd_height.py
-@@ -236,7 +236,8 @@ def bdd_norm_pr_ideal_gens(K, norm_list):
-         sage: from sage.rings.number_field.bdd_height import bdd_norm_pr_ideal_gens
-         sage: K.<g> = QuadraticField(123)
-         sage: bdd_norm_pr_ideal_gens(K, range(5))
-        {0: [0], 1: [1], 2: [g + 11], 3: [], 4: [2]}
-+        {0: [0], 1: [1], 2: [g + 11], 3: [], 4: [2]}  # 64-bit
-+        {0: [0], 1: [1], 2: [g - 11], 3: [], 4: [2]}  # 32-bit
- 
-     ::
- 
-diff --git a/src/sage/rings/number_field/number_field.py b/src/sage/rings/number_field/number_field.py
-index 61d0b98509a..dab3186cea4 100644
--- a/src/sage/rings/number_field/number_field.py
-+++ b/src/sage/rings/number_field/number_field.py
-@@ -4827,7 +4827,8 @@ class NumberField_generic(WithEqualityById, number_field_base.NumberField):
- 
-             sage: K.<a> = NumberField(2*x^2 - 1/3)
-             sage: K._S_class_group_and_units(tuple(K.primes_above(2) + K.primes_above(3)))
-            ([6*a + 2, -6*a + 3, -1, -12*a - 5], [])
-+            ([6*a + 2, -6*a + 3, -1, -12*a - 5], [])  # 64-bit
-+            ([6*a + 2, -6*a - 3, -1, -12*a - 5], [])  # 32-bit
-         """
-         K_pari = self.pari_bnf(proof=proof)
-         S_pari = [p.pari_prime() for p in sorted(set(S))]
--- a/srcpkgs/sagemath/patches/zz-fix-doctest-order.patch
+++ b/srcpkgs/sagemath/patches/zz-fix-doctest-order.patch
@ -1,17 +0,0 @@
--- a/src/sage/rings/number_field/galois_group.py
-+++ b/src/sage/rings/number_field/galois_group.py
-@@ -994,9 +994,11 @@ class GaloisGroup_v2(GaloisGroup_perm):
-             sage: x = polygen(ZZ, 'x')
-             sage: K.<b> = NumberField(x^4 - 2*x^2 + 2, 'a').galois_closure()
-             sage: G = K.galois_group()
-            sage: [G.artin_symbol(P) for P in K.primes_above(7)]
-            [(1,5)(2,6)(3,7)(4,8), (1,5)(2,6)(3,7)(4,8),
-             (1,4)(2,3)(5,8)(6,7), (1,4)(2,3)(5,8)(6,7)]
-+            sage: sorted([G.artin_symbol(P) for P in K.primes_above(7)])
-+            [(1,4)(2,3)(5,8)(6,7),
-+             (1,4)(2,3)(5,8)(6,7),
-+             (1,5)(2,6)(3,7)(4,8),
-+             (1,5)(2,6)(3,7)(4,8)]
-             sage: G.artin_symbol(17)
-             Traceback (most recent call last):
-             ...
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
-version=10.5
-revision=2
+version=10.6
+revision=1
 _pypi_version=${version/.beta/b}
 _pypi_version=${_pypi_version/.rc/rc}
 build_style=python3-pep517
@ -10,14 +10,14 @@ hostmakedepends="pkg-config python3-Cython python3-Jinja2
 python3-gmpy2 python3-memory_allocator python3-numpy ecl
 python3-cypari2 python3-cysignals python3-devel"
 makedepends="boost-devel brial-devel cliquer-devel ecl eclib-devel
- ecm-devel fflas-ffpack flintlib-devel gap-devel gd-devel giac-devel glpk-devel
+ ecm-devel fflas-ffpack flintlib-devel gap-devel gd-devel glpk-devel
 gsl-devel iml-devel lcalc-devel libbraiding-devel libhomfly-devel libmpc-devel
 libpng-devel linbox-devel m4ri-devel m4rie-devel mpfi-devel
 mpfr-devel ntl-devel openblas-devel pari-devel planarity-devel python3-cypari2
 python3-cysignals python3-devel python3-gmpy2 python3-memory_allocator
 python3-numpy rankwidth-devel singular symmetrica-devel"
 depends="eclib-devel fflas-ffpack flintlib-devel gcc-fortran meson gd-devel
- gfan giac gsl-devel gzip libpng-devel linbox-devel m4ri-devel maxima-ecl
+ gfan gsl-devel gzip libpng-devel linbox-devel m4ri-devel maxima-ecl
 mpfr-devel nauty ntl-devel palp pari-devel pari-elldata-small pari-galdata
 pari-galpol-small pari-seadata-small pkg-config python3-Cython python3-cypari2
 python3-cysignals python3-devel python3-fpylll python3-ipython python3-lrcalc
@ -36,7 +36,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.sagemath.org/"
 changelog="https://github.com/sagemath/sage/releases"
 distfiles="${PYPI_SITE}/s/sagemath-standard/sagemath_standard-${_pypi_version}.tar.gz"
-checksum=fa0e91cc12754db3cbdf843dbe30252b4378c030825530bc6858ddbcac701096
+checksum=0405b9d9f52657969418fc47488ec0cb12fd62c538e50616b11fc9d5c507f9d2
 nocross="due to ntl (eclib, singular), fflas-ffpack, givaro, linbox, sympow, maxima"

 # main repo `.../src/sage/`  is `.../sage/` here
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.5.5
+version=5.5.6
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.scintilla.org/SciTEDownload.html"
 distfiles="https://www.scintilla.org/scite${version//./}.tgz"
-checksum=3e45d2d2a75862e535d2318ee7a4602a4fd1acea3618afbb3d1ec07d266ccce5
+checksum=56634fe8d7a9905ecb9fd7a1f697d2b66721f67c0828a653398c6479db92c6b2

 post_extract() {
 	sed -i '1i#include <cstddef>' scite/src/StringList.h
--- a/srcpkgs/scons/template
+++ b/srcpkgs/scons/template
@ -1,7 +1,7 @@
 # Template file for 'scons'
 pkgname=scons
-version=4.8.1
-revision=2
+version=4.9.1
+revision=1
 build_style="python3-module"
 make_install_args="--install-data=/usr/share/man/man1/"
 hostmakedepends="python3 python3-setuptools"
@ -11,7 +11,7 @@ maintainer="Wilson Birney <wpb@360scada.com>"
 license="MIT"
 homepage="https://www.scons.org/"
 distfiles="${SOURCEFORGE_SITE}/scons/${version}/SCons-${version}.tar.gz"
-checksum=cad573b329b6a5bc7e654b01f0231064acc979026af68a9e467ddb32bf2ee501
+checksum=e2d78aa56e4646e5dbaf50c0758c6d1e4b0418464d8d6d07a09beb6cf257538f
 make_check=no #SCons dist tarballs do not have tests, confirmed with SCons dev

 post_install() {
--- a/Show more
+++ b/Show more