diff --git a/app-arch/libarchive-qt/libarchive-qt-2.0.8.ebuild b/app-arch/libarchive-qt/libarchive-qt-2.0.8-r1.ebuild
similarity index 79%
rename from app-arch/libarchive-qt/libarchive-qt-2.0.8.ebuild
rename to app-arch/libarchive-qt/libarchive-qt-2.0.8-r1.ebuild
index ca1b4725a4..005ed16288 100644
--- a/app-arch/libarchive-qt/libarchive-qt-2.0.8.ebuild
+++ b/app-arch/libarchive-qt/libarchive-qt-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,20 +13,20 @@ S="${WORKDIR}/${PN}-v${PV}"
 LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="qt6"
 
 DEPEND="
+	app-arch/bzip2
 	app-arch/libarchive:=
+	app-arch/xz-utils
+	dev-qt/qtbase:6
 	sys-libs/zlib
-	!qt6? ( dev-qt/qtcore:5 )
-	qt6? ( dev-qt/qtbase:6 )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local emesonargs=(
 		-Dinstall_static=false
-		-Duse_qt_version=$(usex qt6 qt6 qt5)
+		-Duse_qt_version=qt6
 	)
 	meson_src_configure
 }
diff --git a/app-benchmarks/kdiskmark/Manifest b/app-benchmarks/kdiskmark/Manifest
index 9687ddcc01..b75a68adad 100644
--- a/app-benchmarks/kdiskmark/Manifest
+++ b/app-benchmarks/kdiskmark/Manifest
@@ -1 +1 @@
-DIST kdiskmark-3.1.4.tar.gz 194855 BLAKE2B fc8f59492b14849ffe6962183082a86c3e9d82e67f6b1b6a0449f7c714480d46c62ca85e4b1f7b838b42fd4cc5fcf3e8e81e0d3df5c955657cf8799b9f9110b6 SHA512 53f292e4137ac36dfbc09ad400496170bfd13a8c18f1c474bd15b00cdd931918713e034e35d6f3dbda29eb1ee89d8f273dd8e794a9e70c95ec96ebf31f0baedf
+DIST kdiskmark-3.2.0-source.tar.gz 195625 BLAKE2B 65d0fdc31869c5567463a7aa31179c82ad289bb2f75adb88b6e1b9023f54963f5903902150ed3c2fff2a2f9a089f24ac445526891705ccc1ba8db7adfdf2485a SHA512 2a8e5c755accca9b5fa24155e722e6da6c975f247dd8ee29db97ac975ea4a86a736248edda6d40853f11da9c4cc86c58a50797f508a26cc717e27c7f902322d9
diff --git a/app-benchmarks/kdiskmark/kdiskmark-3.1.4-r1.ebuild b/app-benchmarks/kdiskmark/kdiskmark-3.1.4-r1.ebuild
deleted file mode 100644
index 147a05e787..0000000000
--- a/app-benchmarks/kdiskmark/kdiskmark-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Disk benchmarking tool"
-HOMEPAGE="https://github.com/JonMagon/KDiskMark"
-SRC_URI="https://github.com/JonMagon/KDiskMark/releases/download/${PV}/KDiskMark-${PV}-source.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/KDiskMark-${PV}"
-
-inherit cmake
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/linguist-tools:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	kde-frameworks/extra-cmake-modules
-	sys-auth/polkit-qt
-	sys-block/fio[aio]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	cmake_src_configure
-}
diff --git a/app-benchmarks/kdiskmark/kdiskmark-3.2.0.ebuild b/app-benchmarks/kdiskmark/kdiskmark-3.2.0.ebuild
new file mode 100644
index 0000000000..9a026e5025
--- /dev/null
+++ b/app-benchmarks/kdiskmark/kdiskmark-3.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Disk benchmarking tool"
+HOMEPAGE="https://github.com/JonMagon/KDiskMark"
+SRC_URI="https://github.com/JonMagon/KDiskMark/releases/download/${PV}/${P}-source.tar.gz"
+
+inherit cmake xdg
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+	dev-qt/qtbase:6[dbus,gui,network,widgets]
+	sys-auth/polkit-qt[qt6]
+"
+DEPEND="
+	${COMMON_DEPEND}
+	kde-frameworks/extra-cmake-modules
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	sys-block/fio[aio]
+	x11-themes/hicolor-icon-theme
+"
+BDEPEND="dev-qt/qttools:6[linguist]"
diff --git a/app-containers/waydroid/Manifest b/app-containers/waydroid/Manifest
index fb378a3fa2..7a31ab31b5 100644
--- a/app-containers/waydroid/Manifest
+++ b/app-containers/waydroid/Manifest
@@ -1,3 +1,4 @@
 DIST waydroid-1.4.3.tar.gz 240785 BLAKE2B e654f2ed74f8d22810417ee5d6f6134ee5050b4e105dd2c643fa39df660e8c325a80f8e75176dd65e052deba187890f8afd94c384d707e0287027d3454a533ea SHA512 e94edeca7097cb1572296d0b6e308483b1bd21e1bd50d9e6d2bd54d4ba75ffeb8bd4e1d1f8143fbcf49dddd30155da2e3c5a58240a85b159dae4e71985e547aa
 DIST waydroid-1.5.1.tar.gz 241421 BLAKE2B 0368304d2088f8920d3dd65cd7fcb9d9517097146b543d838219f337f55444e32d10e2dfc4d0ec2570268959f005686cc3a756c8a44cb89bd87a473cf40a05d1 SHA512 fde8c699fdd67d49ee355c96dbba5c94ce2061c280bb28533035982cd460335f93cd9350de90b525d286f72bd3e4bad73a341fca31909e9623553e9280fe7463
 DIST waydroid-1.5.2.tar.gz 241865 BLAKE2B 39ba1f759a9420fa92d02ea289cedfb8342e680ff57b304df3b94772991564d8385b8b722f2061dd1e0e9a40e0aa6aab52b6de5d3fc60e69a93d75b387693549 SHA512 80be97409d73c3dc649482ff9b8a9b3c316f7cfa7560c87e26a2b68a0efdcaa34c070825334789b6830e3ee0a88eb0967e9101575e4eadc4a39bda099c0f7651
+DIST waydroid-1.5.3.tar.gz 242090 BLAKE2B f90eef963c604a19dc5bbe837aa304b283e604d063fe1c3ca2a2da002a47a4a99761fa92ec0972582f76fe7f94e85d0a2cbc2270f090cf3ab695a0c8966c3317 SHA512 58d5a9384aa9755368a79992f69a863805b231f1f2f85c35eb46cc4a07b283b666a8d75cdc7651d28eee97001b81a4dc5353e7c3f32e301b19eab532083b9a29
diff --git a/app-containers/waydroid/waydroid-1.5.3.ebuild b/app-containers/waydroid/waydroid-1.5.3.ebuild
new file mode 100644
index 0000000000..fb15f99c5e
--- /dev/null
+++ b/app-containers/waydroid/waydroid-1.5.3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+inherit linux-info xdg python-single-r1
+
+DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
+HOMEPAGE="https://waydro.id"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="apparmor +clipboard systemd"
+
+DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
+RDEPEND="
+	systemd? ( sys-apps/systemd )
+	app-containers/lxc[systemd?,apparmor?,seccomp]
+	$(python_gen_cond_dep '
+		clipboard? ( >=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] )
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+	')
+	net-firewall/nftables
+	net-dns/dnsmasq
+	>=dev-libs/libglibutil-1.0.79
+	>=dev-libs/gbinder-1.1.41
+	${PYTHON_DEPS}
+"
+CONFIG_CHECK="
+	~ANDROID_BINDER_IPC
+	~ANDROID_BINDERFS
+	~MEMFD_CREATE
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NETFILTER_XT_NAT
+	~PSI
+	~!PSI_DEFAULT_DISABLED
+	~NF_TABLES
+	~NF_TABLES_INET
+	~NF_TABLES_NETDEV
+	~NFT_NUMGEN
+	~NFT_NAT
+	~NFT_TUNNEL
+	~NFT_QUOTA
+	~NFT_SOCKET
+	~NF_FLOW_TABLE
+	~NFT_BRIDGE_META
+	~NFT_BRIDGE_REJECT
+"
+ERROR_ANDROID_BINDERFS="CONFIG_ANDROID_BINDERFS: need for creating Android-specific binder IPC channels"
+ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-specific binder IPC channels"
+ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers,
+	therefore it's vital for android-specific memory management"
+ERROR_NETFILTER_XT_NAT="CONFIG_NETFILTER_XT_NAT: see bug #937106"
+ERROR_NETFILTER_XT_TARGET_MASQUERADE="CONFIG_NETFILTER_XT_TARGET_MASQUERADE: see bug #937106"
+ERROR_PSI="CONFIG_PSI: see bug #947280"
+ERROR_NF_TABLES="CONFIG_NF_TABLES: Make sure you have NFTABLES up and running in your kernel"
+ERROR_NFT_NAT="CONFIG_NFT_NAT: see bug #947280"
+ERROR_NFT_BRIDGE_META="CONFIG_NFT_BRIDGE_META: see bug #947280"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use apparmor; then
+		# https://github.com/waydroid/waydroid/issues/652
+		sed -e '/^lxc\.apparmor\.profile =/d' \
+			-i data/configs/config_3 || die
+	fi
+	default
+}
+
+src_install() {
+	python_fix_shebang waydroid.py
+	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
+	if ! use systemd; then
+		elog "Installing waydroid OpenRC daemon"
+		doinitd "${FILESDIR}"/waydroid
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "After package installation run either 'emerge --config app-containers/waydroid'"
+	elog "or 'waydroid init' from root shell to install android container runtime"
+	elog "To run waydroid, 1. Start container: 'rc-service waydroid start'"
+	elog "2. start wayland channel (from user shell) 'waydroid session start'"
+	elog "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
+	elog "(does not cover Gentoo-specific things sadly)"
+	elog
+	ewarn "Make sure you have NFTABLES up and running in your kernel. See"
+	ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
+	ewarn
+	if use apparmor; then
+		ewarn "Check the known issues for apparmor:"
+		ewarn "https://docs.waydro.id/debugging/known-issues"
+	fi
+}
+
+pkg_config() {
+	"${EROOT}"/usr/bin/waydroid init
+}
diff --git a/dev-db/soci/soci-4.0.3-r4.ebuild b/dev-db/soci/soci-4.0.3-r4.ebuild
index 430c6c89dd..b36989c37a 100644
--- a/dev-db/soci/soci-4.0.3-r4.ebuild
+++ b/dev-db/soci/soci-4.0.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceforge.net/projects/soci/files/soci/${P}/${P}.tar.gz/downl
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="odbc sqlite oracle postgres mysql static-libs test lto +cxx11"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-embedded/esp-idf-monitor/Manifest b/dev-embedded/esp-idf-monitor/Manifest
index 431b822747..af55291a93 100644
--- a/dev-embedded/esp-idf-monitor/Manifest
+++ b/dev-embedded/esp-idf-monitor/Manifest
@@ -1,2 +1,3 @@
 DIST esp-idf-monitor-1.5.0.tar.gz 40536 BLAKE2B 6a079992592b5029c4d4f44871d0b751245efde5719aff4585bbe09fd1188c99430bb429b97475b2004652adfd6477e9e55bd7de05ef7c27173f9c6364ff6d71 SHA512 eaa4a3130a84e2c12adc4dc695a907da1c3cc22a30901968a4e10e49c60410c9e7296668dffc27c8dd2f8a87a24e1592f911e433dd4f76382954835255169d9f
 DIST esp_idf_monitor-1.6.0.tar.gz 47258 BLAKE2B a13f8775b7d5256caec64f593b2cab24e5c13abe37bdcb255dffd21a1bcf8dcdac66099eb369b16c28fc7a866cdf224592758f839179c77883d475f44d04fd59 SHA512 874369c425ccc4ea58dcdad64692caa5b7ef2bf5166a6fcc8839b20a4e734296160c701f404080700af1091c4af6df6d5b640f990f6cd5d6c7a8f256e0af1291
+DIST esp_idf_monitor-1.6.2.tar.gz 47568 BLAKE2B c28f601a5568649a1e738b873cdd61c46fb39a2e7334fd3ca0c85f18ed915fc7286d5829dc88e0c6a4433b537e08cc095e4ed20f58c2e2ecba4fc9682429403b SHA512 01e3ea6067d04dd99eb001beaa839c598f81d44964163f928d642ae960fd92ef916b10f440b4f26cc3cce01627938c8564cade35a785230405bc8ce1e4a6cbc5
diff --git a/dev-embedded/esp-idf-monitor/esp-idf-monitor-1.6.2.ebuild b/dev-embedded/esp-idf-monitor/esp-idf-monitor-1.6.2.ebuild
new file mode 100644
index 0000000000..9ddcf24dde
--- /dev/null
+++ b/dev-embedded/esp-idf-monitor/esp-idf-monitor-1.6.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python object-oriented database"
+HOMEPAGE="https://github.com/espressif/esp-idf-monitor"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-embedded/esp-coredump[${PYTHON_USEDEP}]
+	dev-embedded/esp-idf-panic-decoder[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-embedded/esp-idf-nvs-partition-gen/Manifest b/dev-embedded/esp-idf-nvs-partition-gen/Manifest
index 8323962767..b5b4e31d48 100644
--- a/dev-embedded/esp-idf-nvs-partition-gen/Manifest
+++ b/dev-embedded/esp-idf-nvs-partition-gen/Manifest
@@ -1,2 +1,2 @@
-DIST esp_idf_nvs_partition_gen-0.1.4.tar.gz 22899 BLAKE2B e339499ba95d1a4e7eeba5453294d83b35ee5a3daae902698ff206b24d50f590be3a80d1c059eabee6b00b44be79480425566bfbef7217f0a800e16ff529116e SHA512 ff8225f5d6acb3ae082782287a9d19d06dc9be5302b53fee08f2bcebc5ed54c3d66f5e8a5a2e2989189153c5f9c408dcac96f8e207a1abba3c15d374dcd37d71
 DIST esp_idf_nvs_partition_gen-0.1.6.tar.gz 23041 BLAKE2B 5a5d2816f590ef4a5a39c7d7ca043d3f32fb23b9017e6f98641034178e4c7af316d6c36360c1a865b531e4a0d5de45919304353c131c5d662f454d79a470b7af SHA512 a4cf39a13a35b325b605e3401716cde7dacb360cd8c2f6f5a27544a9a0ea3d6e6e03c5d95ccee3bc0cfd5c999b55486893630da62a71d65df4ecf293a1a1376e
+DIST esp_idf_nvs_partition_gen-0.1.9.tar.gz 24332 BLAKE2B 61592b26459e8e6822d1d724c1192fd6fd2741e5eda66fe5bd6e2a725242ee3c8b27346cc0488a591f9f2a7dccb2c28207cbaa5fd82d431a60afb3d9ee7e5f3f SHA512 91b06f5775f720684f75f03dfd7bf093b7013898d8cbe9b65f6d62c3a92398caafa590db997eb0fec7b30c1da3a7512c5d98ead19c6debaecaedc54e8302f634
diff --git a/dev-embedded/esp-idf-nvs-partition-gen/esp-idf-nvs-partition-gen-0.1.4.ebuild b/dev-embedded/esp-idf-nvs-partition-gen/esp-idf-nvs-partition-gen-0.1.9.ebuild
similarity index 100%
rename from dev-embedded/esp-idf-nvs-partition-gen/esp-idf-nvs-partition-gen-0.1.4.ebuild
rename to dev-embedded/esp-idf-nvs-partition-gen/esp-idf-nvs-partition-gen-0.1.9.ebuild
diff --git a/dev-embedded/esp-idf-size/Manifest b/dev-embedded/esp-idf-size/Manifest
index 87597c69f4..c3eb2af981 100644
--- a/dev-embedded/esp-idf-size/Manifest
+++ b/dev-embedded/esp-idf-size/Manifest
@@ -1 +1,2 @@
 DIST esp-idf-size-1.6.1.tar.gz 71571 BLAKE2B 09b0ac1ee80503393dce1424581858dc5db12f65d68b92ce6f5cdab7583ea35c03a84a9f7066638b0a19287489e59d6150187614b4eb536b2983acb85c1a067e SHA512 ab3ed6eaca31543e1839dd33c7fbd9f1c9859be66b1c6dd66e8fc0b5b3410ce47ae151d149f0f916744a07e63441c55050ffd9a0f4dcee9004c83e835d885f9a
+DIST esp_idf_size-1.7.1.tar.gz 73712 BLAKE2B da73be60605336ca35191db2f1f0860cfa96ca3f2acd412c8bc1c6244159c3f0eb8ed5e39a52cac0919c128e6bcdf8ccad6b36a2a28ca1f0b46f6769f35f4086 SHA512 1b0b7f5fd84c9de3901256453c068538261b88ffaa3259b8e0686e24ee50074987ce770d57566d4a380f1ffa5704fab900f228d519e783b308a537ebf7c4ffaf
diff --git a/dev-embedded/esp-idf-size/esp-idf-size-1.7.1.ebuild b/dev-embedded/esp-idf-size/esp-idf-size-1.7.1.ebuild
new file mode 100644
index 0000000000..0ecd43ce60
--- /dev/null
+++ b/dev-embedded/esp-idf-size/esp-idf-size-1.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Firmware size analysis for ESP-IDF"
+HOMEPAGE="https://github.com/espressif/esp-idf-size"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/pyelftools[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
diff --git a/dev-embedded/idf-component-manager/Manifest b/dev-embedded/idf-component-manager/Manifest
index c23fc597c4..8ce42b4850 100644
--- a/dev-embedded/idf-component-manager/Manifest
+++ b/dev-embedded/idf-component-manager/Manifest
@@ -1,3 +1,2 @@
-DIST idf-component-manager-2.0.4.gh.tar.gz 325170 BLAKE2B 813ec539fc3d48a51dc6378e3a2922cd996c56472091a5d58775c8d67c046acbdf87741ef0ccf69d8c00fcf7e684a5117134a146d55145ea59359a55cead76e1 SHA512 5160c3e0a580d499ce722966f166a87e2029b15e1e60566d8b2d063217e9bc156ecf47908800a270e75d8de25494b74efdf5cd859536e76bd717065f0d1fb4c4
-DIST idf-component-manager-2.1.1.gh.tar.gz 306788 BLAKE2B a8b5d06d897386148e885cec7faacd2e44f80eddc116da2afdf6dbac0f0af583eaf6438c0280b7bd51b21389137899d91de198cbaa86e3ec757b679a1b3fb239 SHA512 f6d4448810b885333c98fd7be091138a1e060e37ea21222df50327f0ef33c983649ed4ff6cb23c4d20d485a256132f9d75dfb6bfdc77b594c324adcb061502ba
 DIST idf-component-manager-2.1.2.gh.tar.gz 308251 BLAKE2B 013152281d4d6650e468c358a868d8d76bfb7a7d8e694979248f85a05d462b94ad87483c5abf5aa4ff92ff78adaa8de7faac6b8e60c3caba238c8f8104d98bab SHA512 7dac54f184086c776e09aa3480a8765d5e192255a05f6762bbb03e8f7455ad57397a162de745c8f91c30bab054769215c426b928dc9eb55b7251d49ed97a9c70
+DIST idf-component-manager-2.2.2.gh.tar.gz 306348 BLAKE2B 30c25712632fc75c9802e9d322225d94d7c7945786ddf3b9d02aaf3643490b6ab5772fd77fd4ff4376373e40e3864e97203cc76e32249bd0a913a5c8eb388cea SHA512 caaa5590fd1bc8af5b625525f0bda7d835a0e59fbd251bd3196177f4c0ca974776cea89fad162c191ef943bf5d3ee2d2f653f1e5df65799f53d8874f825e19db
diff --git a/dev-embedded/idf-component-manager/idf-component-manager-2.0.4.ebuild b/dev-embedded/idf-component-manager/idf-component-manager-2.0.4.ebuild
deleted file mode 100644
index 0ec7c25c89..0000000000
--- a/dev-embedded/idf-component-manager/idf-component-manager-2.0.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Tool for installing ESP-IDF components"
-HOMEPAGE="https://github.com/espressif/idf-component-manager"
-SRC_URI="https://github.com/espressif/${PN}/archive/refs/tags/v${PV}.tar.gz	-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-		dev-python/filelock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-RDEPEND="
-	dev-python/cachecontrol[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/jsonref[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pydantic[${PYTHON_USEDEP}]
-	dev-python/pydantic-settings[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-	dev-python/schema[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-
-# Requires additional files not available in the tarball
-EPYTEST_DESELECT=(
-	tests/test_component_manager.py::test_pack_component_with_examples_errors
-	tests/test_component_manager.py::test_pack_component_with_dest_dir
-	tests/test_profile.py::TestMultiStorageClient::test_registry_storage_url
-	tests/test_profile.py::TestMultiStorageClient::test_storage_clients_precedence
-)
-
-# network access
-EPYTEST_IGNORE=(
-	tests/test_api_client.py
-	tests/test_prepare_dep_dirs.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-embedded/idf-component-manager/idf-component-manager-2.1.1.ebuild b/dev-embedded/idf-component-manager/idf-component-manager-2.2.2.ebuild
similarity index 94%
rename from dev-embedded/idf-component-manager/idf-component-manager-2.1.1.ebuild
rename to dev-embedded/idf-component-manager/idf-component-manager-2.2.2.ebuild
index b668811a94..ec8ff9792d 100644
--- a/dev-embedded/idf-component-manager/idf-component-manager-2.1.1.ebuild
+++ b/dev-embedded/idf-component-manager/idf-component-manager-2.2.2.ebuild
@@ -58,6 +58,8 @@ EPYTEST_DESELECT=(
 	tests/cli/test_manifest_command.py::test_add_git_dependency_invalid
 	tests/cli/test_manifest_command.py::test_manifest_keeps_comments
 	tests/cli/test_module.py::test_raise_exception_on_warnings
+	tests/cli/test_registry_command.py::test_logout_from_registry_revoked_token
+	tests/sources/test_git.py::test_versions_component_hash
 )
 
 # network access
diff --git a/dev-hare/hare-compress/Manifest b/dev-hare/hare-compress/Manifest
new file mode 100644
index 0000000000..eb4074fd17
--- /dev/null
+++ b/dev-hare/hare-compress/Manifest
@@ -0,0 +1 @@
+DIST hare-compress-0.25.2.0.tar.gz 735674 BLAKE2B 0a6a86bc02299f1f15bd37ddb6573b187987d43ae4fc7be452b9f92d1aefdb21e09735443d61b84e2c761e25551efd6137df5c064b4aa0d2d9278598bf1a27b8 SHA512 f4e738aa085e5ffda2dcfca9c55168cd1eaad79a148f3eb905dcb37edb8591bde6d0146077e7121633b27fd6b1186f526580ca55d3c1e2d698a9a0e4b5389a5f
diff --git a/dev-hare/hare-compress/hare-compress-0.25.2.0.ebuild b/dev-hare/hare-compress/hare-compress-0.25.2.0.ebuild
new file mode 100644
index 0000000000..2d18ad1bc6
--- /dev/null
+++ b/dev-hare/hare-compress/hare-compress-0.25.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-compress"
+	SLOT="0"
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare-compress/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SLOT="0/${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+DESCRIPTION="Compression algorithms for Hare"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-compress"
+LICENSE="MPL-2.0"
+SLOT="0"
+
+DEPEND=">=dev-lang/hare-0.25.2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
diff --git a/dev-hare/hare-compress/hare-compress-9999.ebuild b/dev-hare/hare-compress/hare-compress-9999.ebuild
index 4fe766478d..2d18ad1bc6 100644
--- a/dev-hare/hare-compress/hare-compress-9999.ebuild
+++ b/dev-hare/hare-compress/hare-compress-9999.ebuild
@@ -1,17 +1,25 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit git-r3
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-compress"
+	SLOT="0"
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare-compress/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SLOT="0/${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
 
 DESCRIPTION="Compression algorithms for Hare"
 HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-compress"
-EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-compress"
 LICENSE="MPL-2.0"
 SLOT="0"
 
-DEPEND="dev-lang/hare"
+DEPEND=">=dev-lang/hare-0.25.2"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/dev-hare/hare-json/Manifest b/dev-hare/hare-json/Manifest
index 2c6da8b22d..e05896c4f7 100644
--- a/dev-hare/hare-json/Manifest
+++ b/dev-hare/hare-json/Manifest
@@ -1 +1,2 @@
 DIST hare-json-0.24.2.tar.gz 13906 BLAKE2B 5c82ceaf96ac8f01c14c718203888d354cefa17e7de862f28ddcb675a199fdaf802076abb67ec31ac299090fda3392cc527290bfa1eb7b1f745a5d8a7891b648 SHA512 f30e2f2f5ff5ecb6f2ff32c8dc1974587ac6914f141bc1eabf95ded1470b0b2f85f1ae195c11f05779b77b82b724e8dd0d252ed35e6083dfc2df6bbdb23466f0
+DIST hare-json-0.25.2.0.tar.gz 14129 BLAKE2B e73a1fb77beb50588ec038e1ad8bf98ba56ded06ee0183d1bd2b5e5231e705ba2eaced21d7683baad99e7a77032962cedc4a07c3af78f275f2eb364685dbe952 SHA512 a132e0b60851d346fb5be2a60010456a61b08b7b70fe3a0c0550a978986b869e6e7bf2efd87e0b543b37b2f5cac12cda6650089b6a7e1ea38ab8be78c373a9b8
diff --git a/dev-hare/hare-json/hare-json-0.25.2.0.ebuild b/dev-hare/hare-json/hare-json-0.25.2.0.ebuild
new file mode 100644
index 0000000000..20906fdc4f
--- /dev/null
+++ b/dev-hare/hare-json/hare-json-0.25.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="JSON support for Hare"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-json"
+SRC_URI="https://git.sr.ht/~sircmpwn/hare-json/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+DEPEND=">=dev-lang/hare-0.24.2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
diff --git a/dev-hare/hare-xml/Manifest b/dev-hare/hare-xml/Manifest
index 6ab825cd31..7882a6023b 100644
--- a/dev-hare/hare-xml/Manifest
+++ b/dev-hare/hare-xml/Manifest
@@ -1 +1,2 @@
+DIST hare-xml-0.25.2.0.tar.gz 12417 BLAKE2B 821576d95487e854020fc56f823042caa2a4947545397cafd94497059513a86792a1bc23c43b912000e962291806b98d7dd8ce685fa0483462f0dfcda409fbe8 SHA512 9f7a2e6cfbd2e0fd55301bf8a7380f0950844a30a6551ffa626143ee93dc6fbaeef4a9585c17318dfb562f044425e6cdd4a38da35e10551cabf901feeb1a07c1
 DIST hare-xml-82ad30e1143286417b12b00d45ee1a03330f117e.tar.gz 11596 BLAKE2B 125b34d3773677ec7cf242eabcf0c55365ca0914e566075b8cef41ecc70119622fed3297d1f056f7336b7b247ab50e81ce66f41a1c817749eceb718b803d5c4c SHA512 0b16eaaa1a4c13692179eb8fd3c9d7ef3a63fb89df5520b09b961618890a66d6a7f13cb93c19ebb9d81b9edcb10a1ef3c9570e6269fbcae8e60e52b0c8471e5f
diff --git a/dev-hare/hare-xml/hare-xml-0.25.2.0.ebuild b/dev-hare/hare-xml/hare-xml-0.25.2.0.ebuild
new file mode 100644
index 0000000000..ed87a6806f
--- /dev/null
+++ b/dev-hare/hare-xml/hare-xml-0.25.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-xml"
+	SLOT="0"
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare-xml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SLOT="0/${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+DESCRIPTION="XML support for Hare"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-xml"
+
+LICENSE="MPL-2.0"
+
+DEPEND=">=dev-lang/hare-0.25.2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
diff --git a/dev-python/sphinx-sitemap/sphinx-sitemap-2.7.1.ebuild b/dev-python/sphinx-sitemap/sphinx-sitemap-2.7.1.ebuild
index 41972cc260..13c641a6b6 100644
--- a/dev-python/sphinx-sitemap/sphinx-sitemap-2.7.1.ebuild
+++ b/dev-python/sphinx-sitemap/sphinx-sitemap-2.7.1.ebuild
@@ -17,7 +17,6 @@ SRC_URI="https://github.com/jdillard/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="git"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/games-fps/quakespasm/Manifest b/games-fps/quakespasm/Manifest
index 851f94c754..e4cf96e888 100644
--- a/games-fps/quakespasm/Manifest
+++ b/games-fps/quakespasm/Manifest
@@ -1 +1,2 @@
 DIST quakespasm-0.94.1.tar.gz 9900452 BLAKE2B 21fc363d09e1fbf8f8217d54ad18e38e51e715dc4fe92d591d605b24bae52f9554159c4cc4c97842e6e3e34efb8d422c5a5fe5edc91ae354f97935ae23051047 SHA512 17b7fc74a5e3932b6341c36d957f86ffc01e88013971be2eb4252b57fceecaebeb5cd9a67619ebd38422dfe0fbdbe06a5e5486dcf82ff17fb7d1b0ba664b1cf0
+DIST quakespasm-0.96.3.tar.gz 11552047 BLAKE2B 70412a86b549995011bf3e68f20f2b997ed22dcc2db49c2c107326f0db58205f14efcfcacb6c29f7c198051b8e4d8fbea42dd489d1b4b368fb7bcc530a70b8f5 SHA512 e8500d566a6cc6532c81823aa7775a48d9edcecc053528477d3c360ba17b8895b5fbda20b2679f571c9996da58d411eed1f975ef9435beb63a3261c14082f18e
diff --git a/games-fps/quakespasm/files/quakespasm-0.96.3-cflags.patch b/games-fps/quakespasm/files/quakespasm-0.96.3-cflags.patch
new file mode 100644
index 0000000000..7b402d8d08
--- /dev/null
+++ b/games-fps/quakespasm/files/quakespasm-0.96.3-cflags.patch
@@ -0,0 +1,10 @@
+--- a/Quake/Makefile	2022-06-28 03:02:56.000000000 +0300
++++ b/Quake/Makefile	2022-09-30 19:05:39.392041782 +0300
+@@ -61,7 +61,6 @@ CFLAGS += -g
+ do_strip=
+ else
+ DFLAGS += -DNDEBUG
+-CFLAGS += -O2
+ #CFLAGS += -fno-asynchronous-unwind-tables
+ CFLAGS += $(call check_gcc,-fweb,)
+ CFLAGS += $(call check_gcc,-frename-registers,)
diff --git a/games-fps/quakespasm/files/quakespasm-0.96.3-mkpak-portable-shell.patch b/games-fps/quakespasm/files/quakespasm-0.96.3-mkpak-portable-shell.patch
new file mode 100644
index 0000000000..891267e4b8
--- /dev/null
+++ b/games-fps/quakespasm/files/quakespasm-0.96.3-mkpak-portable-shell.patch
@@ -0,0 +1,62 @@
+From dd8a42d142a638de08cb6ea7483e33b27fe221b5 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Thu, 19 Jun 2025 18:10:04 +0300
+Subject: [PATCH] mkpak.sh: use more portable shell
+
+At least it now works in dash
+---
+ Misc/qs_pak/mkpak.sh | 16 ++++++----------
+ 1 file changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/Misc/qs_pak/mkpak.sh b/Misc/qs_pak/mkpak.sh
+index e6562bf9..dbfd9eb5 100755
+--- a/Misc/qs_pak/mkpak.sh
++++ b/Misc/qs_pak/mkpak.sh
+@@ -39,7 +39,7 @@ assert_valid_file() {
+ 	then
+ 		error "$1: Permission denied"
+ 	fi
+-	if test $(echo -n "$1" | wc -c) -gt 55
++	if test $(printf '%s' "$1" | wc -c) -gt 55
+ 	then
+ 		error "$1: Name too long"
+ 	fi
+@@ -53,15 +53,11 @@ assert_valid_int32() {
+ }
+ 
+ octal() {
+-	if test $1 -gt 7
+-	then
+-		octal $(expr $1 / 8)
+-	fi
+-	echo -n $(expr $1 % 8) 
++	printf '%o' $1
+ }
+ 
+ byte() {
+-	echo -en \\0$(octal $1)
++	printf '%b' "\\0$(octal $1)"
+ }
+ 
+ little_endian_uint32() {
+@@ -90,14 +86,14 @@ zero_padding() {
+ }
+ 
+ header() {
+-	echo -n PACK
++	printf '%s' PACK
+ 	little_endian_int32 $1
+ 	little_endian_int32 $2
+ }
+ 
+ directory_entry() {
+-	echo -n "$1"
+-	zero_padding $(expr 56 - $(echo -n "$1" | wc -c))
++	printf '%s' "$1"
++	zero_padding $(expr 56 - $(printf '%s' "$1" | wc -c))
+ 	little_endian_int32 $2
+ 	little_endian_int32 $3
+ }
+-- 
+2.49.0
+
diff --git a/games-fps/quakespasm/metadata.xml b/games-fps/quakespasm/metadata.xml
index 1c7e5bfde0..88b6d447f2 100644
--- a/games-fps/quakespasm/metadata.xml
+++ b/games-fps/quakespasm/metadata.xml
@@ -5,6 +5,10 @@
 		<email>contact@hacktivis.me</email>
 		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
 	<use>
 		<flag name="sdl2">Use <pkg>media-libs/libsdl2</pkg> instead of <pkg>media-libs/libsdl</pkg></flag>
 	</use>
diff --git a/games-fps/quakespasm/quakespasm-0.96.3.ebuild b/games-fps/quakespasm/quakespasm-0.96.3.ebuild
new file mode 100644
index 0000000000..b35953f345
--- /dev/null
+++ b/games-fps/quakespasm/quakespasm-0.96.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/quakespasm/quakespasm"
+else
+	SRC_URI="https://download.sourceforge.net/quakespasm/Source/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+inherit desktop eapi9-ver
+
+DESCRIPTION="A modern, cross-platform Quake game engine based on FitzQuake"
+HOMEPAGE="https://quakespasm.sourceforge.net/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="flac mikmod modplug mp3 opus vorbis"
+
+DEPEND="
+	media-libs/libsdl2[opengl]
+	media-libs/libglvnd
+	flac? ( media-libs/flac:= )
+	mikmod? ( media-libs/libmikmod )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-sound/mpg123 )
+	opus? ( media-libs/opusfile )
+	vorbis? ( media-libs/libvorbis )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( Quakespasm.html Quakespasm.txt Quakespasm-Music.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.96.3-cflags.patch
+	"${FILESDIR}"/${P}-mkpak-portable-shell.patch # https://github.com/sezero/quakespasm/pull/127
+)
+
+src_compile() {
+	local emakeargs=(
+		COMMON_LIBS="-lOpenGL -lm"
+		LDFLAGS="${LDFLAGS}"
+		DO_USERDIRS=1
+		MP3LIB=mpg123
+		STRIP="$(type -P true)"
+		USE_SDL2=1
+		USE_CODEC_FLAC=$(usex flac 1 0)
+		USE_CODEC_MIKMOD=$(usex mikmod 1 0)
+		USE_CODEC_MODPLUG=$(usex modplug 1 0)
+		USE_CODEC_MP3=$(usex mp3 1 0)
+		USE_CODEC_VORBIS=$(usex vorbis 1 0)
+		USE_CODEC_OPUS=$(usex opus 1 0)
+	)
+
+	emake -C Quake "${emakeargs[@]}"
+	emake -C Misc/qs_pak
+}
+
+src_install() {
+	dobin Quake/quakespasm
+
+	insinto /usr/share/quakespasm
+	doins Misc/qs_pak/quakespasm.pak
+
+	insinto /usr/share/metainfo
+	doins Linux/net.sourceforge.quakespasm.Quakespasm.appdata.xml
+
+	domenu Linux/net.sourceforge.quakespasm.Quakespasm.desktop
+
+	newicon Misc/QuakeSpasm_512.png net.sourceforge.quakespasm.Quakespasm.png
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] || ver_replacing -lt 0.96.3; then
+		elog
+		elog "Please note that quakespasm doesn't support system-wide game data."
+		elog "In order to play, you must copy game data files into"
+		elog "\"~/.quakespasm/\" directory."
+		elog
+		elog "It is also recommended to copy quakespasm.pak as it contains default"
+		elog "config, custom console background and other minor features:"
+		elog "cp \"${EROOT}/usr/share/quakespasm/quakespasm.pak\" ~/.quakespasm/"
+		elog
+	fi
+}
diff --git a/games-fps/quakespasm/quakespasm-9999.ebuild b/games-fps/quakespasm/quakespasm-9999.ebuild
index 06e9ceb72e..2481b28dd8 100644
--- a/games-fps/quakespasm/quakespasm-9999.ebuild
+++ b/games-fps/quakespasm/quakespasm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,37 +7,84 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/quakespasm/quakespasm"
 else
-	SRC_URI="https://downloads.sourceforge.net/project/${PN}/Source/${P}.tar.gz"
+	SRC_URI="https://download.sourceforge.net/quakespasm/Source/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
-DESCRIPTION="Modern, cross-platform Quake 1 engine based on FitzQuake"
-HOMEPAGE="https://quakespasm.sourceforge.net"
-LICENSE="GPL-2"
+inherit desktop eapi9-ver
+
+DESCRIPTION="A modern, cross-platform Quake game engine based on FitzQuake"
+HOMEPAGE="https://quakespasm.sourceforge.net/"
+
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="sdl2"
+IUSE="flac mikmod modplug mp3 opus vorbis"
 
 DEPEND="
+	media-libs/libsdl2[opengl]
 	media-libs/libglvnd
-	media-libs/libmad
-	media-libs/libvorbis
-	sdl2? ( media-libs/libsdl2[opengl] )
-	!sdl2? ( media-libs/libsdl[opengl] )
+	flac? ( media-libs/flac:= )
+	mikmod? ( media-libs/libmikmod )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-sound/mpg123 )
+	opus? ( media-libs/opusfile )
+	vorbis? ( media-libs/libvorbis )
 "
 RDEPEND="${DEPEND}"
-DOCS=( Quakespasm.html  Quakespasm-Music.txt  Quakespasm.txt )
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	sed -i '/^CFLAGS += -O2$/d' Quake/Makefile || die
-	default
-}
+DOCS=( Quakespasm.html Quakespasm.txt Quakespasm-Music.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.96.3-cflags.patch
+)
 
 src_compile() {
-	cd Quake || die
-	emake COMMON_LIBS="-lm -lOpenGL" USE_SDL2=$(usex sdl2 1 0) STRIP="/bin/true"
+	local emakeargs=(
+		COMMON_LIBS="-lOpenGL -lm"
+		LDFLAGS="${LDFLAGS}"
+		DO_USERDIRS=1
+		MP3LIB=mpg123
+		STRIP="$(type -P true)"
+		USE_SDL2=1
+		USE_CODEC_FLAC=$(usex flac 1 0)
+		USE_CODEC_MIKMOD=$(usex mikmod 1 0)
+		USE_CODEC_MODPLUG=$(usex modplug 1 0)
+		USE_CODEC_MP3=$(usex mp3 1 0)
+		USE_CODEC_VORBIS=$(usex vorbis 1 0)
+		USE_CODEC_OPUS=$(usex opus 1 0)
+	)
+
+	emake -C Quake "${emakeargs[@]}"
+	emake -C Misc/qs_pak
 }
 
 src_install() {
-	einstalldocs
 	dobin Quake/quakespasm
+
+	insinto /usr/share/quakespasm
+	doins Misc/qs_pak/quakespasm.pak
+
+	insinto /usr/share/metainfo
+	doins Linux/net.sourceforge.quakespasm.Quakespasm.appdata.xml
+
+	domenu Linux/net.sourceforge.quakespasm.Quakespasm.desktop
+
+	newicon Misc/QuakeSpasm_512.png net.sourceforge.quakespasm.Quakespasm.png
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] || ver_replacing -lt 0.96.3; then
+		elog
+		elog "Please note that quakespasm doesn't support system-wide game data."
+		elog "In order to play, you must copy game data files into"
+		elog "\"~/.quakespasm/\" directory."
+		elog
+		elog "It is also recommended to copy quakespasm.pak as it contains default"
+		elog "config, custom console background and other minor features:"
+		elog "cp \"${EROOT}/usr/share/quakespasm/quakespasm.pak\" ~/.quakespasm/"
+		elog
+	fi
 }
diff --git a/gui-apps/corearchiver/corearchiver-5.0.0.ebuild b/gui-apps/corearchiver/corearchiver-5.0.0.ebuild
index 260e331d4f..a4a12dbb9e 100644
--- a/gui-apps/corearchiver/corearchiver-5.0.0.ebuild
+++ b/gui-apps/corearchiver/corearchiver-5.0.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 DEPEND="
-	app-arch/libarchive-qt[qt6]
+	app-arch/libarchive-qt[qt6(+)]
 	dev-qt/qtbase:6[gui,widgets]
 	gui-libs/libcprime
 "
diff --git a/net-im/beeper/Manifest b/net-im/beeper/Manifest
index 7b7e05cd52..c751cb589e 100644
--- a/net-im/beeper/Manifest
+++ b/net-im/beeper/Manifest
@@ -1,2 +1,2 @@
-DIST Beeper-4.0.732.AppImage 203881546 BLAKE2B 68245059dd1f2c9a6b489c49d151574d20083d8c55e046b6228906972aca3c0106b7a99dc9dbcc77cf17e780a433f543dc73d3244be05e2e1576724382ea8e3c SHA512 edd2d173c357fc5f810fecfa75ae2170d1cb9b5a4cd6bd399da4e22cf531ffe7a7d93a10e1c061bbdc21edfcc6d671f957ec68a72a1e0b5e9b050b287f8cf95b
 DIST Beeper-4.0.747.AppImage 201155493 BLAKE2B 54860a20f5fada352b2b88fabff2df69545795ded4932ecb2c8d44e81fdadc180ff1d53a7910b4054aef40baae61a19f8893eff25c2c851347f412e2fea626f6 SHA512 340c6f45b75b5ddb2559f3b1337681b78e5f6fc9ee25936424eef0ec0e89d4d9cf68b31553307c95447e6778141d27f9c0ab1e89d9e3e584ed1ead3c0278d871
+DIST Beeper-4.0.779.AppImage 202627692 BLAKE2B 7c7244390ffd145ab577bfe00a0726d796dbbd300e61f86c1194dc6a0efc896e92c4edc481510afaab4bc3960abffc70a4505aca0f550b262b92ab2025900ee5 SHA512 1036b23b4298468d2727113689e38bfc310dddb3424b36d40bb51be1c246967356d027868ffa5549ca4ddcabad254a3a6300e4b88c24246e5b788bff6b12f372
diff --git a/net-im/beeper/beeper-4.0.732.ebuild b/net-im/beeper/beeper-4.0.779.ebuild
similarity index 77%
rename from net-im/beeper/beeper-4.0.732.ebuild
rename to net-im/beeper/beeper-4.0.779.ebuild
index c652e29606..d27c679c8d 100644
--- a/net-im/beeper/beeper-4.0.732.ebuild
+++ b/net-im/beeper/beeper-4.0.779.ebuild
@@ -11,7 +11,7 @@ CHROMIUM_LANGS="
 	sw ta te th tr uk ur vi zh-CN zh-TW
 "
 
-inherit chromium-2 desktop optfeature pax-utils xdg
+inherit chromium-2 optfeature pax-utils xdg
 
 # To check the latest version, run:
 #
@@ -21,7 +21,7 @@ APPIMAGE="Beeper-${PV}.AppImage"
 DESCRIPTION="Beeper: Unified Messenger"
 HOMEPAGE="https://www.beeper.com/"
 SRC_URI="https://beeper-desktop.download.beeper.com/builds/${APPIMAGE}"
-S="${WORKDIR}"
+S="${WORKDIR}/squashfs-root"
 
 LICENSE="all-rights-reserved"
 # node_modules licenses
@@ -64,12 +64,11 @@ RDEPEND="
 QA_PREBUILT="*"
 
 src_unpack() {
-	mkdir -p "${S}" || die
-	cp "${DISTDIR}/${APPIMAGE}" "${S}" || die
+	cd "${WORKDIR}" || die	# "appimage-extract" unpacks to current directory.
 
-	cd "${S}" || die	# "appimage-extract" unpacks to current directory.
-	chmod +x "${S}/${APPIMAGE}" || die
-	"${S}/${APPIMAGE}" --appimage-extract || die
+	cp "${DISTDIR}/${APPIMAGE}" "${WORKDIR}" || die
+	chmod +x "${APPIMAGE}" || die
+	./"${APPIMAGE}" --appimage-extract || die
 }
 
 src_prepare() {
@@ -80,12 +79,10 @@ src_prepare() {
 	find "${S}" -type f -exec chmod a+r {} + || die
 
 	# Fix desktop menu item
-	pushd squashfs-root || die
 	sed "/^Exec=/c Exec=beepertexts %U" -i beepertexts.desktop || die
-	popd || die
 
 	# Handle Chromium language packs
-	pushd squashfs-root/locales || die
+	pushd locales || die
 	chromium_remove_language_paks
 	popd || die
 }
@@ -96,11 +93,12 @@ src_configure() {
 }
 
 src_install() {
-	cd "${S}/squashfs-root" || die
+	# Install icons and the desktop file
+	mkdir -p usr/share/applications || die
+	mv beepertexts.desktop usr/share/applications || die
 
-	# Install icons
 	insinto /usr/share
-	doins -r ./usr/share/icons
+	doins -r ./usr/share/{applications,icons}
 
 	# Cleanup
 	local -a toremove=(
@@ -109,11 +107,11 @@ src_install() {
 		LICENSE.electron.txt
 		LICENSES.chromium.html
 		beepertexts.png
-		resources/app/node_modules/@img/sharp-libvips-linux-x64/lib/libvips-cpp.so.42
+		resources/app/build/main/linux-*.mjs
 		resources/app/node_modules/classic-level/prebuilds/linux-x64/classic-level.musl.node
 		usr
 	)
-	rm -f -r "${toremove[@]}" || die
+	rm -r "${toremove[@]}" || die
 
 	# Install
 	local apphome="/opt/BeeperTexts"
@@ -123,8 +121,14 @@ src_install() {
 	cp -r . "${ED}${apphome}" || die
 	fperms 4711 "${apphome}"/chrome-sandbox
 
+	local libvips_dest=(
+		resources/app/node_modules/@img/sharp-libvips-linux-x64/lib/libvips-cpp.so.*
+	)
+	(( ${#libvips_dest[@]} == 1 )) ||
+		die "multiple or no libvips libraries found"
+	dosym -r /usr/$(get_libdir)/libvips-cpp.so.42 "${apphome}/${libvips_dest[0]}"
+
 	dosym -r "${apphome}"/beepertexts /usr/bin/beepertexts
-	domenu beepertexts.desktop
 }
 
 pkg_postinst() {
diff --git a/sci-electronics/logic-bin/Manifest b/sci-electronics/logic-bin/Manifest
index 0f8c9727c0..71b6fff294 100644
--- a/sci-electronics/logic-bin/Manifest
+++ b/sci-electronics/logic-bin/Manifest
@@ -1 +1,2 @@
 DIST Logic-2.4.14-linux-x64.AppImage 187591212 BLAKE2B 744e3266e8545c700ac2fd5ad31f9df569a2d5fe5b796a88934b7c6b730dd6282f44827748bc134960babebbf47ab9dfc12fb078d3a5b38f3eff22d1e835c2b0 SHA512 c32626eb359cad568a5871e29b4aa291294f92fd21052c80a3a21ed3a49ac3803cf0bee0af26a1b9f53e95ad47e4f71c86b241699dee59fefcd24e056de5c4d5
+DIST Logic-2.4.29-linux-x64.AppImage 190784685 BLAKE2B 77e3ef319656fa000a33f7f43385d8132331df6b2aa7bcb7609b53e7cdf53b8c82c99e1508877c07ea20ac0af761501f2db9ae3043e71e09f701a171a4c13167 SHA512 7f99549b3aa1a0c60d157177b14216c2cb55eadbecd4043051a657e0b60a040c6d38ab3117575100f35e3a8fd3805436986b3653dad02240a262ce5283600aa3
diff --git a/sci-electronics/logic-bin/logic-bin-2.4.29.ebuild b/sci-electronics/logic-bin/logic-bin-2.4.29.ebuild
new file mode 100644
index 0000000000..1678ed8aad
--- /dev/null
+++ b/sci-electronics/logic-bin/logic-bin-2.4.29.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk ur vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop xdg
+
+APPIMAGE="Logic-${PV}-linux-x64.AppImage"
+DESCRIPTION="Saleae logic analyzer"
+HOMEPAGE="https://www.saleae.com"
+
+SRC_URI="https://downloads2.saleae.com/logic2/${APPIMAGE}"
+
+S="${WORKDIR}"
+LICENSE="Saleae"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-core:2
+	dev-libs/dbus-glib
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libdbusmenu
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libxcrypt
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+"
+
+BDEPEND="dev-util/patchelf"
+
+QA_PREBUILT="*"
+
+src_unpack() {
+	cp "${DISTDIR}/${APPIMAGE}" "${S}" || die
+
+	cd "${S}" || die # "appimage-extract" unpacks to current directory
+	chmod +x "${APPIMAGE}" || die
+	./"${APPIMAGE}" --appimage-extract || die
+}
+
+src_prepare() {
+	# Fix permissions
+	find "${S}" -type d -exec chmod a+rx {} + || die
+	find "${S}" -type f -exec chmod a+r {} + || die
+
+	cd squashfs-root || die
+
+	for f in *.so; do
+		patchelf --set-rpath '$ORIGIN' $f || die
+	done
+
+	# scanelf: rpath_security_checks(): Security problem NULL DT_RUNPATH
+	pushd resources/linux-x64/Analyzers || die
+	for f in *.so; do
+		patchelf --set-rpath '$ORIGIN' $f || die
+	done
+	popd
+
+	pushd locales || die
+	chromium_remove_language_paks
+	popd
+
+	default
+}
+
+src_configure() {
+	default
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_install() {
+	cd "${S}/squashfs-root" || die
+
+	insinto /usr/share
+	doins -r ./usr/share/icons
+
+	local -a toremove=(
+		.DirIcon
+		AppRun
+		Logic.png
+		usr/lib/libnotify.so.4
+		usr/lib/libXss.so.1
+		usr/lib/libXtst.so.6
+	)
+	rm -r "${toremove[@]}" || die
+
+	insinto /opt/Logic
+	doins -r *
+
+	fperms 4755 /opt/Logic/chrome-sandbox
+	for i in Logic chrome_crashpad_handler *.so* usr/lib/*.so*; do
+		fperms +x "/opt/Logic/${i}"
+	done
+
+	dosym -r "/opt/Logic/Logic" /usr/bin/Logic
+	domenu Logic.desktop
+}
diff --git a/sci-mathematics/frama-c-aorai/metadata.xml b/sci-mathematics/frama-c-aorai/metadata.xml
index 85760eeb55..30c042c394 100644
--- a/sci-mathematics/frama-c-aorai/metadata.xml
+++ b/sci-mathematics/frama-c-aorai/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="eva">Build support for the Eva plugin</flag>
 	</use>
diff --git a/sci-mathematics/frama-c-callgraph/metadata.xml b/sci-mathematics/frama-c-callgraph/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-callgraph/metadata.xml
+++ b/sci-mathematics/frama-c-callgraph/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-constant-folding/metadata.xml b/sci-mathematics/frama-c-constant-folding/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-constant-folding/metadata.xml
+++ b/sci-mathematics/frama-c-constant-folding/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-dive/metadata.xml b/sci-mathematics/frama-c-dive/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-dive/metadata.xml
+++ b/sci-mathematics/frama-c-dive/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-e-acsl/metadata.xml b/sci-mathematics/frama-c-e-acsl/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-e-acsl/metadata.xml
+++ b/sci-mathematics/frama-c-e-acsl/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-eva/metadata.xml b/sci-mathematics/frama-c-eva/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-eva/metadata.xml
+++ b/sci-mathematics/frama-c-eva/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-from/metadata.xml b/sci-mathematics/frama-c-from/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-from/metadata.xml
+++ b/sci-mathematics/frama-c-from/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-impact/metadata.xml b/sci-mathematics/frama-c-impact/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-impact/metadata.xml
+++ b/sci-mathematics/frama-c-impact/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-inout/metadata.xml b/sci-mathematics/frama-c-inout/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-inout/metadata.xml
+++ b/sci-mathematics/frama-c-inout/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-instantiate/metadata.xml b/sci-mathematics/frama-c-instantiate/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-instantiate/metadata.xml
+++ b/sci-mathematics/frama-c-instantiate/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-loopanalysis/metadata.xml b/sci-mathematics/frama-c-loopanalysis/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-loopanalysis/metadata.xml
+++ b/sci-mathematics/frama-c-loopanalysis/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-metrics/metadata.xml b/sci-mathematics/frama-c-metrics/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-metrics/metadata.xml
+++ b/sci-mathematics/frama-c-metrics/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-nonterm/metadata.xml b/sci-mathematics/frama-c-nonterm/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-nonterm/metadata.xml
+++ b/sci-mathematics/frama-c-nonterm/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-obfuscator/metadata.xml b/sci-mathematics/frama-c-obfuscator/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-obfuscator/metadata.xml
+++ b/sci-mathematics/frama-c-obfuscator/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-occurrence/metadata.xml b/sci-mathematics/frama-c-occurrence/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-occurrence/metadata.xml
+++ b/sci-mathematics/frama-c-occurrence/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-pdg/metadata.xml b/sci-mathematics/frama-c-pdg/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-pdg/metadata.xml
+++ b/sci-mathematics/frama-c-pdg/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-postdominators/metadata.xml b/sci-mathematics/frama-c-postdominators/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-postdominators/metadata.xml
+++ b/sci-mathematics/frama-c-postdominators/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-printapi/metadata.xml b/sci-mathematics/frama-c-printapi/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-printapi/metadata.xml
+++ b/sci-mathematics/frama-c-printapi/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-qed/metadata.xml b/sci-mathematics/frama-c-qed/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-qed/metadata.xml
+++ b/sci-mathematics/frama-c-qed/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-report/metadata.xml b/sci-mathematics/frama-c-report/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-report/metadata.xml
+++ b/sci-mathematics/frama-c-report/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-rtegen/metadata.xml b/sci-mathematics/frama-c-rtegen/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-rtegen/metadata.xml
+++ b/sci-mathematics/frama-c-rtegen/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-scope/metadata.xml b/sci-mathematics/frama-c-scope/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-scope/metadata.xml
+++ b/sci-mathematics/frama-c-scope/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-security-slicing/metadata.xml b/sci-mathematics/frama-c-security-slicing/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-security-slicing/metadata.xml
+++ b/sci-mathematics/frama-c-security-slicing/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-server/metadata.xml b/sci-mathematics/frama-c-server/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-server/metadata.xml
+++ b/sci-mathematics/frama-c-server/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-slicing/metadata.xml b/sci-mathematics/frama-c-slicing/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-slicing/metadata.xml
+++ b/sci-mathematics/frama-c-slicing/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-sparecode/metadata.xml b/sci-mathematics/frama-c-sparecode/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-sparecode/metadata.xml
+++ b/sci-mathematics/frama-c-sparecode/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-studia/metadata.xml b/sci-mathematics/frama-c-studia/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-studia/metadata.xml
+++ b/sci-mathematics/frama-c-studia/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-users/metadata.xml b/sci-mathematics/frama-c-users/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-users/metadata.xml
+++ b/sci-mathematics/frama-c-users/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c-variadic/metadata.xml b/sci-mathematics/frama-c-variadic/metadata.xml
index 98412b0647..115e9d64a6 100644
--- a/sci-mathematics/frama-c-variadic/metadata.xml
+++ b/sci-mathematics/frama-c-variadic/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sci-mathematics/frama-c/metadata.xml b/sci-mathematics/frama-c/metadata.xml
index 01095e3011..1ce8baccd3 100644
--- a/sci-mathematics/frama-c/metadata.xml
+++ b/sci-mathematics/frama-c/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 Frama-C is a suite of tools dedicated to the analysis of the source code
 of software written in C. It gathers several static analysis techniques