diff --git a/app-benchmarks/kdiskmark/Manifest b/app-benchmarks/kdiskmark/Manifest
new file mode 100644
index 0000000000..9687ddcc01
--- /dev/null
+++ b/app-benchmarks/kdiskmark/Manifest
@@ -0,0 +1 @@
+DIST kdiskmark-3.1.4.tar.gz 194855 BLAKE2B fc8f59492b14849ffe6962183082a86c3e9d82e67f6b1b6a0449f7c714480d46c62ca85e4b1f7b838b42fd4cc5fcf3e8e81e0d3df5c955657cf8799b9f9110b6 SHA512 53f292e4137ac36dfbc09ad400496170bfd13a8c18f1c474bd15b00cdd931918713e034e35d6f3dbda29eb1ee89d8f273dd8e794a9e70c95ec96ebf31f0baedf
diff --git a/app-benchmarks/kdiskmark/kdiskmark-3.1.4.ebuild b/app-benchmarks/kdiskmark/kdiskmark-3.1.4.ebuild
new file mode 100644
index 0000000000..eb735d878c
--- /dev/null
+++ b/app-benchmarks/kdiskmark/kdiskmark-3.1.4.ebuild
@@ -0,0 +1,30 @@
+# 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
+	kde-frameworks/extra-cmake-modules
+	sys-auth/polkit-qt
+	sys-block/fio[aio]"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_configure() {
+	cmake_src_configure
+}
diff --git a/app-benchmarks/kdiskmark/metadata.xml b/app-benchmarks/kdiskmark/metadata.xml
new file mode 100644
index 0000000000..0262e6f08f
--- /dev/null
+++ b/app-benchmarks/kdiskmark/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mark@harmstone.com</email>
+		<name>Mark Harmstone</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">JonMagon/KDiskMark</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest
index 0d45767258..5765ebdb4c 100644
--- a/app-editors/imhex/Manifest
+++ b/app-editors/imhex/Manifest
@@ -1,2 +1,2 @@
-DIST imhex-1.30.1.tar.gz 25920970 BLAKE2B 03a651134bda5814dc4e989a763f148b3a03694640d1baaa4be6e075ad9c5e798959bc477484f8214423e15836cc01de033e10606ee04dc375521101b4c75f13 SHA512 04c71f15fdbe17443b0f98cef2c2562b7d360f14065e4fab2c2dc1eaf9bbd0d8aa9a267dd1eab208d77cf00622edf6b5126b2d266b817f301a2281aae82eed45
-DIST imhex-patterns-1.30.1.tar.gz 3377742 BLAKE2B 4fa9475f7b04f5765f0a81258e9d01bf814b7b7a0b318c096fdc3ba728938f3f782c9c30fde7ced79626b70b550649d883eda6cf5bbc4b3d8d3a9ad8ac1c5364 SHA512 d734c7fe1c31c9b7845422047a9b9d1289c432cfe98d2b08ca5fe22b82262e3ae41ec14e93d3c62d24c87294fcdf439719cef6bc2ee5b2b54b45377addb9f06a
+DIST imhex-1.31.0.tar.gz 25062606 BLAKE2B 9db337f5aa54ccefd925175f8b4869ece873a7c466d6ddded88c26d6f4fd7ba73a7789964ad2ae6a902d2ec653980ef2482434ddcbbbc224aaac8906b16e92c5 SHA512 483a89e84746ba74eb968f84140ae52edb7046d1074160a97eb6ebad6eac0284beccaf39004141cbe1eebcd8ca92d1fd486c45790880503bbcc40c7bdd586cb8
+DIST imhex-patterns-1.31.0.tar.gz 4448476 BLAKE2B 0bace799f0d2280ccd11a1fcafa9d22620a74691f6b5622d3ad0e260143792c8239158ba021de8e775d5d8589f6dfee990d25beab4288c053d9a5b138b8cc252 SHA512 aaeb2028bbc8235fb49ba75bdca71acf725da0035395c86df97c3976bb70f33ad34f9ce3089d72141de6767cc511c575cc3ac85b66ee4eeba8caa252fc874dba
diff --git a/app-editors/imhex/files/llvm-16.patch b/app-editors/imhex/files/llvm-16.patch
new file mode 100644
index 0000000000..5c7efa5faa
--- /dev/null
+++ b/app-editors/imhex/files/llvm-16.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
+index 624e401..cfd30c3 100644
+--- a/cmake/build_helpers.cmake
++++ b/cmake/build_helpers.cmake
+@@ -503,7 +503,7 @@ macro(addBundledLibraries)
+         add_subdirectory(${EXTERN_LIBS_FOLDER}/llvm-demangle EXCLUDE_FROM_ALL)
+         set_target_properties(LLVMDemangle PROPERTIES POSITION_INDEPENDENT_CODE ON)
+     else()
+-        find_package(LLVM REQUIRED Demangle)
++        find_package(LLVM 16 REQUIRED Demangle)
+     endif()
+ 
+     if (NOT USE_SYSTEM_YARA)
diff --git a/app-editors/imhex/imhex-1.30.1.ebuild b/app-editors/imhex/imhex-1.31.0.ebuild
similarity index 79%
rename from app-editors/imhex/imhex-1.30.1.ebuild
rename to app-editors/imhex/imhex-1.31.0.ebuild
index 1ea5d0cef7..ccbb9ef59a 100644
--- a/app-editors/imhex/imhex-1.30.1.ebuild
+++ b/app-editors/imhex/imhex-1.31.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 CMAKE_BUILD_TYPE="Release"
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake llvm toolchain-funcs
+inherit cmake llvm toolchain-funcs desktop
 
 DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
 HOMEPAGE="https://github.com/WerWolv/ImHex"
@@ -20,6 +20,11 @@ S_PATTERNS="${WORKDIR}/ImHex-Patterns-ImHex-v${PV}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="+system-llvm"
+
+PATCHES=(
+	"${FILESDIR}/llvm-16.patch"
+)
 
 DEPEND="
 	app-forensics/yara
@@ -41,6 +46,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
+	system-llvm? ( <sys-devel/llvm-17 )
 	app-admin/chrpath
 	gnome-base/librsvg
 	sys-devel/lld
@@ -53,19 +59,6 @@ pkg_pretend() {
 	fi
 }
 
-src_prepare() {
-	default
-	# We are removing all tests altogether
-	# The tests need ImHex installed to succeed (see https://bugs.gentoo.org/attachment.cgi?id=860683), so we remove them
-	# We could use `ln "${BUILD_DIR}/lib/libimhex.so.${PV}" "/lib64/libimhex.so.${PV}"` and  circumvent sandboxing
-	sed -i \
-		-e 's/enable_testing/#enable_testing/' \
-		-e 's/add_subdirectory(tests/#add_subdirectory(tests/' \
-		"${S}/CMakeLists.txt" || die
-
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-D CMAKE_BUILD_TYPE="Release" \
@@ -76,7 +69,6 @@ src_configure() {
 		-D CMAKE_OBJC_COMPILER_LAUNCHER=ccache \
 		-D CMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \
 		-D CMAKE_SKIP_RPATH=ON \
-		-D IMHEX_USE_BUNDLED_CA=OFF \
 		-D IMHEX_PLUGINS_IN_SHARE=OFF \
 		-D IMHEX_STRIP_RELEASE=OFF \
 		-D IMHEX_OFFLINE_BUILD=ON \
@@ -85,12 +77,13 @@ src_configure() {
 		-D IMHEX_IGNORE_BAD_COMPILER=OFF \
 		-D IMHEX_USE_GTK_FILE_PICKER=OFF \
 		-D IMHEX_DISABLE_STACKTRACE=OFF \
+		-D IMHEX_USE_DEFAULT_BUILD_SETTINGS=OFF \
+		-D IMHEX_STRICT_WARNINGS=OFF \
 		-D IMHEX_VERSION="${PV}" \
 		-D PROJECT_VERSION="${PV}" \
 		-D USE_SYSTEM_CAPSTONE=ON \
-		-D USE_SYSTEM_CURL=ON \
 		-D USE_SYSTEM_FMT=ON \
-		-D USE_SYSTEM_LLVM=ON \
+		-D USE_SYSTEM_LLVM=$(use system-llvm) \
 		-D USE_SYSTEM_NFD=ON \
 		-D USE_SYSTEM_NLOHMANN_JSON=ON \
 		-D USE_SYSTEM_YARA=ON
@@ -102,6 +95,8 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
+	domenu "${S}/dist/${PN}.desktop"
+
 	# Install patterns
 	insinto /usr/share/imhex
 	rm -rf "${S_PATTERNS}/tests"
diff --git a/app-editors/imhex/metadata.xml b/app-editors/imhex/metadata.xml
index 51ae868323..276772b0cc 100644
--- a/app-editors/imhex/metadata.xml
+++ b/app-editors/imhex/metadata.xml
@@ -10,6 +10,9 @@
 		<bugs-to>https://github.com/WerWolv/ImHex/issues</bugs-to>
 		<remote-id type="github">WerWolv/ImHex</remote-id>
 	</upstream>
+	<use>
+		<flag name="system-llvm">Use the system LLVM installation</flag>
+	</use>
 	<longdescription lang="en">
 		Features
 
diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild
index fe83830faf..ef9785f27b 100644
--- a/dev-zig/zls/zls-9999.ebuild
+++ b/dev-zig/zls/zls-9999.ebuild
@@ -106,8 +106,7 @@ ezig() {
 src_unpack() {
 	git-r3_src_unpack
 	cd "${S}" || die
-	# "zig build" doesn't have "fetch" subcommand yet
-	ezig build --help || die "Fetching Zig modules failed"
+	ezig build --fetch || die "Fetching Zig modules failed"
 	local ZLS_GEN_FLAGS="--generate-version-data master --generate-version-data-path version_data_offline.zig"
 	ezig build gen --verbose -- ${ZLS_GEN_FLAGS} || die "Pre-generating Zig version data failed"
 }
diff --git a/gui-apps/wob/wob-0.15.1.ebuild b/gui-apps/wob/wob-0.15.1.ebuild
index a6b0cd820b..e3698417ba 100644
--- a/gui-apps/wob/wob-0.15.1.ebuild
+++ b/gui-apps/wob/wob-0.15.1.ebuild
@@ -15,7 +15,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+man +seccomp test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/wayland"
+RDEPEND="
+	dev-libs/inih
+	dev-libs/wayland
+"
 DEPEND="${RDEPEND}
 	dev-libs/wayland-protocols
 	seccomp? ( sys-libs/libseccomp )
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 54c83270ef..5acbf7863e 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -12,5 +12,13 @@ DIST feather-2.4.9-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e4244
 DIST feather-2.4.9-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
 DIST feather-2.4.9-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
 DIST feather-2.4.9-monero.tar.gz 11649111 BLAKE2B fc087623b02fe57947aa4c4294e1bdee09ef171651382af99e870d299093f3380e00f9852f28683a6c4b4cff4ef0d1c573fb94c53083f4077d3b22e6b352b3bd SHA512 69dcc76e4e23c26ff1e7d01b1993af09a0f6f075d091a9169f7cfecfb094386380d657f66664a538c82977a7ca91f8df2ac33338339f53d55bc3beda2f8235db
+DIST feather-2.4.9-r1-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
+DIST feather-2.4.9-r1-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
+DIST feather-2.4.9-r1-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
+DIST feather-2.4.9-r1-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
+DIST feather-2.4.9-r1-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
+DIST feather-2.4.9-r1-monero.tar.gz 14011935 BLAKE2B b46ef62cb982f134c9c643f9bbe8fee196a42d9c7291f296c6185e598c240565c5c2714ed3f5337df34f2233cb0c54e1f70af605f7e871c0e4cc385d8820e6e1 SHA512 a9e5edf93f7d75dca47a0a9b0a06326f3e6774aa9e759492f399af18a0b0842237ad27beb7b1d0fbfd69a0e9e8adbdd2439b79ddc3e872c8a0bcb2ff546eb64e
+DIST feather-2.4.9-r1-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
+DIST feather-2.4.9-r1.tar.gz 1241941 BLAKE2B 725c949525970fb8368fdcc3443b5fde7ffbdb12b82608c6fa590e5104bd3fe4c42a5dca299e83acbd2b74d9bd2f7bf11a885c1cbdbafaed1eac3e7a825addc6 SHA512 71637871fead4d607c4a4536be1737c8640672921da5807dc17956e11ba95d5ae71467163dc01075df8c7b7c56ffe63ffbcdab433e4882215d542fcb89dac9a0
 DIST feather-2.4.9-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
 DIST feather-2.4.9.tar.gz 1241941 BLAKE2B 725c949525970fb8368fdcc3443b5fde7ffbdb12b82608c6fa590e5104bd3fe4c42a5dca299e83acbd2b74d9bd2f7bf11a885c1cbdbafaed1eac3e7a825addc6 SHA512 71637871fead4d607c4a4536be1737c8640672921da5807dc17956e11ba95d5ae71467163dc01075df8c7b7c56ffe63ffbcdab433e4882215d542fcb89dac9a0
diff --git a/net-p2p/feather/feather-2.4.9-r1.ebuild b/net-p2p/feather/feather-2.4.9-r1.ebuild
new file mode 100644
index 0000000000..4565940bc9
--- /dev/null
+++ b/net-p2p/feather/feather-2.4.9-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
+MONERO_DIST_COMIT="db1ac578a16e678f0778fb37001921f93704f0ed"
+	MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
+	RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
+	RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
+	SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
+	TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
+
+DESCRIPTION="A free, open-source Monero wallet"
+HOMEPAGE="https://featherwallet.org"
+SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
+${PF}.tar.gz
+	https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
+${PF}-singleapplication.tar.gz
+	https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
+${PF}-monero.tar.gz
+	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
+${PF}-monero-miniupnp.tar.gz
+	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
+${PF}-monero-randomx.tar.gz
+	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
+${PF}-monero-rapidjson.tar.gz
+	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
+${PF}-monero-supercop.tar.gz
+	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
+${PF}-monero-trezorcommon.tar.gz
+"
+
+# Feather is released under the terms of the BSD license, but it vendors
+# code from Monero and Tor too.
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qrcode xmrig localmonero"
+
+DEPEND="
+	dev-libs/libsodium:=
+	media-gfx/qrencode:=
+	media-gfx/zbar:=[v4l]
+	=dev-libs/polyseed-1.0.0
+	dev-libs/libzip:=
+	dev-libs/boost:=[nls]
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtnetwork-5.15:5
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtxml-5.15:5
+	>=dev-qt/qtwebsockets-5.15:5
+	>=dev-qt/qtmultimedia-5.15:5[widgets]
+	>=dev-qt/qtconcurrent-5.15:5
+	dev-libs/libgcrypt:=
+	sys-libs/zlib
+	dev-libs/openssl:=
+	net-dns/unbound:=[threads]
+	net-libs/czmq:=
+"
+RDEPEND="
+	${DEPEND}
+	net-vpn/tor
+	xmrig? ( net-misc/xmrig )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${PF}.tar.gz \
+		${PF}-singleapplication.tar.gz \
+		${PF}-monero.tar.gz \
+		${PF}-monero-miniupnp.tar.gz \
+		${PF}-monero-randomx.tar.gz \
+		${PF}-monero-rapidjson.tar.gz \
+		${PF}-monero-supercop.tar.gz \
+		${PF}-monero-trezorcommon.tar.gz
+	mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
+		"${WORKDIR}"/${P}/src/third-party/singleapplication || die
+	mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
+		"${WORKDIR}"/${P}/monero || die
+	mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
+		"${WORKDIR}"/${P}/monero/external/miniupnp || die
+	mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
+		"${WORKDIR}"/${P}/monero/external/randomx || die
+	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
+		"${WORKDIR}"/${P}/monero/external/rapidjson || die
+	mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
+		"${WORKDIR}"/${P}/monero/external/supercop || die
+	mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
+		"${WORKDIR}"/${P}/monero/external/trezor-common || die
+}
+
+src_prepare() {
+	default
+	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${P}/src/config-feather.h || die
+	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${P}/src/config-feather.h || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DBUILD_SHARED_LIBS=OFF
+		-DARCH=x86-64
+		-DBUILD_TAG="linux-x64"
+		-DBUILD_64=ON
+		-DSELF_CONTAINED=OFF
+		-DLOCALMONERO=$(usex localmonero)
+		-DXMRIG=$(usex xmrig)
+		-DCHECK_UPDATES=OFF
+		-DPLATFORM_INSTALLER=OFF
+		-DUSE_DEVICE_TREZOR=OFF
+		-DDONATE_BEG=OFF
+		-DWITH_SCANNER=$(usex qrcode)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_build feather
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/bin/feather"
+
+	newicon -s 256 "${WORKDIR}"/${P}/src/assets/images/appicons/256x256.png feather.png
+	newicon -s 128 "${WORKDIR}"/${P}/src/assets/images/appicons/128x128.png feather.png
+	newicon -s 96 "${WORKDIR}"/${P}/src/assets/images/appicons/96x96.png feather.png
+	newicon -s 64 "${WORKDIR}"/${P}/src/assets/images/appicons/64x64.png feather.png
+	newicon -s 48 "${WORKDIR}"/${P}/src/assets/images/appicons/48x48.png feather.png
+	newicon -s 32 "${WORKDIR}"/${P}/src/assets/images/appicons/32x32.png feather.png
+	domenu "${WORKDIR}"/${P}/src/assets/feather.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	einfo "Ensure that Tor is running with 'rc-service tor start' before"
+	einfo "using Feather."
+}
diff --git a/sci-electronics/slang/files/slang-4.0-fix-gentoo-libfmt-depend.patch b/sci-electronics/slang/files/slang-4.0-fix-gentoo-libfmt-depend.patch
new file mode 100644
index 0000000000..bae7276593
--- /dev/null
+++ b/sci-electronics/slang/files/slang-4.0-fix-gentoo-libfmt-depend.patch
@@ -0,0 +1,26 @@
+From 4be4a956ad1a1ff767dcc91c88fac103d5780578 Mon Sep 17 00:00:00 2001
+From: Huang Rui <vowstar@gmail.com>
+Date: Fri, 15 Sep 2023 19:38:34 +0800
+Subject: [PATCHv1] external/CMakeLists.txt: fix gentoo libfmt depend
+
+Signed-off-by: Huang Rui <vowstar@gmail.com>
+---
+ external/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index 9341eb2e2ffa..4ea7429a69a8 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ # ~~~
+ 
+ # Required minimum versions for dependencies
+-set(fmt_min_version "10.0")
++set(fmt_min_version "9.0")
+ set(mimalloc_min_version "2.1")
+ set(catch2_min_version "3.0")
+ 
+-- 
+2.42.0
+