diff --git a/.gitignore b/.gitignore
index 958f644..0a1b2da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,23 @@
 *.swp
 *~
 \#*#
-*.o
-masterdir*
-hostdir*
-masterdir*/
-hostdir*/
+
+# exclude everything in root except files and directories from void-packages
+/*
+!/.gitattributes
+!/.github
+!/.gitignore
+!/.mailmap
+!/CONTRIBUTING.md
+!/COPYING
+!/Manual.md
+!/README.md
+!/common
+!/etc
+!/srcpkgs
+!/xbps-src
 etc/conf
 etc/conf.*
 etc/virtual
 etc/xbps.d/custom
-.xbps-checkvers*.plist
+etc/repo-keys
diff --git a/COPYING b/COPYING
index 4def475..9f53c19 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
  Copyright (c) 2008-2020 Juan Romero Pardines and contributors
- Copyright (c) 2017-2023 The Void Linux team and contributors
+ Copyright (c) 2017-2024 The Void Linux team and contributors
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
diff --git a/Manual.md b/Manual.md
index 667ab63..e6a9855 100644
--- a/Manual.md
+++ b/Manual.md
@@ -62,7 +62,6 @@ packages for XBPS, the `Void Linux` native packaging system.
 		* [kernel-hooks](#triggers_kernel_hooks)
 		* [mimedb](#triggers_mimedb)
 		* [mkdirs](#triggers_mkdirs)
-		* [openjdk-profile](#triggers_openjdk_profile)
 		* [pango-modules](#triggers_pango_module)
 		* [pycompile](#triggers_pycompile)
 		* [register-shell](#triggers_register_shell)
@@ -2016,13 +2015,6 @@ During removal it will delete the directory using `rmdir`.
 To include this trigger use the `make_dirs` variable, as the trigger won't do anything
 unless it is defined.
 
-<a id="triggers_openjdk_profile"></a>
-#### openjdk-profile
-
-The openjdk-profile trigger is responsible for creating an entry in /etc/profile.d that
-sets the `JAVA_HOME` environment variable to the currently-selected alternative for
-`/usr/bin/java` on installation. This trigger must be manually requested.
-
 <a id="triggers_pango_module"></a>
 #### pango-modules
 
diff --git a/README.md b/README.md
index a63ee5e..bd7fed8 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Once built, the package will be available in `hostdir/binpkgs` or an appropriate
 Alternatively, packages can be installed with the `xi` utility, from the `xtools` package. `xi` takes the repository of the current working directory into account.
 
 ```
-# xi <package_name>
+$ xi <package_name>
 ```
 
 <a name="chroot-methods"></a>
@@ -217,7 +217,7 @@ The following directory hierarchy is used with a default configuration file:
             |  |- repocache ...
             |  |- sources ...
             |
-            |- masterdir
+            |- masterdir-<arch>
             |  |- builddir -> ...
             |  |- destdir -> ...
             |  |- host -> bind mounted from <hostdir>
@@ -226,7 +226,7 @@ The following directory hierarchy is used with a default configuration file:
 
 The description of these directories is as follows:
 
- - `masterdir`: master directory to be used as rootfs to build/install packages.
+ - `masterdir-<arch>`: master directory to be used as rootfs to build/install packages.
  - `builddir`: to unpack package source tarballs and where packages are built.
  - `destdir`: to install packages, aka **fake destdir**.
  - `hostdir/ccache`: to store ccache data if the `XBPS_CCACHE` option is enabled.
@@ -340,6 +340,9 @@ Each time a binary package is created, a package signature must be created with
 
 > It is not possible to sign a repository with multiple RSA keys.
 
+If packages in `hostdir/binpkgs` are signed, the key in `.plist` format (as imported by xbps) can be placed
+in `etc/repo-keys/` to prevent xbps-src from prompting to import that key.
+
 <a name="rebuilding"></a>
 ### Rebuilding and overwriting existing local packages
 
@@ -447,7 +450,7 @@ and `xbps-src` should be fully functional; just start the `bootstrap` process, i
 
     $ ./xbps-src binary-bootstrap
 
-The default masterdir is created in the current working directory, i.e `void-packages/masterdir`.
+The default masterdir is created in the current working directory, i.e. `void-packages/masterdir-<arch>`, where `<arch>` for the default masterdir is is the native xbps architecture.
 
 <a name="remaking-masterdir"></a>
 ### Remaking the masterdir
@@ -474,20 +477,21 @@ Two ways are available to build 32bit packages on x86\_64:
 
 The canonical mode (native) needs a new x86 `masterdir`:
 
-    $ ./xbps-src -m masterdir-x86 binary-bootstrap i686
-    $ ./xbps-src -m masterdir-x86 ...
+    $ ./xbps-src -A i686 binary-bootstrap
+    $ ./xbps-src -A i686 ...
 
 <a name="building-for-musl"></a>
 ### Building packages natively for the musl C library
 
-Canonical way of building packages for same architecture but different C library is through dedicated masterdir.
+The canonical way of building packages for same architecture but different C library is through a dedicated masterdir by using the host architecture flag `-A`.
 To build for x86_64-musl on glibc x86_64 system, prepare a new masterdir with the musl packages:
 
-    $ ./xbps-src -m masterdir-x86_64-musl binary-bootstrap x86_64-musl
+    $ ./xbps-src -A x86_64-musl binary-bootstrap
 
+This will create and bootstrap a new masterdir called `masterdir-x86_64-musl` that will be used when `-A x86_64-musl` is specified.
 Your new masterdir is now ready to build packages natively for the musl C library:
 
-    $ ./xbps-src -m masterdir-x86_64-musl pkg ...
+    $ ./xbps-src -A x86_64-musl pkg ...
 
 <a name="building-base-system"></a>
 ### Building void base-system from scratch
diff --git a/common/build-helper/meson.sh b/common/build-helper/meson.sh
index 040771c..6232f92 100644
--- a/common/build-helper/meson.sh
+++ b/common/build-helper/meson.sh
@@ -61,7 +61,6 @@ cat > "${XBPS_WRAPPERDIR}/meson/xbps_meson.cross" <<-EOF
 	cpp = '${CXX}'
 	ar = '${XBPS_CROSS_TRIPLET}-gcc-ar'
 	nm = '${NM}'
-	ld = '${LD}'
 	strip = '${STRIP}'
 	readelf = '${READELF}'
 	objcopy = '${OBJCOPY}'
@@ -75,6 +74,7 @@ cat > "${XBPS_WRAPPERDIR}/meson/xbps_meson.cross" <<-EOF
 	
 	[properties]
 	needs_exe_wrapper = true
+	bindgen_clang_arguments = ['-target', '${XBPS_CROSS_TRIPLET}']
 	
 	[host_machine]
 	system = 'linux'
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 96ec351..22bfd98 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -30,6 +30,9 @@ else
 	unset CARGO_BUILD_TARGET
 fi
 
+# prevent cargo stripping debug symbols
+export CARGO_PROFILE_RELEASE_STRIP=false
+
 # For cross-compiling rust -sys crates
 export PKG_CONFIG_ALLOW_CROSS=1
 
@@ -61,3 +64,9 @@ export ZSTD_SYS_USE_PKG_CONFIG=1
 
 # onig-sys
 export RUSTONIG_SYSTEM_LIBONIG=1
+
+# libsqlite3-sys
+export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
+
+# jemalloc-sys
+export JEMALLOC_SYS_WITH_LG_PAGE=16
diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh
index b76d89c..8aec7a0 100644
--- a/common/build-style/python3-module.sh
+++ b/common/build-style/python3-module.sh
@@ -12,7 +12,7 @@ do_check() {
 		if python3 -c 'import xdist' >/dev/null 2>&1; then
 			testjobs="-n $XBPS_MAKEJOBS"
 		fi
-		PYTHONPATH="$(cd build/lib* && pwd)" \
+		PYTHONPATH="$(cd build/lib* && pwd)" PY_IGNORE_IMPORTMISMATCH=1 \
 			${make_check_pre} \
 			python3 -m pytest ${testjobs} ${make_check_args} ${make_check_target}
 	else
diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index 5ec20dd..46ce6cf 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -33,7 +33,7 @@ do_check() {
 	python3 -m installer --destdir "${testdir}" \
 		${make_install_args} ${make_install_target:-dist/*.whl}
 
-	PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" \
+	PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" PY_IGNORE_IMPORTMISMATCH=1 \
 		${make_check_pre} pytest3 ${testjobs} ${make_check_args} ${make_check_target}
 }
 
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 2e8ebb5..d94e90c 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -264,9 +264,10 @@ _void_cross_build_glibc() {
 
 	CC="${tgt}-gcc" CXX="${tgt}-g++" CPP="${tgt}-cpp" LD="${tgt}-ld" \
 	AR="${tgt}-ar" AS="${tgt}-as" NM="${tgt}-nm" \
+	OBJDUMP="${tgt}-objdump" OBJCOPY="${tgt}-objcopy" \
 	CFLAGS="-pipe ${cross_glibc_cflags}" \
 	CXXFLAGS="-pipe ${cross_glibc_cflags}" \
-	CPPFLAGS="${cross_glibc_cflags}" \
+	CPPFLAGS="" \
 	LDFLAGS="${cross_glibc_ldflags}" \
 	../glibc-${ver}/configure \
 		--prefix=/usr \
@@ -403,13 +404,8 @@ _void_cross_build_gcc() {
 
 	# note on --disable-libquadmath:
 	# on some platforms the library is actually necessary for the
-	# fortran frontend to build, but still disable it because it
-	# should not be in the resulting packages; it conflicts with
-	# the libquadmath you can install into the cross root
-	#
-	# platforms where this is a problem should explicitly force
-	# libquadmath to be on via cross_gcc_configure_args, the
-	# do_install in this build-style automatically removes it
+	# fortran frontend to build, platforms where this is a problem
+	# should explicitly force libquadmath to be on via cross_gcc_configure_args
 	#
 	../gcc-${ver}/configure \
 		--prefix=/usr \
@@ -645,9 +641,9 @@ do_install() {
 	ln -sf libgnat-${gcc_major}.so ${DESTDIR}/${sysroot}/usr/lib/libgnat.so
 	rm -vf ${DESTDIR}/${adalib}/libgna{rl,t}.so
 
-	# If libquadmath was forced (needed for gfortran on some platforms)
-	# then remove it because it conflicts with libquadmath package
-	rm -rf ${DESTDIR}/${sysroot}/usr/lib/libquadmath.*
+	# Remove libgomp library because it conflicts with libgomp and
+	# libgomp-devel packages
+	rm -f ${DESTDIR}/${sysroot}/usr/lib/libgomp*
 
 	# Remove libdep linker plugin because it conflicts with system binutils
 	rm -f ${DESTDIR}/usr/lib/bfd-plugins/libdep*
diff --git a/common/environment/setup/archive.sh b/common/environment/setup/archive.sh
index 813c0cf..2f84d0a 100644
--- a/common/environment/setup/archive.sh
+++ b/common/environment/setup/archive.sh
@@ -71,21 +71,21 @@ vextract() {
 			-f $archive
 		;;
 	gz|bz2|xz|zst)
-		cp -f $archive "$dst"
+		cp -f $archive "${dst:-.}"
 		(
 			if [ "$dst" ]; then cd "$dst"; fi
 			case ${sfx} in
 			gz)
-				gunzip -f $archive
+				gunzip -f ${archive##*/}
 				;;
 			bz2)
-				bunzip2 -f $archive
+				bunzip2 -f ${archive##*/}
 				;;
 			xz)
-				unxz -f $archive
+				unxz -f ${archive##*/}
 				;;
 			zst)
-				unzstd $archive
+				unzstd ${archive##*/}
 				;;
 			esac
 		)
diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh
index 6c016db..b08379a 100644
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -11,7 +11,7 @@ for var in $(awk 'BEGIN{for (i in ENVIRON) {print i}}' </dev/null); do
 		var="${var#BASH_FUNC_}"
 		unset -f "$var"
 		;;
-	XBPS_* | IN_CHROOT | CHROOT_READY | SOURCE_DATE_EPOCH)
+	XBPS_* | IN_CHROOT | CHROOT_READY | SOURCE_DATE_EPOCH | NOCOLORS)
 		# xbps-src specific
 		;;
 	SOURCEFORGE_SITE | NONGNU_SITE | XORG_SITE | DEBIAN_SITE | GNOME_SITE)
diff --git a/common/shlibs b/common/shlibs
index 95eec1f..90485b5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -17,41 +17,43 @@
 # one (order top->bottom) is preferred over the next ones.
 #
 libc.so musl-1.1.24_7
-libc.so.6 glibc-2.36_1
-libm.so.6 glibc-2.36_1
-libpthread.so.0 glibc-2.36_1
-librt.so.1 glibc-2.36_1
-libdl.so.2 glibc-2.36_1
-ld-linux-x86-64.so.2 glibc-2.36_1 x86_64
-ld-linux.so.2 glibc-2.36_1 i686
-ld-linux.so.3 glibc-2.36_1 armv5tel
-ld-linux-aarch64.so.1 glibc-2.36_1 aarch64
-ld-linux-riscv64-lp64d.so.1 glibc-2.36_1 riscv64
-ld64.so.2 glibc-2.36_1 ppc64
-ld.so.1 glibc-2.36_1 mips
-ld.so.1 glibc-2.36_1 ppc
-ld-linux-armhf.so.3 glibc-2.36_1
-libresolv.so.2 glibc-2.36_1
-libanl.so.1 glibc-2.36_1
-libthread_db.so.1 glibc-2.36_1
-libutil.so.1 glibc-2.36_1
-libnsl.so.1 glibc-2.36_1
-libnss_db.so.2 glibc-2.36_1
-libnss_files.so.2 glibc-2.36_1
-libnss_compat.so.2 glibc-2.36_1
-libnss_dns.so.2 glibc-2.36_1
-libnss_hesiod.so.2 glibc-2.36_1
-libcrypt.so.1 glibc-2.36_1
-libBrokenLocale.so.1 glibc-2.36_1
+libc.so.6 glibc-2.38_1
+libm.so.6 glibc-2.38_1
+libpthread.so.0 glibc-2.38_1
+librt.so.1 glibc-2.38_1
+libdl.so.2 glibc-2.38_1
+ld-linux-x86-64.so.2 glibc-2.38_1 x86_64
+ld-linux.so.2 glibc-2.38_1 i686
+ld-linux.so.3 glibc-2.38_1 armv5tel
+ld-linux-aarch64.so.1 glibc-2.38_1 aarch64
+ld-linux-riscv64-lp64d.so.1 glibc-2.38_1 riscv64
+ld64.so.2 glibc-2.38_1 ppc64
+ld.so.1 glibc-2.38_1 mips
+ld.so.1 glibc-2.38_1 ppc
+ld-linux-armhf.so.3 glibc-2.38_1
+libresolv.so.2 glibc-2.38_1
+libanl.so.1 glibc-2.38_1
+libthread_db.so.1 glibc-2.38_1
+libutil.so.1 glibc-2.38_1
+libnsl.so.1 glibc-2.38_1
+libnss_db.so.2 glibc-2.38_1
+libnss_files.so.2 glibc-2.38_1
+libnss_compat.so.2 glibc-2.38_1
+libnss_dns.so.2 glibc-2.38_1
+libnss_hesiod.so.2 glibc-2.38_1
+libBrokenLocale.so.1 glibc-2.38_1
+libcrypt.so.2 libxcrypt-4.4.36_1
+libcrypt.so.1 libxcrypt-compat-4.4.36_1
 libSimGearCore.so.2020.3.17 simgear-2020.3.17_1
 libSimGearScene.so.2020.3.17 simgear-2020.3.17_1
-libmemusage.so glibc-2.36_1
-libSegFault.so glibc-2.36_1
-libpcprofile.so glibc-2.36_1
-libcidn.so.1 glibc-2.36_1
-libmvec.so.1 glibc-2.36_1
+libmemusage.so glibc-2.38_1
+libSegFault.so glibc-2.38_1
+libpcprofile.so glibc-2.38_1
+libcidn.so.1 glibc-2.38_1
+libmvec.so.1 glibc-2.38_1
 libcddgmp.so.0 cddlib-0.94m_1
 libcdd.so.0 cddlib-0.94m_1
+libcowsql.so.0 cowsql-1.15.4_1
 libz.so.1 zlib-1.2.3_1
 libb2.so.1 libb2-0.98.1_1
 libbz2.so.1 bzip2-1.0.5_1
@@ -61,7 +63,7 @@ libcc1plugin.so.0 gcc-6.2.1_1
 libitm.so.1 libitm-4.7.3_1
 liblto_plugin.so.0 gcc-4.7.3_1
 libgcc_s.so.1 libgcc-4.4.0_1
-libgo.so.21 libgo-12.2.0_1
+libgo.so.22 libgo-13.2.0_1
 libgccjit.so.0 libgccjit-10.2.1pre1_1
 libperl.so.5.38 perl-5.38.0_1
 libgmp.so.10 gmp-5.0.1_1
@@ -71,6 +73,9 @@ libmpfr.so.6 mpfr-4.0.0_1
 libppl.so.14 ppl-1.2_1
 libppl_c.so.4 ppl-0.11_1
 libstdc++.so.6 libstdc++-4.4.0_1
+libsframe.so.1 binutils-libs-2.41_1
+libctf-nobfd.so.0 binutils-libs-2.41_1
+libctf.so.0 binutils-libs-2.41_1
 libncurses.so.6 ncurses-libs-6.0_1 ignore
 libncursesw.so.6 ncurses-libs-5.8_1 ignore
 libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
@@ -131,9 +136,6 @@ libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
 libGLESv1_CM.so.1 libGLES-1.0_1
 libGLESv2.so.2 libGLES-1.0_1
-libbrcmEGL.so rpi-userland-20180103_2
-libbrcmGLESv2.so rpi-userland-20180103_2
-libbrcmOpenVG.so rpi-userland-20180103_2
 libnvidia-ml.so.1 nvidia-libs-346.47_1 ignore
 libnvidia-ml.so.1 nvidia390-libs-390.87_1 ignore
 libnvidia-ml.so.1 nvidia470-libs-470.103.01_1 ignore
@@ -171,7 +173,7 @@ libxslt.so.1 libxslt-1.1.24_1
 libstartup-notification-1.so.0 startup-notification-0.10_1
 libwnck-3.so.0 libwnck-2.91.90_1
 libnl.so.1 libnl-1.1_1
-libnl-3.so.200 libnl3-3.2.1_1
+libnl-3.so.200 libnl3-3.2.22_1
 libnl-route-3.so.200 libnl3-3.2.1_1
 libnl-idiag-3.so.200 libnl3-3.2.28_1
 libnl-nf-3.so.200 libnl3-3.2.1_1
@@ -235,8 +237,8 @@ libgnutlsxx.so.30 gnutls-3.7.4_1
 libgnutls-dane.so.0 gnutls-3.6.12_1
 libdevmapper.so.1.02 device-mapper-2.02.110_1
 libdevmapper-event.so.1.02 device-mapper-2.02.110_1
-libdevmapper-event-lvm2.so.2.02 device-mapper-2.02.110_1
-liblvm2cmd.so.2.02 device-mapper-2.02.54_1
+libdevmapper-event-lvm2.so.2.03 device-mapper-2.03.18_1
+liblvm2cmd.so.2.03 device-mapper-2.03.18_1
 libprop.so.0 proplib-0.1_1
 libfontenc.so.1 libfontenc-1.0.4_1
 libx86.so.1 libx86-1.1_1
@@ -316,6 +318,8 @@ libxcb-event.so.1 xcb-util-0.3.4_1
 libxcb-util.so.1 xcb-util-0.3.9_1
 libtiff.so.6 tiff-4.5.0_1
 libtiffxx.so.6 tiff-4.5.0_1
+libtiff.so.5 tiff5-4.4.0_1
+libtiffxx.so.5 tiff5-4.4.0_1
 libnotify.so.4 libnotify-0.7_1
 libexo-1.so.0 exo-0.7.3_1
 libexo-2.so.0 exo-0.12.0_1
@@ -345,7 +349,7 @@ libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.10_1
 libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.130 libpoppler-23.08.0_1
+libpoppler.so.133 libpoppler-23.12.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
@@ -469,7 +473,7 @@ libfsimage.so.1.0 xen-libs-4.10.0_1
 libxenstat.so.4.14 xen-libs-4.14.0_1
 libfam.so.0 gamin-0.1.10_1
 libgamin-1.so.0 gamin-0.1.10_1
-libkateprivate.so.23.08.2 libkate-23.08.2_1
+libkateprivate.so.23.08.4 libkate-23.08.4_1
 libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
 libKPim5Libkleo.so.5 libkleo-23.04.0_1
 libKPim5GrantleeTheme.so.5 grantleetheme-23.04.0_1
@@ -555,17 +559,17 @@ libgimpcolor-2.0.so.0 libgimp-2.10.0_1
 libgimpmodule-2.0.so.0 libgimp-2.10.0_1
 libgmic.so.3 gmic-3.1.6_1
 libcgmic.so.3 gmic-3.1.6_1
-libexiv2.so.28 exiv2-0.28_1
+libexiv2.so.28 exiv2-0.28.1_1
 libKF5Holidays.so.5 kholidays-5.47.0_1
 libPhabricatorHelpers.so.5 purpose-5.48.0_1
 libKF5PurposeWidgets.so.5 purpose-5.48.0_1
 libKF5Purpose.so.5 purpose-5.48.0_1
 libKF5PulseAudioQt.so.3 pulseaudio-qt-1.3_1
 libReviewboardHelpers.so.5 purpose-5.48.0_1
-libecpg_compat.so.3 postgresql-libs-15.1_1
-libecpg.so.6 postgresql-libs-15.1_1
-libpgtypes.so.3 postgresql-libs-15.1_1
-libpq.so.5 postgresql-libs-15.1_1
+libecpg_compat.so.3 postgresql-libs-16.1_1
+libecpg.so.6 postgresql-libs-16.1_1
+libpgtypes.so.3 postgresql-libs-16.1_1
+libpq.so.5 postgresql-libs-16.1_1
 libmypaint.so.0 libmypaint-1.6.1_1
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
@@ -664,7 +668,6 @@ libboost_python312.so.1.83.0 boost-python3-1.83.0_1
 libexempi.so.8 exempi-2.5.0_1
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2-1.45.so.2 libsgutils-1.45_1
-liblvm2app.so.2.2 liblvm2app-2.02.54_1
 libcpufreq.so.0 libcpufreq-007_1
 libcpuid.so.16 libcpuid-0.6.2_1
 libgucharmap_2_90.so.7 gucharmap-3.0.0_1
@@ -708,15 +711,13 @@ libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11
 libnetpgp.so.0 libnetpgp-20140220_19
 libmj.so.0 libmj-20140220_19
-libmca_common_sm.so.40 libopenmpi-3.0.1_1
-libmca_common_dstore.so.1 libopenmpi-4.0.1_1
-libmca_common_ompio.so.41 libopenmpi-3.0.1_1
-libmca_common_monitoring.so.50 libopenmpi-3.1.2_1
-libmpi.so.40 libopenmpi-3.0.1_1
-libompitrace.so.40 libopenmpi-3.0.1_1
-libopen-pal.so.40 libopenmpi-3.0.1_1
-libopen-rte.so.40 libopenmpi-3.0.1_1
-liboshmem.so.40 libopenmpi-3.0.1_1
+libmpi.so.40 libopenmpi-5.0.1_1
+libmpi_mpifh.so.40 libopenmpi-5.0.1_1
+libmpi_usempi_ignore_tkr.so.40 libopenmpi-5.0.1_1
+libmpi_usempif08.so.40 libopenmpi-5.0.1_1
+libopen-pal.so.80 libopenmpi-5.0.1_1
+libpmix.so.2 libopenmpi-5.0.1_1
+libprrte.so.3 libopenmpi-5.0.1_1
 libmtp.so.9 libmtp-1.1.4_1
 libelf.so.1 libelf-0.155_1
 libdw.so.1 libelf-0.155_1
@@ -736,7 +737,6 @@ libgarcon-gtk3-1.so.0 garcon-0.6.1_1
 libxfce4ui-2.so.0 libxfce4ui-4.18.0_1
 libxfce4ui-2.so.0 libxfce4ui-nocsd-4.17.0_1
 libxfce4kbd-private-3.so.0 libxfce4ui-4.18.0_1
-libxfce4kbd-private-3.so.0 libxfce4ui-nocsd-4.17.0_1
 libxml++-2.6.so.2 libxml++-2.32.0_1
 libxml++-3.0.so.1 libxml++3.0-3.0.1_1
 libftgl.so.2 ftgl-2.1.2_1
@@ -856,8 +856,8 @@ libgdkmm-2.4.so.1 gtkmm2-2.24.0_1
 libgtkmm-2.4.so.1 gtkmm2-2.24.0_1
 libquadmath.so.0 libquadmath-4.4.0_1
 libgfortran.so.5 libgfortran-8.2.0_1
-libgnarl-12.so libada-12.2.0_1
-libgnat-12.so libada-12.2.0_1
+libgnarl-13.so libada-13.2.0_1
+libgnat-13.so libada-13.2.0_1
 libsharpyuv.so.0 libsharpyuv-1.3.0_1
 libwebp.so.7 libwebp-0.6.0_1
 libwebpmux.so.3 libwebp-0.6.0_1
@@ -1224,22 +1224,6 @@ libtaginfo.so.1 libtaginfo-0.1.3_1
 libtaginfo_c.so.0 libtaginfo-0.1.3_1
 libaa.so.1 aalib-1.4rc4_2
 libbsd.so.0 libbsd-0.4.2_1
-libWFC.so rpi-userland-0.0.0.0.20150907_1
-libbcm_host.so rpi-userland-0.0.0.0.20150907_1
-libopenmaxil.so rpi-userland-0.0.0.0.20150907_1
-libvchiq_arm.so rpi-userland-0.0.0.0.20150907_1
-libvcos.so rpi-userland-0.0.0.0.20150907_1
-libmmal.so rpi-userland-0.0.0.0.20150907_1
-libmmal_core.so rpi-userland-0.0.0.0.20150907_1
-libmmal_util.so rpi-userland-0.0.0.0.20150907_1
-libOpenVG.so rpi-userland-0.0.0.0.20150907_1
-libmmal_vc_client.so rpi-userland-20170427_1
-libmmal_components.so rpi-userland-20170427_1
-libvcsm.so rpi-userland-20170427_1
-libcontainers.so rpi-userland-20170427_1
-libbrcmWFC.so rpi-userland-20180103_1
-libdebug_sym.so rpi-userland-20180103_1
-libdtovl.so rpi-userland-20180103_1
 libwiringPi.so libwiringPi-0.0.20200408_1
 libwiringPiDev.so libwiringPi-0.0.20200408_1
 liblockdev.so.1 lockdev-1.0.3_1
@@ -1436,7 +1420,7 @@ libgpaste-gtk4.so.0 libgpaste-42.1_1
 libthreadutil.so.6 libupnp-1.6.18_1
 libupnp.so.17 libupnp-1.14.0_1
 libixml.so.11 libupnp-1.14.0_1
-libupnpp.so.12 libupnpp-0.22.2_1
+libupnpp.so.14 libupnpp-0.24.0_1
 libgeocode-glib.so.0 geocode-glib-libsoup2-3.26.4_1
 libgeocode-glib-2.so.0 geocode-glib-3.26.4_2
 libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
@@ -1570,9 +1554,6 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libwiretap.so.13 libwireshark-4.0.0_1
-libwireshark.so.16 libwireshark-4.0.0_1
-libwsutil.so.14 libwireshark-4.0.0_1
 libKPim5ContactEditor.so.5 akonadi-contacts-23.04.0_1
 libKPim5AkonadiContact.so.5 akonadi-contacts-23.04.0_1
 libKF5Prison.so.5 prison-5.43.0_1
@@ -1689,6 +1670,7 @@ libubsan.so.1 libsanitizer-8.2.0_1
 libtsan.so.2 libsanitizer-12.2.0_1
 libasan.so.8 libsanitizer-12.2.0_1
 liblsan.so.0 libsanitizer-6.3.0_1
+libhwasan.so.0 libsanitizer-13.2.0_1
 libvtv.so.0 libvtv-6.3.0_1
 libatomic.so.1 libatomic-4.9.0_1
 libpcsclite.so.1 libpcsclite-1.8.11_1
@@ -1773,7 +1755,7 @@ libnftnl.so.11 libnftnl-1.1.2_1
 libfcgi.so.0 fcgi-2.4.0_2
 libdshconfig.so.1 libdshconfig-0.20.13_1
 libpar2.so.1 libpar2-0.4_1
-libsodium.so.23 libsodium-1.0.15_1
+libsodium.so.26 libsodium-1.0.19_1
 libstrophe.so.0 libstrophe-0.10.1_2
 libganv-1.so.1 ganv-1.4.2_1
 libblas.so.3 blas-3.5.0_1
@@ -1958,7 +1940,7 @@ libsysstat-qt5.so.0 libsysstat-0.3.2_1
 libpolkit-qt5-agent-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
-libfm-qt.so.13 libfm-qt-1.3.0_1
+libfm-qt.so.14 libfm-qt-1.4.0_1
 libqtermwidget5.so.1 qtermwidget-1.0.0_1
 libmd4c.so.0 libmd4c-0.4.8_1
 libmd4c-html.so.0 libmd4c-html-0.4.8_1
@@ -2057,12 +2039,13 @@ libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libQt6SpatialAudio.so.6 qt6-multimedia-6.3.1_1
 libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
-libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
-libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-pdf-6.6.0_3
+libQt6PdfQuick.so.6 qt6-pdf-6.6.0_3
+libQt6Pdf.so.6 qt6-pdf-6.6.0_3
 libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
-libQt6Pdf.so.6 qt6-webengine-6.3.1_1
 libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
 libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6TextToSpeech.so.6 qt6-speech-6.6.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.9 libnpupnp-5.0.0_1
 libglfw.so.3 glfw-3.0.4_1
@@ -2072,6 +2055,7 @@ libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
+libopenpgl.so.0 openpgl-0.5.0_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.5.3_12
 libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.18_1
@@ -2158,6 +2142,12 @@ libdruntime-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
 libdruntime-ldc-shared.so.101 ldc-runtime-1.31.0_1
 libphobos2-ldc-shared.so.101 ldc-runtime-1.31.0_1
 libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
+libFcitx5Qt6DBusAddons.so.1 fcitx5-qt6-5.1.4_1
+libFcitx5Qt6WidgetsAddons.so.2 fcitx5-qt6-5.1.4_1
+libdruntime-ldc-shared.so.105 ldc-runtime-1.35.0_1
+libphobos2-ldc-shared.so.105 ldc-runtime-1.35.0_1
+libdruntime-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
+libphobos2-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
 libmarblewidget-qt5.so.28 marble5-17.12.2_1
 libastro.so.2 marble5-17.12.2_1
 libparrot.so.6.9.0 parrot-6.9.0_1
@@ -2226,11 +2216,11 @@ libwebsockets.so.19 libwebsockets-4.3.2_1
 libnfc.so.6 libnfc-1.8.0_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
-libsfml-network.so.2.5 SFML-2.5.0_1
-libsfml-system.so.2.5 SFML-2.5.0_1
-libsfml-window.so.2.5 SFML-2.5.0_1
-libsfml-audio.so.2.5 SFML-2.5.0_1
-libsfml-graphics.so.2.5 SFML-2.5.0_1
+libsfml-network.so.2.6 SFML-2.6.1_1
+libsfml-system.so.2.6 SFML-2.6.1_1
+libsfml-window.so.2.6 SFML-2.6.1_1
+libsfml-audio.so.2.6 SFML-2.6.1_1
+libsfml-graphics.so.2.6 SFML-2.6.1_1
 libclamav.so.9 clamav-0.103.1_2
 libclamunrar.so.9 clamav-0.103.1_2
 libclamunrar_iface.so.9 clamav-0.103.1_2
@@ -2269,8 +2259,8 @@ libOkteta3Gui.so.0 okteta-0.26.0_1
 libhttp_parser.so.2.9 http-parser-2.9.0_1
 libmaa.so.4 libmaa-1.4.2_1
 libcodeblocks.so.0 codeblocks-13.12_1
-liblept.so.5 leptonica-1.73_1
-libtesseract.so.4 tesseract-ocr-4.0.0_1
+libleptonica.so.6 leptonica-1.84.0_1
+libtesseract.so.5 tesseract-ocr-5.3.3_1
 libffmpegthumbnailer.so.4 ffmpegthumbnailer-2.0.10_1
 libopenraw.so.7 libopenraw-0.1.0_1
 libopenrawgnome.so.7 libopenraw-0.1.0_1
@@ -2559,7 +2549,8 @@ libndpi.so.3 ndpi-3.4_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libseafile.so.0 seafile-libclient-7.0.10_2
-libpodofo.so.0.9.7 libpodofo-0.9.7_2
+libpodofo.so.0.9.7 libpodofo0.9.7-0.9.7_1
+libpodofo.so.2 libpodofo-0.10.3_1
 libIrcUtil.so.3 libcommuni-3.4.0_1
 libIrcCore.so.3 libcommuni-3.4.0_1
 libIrcModel.so.3 libcommuni-3.4.0_1
@@ -2751,7 +2742,7 @@ libmono-btls-shared.so mono-5.2.0.215_1
 libxcb-xrm.so.0 xcb-util-xrm-1.0_1
 libinchi.so.0 openbabel-3.1.1_1
 libopenbabel.so.7 openbabel-3.1.1_1
-libcourier-unicode.so.7 courier-unicode-2.2.2_1
+libcourier-unicode.so.8 courier-unicode-2.3.0_1
 libzstd.so.1 libzstd-1.0.0_1
 libudis86.so.0 udis86-1.7.2_4
 libsass.so.1 libsass-3.5.0_1
@@ -2865,27 +2856,28 @@ libkj-http-0.10.2.so capnproto-0.10.2_1
 libkj-async-0.10.2.so capnproto-0.10.2_1
 libkj-test-0.10.2.so capnproto-0.10.2_1
 libkj-0.10.2.so capnproto-0.10.2_1
-libkea-asiodns.so.24 libkea-2.2.0_1
-libkea-asiolink.so.40 libkea-2.2.0_1
-libkea-cc.so.39 libkea-2.2.0_1
-libkea-cfgclient.so.36 libkea-2.2.0_1
-libkea-cryptolink.so.28 libkea-2.2.0_1
-libkea-d2srv.so.16 libkea-2.2.0_1
-libkea-database.so.35 libkea-2.2.0_1
-libkea-dhcp++.so.54 libkea-2.2.0_1
-libkea-dhcp_ddns.so.29 libkea-2.2.0_1
-libkea-dhcpsrv.so.69 libkea-2.2.0_1
-libkea-dns++.so.30 libkea-2.2.0_1
-libkea-eval.so.39 libkea-2.2.0_1
-libkea-exceptions.so.13 libkea-2.2.0_1
-libkea-hooks.so.57 libkea-2.2.0_1
-libkea-http.so.42 libkea-2.2.0_1
-libkea-log.so.35 libkea-2.2.0_1
-libkea-pgsql.so.36 libkea-2.2.0_1
-libkea-process.so.40 libkea-2.2.0_1
-libkea-stats.so.18 libkea-2.2.0_1
-libkea-util-io.so.0 libkea-2.2.0_1
-libkea-util.so.52 libkea-2.2.0_1
+libkea-asiodns.so.35 libkea-2.4.1_1
+libkea-asiolink.so.56 libkea-2.4.1_1
+libkea-cc.so.54 libkea-2.4.1_1
+libkea-cfgclient.so.51 libkea-2.4.1_1
+libkea-cryptolink.so.38 libkea-2.4.1_1
+libkea-d2srv.so.30 libkea-2.4.1_1
+libkea-database.so.48 libkea-2.4.1_1
+libkea-dhcp++.so.74 libkea-2.4.1_1
+libkea-dhcp_ddns.so.41 libkea-2.4.1_1
+libkea-dhcpsrv.so.90 libkea-2.4.1_1
+libkea-dns++.so.42 libkea-2.4.1_1
+libkea-eval.so.52 libkea-2.4.1_1
+libkea-exceptions.so.23 libkea-2.4.1_1
+libkea-hooks.so.78 libkea-2.4.1_1
+libkea-http.so.56 libkea-2.4.1_1
+libkea-log.so.48 libkea-2.4.1_1
+libkea-pgsql.so.53 libkea-2.4.1_1
+libkea-process.so.57 libkea-2.4.1_1
+libkea-stats.so.29 libkea-2.4.1_1
+libkea-tcp.so.5 libkea-2.4.1_1
+libkea-util-io.so.0 libkea-2.4.1_1
+libkea-util.so.68 libkea-2.4.1_1
 libytnef.so.0 ytnef-1.8_1
 libpisock.so.9 pilot-link-0.12.5_1
 libpisync.so.1 pilot-link-0.12.5_1
@@ -2949,7 +2941,6 @@ libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.22 libqalculate-3.20.1_1
-libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 ostree-2023.1_1
 librhash.so.1 rhash-1.4.4_1
 libserialport.so.0 libserialport-0.1.1_1
@@ -3189,29 +3180,29 @@ libarcan_tui.so.0.15 arcan-0.6.1.1_1
 libarcan_a12.so.0.1 arcan-0.6.1.1_1
 liblwipv6.so.2 lwipv6-1.5a_1
 libpipewire-0.3.so.0 libpipewire-0.3.6_1
-libvolk.so.3.0 volk-3.0.0_1
-libgnuradio-runtime.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-pmt.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-blocks.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-audio.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-fec.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-fft.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-filter.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-analog.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-digital.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-dtv.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-channels.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-trellis.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-video-sdl.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-vocoder.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-wavelet.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-uhd.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-network.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-soapy.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-qtgui.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-zeromq.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-iio.so.3.10.5 gnuradio-3.10.5.0_1
-libgnuradio-pdu.so.3.10.5 gnuradio-3.10.5.0_1
+libvolk.so.3.1 volk-3.1.0_1
+libgnuradio-runtime.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-pmt.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-blocks.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-audio.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-fec.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-fft.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-filter.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-analog.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-digital.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-dtv.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-channels.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-trellis.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-video-sdl.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-vocoder.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-wavelet.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-uhd.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-network.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-soapy.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-qtgui.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-zeromq.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-iio.so.3.10.8 gnuradio-3.10.8.0_1
+libgnuradio-pdu.so.3.10.8 gnuradio-3.10.8.0_1
 libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
 libflann_cpp.so.1.9 flann-1.9.1_1
 libflann.so.1.9 flann-1.9.1_1
@@ -3491,11 +3482,11 @@ libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1
 libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1
-libwlroots.so.9 wlroots0.14-0.14.1_1
 libwlroots.so.10 wlroots0.15-0.15.1_1
 libwlroots.so.11 wlroots0.16-0.16.0_1
+libwlroots.so.12 wlroots0.17-0.17.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
-libcotp.so.2 libcotp-2.0.1_1
+libcotp.so.3 libcotp-3.0.0_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
@@ -3555,7 +3546,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.15 libpinyin-2.8.1_1
 libzhuyin.so.15 libzhuyin-2.8.1_1
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.6.0 uhd-4.6.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5.so.2.0.0git gnuradio-nrsc5-2.0.0_1
@@ -3832,7 +3823,7 @@ libigraph.so.3 igraph-0.10.2_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
 librdkafka.so.1 librdkafka-1.4.4_3
 librdkafka++.so.1 librdkafka-1.4.4_3
-libraft.so.2 raft-0.13.0_1
+libraft.so.0 raft-0.18.2_1
 libmdnsd.so.1 libmdnsd-0.9_1
 libosdGPU.so.3.4.3 OpenSubdiv-3.4.3_1
 libosdCPU.so.3.4.3 OpenSubdiv-3.4.3_1
@@ -3867,7 +3858,7 @@ libhidrd_item.so.0 hidrd-0.2.0_1
 libhidrd_opt.so.0 hidrd-0.2.0_1
 libhidrd_strm.so.0 hidrd-0.2.0_1
 libhidrd_fmt.so.0 hidrd-0.2.0_1
-libjcat.so.1 libjcat-0.1.2_1
+libjcat.so.1 libjcat-0.1.14_1
 libmatio.so.11 matio-1.5.23_1
 libportal.so.1 libportal-0.6_1
 libportal-gtk3.so.1 libportal-gtk3-0.6_1
@@ -3906,6 +3897,7 @@ libnotcurses++.so.3 notcurses-3.0.5_1
 libnotcurses-ffi.so.3 notcurses-3.0.5_1
 libevemu.so.3 evemu-2.7.0_1
 libinih.so.0 inih-52_1
+libINIReader.so.0 inih-57_1
 libpcaudio.so.0 pcaudiolib-1.1_1
 libdcerpc-samr.so.0 samba-4.13.2_1
 libdcerpc-server-core.so.0 samba-4.13.2_1
@@ -3975,8 +3967,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.17 flintlib-2.9.0_1
-libarb.so.2 arb-2.20.0_1
+libflint.so.18 flintlib-3.0.0_1
 libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
@@ -4014,7 +4005,7 @@ libkdumpfile.so.10 libkdumpfile-0.4.1_1
 libamd.so.3 SuiteSparse-6.0.1_1
 libcamd.so.3 SuiteSparse-6.0.1_1
 libccolamd.so.3 SuiteSparse-6.0.1_1
-libcholmod.so.4 SuiteSparse-6.0.1_1
+libcholmod.so.5 SuiteSparse-7.3.0_1
 libcolamd.so.3 SuiteSparse-6.0.1_1
 libcxsparse.so.4 SuiteSparse-6.0.1_1
 libspqr.so.4 SuiteSparse-7.2.0_1
@@ -4062,6 +4053,7 @@ libawt_xawt.so openjdk17-jre-17.0.1+12_1
 libjava.so openjdk17-jre-17.0.1+12_1
 libjli.so openjdk17-jre-17.0.1+12_1
 libjvm.so openjdk17-jre-17.0.1+12_1
+libspatialindex.so.6 libspatialindex-1.9.3_1
 librttopo.so.1 librttopo-1.1.0_1
 libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
@@ -4096,7 +4088,7 @@ librz_syscall.so.0.6 rizin-0.6.0_1
 librz_type.so.0.6 rizin-0.6.0_1
 librz_util.so.0.6 rizin-0.6.0_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
-libLimeSuite.so.23.10-1 LimeSuite-23.10.0_1
+libLimeSuite.so.23.11-1 LimeSuite-23.11.0_1
 libnvme.so.1 libnvme-1.0_1
 libnvme-mi.so.1 libnvme-1.2_1
 libRInside.so R-cran-RInside-0.2.16_1
@@ -4270,6 +4262,18 @@ libgrass_gproj.8.3.so grass-8.3.0_1
 libgrass_imagery.8.3.so grass-8.3.0_1
 libgrass_raster.8.3.so grass-8.3.0_1
 libgrass_vector.8.3.so grass-8.3.0_1
+libvpl.so.2 oneVPL-2023.3.1_1
+libusrsctp.so.2 usrsctp-0.9.5.0_1
+libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
+libgeotiff.so.5 libgeotiff-1.7.1_1
+libdraco.so.8 draco-1.5.6_1
+libpdal_base.so.16 libpdal-2.6.2_1
+libpdalcpp.so.16 libpdal-2.6.2_1
+libdisplay-info.so.1 libdisplay-info-0.1.1_1
+libsqsh.so.1 libsqsh-1.3.0_1
+libunicode.so.0.4 libunicode-0.4.0_1
+libunicode_ucd.so.0.4 libunicode-0.4.0_1
+libunicode_loader.so.0.4 libunicode-0.4.0_1
 
 # Cereus Linux custom shlibs
 libcalamares.so.3.2.62 calamares-3.2.62_2
diff --git a/common/travis/license.lst b/common/travis/license.lst
index aab1ca5..f0ac528 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -28,6 +28,7 @@ Abstyles
 AdaCore-doc
 Adobe-2006
 Adobe-Glyph
+Adobe-Utopia
 Afmparse
 Aladdin
 Apache-1.0
@@ -42,6 +43,7 @@ Artistic-2.0
 Asterisk-exception
 Autoconf-exception-2.0
 Autoconf-exception-3.0
+Autoconf-exception-generic-3.0
 Autoconf-exception-generic
 Autoconf-exception-macro
 BSD-1-Clause
@@ -50,6 +52,7 @@ BSD-2-Clause-Views
 BSD-2-Clause
 BSD-3-Clause-Attribution
 BSD-3-Clause-Clear
+BSD-3-Clause-HP
 BSD-3-Clause-LBNL
 BSD-3-Clause-Modification
 BSD-3-Clause-No-Military-License
@@ -57,6 +60,8 @@ BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-License
 BSD-3-Clause-No-Nuclear-Warranty
 BSD-3-Clause-Open-MPI
+BSD-3-Clause-Sun
+BSD-3-Clause-flex
 BSD-3-Clause
 BSD-4-Clause-Shortened
 BSD-4-Clause-UC
@@ -65,8 +70,10 @@ BSD-4.3RENO
 BSD-4.3TAHOE
 BSD-Advertising-Acknowledgement
 BSD-Attribution-HPND-disclaimer
+BSD-Inferno-Nettverk
 BSD-Protection
 BSD-Source-Code
+BSD-Systemics
 BSL-1.0
 BUSL-1.1
 Baekmuk
@@ -174,11 +181,13 @@ Clips
 Community-Spec-1.0
 Condor-1.1
 Cornell-Lossless-JPEG
+Cronyx
 Crossword
 CrystalStacker
 Cube
 D-FSL-1.0
 DL-DE-BY-2.0
+DL-DE-ZERO-2.0
 DOC
 DRL-1.0
 DSDP
@@ -199,6 +208,7 @@ Elastic-2.0
 Entessa
 ErlPL-1.1
 Eurosym
+FBM
 FDK-AAC
 FLTK-exception
 FSFAP
@@ -208,10 +218,13 @@ FSFULLRWD
 FTL
 Fair
 Fawkes-Runtime-exception
+Ferguson-Twofish
 Font-exception-2.0
 Frameworx-1.0
 FreeBSD-DOC
 FreeImage
+Furuseth
+GCC-exception-2.0-note
 GCC-exception-2.0
 GCC-exception-3.1
 GD
@@ -236,6 +249,7 @@ GFDL-1.3-or-later
 GL2PS
 GLWTPL
 GNAT-exception
+GNU-compiler-exception
 GPL-1.0-only
 GPL-1.0-or-later
 GPL-2.0-only
@@ -253,8 +267,16 @@ Glide
 Glulxe
 Graphics-Gems
 HP-1986
+HP-1989
+HPND-DEC
 HPND-Markus-Kuhn
+HPND-Pbmplus
+HPND-UC
+HPND-doc-sell
+HPND-doc
+HPND-export-US-modify
 HPND-export-US
+HPND-sell-regexpr
 HPND-sell-variant-MIT-disclaimer
 HPND-sell-variant
 HPND
@@ -281,6 +303,7 @@ JPNIC
 JSON
 Jam
 JasPer-2.0
+Kastrup
 Kazlib
 KiCad-libraries-exception
 Knuth-CTAN
@@ -321,6 +344,7 @@ Linux-man-pages-copyleft-2-para
 Linux-man-pages-copyleft-var
 Linux-man-pages-copyleft
 Linux-syscall-note
+Lucida-Bitmap-Fonts
 MIT-0
 MIT-CMU
 MIT-Festival
@@ -330,8 +354,11 @@ MIT-advertising
 MIT-enna
 MIT-feh
 MIT-open-group
+MIT-testregex
 MIT
 MITNFA
+MMIXware
+MPEG-SSG
 MPL-1.0
 MPL-1.1
 MPL-2.0-no-copyleft-exception
@@ -342,6 +369,7 @@ MS-RL
 MTLL
 MakeIndex
 Martin-Birgmeier
+McPhee-slideshow
 Minpack
 MirOS
 Motosoto
@@ -427,6 +455,7 @@ OSL-3.0
 OpenJDK-assembly-exception-1.0
 OpenPBS-2.3
 OpenSSL
+PADL
 PDDL-1.0
 PHP-3.0
 PHP-3.01
@@ -455,11 +484,13 @@ RSA-MD
 RSCPL
 Rdisc
 Ruby
+SANE-exception
 SAX-PD
 SCEA
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
+SGI-OpenGL
 SGP4
 SHL-0.5
 SHL-0.51
@@ -467,6 +498,7 @@ SHL-2.0
 SHL-2.1
 SISSL-1.2
 SISSL
+SL
 SMLNJ
 SMPPL
 SNIA
@@ -482,6 +514,7 @@ Sendmail-8.23
 Sendmail
 SimPL-2.0
 Sleepycat
+Soundex
 Spencer-86
 Spencer-94
 Spencer-99
@@ -498,12 +531,16 @@ TOSL
 TPDL
 TPL-1.0
 TTWL
+TTYP0
 TU-Berlin-1.0
 TU-Berlin-2.0
 TermReadKey
+Texinfo-exception
+UBDL-exception
 UCAR
 UCL-1.0
 UPL-1.0
+URT-RLE
 Unicode-DFS-2015
 Unicode-DFS-2016
 Unicode-TOU
@@ -535,12 +572,14 @@ ZPL-1.1
 ZPL-2.0
 ZPL-2.1
 Zed
+Zeeff
 Zend-2.0
 Zimbra-1.3
 Zimbra-1.4
 Zlib
 blessing
 bzip2-1.0.6
+check-cvs
 checkmk
 copyleft-next-0.3.0
 copyleft-next-0.3.1
@@ -584,6 +623,7 @@ eCos-exception-2.0
 eGenix
 etalab-2.0
 freertos-exception-2.0
+fwlw
 gSOAP-1.3b
 gnu-javamail-exception
 gnuplot
@@ -594,16 +634,24 @@ libpri-OpenH323-exception
 libselinux-1.0
 libtiff
 libutil-David-Nugent
+lsof
+magaz
 metamail
 mif-exception
 mpi-permissive
 mpich2
 mplus
 openvpn-openssl-exception
+pnmstitch
 psfrag
 psutils
+python-ldap
 snprintf
+ssh-keyscan
+stunnel-exception
+swrule
 u-boot-exception-2.0
+ulem
 vsftpd-openssl-exception
 w3m
 x11vnc-openssl-exception
diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index 20f6152..57ef45a 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -410,22 +410,12 @@ install_pkg_deps() {
     done
 
     if [[ ${host_binpkg_deps} ]]; then
-        if [ -z "$XBPS_QUIET" ]; then
-            # normal messages in bold
-            [[ $NOCOLORS ]] || printf "\033[1m"
-            echo "=> $pkgver: installing host dependencies: ${host_binpkg_deps[@]} ..."
-            [[ $NOCOLORS ]] || printf "\033[m"
-        fi
+        msg_normal "$pkgver: installing host dependencies: ${host_binpkg_deps[*]} ...\n"
         install_pkg_from_repos "" host "${host_binpkg_deps[@]}"
     fi
 
     if [[ ${binpkg_deps} ]]; then
-        if [ -z "$XBPS_QUIET" ]; then
-            # normal messages in bold
-            [[ $NOCOLORS ]] || printf "\033[1m"
-            echo "=> $pkgver: installing target dependencies: ${binpkg_deps[@]} ..."
-            [[ $NOCOLORS ]] || printf "\033[m"
-        fi
+        msg_normal "$pkgver: installing target dependencies: ${binpkg_deps[*]} ...\n"
         install_pkg_from_repos "$cross" target "${binpkg_deps[@]}"
     fi
 
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 33d5ad5..fc17dae 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -8,22 +8,30 @@ install_base_chroot() {
         XBPS_TARGET_PKG="$1"
     fi
     # binary bootstrap
-    msg_normal "xbps-src: installing base-chroot-cereus...\n"
+    msg_normal "xbps-src: installing base-chroot...\n"
     # XBPS_TARGET_PKG == arch
     if [ "$XBPS_TARGET_PKG" ]; then
         _bootstrap_arch="env XBPS_TARGET_ARCH=$XBPS_TARGET_PKG"
     fi
     (export XBPS_MACHINE=$XBPS_TARGET_PKG XBPS_ARCH=$XBPS_TARGET_PKG; chroot_sync_repodata)
-    ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot-cereus
+    # Fix cyclic between glibc and libxcrypt-compat
+    case "$XBPS_MACHINE" in
+        *-musl)
+            ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot
+            ;;
+        *)
+            ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS} -y base-chroot glibc libxcrypt-compat
+            ;;
+    esac
     if [ $? -ne 0 ]; then
-        msg_error "xbps-src: failed to install base-chroot-cereus!\n"
+        msg_error "xbps-src: failed to install base-chroot!\n"
     fi
     # Reconfigure base-files to create dirs/symlinks.
     if xbps-query -r $XBPS_MASTERDIR base-files &>/dev/null; then
         XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-files &>/dev/null
     fi
 
-    msg_normal "xbps-src: installed base-chroot-cereus successfully!\n"
+    msg_normal "xbps-src: installed base-chroot successfully!\n"
     chroot_prepare $XBPS_TARGET_PKG || msg_error "xbps-src: failed to initialize chroot!\n"
     chroot_check
     chroot_handler clean
@@ -34,7 +42,7 @@ reconfigure_base_chroot() {
     local pkgs="glibc-locales ca-certificates"
     [ -z "$IN_CHROOT" -o -e $statefile ] && return 0
     # Reconfigure ca-certificates.
-    msg_normal "xbps-src: reconfiguring base-chroot-cereus...\n"
+    msg_normal "xbps-src: reconfiguring base-chroot...\n"
     for f in ${pkgs}; do
         if xbps-query -r $XBPS_MASTERDIR $f &>/dev/null; then
             xbps-reconfigure -r $XBPS_MASTERDIR -f $f
@@ -51,7 +59,7 @@ update_base_chroot() {
     if $(${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -nu|grep -q xbps); then
         ${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -yu xbps || msg_error "xbps-src: failed to update xbps!\n"
     fi
-    ${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -yu || msg_error "xbps-src: failed to update base-chroot-cereus!\n"
+    ${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -yu || msg_error "xbps-src: failed to update base-chroot!\n"
     msg_normal "xbps-src: cleaning up $XBPS_MASTERDIR masterdir...\n"
     [ -z "$XBPS_KEEP_ALL" -a -z "$XBPS_SKIP_DEPS" ] && remove_pkg_autodeps
     [ -z "$XBPS_KEEP_ALL" -a -z "$keep_all_force" ] && rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
@@ -309,6 +317,9 @@ chroot_sync_repodata() {
     # Copy xbps repository keys to the masterdir.
     mkdir -p $XBPS_MASTERDIR/var/db/xbps/keys
     cp -f $XBPS_COMMONDIR/repo-keys/*.plist $XBPS_MASTERDIR/var/db/xbps/keys
+    if [ -n "$(shopt -s nullglob; echo "$XBPS_DISTDIR"/etc/repo-keys/*.plist)" ]; then
+        cp -f "$XBPS_DISTDIR"/etc/repo-keys/*.plist "$XBPS_MASTERDIR"/var/db/xbps/keys
+    fi
 
     # Make sure to sync index for remote repositories.
     if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 0424794..4083e08 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -176,8 +176,13 @@ msg_warn_nochroot() {
 
 msg_normal() {
     if [ -z "$XBPS_QUIET" ]; then
-        # normal messages in bold
-        [ -n "$NOCOLORS" ] || printf "\033[1m"
+        # normal messages in bright bold white
+        if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+            # Github CI considers '1m' to be just a font bold
+            [ -n "$NOCOLORS" ] || printf "\033[97m\033[1m"
+        else
+            [ -n "$NOCOLORS" ] || printf "\033[1m"
+        fi
         printf "=> $@"
         [ -n "$NOCOLORS" ] || printf "\033[m"
     fi
@@ -201,7 +206,12 @@ report_broken() {
 }
 
 msg_normal_append() {
-    [ -n "$NOCOLORS" ] || printf "\033[1m"
+    if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+        # Github CI considers '1m' to be just a font bold
+        [ -n "$NOCOLORS" ] || printf "\033[97m\033[1m"
+    else
+        [ -n "$NOCOLORS" ] || printf "\033[1m"
+    fi
     printf "$@"
     [ -n "$NOCOLORS" ] || printf "\033[m"
 }
diff --git a/common/xbps-src/shutils/show.sh b/common/xbps-src/shutils/show.sh
index 6ae0f4e..4671a13 100644
--- a/common/xbps-src/shutils/show.sh
+++ b/common/xbps-src/shutils/show.sh
@@ -75,7 +75,7 @@ show_avail() {
 
 show_eval_dep() {
     local f x _pkgname _srcpkg found
-    local _dep="$1"
+    local _dep="${1%-32bit}"
     local _host="$2"
     if [ -z "$CROSS_BUILD" ] || [ -z "$_host" ]; then
         # ignore dependency on itself
@@ -92,8 +92,7 @@ show_eval_dep() {
         [[ $_dep == $x ]] && found=1 && break
     done
     [[ $found ]] && return
-    _pkgname=${_dep/-32bit}
-    _srcpkg=$(readlink -f ${XBPS_SRCPKGDIR}/${_pkgname})
+    _srcpkg=$(readlink -f ${XBPS_SRCPKGDIR}/${_dep})
     _srcpkg=${_srcpkg##*/}
     echo $_srcpkg
 }
@@ -129,15 +128,16 @@ show_pkg_makedepends() {
 }
 
 show_pkg_build_options() {
-    local f opt desc
+    local f
 
     [ -z "$PKG_BUILD_OPTIONS" ] && return 0
 
     source $XBPS_COMMONDIR/options.description
     msg_normal "$pkgver: the following build options are set:\n"
     for f in ${PKG_BUILD_OPTIONS}; do
-        opt="${f#\~}"
-        eval desc="\${desc_option_${opt}}"
+        local opt="${f#\~}"
+        local descref="desc_option_${opt}"
+        local desc="${!descref-Enable support for $opt}"
         if [[ ${f:0:1} == '~' ]]; then
             echo "   $opt: $desc (OFF)"
         else
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 8838d45..99615ef 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -29,6 +29,7 @@ nodejs-runtime nodejs
 ntp-daemon chrony
 phonon-backend phonon-backend-gstreamer
 phonon-qt5-backend phonon-qt5-backend-gstreamer
+php-runtime php8.3
 pipewire-session-manager base-chroot-cyclic-solver
 rkt-stage1 rkt-stage1-coreos
 smtp-server opensmtpd
diff --git a/xbps-src b/xbps-src
index cdb5f8c..b4e99f5 100755
--- a/xbps-src
+++ b/xbps-src
@@ -14,14 +14,17 @@ $PROGNAME: [options] <target> [arguments]
 
 Targets: (only one may be specified)
 
-binary-bootstrap [arch]
+binary-bootstrap
     Install bootstrap packages from host repositories into <masterdir>.
-    If the optional 'arch' argument is set, it will install bootstrap packages
-    from this architecture, and its required xbps utilities. The <masterdir>
-    will be initialized for chroot operations.
+    If the optional '-A <arch>' flag is set, it will install bootstrap packages
+    from this architecture, and its required xbps utilities. The <masterdir> will
+    be initialized for chroot operations.
 
 bootstrap
     Build and install from source the bootstrap packages into <masterdir>.
+    If the optional '-A <arch>' flag is set, it will build and install bootstrap
+    packages from this architecture, and its required xbps utilities. The <masterdir>
+    will be initialized for chroot operations.
 
 bootstrap-update
     Updates bootstrap packages with latest versions available from registered
@@ -151,6 +154,13 @@ Options:
 
 -1  If dependencies of target package are missing, fail instead of building them.
 
+-A <host>
+    Use this host machine. Automatically creates masterdir-<host> if it doesn't
+    already exist. Some host machines may require qemu-user-static and
+    binfmt-support if not natively supported by the processor. Supported hosts:
+
+$(print_cross_targets)
+
 -a  <target>
     Cross compile packages for this target machine. Supported targets:
 
@@ -194,7 +204,7 @@ $(print_cross_targets)
 -m  <masterdir>
     Absolute path to a directory to be used as masterdir.
     The masterdir is the main directory to build/store/compile packages.
-    If unset defaults to void-packages/masterdir.
+    If unset defaults to void-packages/masterdir-<host>.
 
 -N  Disable use of remote repositories to resolve dependencies.
 
@@ -290,19 +300,8 @@ check_native_arch() {
         else
             export XBPS_ARCH=$(xbps-uhelper arch)
         fi
-    elif [ "$XBPS_TARGET" = 'binary-bootstrap' ] && [ "$XBPS_TARGET_PKG" ]; then
-        # ^ special case for binary-bootstrap for e.g:
-        # x86_64 -> x86_64-musl
-        # x86_64 -> i686
-        export XBPS_ARCH=$XBPS_TARGET_PKG
     else
-        LDD=$(ldd --version 2>&1|head -1)
-        if [[ $LDD == *musl* ]]; then
-            export XBPS_ARCH=${XBPS_MACHINE%-musl}-musl
-        else
-            # XBPS_ARCH == $(uname -m)
-            export XBPS_ARCH=$(uname -m)
-        fi
+        export XBPS_ARCH="$XBPS_MACHINE"
     fi
 }
 
@@ -372,7 +371,7 @@ readonly XBPS_SRC_VERSION="113"
 export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
 
 XBPS_OPTIONS=
-XBPS_OPTSTRING="1a:bc:CEfgGhH:iIj:Lm:No:p:qsQKr:tV"
+XBPS_OPTSTRING="1A:a:bc:CEfgGhH:iIj:Lm:No:p:qsQKr:tV"
 
 # Preprocess arguments in order to allow options before and after XBPS_TARGET.
 eval set -- $(getopt "$XBPS_OPTSTRING" "$@");
@@ -383,6 +382,7 @@ eval set -- $(getopt "$XBPS_OPTSTRING" "$@");
 while getopts "$XBPS_OPTSTRING" opt; do
     case $opt in
         1) XBPS_ARG_BUILD_ONLY_ONE_PKG=yes; XBPS_OPTIONS+=" -1";;
+        A) XBPS_ARG_MACHINE="$OPTARG"; XBPS_OPTIONS+=" -A $OPTARG";;
         a) XBPS_ARG_CROSS_BUILD="$OPTARG"; XBPS_OPTIONS+=" -a $OPTARG";;
         b) XBPS_ARG_IGNORE_BROKENNESS=yes; XBPS_OPTIONS+=" -b";;
         c) XBPS_ARG_CONFIG="$OPTARG"; XBPS_OPTIONS+=" -c $OPTARG";;
@@ -474,6 +474,9 @@ fi
 # Read settings from config file
 [ -s "$XBPS_CONFIG_FILE" ] && . $XBPS_CONFIG_FILE &>/dev/null
 
+# show colors unconditionally in CI
+[ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ] && export NOCOLORS=
+
 # Set options passed on command line, after configuration files have been read
 [ -n "$XBPS_ARG_BUILD_ONLY_ONE_PKG" ] && XBPS_BUILD_ONLY_ONE_PKG=yes
 [ -n "$XBPS_ARG_IGNORE_BROKENNESS" ] && XBPS_IGNORE_BROKENNESS=1
@@ -490,6 +493,7 @@ fi
 [ -n "$XBPS_ARG_PRINT_VARIABLES" ] && XBPS_PRINT_VARIABLES="$XBPS_ARG_PRINT_VARIABLES"
 [ -n "$XBPS_ARG_ALT_REPOSITORY" ] && XBPS_ALT_REPOSITORY="$XBPS_ARG_ALT_REPOSITORY"
 [ -n "$XBPS_ARG_STRICT" ] && XBPS_STRICT="$XBPS_ARG_STRICT"
+[ -n "$XBPS_ARG_MACHINE" ] && XBPS_MACHINE="$XBPS_ARG_MACHINE"
 [ -n "$XBPS_ARG_CROSS_BUILD" ] && XBPS_CROSS_BUILD="$XBPS_ARG_CROSS_BUILD"
 [ -n "$XBPS_ARG_CHECK_PKGS" ] && XBPS_CHECK_PKGS="$XBPS_ARG_CHECK_PKGS"
 [ -n "$XBPS_ARG_MAKEJOBS" ] && XBPS_MAKEJOBS="$XBPS_ARG_MAKEJOBS"
@@ -524,9 +528,19 @@ if [ -z "$IN_CHROOT" -a "$UID" -eq 0 -a -z "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
     exit 1
 fi
 
-# if XBPS_MASTERDIR unset, defaults to $XBPS_DISTDIR/masterdir.
-: ${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir}
-[ ! -d $XBPS_MASTERDIR ] &&  mkdir -p $XBPS_MASTERDIR
+# if XBPS_MASTERDIR unset, defaults to $XBPS_DISTDIR/masterdir-<host machine>
+# unless in a container for simplicity of container/CI usage
+if [ "$XBPS_CHROOT_CMD" = ethereal ]; then
+    : "${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir}"
+else
+    : "${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir-$XBPS_MACHINE}"
+    # but use $XBPS_DISTDIR/masterdir if it exists and the new style doesn't
+    if [ ! -d "${XBPS_MASTERDIR}" ] && [ -r "${XBPS_DISTDIR}/masterdir/.xbps_chroot_init" ] \
+        && [ "$(cat "${XBPS_DISTDIR}/masterdir/.xbps_chroot_init")" = "$XBPS_MACHINE" ]; then
+        XBPS_MASTERDIR="${XBPS_DISTDIR}/masterdir"
+    fi
+fi
+[ ! -d "$XBPS_MASTERDIR" ] && mkdir -p "$XBPS_MASTERDIR"
 
 # if XBPS_HOSTDIR unset, defaults to $XBPS_DISTDIR/hostdir.
 : ${XBPS_HOSTDIR:=$XBPS_DISTDIR/hostdir}
@@ -614,10 +628,10 @@ if [ -z "$XBPS_REINIT" -a -s $XBPS_MASTERDIR/.xbps_chroot_init ]; then
         linux32 xbps-reconfigure -r ${XBPS_MASTERDIR} -a &>/dev/null
         # reexec itself via linux32
         export XBPS_REINIT=1
-        exec linux32 $0 ${XBPS_OPTIONS} $@
+        exec linux32 $0 ${XBPS_OPTIONS} "$@"
     fi
 fi
-if [ "$XBPS_ARCH" ]; then
+if [ -n "$XBPS_ARCH" ]; then
     export XBPS_MACHINE=$XBPS_ARCH
 fi
 # At this point if XBPS_TARGET_MACHINE isn't defined we assume
@@ -740,13 +754,21 @@ reconfigure_base_chroot
 #
 case "$XBPS_TARGET" in
     binary-bootstrap)
-        install_base_chroot ${XBPS_TARGET_PKG:=$XBPS_MACHINE}
+        if [ -n "$XBPS_TARGET_PKG" ]; then
+            msg_error "xbps-src: binary-bootstrap <arch> is no longer supported, use '-A <arch>' instead\n"
+            exit 1
+        fi
+        install_base_chroot "$XBPS_MACHINE"
         ;;
     bootstrap)
         if [ -n "$XBPS_CHECK_PKGS" ]; then
             msg_error "xbps-src: disable tests for bootstrap\n"
             exit 1
         fi
+        if [ -n "$XBPS_TARGET_PKG" ]; then
+            msg_error "xbps-src: bootstrap <arch> is no longer supported, use '-A <arch>' instead\n"
+            exit 1
+        fi
         # base-chroot building on host
         # check for required host utils
         check_reqhost_utils bootstrap
@@ -758,7 +780,7 @@ case "$XBPS_TARGET" in
                 base-chroot base-chroot $XBPS_TARGET || exit 1
         ) || exit 1
         [ -d $XBPS_MASTERDIR ] && rm -rf $XBPS_MASTERDIR
-        install_base_chroot ${XBPS_TARGET_PKG:=$XBPS_MACHINE}
+        install_base_chroot "$XBPS_MACHINE"
         ;;
     bootstrap-update)
         if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then