diff --git a/dev-lang/swift/swift-6.0.1-r1.ebuild b/dev-lang/swift/swift-6.0.1-r1.ebuild
index c3a52bc8da..86dc9abab2 100644
--- a/dev-lang/swift/swift-6.0.1-r1.ebuild
+++ b/dev-lang/swift/swift-6.0.1-r1.ebuild
@@ -109,6 +109,18 @@ BDEPEND="
 	' python3_{12..13})
 "
 
+# Swift 6 upstream currently doesn't build with oneTBB installed because Swift's
+# `libstdcxx.h` includes `<execution>`, which, in combination with recent
+# `libstdc++` versions, causes `tbb/execution` to get picked up; this results in
+# a circular dependency back on the stdlib, failing the build.
+#
+# See:
+# * https://bugs.gentoo.org/947141
+# * https://github.com/swiftlang/swift/issues/76166
+BDEPEND+="
+	!!dev-cpp/tbb
+"
+
 # Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags
 # (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`).
 clang-ldflags() {
diff --git a/dev-lang/swift/swift-6.0.1.ebuild b/dev-lang/swift/swift-6.0.1.ebuild
index 3b5cdb3112..085c043de8 100644
--- a/dev-lang/swift/swift-6.0.1.ebuild
+++ b/dev-lang/swift/swift-6.0.1.ebuild
@@ -108,6 +108,18 @@ BDEPEND="
 	' python3_{12..13})
 "
 
+# Swift 6 upstream currently doesn't build with oneTBB installed because Swift's
+# `libstdcxx.h` includes `<execution>`, which, in combination with recent
+# `libstdc++` versions, causes `tbb/execution` to get picked up; this results in
+# a circular dependency back on the stdlib, failing the build.
+#
+# See:
+# * https://bugs.gentoo.org/947141
+# * https://github.com/swiftlang/swift/issues/76166
+BDEPEND+="
+	!!dev-cpp/tbb
+"
+
 # Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags
 # (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`).
 clang-ldflags() {
diff --git a/dev-lang/swift/swift-6.0.2.ebuild b/dev-lang/swift/swift-6.0.2.ebuild
index c3a52bc8da..86dc9abab2 100644
--- a/dev-lang/swift/swift-6.0.2.ebuild
+++ b/dev-lang/swift/swift-6.0.2.ebuild
@@ -109,6 +109,18 @@ BDEPEND="
 	' python3_{12..13})
 "
 
+# Swift 6 upstream currently doesn't build with oneTBB installed because Swift's
+# `libstdcxx.h` includes `<execution>`, which, in combination with recent
+# `libstdc++` versions, causes `tbb/execution` to get picked up; this results in
+# a circular dependency back on the stdlib, failing the build.
+#
+# See:
+# * https://bugs.gentoo.org/947141
+# * https://github.com/swiftlang/swift/issues/76166
+BDEPEND+="
+	!!dev-cpp/tbb
+"
+
 # Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags
 # (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`).
 clang-ldflags() {
diff --git a/dev-lang/swift/swift-6.0.3.ebuild b/dev-lang/swift/swift-6.0.3.ebuild
index c3a52bc8da..86dc9abab2 100644
--- a/dev-lang/swift/swift-6.0.3.ebuild
+++ b/dev-lang/swift/swift-6.0.3.ebuild
@@ -109,6 +109,18 @@ BDEPEND="
 	' python3_{12..13})
 "
 
+# Swift 6 upstream currently doesn't build with oneTBB installed because Swift's
+# `libstdcxx.h` includes `<execution>`, which, in combination with recent
+# `libstdc++` versions, causes `tbb/execution` to get picked up; this results in
+# a circular dependency back on the stdlib, failing the build.
+#
+# See:
+# * https://bugs.gentoo.org/947141
+# * https://github.com/swiftlang/swift/issues/76166
+BDEPEND+="
+	!!dev-cpp/tbb
+"
+
 # Adapted from `flag-o-matic.eclass`'s `raw-ldflags`: turns GCC-style flags
 # (`-Wl,-foo`) into Clang-style flags (`-Xlinker -foo`).
 clang-ldflags() {
diff --git a/games-strategy/unciv-bin/Manifest b/games-strategy/unciv-bin/Manifest
index 2d8d7a2019..8423c287cc 100644
--- a/games-strategy/unciv-bin/Manifest
+++ b/games-strategy/unciv-bin/Manifest
@@ -1 +1 @@
-DIST unciv-bin-4.14.17.jar 55257536 BLAKE2B 8683dd1f4c85e4bb9731cbfcd751d6ac937cee8580ad58556b6ab28c9e7283af6e789a9e51c23585beee4ac75109f0729a59dc56ea76f25d43c57629ed940ddf SHA512 62cbb7feb6f15a69f152c6c62a6aed52591db81541e499419a12720a0c927fcc069d3328b94c850c14a21a6addacb3344c44311ccddb882ca154603df4398fe9
+DIST unciv-bin-4.15.2.jar 55155994 BLAKE2B 5940c04447573f825ed28cb994cf65315216835ce390c04e6b6353361fb5428f13bc2d032838c5166ec628c05feeee07d3a549e8e52d10fec841d5d1cf055feb SHA512 7571fba7540b40fd159e95c26d15a2a980cb0657824704c9c552ce95ef2b26b944e01a6a18d56c72f2395a296e86f66b9f8078a610a34643b47136e84e39ab2d
diff --git a/games-strategy/unciv-bin/unciv-bin-4.14.17.ebuild b/games-strategy/unciv-bin/unciv-bin-4.15.2.ebuild
similarity index 100%
rename from games-strategy/unciv-bin/unciv-bin-4.14.17.ebuild
rename to games-strategy/unciv-bin/unciv-bin-4.15.2.ebuild
diff --git a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild
index 3e3d668643..28faa3832e 100644
--- a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild
+++ b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.9.2.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/steam
 	dev-python/requests
-	dev-python/pyside6[designer(+)]
+	dev-python/pyside6[gui,uitools,widgets]
 	dev-python/vdf
 	dev-python/pyxdg
 	dev-python/pyaml
diff --git a/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild b/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild
index fe322a1732..97cf515d6f 100644
--- a/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild
+++ b/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 
 DEPEND="dev-python/steam
 	dev-python/requests
-	dev-python/pyside6[designer(+)]
+	dev-python/pyside6[dbus,gui,uitools,widgets]
 	dev-python/vdf
 	dev-python/pyxdg
 	dev-python/pyaml
diff --git a/gui-apps/coreapps-meta/coreapps-meta-4.5.0.ebuild b/gui-apps/coreapps-meta/coreapps-meta-4.5.0.ebuild
deleted file mode 100644
index ec1d7532b0..0000000000
--- a/gui-apps/coreapps-meta/coreapps-meta-4.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Meta package for coreapps"
-HOMEPAGE="https://gitlab.com/cubocore/coreapps"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="
-	location
-	pulseaudio
-	udisks
-"
-
-RDEPEND="
-	~gui-apps/coreaction-${PV}
-	~gui-apps/coreapps-meta-${PV}
-	~gui-apps/corearchiver-${PV}
-	~gui-apps/corefm-${PV}
-	~gui-apps/coregarage-${PV}
-	~gui-apps/corehunt-${PV}
-	~gui-apps/coreimage-${PV}
-	~gui-apps/coreinfo-${PV}
-	~gui-apps/corekeyboard-${PV}
-	~gui-apps/corepad-${PV}
-	~gui-apps/corepaint-${PV}
-	~gui-apps/corepdf-${PV}
-	~gui-apps/corepins-${PV}
-	~gui-apps/corerenamer-${PV}
-	~gui-apps/coreshot-${PV}
-	~gui-apps/corestats-${PV}
-	~gui-apps/corestuff-${PV}
-	~gui-apps/coreterminal-${PV}
-	~gui-apps/coretime-${PV}
-	~gui-apps/coretoppings-${PV}[location?,pulseaudio?]
-	~gui-apps/coreuniverse-${PV}
-	~gui-libs/libcprime-${PV}
-	~gui-libs/libcsys-${PV}[udisks?]
-"
diff --git a/gui-apps/coreapps-meta/coreapps-meta-9999.ebuild b/gui-apps/coreapps-meta/coreapps-meta-9999.ebuild
deleted file mode 100644
index 6a175a853d..0000000000
--- a/gui-apps/coreapps-meta/coreapps-meta-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Meta package for coreapps"
-HOMEPAGE="https://gitlab.com/cubocore/coreapps"
-
-LICENSE="metapackage"
-SLOT="0"
-PROPERTIES="live"
-IUSE="
-	location
-	pulseaudio
-	udisks
-"
-
-RDEPEND="
-	~gui-apps/coreaction-${PV}
-	~gui-apps/coreapps-meta-${PV}
-	~gui-apps/corearchiver-${PV}
-	~gui-apps/corefm-${PV}
-	~gui-apps/coregarage-${PV}
-	~gui-apps/corehunt-${PV}
-	~gui-apps/coreimage-${PV}
-	~gui-apps/coreinfo-${PV}
-	~gui-apps/corekeyboard-${PV}
-	~gui-apps/corepad-${PV}
-	~gui-apps/corepaint-${PV}
-	~gui-apps/corepdf-${PV}
-	~gui-apps/corepins-${PV}
-	~gui-apps/corerenamer-${PV}
-	~gui-apps/coreshot-${PV}
-	~gui-apps/corestats-${PV}
-	~gui-apps/corestuff-${PV}
-	~gui-apps/coreterminal-${PV}
-	~gui-apps/coretime-${PV}
-	~gui-apps/coretoppings-${PV}[location?,pulseaudio?]
-	~gui-apps/coreuniverse-${PV}
-	~gui-libs/libcprime-${PV}
-	~gui-libs/libcsys-${PV}[udisks?]
-"
diff --git a/gui-apps/coreapps-meta/metadata.xml b/gui-apps/coreapps-meta/metadata.xml
deleted file mode 100644
index 22bc7c8df9..0000000000
--- a/gui-apps/coreapps-meta/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="location">Enable location discovery</flag>
-	</use>
-	<upstream>
-		<remote-id type="gitlab">cubocore/coreapps</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gui-apps/coreterminal/Manifest b/gui-apps/coreterminal/Manifest
index b89a030cf9..629c5ccad5 100644
--- a/gui-apps/coreterminal/Manifest
+++ b/gui-apps/coreterminal/Manifest
@@ -1 +1 @@
-DIST coreterminal-v4.5.0.tar.bz2 73959 BLAKE2B a3ae53915053642eef3b143e67846baeee54aae8db3895be8fd2ab997563b6750e9c2f5b230595e7f21d33a00a07e614cc8eae87be8047bd66e5a8f6b9b89695 SHA512 8084e2525d3ba369b2945c92c7c413ebfe8aca634f2bf64f0402131376e712ae6ff07143ce0afca0dab30274598edb1e10e06d109794d59f5249613083004f06
+DIST coreterminal-5.0.0_pre20241230.tar.bz2 74606 BLAKE2B 99f991b84315da4f082c97daaff27a2222c51014d74a2c7b144b338aec665fab7651591d7fc2ec55d024eff9ce04b3fd583a63b4d11413501d1c9d82b8c78d65 SHA512 f95d53f70fcbc627920ae491adb00424106065cbff00c05901be9386ab5cb0d248c54b0a1618238143b83d5425fa43f0eca10eb7dddb8d435a67514a94f38408
diff --git a/gui-apps/coreterminal/coreterminal-4.5.0.ebuild b/gui-apps/coreterminal/coreterminal-5.0.0_pre20241230.ebuild
similarity index 59%
rename from gui-apps/coreterminal/coreterminal-4.5.0.ebuild
rename to gui-apps/coreterminal/coreterminal-5.0.0_pre20241230.ebuild
index 27568e62e5..91d756919e 100644
--- a/gui-apps/coreterminal/coreterminal-4.5.0.ebuild
+++ b/gui-apps/coreterminal/coreterminal-5.0.0_pre20241230.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit xdg cmake
+inherit cmake xdg
 
 DESCRIPTION="A terminal emulator for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreterminal"
@@ -12,20 +12,19 @@ if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/cubocore/coreapps/coreterminal.git"
 else
-	SRC_URI="https://gitlab.com/cubocore/coreapps/coreterminal/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+	COMMIT="d9b74e075eee75e79cb394c1caac28e1179ecde8"
+	SRC_URI="https://gitlab.com/cubocore/coreapps/coreterminal/-/archive/${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-v${PV}"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 fi
 
 LICENSE="GPL-3+"
 SLOT="0"
 
 DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtserialport:5
-	dev-qt/qtwidgets:5
-	gui-libs/libcprime
-	<x11-libs/qtermwidget-2:=
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtserialport:6
+	>=gui-libs/libcprime-5.0.0_pre20240921
+	>=x11-libs/qtermwidget-2.0.0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/gui-apps/coreterminal/coreterminal-9999.ebuild b/gui-apps/coreterminal/coreterminal-9999.ebuild
index 27568e62e5..d434bce99f 100644
--- a/gui-apps/coreterminal/coreterminal-9999.ebuild
+++ b/gui-apps/coreterminal/coreterminal-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit xdg cmake
+inherit cmake xdg
 
 DESCRIPTION="A terminal emulator for C Suite"
 HOMEPAGE="https://gitlab.com/cubocore/coreapps/coreterminal"
@@ -21,11 +21,9 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtserialport:5
-	dev-qt/qtwidgets:5
-	gui-libs/libcprime
-	<x11-libs/qtermwidget-2:=
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtserialport:6
+	>=gui-libs/libcprime-5.0.0_pre20240921
+	>=x11-libs/qtermwidget-2.0.0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/gui-apps/hyprlock/Manifest b/gui-apps/hyprlock/Manifest
index 0cefc97540..18188d13ba 100644
--- a/gui-apps/hyprlock/Manifest
+++ b/gui-apps/hyprlock/Manifest
@@ -1 +1 @@
-DIST hyprlock-0.5.0.tar.gz 67016 BLAKE2B c15491e00c0b3ea04e9d99c399d6803271849f75432ed34b516cbe059582371de357e67077e356eb7d71a7490e010ff2a5333444410023a73598d5ee185f2346 SHA512 c9fc30e20889dc694294ad9ec03c39c7e47fada4972139822b9f9275d04f2de6a9105918eca1369a4c6a3e4f5c6a956675beebbbab688f0d8f13bffccedb5a03
+DIST hyprlock-0.6.0.tar.gz 71344 BLAKE2B 77dbe7c4061c0d52663e286e701e1819f10194515130126078375f26e1b58d7cb74d7b980e6587751a65ccf762bbcb0cd6ff6fb9fedc375c891f5d6cff773de4 SHA512 d8931b44db0d25a2665a3b1a2a8656724ffd2d09effab37f0c53e40367637899f7040d96a0886202c6d4d5fb03e477a4fc351cbd31b81cdb715e180bc8dde6c2
diff --git a/gui-apps/hyprlock/files/hyprlock-0.6.0-explicitly-require-gles3.patch b/gui-apps/hyprlock/files/hyprlock-0.6.0-explicitly-require-gles3.patch
new file mode 100644
index 0000000000..3c9e2ba116
--- /dev/null
+++ b/gui-apps/hyprlock/files/hyprlock-0.6.0-explicitly-require-gles3.patch
@@ -0,0 +1,37 @@
+https://github.com/hyprwm/hyprlock/commit/023aff52ad45a3c55144c6bbda33395dfb9e9db0
+https://bugs.gentoo.org/947781
+Allow building on a system that lacks GLX support.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.19)
++cmake_minimum_required(VERSION 3.27)
+ 
+ file(READ "${CMAKE_SOURCE_DIR}/VERSION" VER_RAW)
+ string(STRIP ${VER_RAW} VERSION)
+@@ -37,7 +37,7 @@ message(STATUS "Checking deps...")
+ 
+ find_package(Threads REQUIRED)
+ find_package(PkgConfig REQUIRED)
+-find_package(OpenGL REQUIRED)
++find_package(OpenGL REQUIRED COMPONENTS EGL GLES3)
+ pkg_check_modules(
+   deps
+   REQUIRED
+@@ -47,7 +47,6 @@ pkg_check_modules(
+   wayland-egl
+   hyprlang>=0.4.0
+   egl
+-  opengl
+   xkbcommon
+   libjpeg
+   libwebp
+@@ -63,7 +62,7 @@ pkg_check_modules(
+ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
+ add_executable(hyprlock ${SRCFILES})
+ target_link_libraries(hyprlock PRIVATE pam rt Threads::Threads PkgConfig::deps
+-                                       OpenGL::EGL OpenGL::GL)
++                                       OpenGL::EGL OpenGL::GLES3)
+ 
+ # protocols
+ find_program(WaylandScanner NAMES wayland-scanner)
diff --git a/gui-apps/hyprlock/hyprlock-0.5.0-r1.ebuild b/gui-apps/hyprlock/hyprlock-0.6.0.ebuild
similarity index 80%
rename from gui-apps/hyprlock/hyprlock-0.5.0-r1.ebuild
rename to gui-apps/hyprlock/hyprlock-0.6.0.ebuild
index 2a0d89babd..a476d5b874 100644
--- a/gui-apps/hyprlock/hyprlock-0.5.0-r1.ebuild
+++ b/gui-apps/hyprlock/hyprlock-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,8 +21,9 @@ SLOT="0"
 
 RDEPEND="
 	dev-cpp/sdbus-c++:0/2
+	dev-libs/hyprgraphics
 	>=dev-libs/hyprlang-0.4.0
-	>=gui-libs/hyprutils-0.2.0:=
+	>=gui-libs/hyprutils-0.2.6:=
 	dev-libs/date
 	dev-libs/glib:2
 	dev-libs/wayland
@@ -47,5 +48,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/hyprlock-0.4.1-fix-CFLAGS-CXXFLAGS.patch"
+	"${FILESDIR}/${PN}-0.4.1-fix-CFLAGS-CXXFLAGS.patch"
+	# bug #947781
+	"${FILESDIR}/${P}-explicitly-require-gles3.patch"
 )
diff --git a/gui-libs/libcprime/Manifest b/gui-libs/libcprime/Manifest
index 39360e17da..af8549e3bb 100644
--- a/gui-libs/libcprime/Manifest
+++ b/gui-libs/libcprime/Manifest
@@ -1 +1,2 @@
+DIST libcprime-5.0.0_pre20240921.tar.bz2 45302 BLAKE2B 1943f160f01cda7bb4fca010fee8cc5e3e182d4a9afc4d57a291427ec48fec38a401c4cb268699beba2b7e2b4972f5c6d1320cbd3d03ec6bef1628cbbfdba93e SHA512 8e1f343f8b8df0d2809d1b0e05eaebc6e304018aa174bc19efa3eadda1804982ac8f6885c29cc943b93e265cb1c5d4fedd3b1d98f70b8e8b3fa72a58bb2c7572
 DIST libcprime-v4.5.0.tar.bz2 45669 BLAKE2B 172188a9706fb12ef54984bd81a328a637bcb69e3bca79c2677186412a10406e9f89b0c56b70241685389b78452a0d16c59ef753aa40c3cc088fb5d36168a386 SHA512 67f2395a380b1d9b3a1aa13d78a5386af40748505cbc2330e05e2d5e60cd82a17e3aa7653bff25c73991a42853eeaa45d98322aa758ae7096d6a3005cc85b8e1
diff --git a/gui-libs/libcprime/libcprime-5.0.0_pre20240921.ebuild b/gui-libs/libcprime/libcprime-5.0.0_pre20240921.ebuild
new file mode 100644
index 0000000000..8d7538e157
--- /dev/null
+++ b/gui-libs/libcprime/libcprime-5.0.0_pre20240921.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for managing settings of CoreApps"
+HOMEPAGE="https://gitlab.com/cubocore/libcprime"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/cubocore/libcprime.git"
+else
+	COMMIT="eff16e1d89bd98d8a4fd22c6decbdc1c573ecca1"
+	SRC_URI="https://gitlab.com/cubocore/libcprime/-/archive/${COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DEPEND="dev-qt/qtbase:6[dbus,gui,network,widgets]"
+RDEPEND="${DEPEND}"
diff --git a/gui-libs/libcprime/libcprime-9999.ebuild b/gui-libs/libcprime/libcprime-9999.ebuild
index db3ba81255..8c74eb8c52 100644
--- a/gui-libs/libcprime/libcprime-9999.ebuild
+++ b/gui-libs/libcprime/libcprime-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
@@ -17,14 +17,8 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
+DEPEND="dev-qt/qtbase:6[dbus,gui,network,widgets]"
 RDEPEND="${DEPEND}"
diff --git a/gui-libs/libcprime/metadata.xml b/gui-libs/libcprime/metadata.xml
index a5ccd7027e..301c7690f3 100644
--- a/gui-libs/libcprime/metadata.xml
+++ b/gui-libs/libcprime/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <upstream>
-    <remote-id type="gitlab">cubocore/coreapps/libcprime</remote-id>
+    <remote-id type="gitlab">cubocore/libcprime</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/gui-wm/niri/Manifest b/gui-wm/niri/Manifest
index f1fb7a8cdc..b720730a29 100644
--- a/gui-wm/niri/Manifest
+++ b/gui-wm/niri/Manifest
@@ -1,4 +1,4 @@
 DIST niri-0.1.10.1-vendored-dependencies.tar.xz 53928792 BLAKE2B 28eb1d090b12f8b324e89d807b0999161360ecc71fc2b3d2b5e7a1cdcb7313e307867f4a763a6124d4bde46c28b90fa3797d75d62fa1b20ac3ae998b69cf94cd SHA512 7ee23334de2dacfdd6e2f73b2056ed81af39abef132d423c9c6097de367f7be3e0ba1694b4818f0ee89518c0e379aafd0ece426ac97a52a5b9c96bd9532ed49e
 DIST niri-0.1.10.1.tar.gz 429116 BLAKE2B 394cce3c11d19ef65d450a0e402e3c97affdff798340bb37aba90ea9b49c4cb5e7417873bd0e66bafb2ff035d71ddfca14fb91a86aa997dc23534bd1eff48035 SHA512 ba816350bad30debcb961d6c516c96a0a732621e78e08f7f04bbf3bee46cb463318a59acf532660288022a247cfcd636d59159b66fd01c1c702d58f8ddf44e6a
-DIST niri-0.1.9-vendored-dependencies.tar.xz 52231744 BLAKE2B c9b7a1a508f273a59219437c644bc954398277ddec772c53dc35556736244b5230ab1a0aa9e31f9b418215d634b05565e1c3331f882a6616e4036d29892a29d3 SHA512 88db732c9d2c81e4285ce0e67ef1c4778367e4ff1540b43d7922b85add199c6f2f29e03d1bc78d321f79684bd6fd0ca3b06533491a5b02cf4872e5dd661a93d2
-DIST niri-0.1.9.tar.gz 409640 BLAKE2B 86caa9f2b9a468c5aef8041f902bbbd252200ab2fda4da5bf9d0997d61014b8f99336dd2b0579cf754d188ce51dfbcee0d83f413d8a10dba451c104a69f73ca0 SHA512 7436ad537b6f4e2d0b05731d94bf02594310526843083a175c061327958d7673d19ec601732969f9910c4e41b97be64a04d2a1eac3c7ec19c4d71a31fdad8d6c
+DIST niri-25.01-vendored-dependencies.tar.xz 47572184 BLAKE2B d8675c7f98f43fe34ff0237b78ae772296015ff28509960b87aa828937bf541fbfeb23cadaf869bfe128fbeff8d16f362e8967a124b996cea2ed0a53036480cb SHA512 a498d667e65175190e5d60edcdb4b11defd34e76644b29f14f01dd31035ac2dc4dfa1962afa57e18d1a06c775c3e6302c3e5cbb6b1fdb3980b148c9912a1ee14
+DIST niri-25.01.tar.gz 572739 BLAKE2B b8d1b1919cc5568b38ffae225a815669dacf8fd5a9d3d6f4e3083f90e4a0ed811ffdf718166ca850655d679af428c7f4067a4973802ecdeb1e580351d2f796d9 SHA512 5c555f4410659a4301151a58938cc9880a9a244af138157c0be0fb38f0e82d20e6fccccad7e47ef515d3aaa0f7ddeef5088adad3f8d0be1a99a89f822c8b7a66
diff --git a/gui-wm/niri/niri-0.1.9-r1.ebuild b/gui-wm/niri/niri-25.01.ebuild
similarity index 73%
rename from gui-wm/niri/niri-0.1.9-r1.ebuild
rename to gui-wm/niri/niri-25.01.ebuild
index a49ec20847..6244d4f15f 100644
--- a/gui-wm/niri/niri-0.1.9-r1.ebuild
+++ b/gui-wm/niri/niri-25.01.ebuild
@@ -1,12 +1,15 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-LLVM_COMPAT=( {16..18} )
-RUST_MIN_VER="1.77.0"
+LLVM_COMPAT=( {16..19} )
+RUST_MIN_VER="1.80.0"
 
-inherit llvm-r1 cargo systemd
+# used for version string
+export NIRI_BUILD_COMMIT="e05bc26"
+
+inherit cargo llvm-r2 systemd
 
 DESCRIPTION="Scrollable-tiling Wayland compositor"
 HOMEPAGE="https://github.com/YaLTeR/niri"
@@ -19,7 +22,7 @@ LICENSE="GPL-3+"
 # Dependent crate licenses
 LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0
-	Unicode-DFS-2016
+	Unicode-3.0 Unicode-DFS-2016
 "
 SLOT="0"
 KEYWORDS="~amd64"
@@ -46,7 +49,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}"
-# Clang is required for bindgen
+# libclang is required for bindgen
 BDEPEND="
 	screencast? ( $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') )
 "
@@ -56,7 +59,7 @@ ECARGO_VENDOR="${WORKDIR}/vendor"
 QA_FLAGS_IGNORED="usr/bin/niri"
 
 pkg_setup() {
-	llvm-r1_pkg_setup
+	llvm-r2_pkg_setup
 	rust_pkg_setup
 }
 
@@ -86,3 +89,16 @@ src_install() {
 	insinto /usr/share/xdg-desktop-portal
 	doins resources/niri-portals.conf
 }
+
+src_test() {
+	# tests create a wayland socket in the xdg runtime dir
+	export XDG_RUNTIME_DIR="${T}/xdg"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	# tests might fail when executed in parallel
+	# https://github.com/YaLTeR/niri/issues/953
+	export RAYON_NUM_THREADS=1
+
+	cargo_src_test
+}
diff --git a/media-libs/amdvlk/amdvlk-2024.4.3.ebuild b/media-libs/amdvlk/amdvlk-2024.4.3.ebuild
index d3f9ae986c..ab86e07356 100644
--- a/media-libs/amdvlk/amdvlk-2024.4.3.ebuild
+++ b/media-libs/amdvlk/amdvlk-2024.4.3.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
@@ -49,6 +49,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
 DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	${BUNDLED_LLVM_DEPEND}
+	app-arch/zstd:=[${MULTILIB_USEDEP}]
 	>=dev-util/vulkan-headers-1.3.296
 	raytracing? ( dev-util/DirectXShaderCompiler )
 	dev-util/glslang[${MULTILIB_USEDEP}]"
@@ -110,17 +111,20 @@ src_prepare() {
 	mv MetroHash-${METROHASH_COMMIT}/ third_party/metrohash || die
 	mv CWPack-${CWPACK_COMMIT}/ third_party/cwpack || die
 	cmake_src_prepare
+
+	# disable forced optimization
+	sed -i '/-O3/d' xgl/cmake/XglCompilerOptions.cmake || die
 }
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DBUILD_WAYLAND_SUPPORT=$(usex wayland)
+		-DVKI_BUILD_WAYLAND=$(usex wayland)
 		-DVKI_RAY_TRACING=$(usex raytracing)
 		-DLLVM_HOST_TRIPLE="${CHOST}"
 		-DLLVM_ENABLE_WERROR=OFF
 		-DENABLE_WERROR=OFF
 		-DVAM_ENABLE_WERROR=OFF
-		-DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF
+		-DVKI_ANALYSIS_WARNINGS_AS_ERRORS=OFF
 		-DMETROHASH_ENABLE_WERROR=OFF
 		-DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs
 		-DPython3_EXECUTABLE="${PYTHON}"
diff --git a/profiles/package.mask b/profiles/package.mask
index 4fd9a66e4f..109b2ad341 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -60,13 +60,6 @@ dev-python/pygaljs
 # Removal on 2025-01-17
 sci-physics/openmodelica
 
-# Takuya Wakazono <pastalian46@gmail.com> (2024-12-08)
-# One of the Qt5 dependencies has been dropped from ::gentoo.
-# No maintainer.
-# Removal on 2025-01-08.
-gui-apps/coreterminal
-gui-apps/coreapps-meta
-
 # Gasc Henri <gasc@eurecom.fr> (2024-12-05)
 # Last release was in 2017, 2 commits in the last 3 years
 # Removal on 2025-01-05
diff --git a/sys-apps/pnpm-bin/Manifest b/sys-apps/pnpm-bin/Manifest
index ec98b1a48e..a030f85efc 100644
--- a/sys-apps/pnpm-bin/Manifest
+++ b/sys-apps/pnpm-bin/Manifest
@@ -1,5 +1,6 @@
+DIST pnpm-bin-10.0.0-amd64 67214167 BLAKE2B 97ce4458818cdea32fdc3f54d5a06d440b842882bcf78d57aa55aba252925a44b94ff78cde26e898b30e7388936df056ff861d51c19df29a6e945cebe9c325f6 SHA512 80aebfdd2b2e7e105d0611c95621e5bd851736da7c191f0913aefc6d609ca48c653065e3cff421fcbd4f3be1c7bb6a80c77455d91aeecea1251a747694ee967a
+DIST pnpm-bin-10.0.0-arm64 63239495 BLAKE2B 1fd60d7578e9350789e8139584dc6a7b83bd152b55cb1e202a86ae2448946804e559b1117a54bfc44dda7b347f44b50e8015cc146b52472adf35a24240a93747 SHA512 50e91e52a28f5fb4ec139940ba2569764066a451d6675d1a3218bea30971a12eb30621345c2b120c9ce88c6b235d1099190ff3d3f89e21f1bb62b70367ddce7f
 DIST pnpm-bin-9.12.3-amd64 68151033 BLAKE2B ca06a4db4ae9a79c0e80d02544b9ebdc302678ee3cf0b9bd78de81ef0e9636b4e2b7d79ef568a1c30b4ca1277e746885eaf0caf1f8dc646dcf86adc886bb568d SHA512 cd8d5779d637df41948edafb700099db5a367358f05334e2dd142b5779ac129d05db7e5452de70612aae839ff23b41634991d88b039624f0fa70bacd173d4c4e
 DIST pnpm-bin-9.12.3-arm64 64176425 BLAKE2B e2d1dfc4feb08590e7081136e09d9bbc539185b480ca9f7235adcb7946271eadea3ec5e913701fa4b21dbbda09b8f806d9268f4be1e20a80156314533ace27ef SHA512 1be62aa3cba73ea52f6ce3db73a6e68ac89c9e0fe29e30bd131c0e4f5a7f93d5f2be7d68f415fd1f8dab0e1b914cb2ea719acc229e10bdc63b4ff352df936996
-DIST pnpm-bin-9.5.0 59513182 BLAKE2B 3fc1e81784a7bf4f177b504cd9941cc9ffb9b50a4a47ea14b76dfcd200f2322e57fed0f1087e17a85bcf62d6d7e179324c6c2c449a34694b12e72b7815c03e0e SHA512 c32c103cb32111617f2401bbd785f796c44516929b389a82728b3b831a6ed72073f1fc87af918d501f5a93422687bccc322ae30a001f22bc3e2a39d736c9a95e
 DIST pnpm-bin-9.6.0-amd64 59521974 BLAKE2B 9bdcba32ba94ef9db6c49ddb5ed10d56003da585b897eaf3687055d38fc05810b4b1a6c0f05558d4417bdcbf52c072a1b7ff153eb2209fa8211a80a430a78966 SHA512 6e6f14cf0d52f2046206cb032b797a9c10623ea2e4a23e222d6791de166a02fdea8c9c365b8d2500448a92cf5e49eb5866bbf95ac69eaa6abe8fed817ee2a2f7
 DIST pnpm-bin-9.6.0-arm64 58044950 BLAKE2B 24242ba24c4aebdbfadc8438900a0e7504ef44c8252f1f866b9437be340dc54c8847b5f84fccb79174e3519e9a1f3aa7bf82388f1f839022210bccb374c8f76b SHA512 9139ce7e4120310ae49eda2bb51f3e3c592d2db7860da9d1004e733c8d95ee62c4de2679e8807ebb10c9ec341626518d681ffff6a94562a8bf7c94b3a1ff7fe5
diff --git a/sys-apps/pnpm-bin/pnpm-bin-9.5.0.ebuild b/sys-apps/pnpm-bin/pnpm-bin-10.0.0.ebuild
similarity index 54%
rename from sys-apps/pnpm-bin/pnpm-bin-9.5.0.ebuild
rename to sys-apps/pnpm-bin/pnpm-bin-10.0.0.ebuild
index 82c1dea506..4dada5bb05 100644
--- a/sys-apps/pnpm-bin/pnpm-bin-9.5.0.ebuild
+++ b/sys-apps/pnpm-bin/pnpm-bin-10.0.0.ebuild
@@ -5,18 +5,21 @@ EAPI=8
 
 DESCRIPTION="Fast, disk space efficient package manager, alternative to npm and yarn"
 HOMEPAGE="https://pnpm.io"
-SRC_URI="https://github.com/pnpm/pnpm/releases/download/v${PV}/pnpm-linux-x64 -> ${P}"
+SRC_URI="
+	amd64? ( https://github.com/pnpm/pnpm/releases/download/v${PV}/pnpm-linux-x64 -> ${P}-amd64 )
+	arm64? ( https://github.com/pnpm/pnpm/releases/download/v${PV}/pnpm-linux-arm64 -> ${P}-arm64 )
+"
 
 S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 -*"
 
 RESTRICT="strip"
 
 QA_PREBUILT="usr/bin/pnpm"
 
 src_install() {
-	newbin "${DISTDIR}/${P}" pnpm
+	newbin "${DISTDIR}/${P}-${ARCH}" pnpm
 }