diff --git a/app-editors/neovim-qt/Manifest b/app-editors/neovim-qt/Manifest
index 653ba816d4..69eafaae46 100644
--- a/app-editors/neovim-qt/Manifest
+++ b/app-editors/neovim-qt/Manifest
@@ -1 +1,2 @@
 DIST neovim-qt-0.2.16.1.tar.gz 1069176 BLAKE2B ccb9d7275735969dc0576b498e017068da63e14ba82e3160621822d83c3902e35064be393dda57f8e70d83bcbb22e8e663f2ec996ffb48ff0140099ae0793a88 SHA512 63910b0416103f8c4f2450a07d4790c2b7fd26e2ba324445a20700a12d1dc3cb6fb06c674f3a1173348dad5c2256e8018167765306ca33ad94bc176bf5e4e45c
+DIST neovim-qt-0.2.17.tar.gz 1076230 BLAKE2B ab322d7f03bca40b4b3ee6e89a20dc04ec06d9ba3f49c0e658586f55e5219d13770078ed956a889dbe100836cb83cbc1829a39d60e9164e3bcb43ba085a72412 SHA512 ff290c6797c51ac23acd87ecd4c8d034321c4994c76b60f5d15626aa31db377090359d4bc681c6a9d0462ff5847269c35b95561ccd156600cf3f09f28ad4b8b2
diff --git a/app-editors/neovim-qt/files/neovim-qt-0.2.17-only-require-Qt5Test-if-tests-are-enabled.patch b/app-editors/neovim-qt/files/neovim-qt-0.2.17-only-require-Qt5Test-if-tests-are-enabled.patch
new file mode 100644
index 0000000000..06ca1b0ed9
--- /dev/null
+++ b/app-editors/neovim-qt/files/neovim-qt-0.2.17-only-require-Qt5Test-if-tests-are-enabled.patch
@@ -0,0 +1,50 @@
+# upstream PR: <https://github.com/equalsraf/neovim-qt/pull/1007>
+
+From dd334be1e113d9e0f2310cc35b620c5090d06e1f Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Tue, 9 Aug 2022 15:32:08 +0200
+Subject: [PATCH] only require Qt5Test if tests are enabled
+
+---
+ CMakeLists.txt                     | 2 +-
+ src/gui/shellwidget/CMakeLists.txt | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8c77d27..ed02426 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -135,7 +135,6 @@ set(CMAKE_AUTOMOC ON)
+ find_package(Qt5Core REQUIRED)
+ find_package(Qt5Network REQUIRED)
+ find_package(Qt5Svg REQUIRED)
+-find_package(Qt5Test REQUIRED)
+ find_package(Qt5Widgets REQUIRED)
+ 
+ if(Qt5Core_VERSION VERSION_LESS 5.8)
+@@ -176,6 +175,7 @@ add_subdirectory(doc)
+ 
+ option(ENABLE_TESTS "Build tests" ON)
+ if(ENABLE_TESTS)
++	find_package(Qt5Test REQUIRED)
+ 	enable_testing()
+ 	add_subdirectory(test)
+ 	add_subdirectory(src/gui/shellwidget/test)
+diff --git a/src/gui/shellwidget/CMakeLists.txt b/src/gui/shellwidget/CMakeLists.txt
+index f456c4a..41bc382 100644
+--- a/src/gui/shellwidget/CMakeLists.txt
++++ b/src/gui/shellwidget/CMakeLists.txt
+@@ -9,7 +9,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ # Qt
+ set(CMAKE_AUTOMOC ON)
+ find_package(Qt5Widgets REQUIRED)
+-find_package(Qt5Test REQUIRED)
++if(ENABLE_TESTS)
++	find_package(Qt5Test REQUIRED)
++endif()
+ 
+ if (WIN32 AND USE_STATIC_QT)
+ 	add_definitions(-DUSE_STATIC_QT)
+-- 
+2.35.1
+
diff --git a/app-editors/neovim-qt/neovim-qt-0.2.17.ebuild b/app-editors/neovim-qt/neovim-qt-0.2.17.ebuild
new file mode 100644
index 0000000000..238a8e04f0
--- /dev/null
+++ b/app-editors/neovim-qt/neovim-qt-0.2.17.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx xdg
+
+DESCRIPTION="Neovim client library and GUI, in Qt5"
+HOMEPAGE="https://github.com/equalsraf/neovim-qt"
+SRC_URI="https://github.com/equalsraf/neovim-qt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+COMMON_DEPEND="
+	dev-libs/msgpack:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+"
+# NOTE: remove dejavu once <https://github.com/equalsraf/neovim-qt/issues/1005>
+#       is resolved
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-qt/qttest:5
+		media-fonts/dejavu[X]
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-editors/neovim"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.17-only-require-Qt5Test-if-tests-are-enabled.patch
+)
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_MSGPACK=ON
+		-DUSE_GCOV=OFF
+		-DENABLE_TESTS=$(usex test)
+		-DBUILD_SHARED_LIBS=OFF # upstream explicitly builds static lib
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/app-emulation/proton-ge-custom-bin/Manifest b/app-emulation/proton-ge-custom-bin/Manifest
index 5eb18aff50..71568d7007 100644
--- a/app-emulation/proton-ge-custom-bin/Manifest
+++ b/app-emulation/proton-ge-custom-bin/Manifest
@@ -1,2 +1,3 @@
 DIST GE-Proton7-27.tar.gz 415170082 BLAKE2B 1773d34defe483a6c894d55de1089eb831f1d44e92bfae5c46faeec825fa8b2cc7c05ac9ca9a05d6ea0c393aa90fe06334a0c07feef71631e27a7dbf30e3dcda SHA512 b741594fbc062bf7e5b5228273680807fb3eb20cfa04993b2e4ce9442ebed18f3e84ca5d59ee19381165d595932fe54b720526bd1f41b2bf74b13a20308de5ee
 DIST GE-Proton7-28.tar.gz 416168736 BLAKE2B 8be4361f8ee4c596cd0ccc7451d204f011c4ddc253822c23e0c411f545fad9f56ce8e5fcdb7ac606e2a2e679c4a09ac488246b909106f89730744db43a909458 SHA512 a08b922c4a294edaaec5773ad7114b16114e06273da86ac8f9e8272065043db7b2cb3f1f944d634243e4f845c19fbeae2f53c56efb40a41471c7405f91d51590
+DIST GE-Proton7-29.tar.gz 416341212 BLAKE2B 42cae5797804e677eebc9ea46c9beec8d9e6945a4538e16cf2a9def61b9cea6945fb68e05b37a2962a18056a6656d73be77ebbeab88770513ee168d991833f84 SHA512 b4c7a6894302a302a15b6f3968987c98190461e9cbb4afa7738fe28fb24b1a2730140c424efc60a77624c8867bcc52e3b6ae1a60c9246aedf208ddb994d602d5
diff --git a/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.29.ebuild b/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.29.ebuild
new file mode 100644
index 0000000000..6a91640c65
--- /dev/null
+++ b/app-emulation/proton-ge-custom-bin/proton-ge-custom-bin-7.29.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit multilib-minimal
+
+DESCRIPTION="A fancy custom distribution of Valves Proton with various patches"
+HOMEPAGE="https://github.com/GloriousEggroll/proton-ge-custom"
+SRC_URI="https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton${PV/./-}/GE-Proton${PV/./-}.tar.gz"
+S="${WORKDIR}/GE-Proton${PV/./-}"
+LICENSE="0BSD LGPL-2+ ZLIB MIT MPL-2.0 OFL-1.1 BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+RESTRICT="mirror strip"
+QA_PREBUILT={*}
+
+RDEPEND="
+		media-libs/mesa[vulkan,${MULTILIB_USEDEP}]
+		media-libs/vulkan-loader[${MULTILIB_USEDEP}]"
+
+src_install() {
+	insinto "/usr/share/Steam/compatibilitytools.d/"
+	doins -r "${S}"
+}
diff --git a/app-misc/clifm/clifm-1.6.ebuild b/app-misc/clifm/clifm-1.6.ebuild
index a17478751e..826248a0c3 100644
--- a/app-misc/clifm/clifm-1.6.ebuild
+++ b/app-misc/clifm/clifm-1.6.ebuild
@@ -53,4 +53,5 @@ pkg_postinst() {
 	optfeature "mounting archives" sys-fs/archivemount
 	optfeature "extracting .iso files" app-arch/p7zip
 	optfeature "creating .iso files" app-cdr/cdrtools
+	xdg_pkg_postinst
 }
diff --git a/app-misc/clifm/clifm-9999.ebuild b/app-misc/clifm/clifm-9999.ebuild
index a17478751e..826248a0c3 100644
--- a/app-misc/clifm/clifm-9999.ebuild
+++ b/app-misc/clifm/clifm-9999.ebuild
@@ -53,4 +53,5 @@ pkg_postinst() {
 	optfeature "mounting archives" sys-fs/archivemount
 	optfeature "extracting .iso files" app-arch/p7zip
 	optfeature "creating .iso files" app-cdr/cdrtools
+	xdg_pkg_postinst
 }
diff --git a/dev-lang/hare/Manifest b/dev-lang/hare/Manifest
index 628dcaaceb..8ca8dae2d7 100644
--- a/dev-lang/hare/Manifest
+++ b/dev-lang/hare/Manifest
@@ -1 +1 @@
-DIST hare-0_pre20220624.tar.gz 671399 BLAKE2B 4ef1d2724219367ce6ffdcf69b5c9f5bd573ddf19a12c0aafa695483c05ef2032961ea714058af9bcfecfcbb45f0ca9bfd3056dc0b388f001f4ddb8a96873233 SHA512 9e8b4b17e293f0bc23cc3913860055d62dae0d0fc700080b2bde76a65c5344bf09e5a51c92f799e9c000bd18550fe10b9a5cd6e38c52ffe7c3faca8a670188ee
+DIST hare-0_pre20220730.tar.gz 681268 BLAKE2B e91bb4e0d87adb8271a1f9a30b744e3874482f38d0d370c6abd446456c960e088d1ff717793c4fa5876461397792c7ec66478bc327e11ba22b372f0ee714a5c4 SHA512 d7c07188e0416e68c5314f40d1dbffa27cd03644784aecb14a29a88d4ad6bc37e310cc8df95dbf93a96eebf2e262638d0ed0c0d98bce22d7c9630984418ce437
diff --git a/dev-lang/hare/hare-0_pre20220624-r1.ebuild b/dev-lang/hare/hare-0_pre20220624-r1.ebuild
deleted file mode 100644
index a9096c3d75..0000000000
--- a/dev-lang/hare/hare-0_pre20220624-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The Hare systems programming language"
-HOMEPAGE="https://harelang.org/"
-EGIT_COMMIT="65449ddbbbf39659bfaf84a2cb78510409a4ab7a"
-SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-LICENSE="MPL-2.0 GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-DEPEND="
-	sys-devel/qbe
-	dev-lang/harec
-"
-BDEPEND="
-	app-text/scdoc
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	git-r3_src_unpack
-	mkdir "${WORKDIR}/${P}/build" || die
-}
-
-src_configure() {
-	cp config.example.mk config.mk || die
-	sed -i -e 's;^PREFIX=.*;PREFIX=/usr;' config.mk || die
-}
diff --git a/dev-lang/hare/hare-0_pre20220730.ebuild b/dev-lang/hare/hare-0_pre20220730.ebuild
new file mode 100644
index 0000000000..df2b5c2345
--- /dev/null
+++ b/dev-lang/hare/hare-0_pre20220730.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 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"
+	SLOT="0"
+else
+	EGIT_COMMIT="296925c91d79362d6b8ac94e0336a38e9af0f1c9"
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	SLOT="0/${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+DESCRIPTION="The Hare systems programming language"
+HOMEPAGE="https://harelang.org/"
+LICENSE="MPL-2.0 GPL-3"
+
+DEPEND="
+	sys-devel/qbe
+	>=dev-lang/harec-0_pre20220702
+"
+BDEPEND="
+	app-text/scdoc
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	cp config.example.mk config.mk || die
+	sed -i \
+		-e 's;^PREFIX=.*;PREFIX=/usr;' \
+		-e 's;^AS =;AS ?=;' \
+		-e 's;^LD =;LD ?=;' \
+		-e 's;^AR =;AR ?=;' \
+		config.mk || die
+}
diff --git a/dev-lang/hare/hare-9999.ebuild b/dev-lang/hare/hare-9999.ebuild
index 7b5abe0c2c..df2b5c2345 100644
--- a/dev-lang/hare/hare-9999.ebuild
+++ b/dev-lang/hare/hare-9999.ebuild
@@ -1,32 +1,40 @@
 # Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit git-r3
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare"
+	SLOT="0"
+else
+	EGIT_COMMIT="296925c91d79362d6b8ac94e0336a38e9af0f1c9"
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	SLOT="0/${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
 
 DESCRIPTION="The Hare systems programming language"
 HOMEPAGE="https://harelang.org/"
-EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare"
 LICENSE="MPL-2.0 GPL-3"
-SLOT="0"
 
 DEPEND="
 	sys-devel/qbe
-	dev-lang/harec
+	>=dev-lang/harec-0_pre20220702
 "
 BDEPEND="
 	app-text/scdoc
 "
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	default
-	git-r3_src_unpack
-	mkdir "${WORKDIR}/${P}/build" || die
-}
-
 src_configure() {
 	cp config.example.mk config.mk || die
-	sed -i -e 's;^PREFIX=.*;PREFIX=/usr;' config.mk || die
+	sed -i \
+		-e 's;^PREFIX=.*;PREFIX=/usr;' \
+		-e 's;^AS =;AS ?=;' \
+		-e 's;^LD =;LD ?=;' \
+		-e 's;^AR =;AR ?=;' \
+		config.mk || die
 }
diff --git a/dev-lang/harec/Manifest b/dev-lang/harec/Manifest
index 8c732b86a5..b86bde0f27 100644
--- a/dev-lang/harec/Manifest
+++ b/dev-lang/harec/Manifest
@@ -1 +1 @@
-DIST harec-0_pre20220624.tar.gz 164875 BLAKE2B c27d074be6095dcd44702244165051a39fb3503ae50976b152743813f88c7d9b2117b21f2123ffc337c1230cbb114e258d0bc2567fba83882336b444f0ea04af SHA512 08323ddf35ff20ff661132e8d34507e9e247e9e6bb709238c68f7e3212030591ce79374b43cb4eb77c545048c69d68082b893ed95ae8fe29d58b3a81aaf41f7f
+DIST harec-0_pre20220702.tar.gz 164745 BLAKE2B 769597c6c4a0ad1f027d8e98bd37359aa53e6e3c457073d672f3616bb17d51b0e677752781e253292cefb94049f32e013758db43e97cbdfe3d73fb7e2c99a10b SHA512 382e3e03ec455257853f0cdddc74cfa8f265915601ddb1c96025bb08ddb111264393ce76a037f2363881e33dcb9d27ed615dbf1d84b1e626df9c19da9c7de5a5
diff --git a/dev-lang/harec/harec-0_pre20220624.ebuild b/dev-lang/harec/harec-0_pre20220702.ebuild
similarity index 93%
rename from dev-lang/harec/harec-0_pre20220624.ebuild
rename to dev-lang/harec/harec-0_pre20220702.ebuild
index 49227e54b6..7102b6f0ed 100644
--- a/dev-lang/harec/harec-0_pre20220624.ebuild
+++ b/dev-lang/harec/harec-0_pre20220702.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" = "9999" ]]; then
 	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/harec"
 	S="${WORKDIR}/${P}/build"
 else
-	EGIT_COMMIT="62d4204f21332d97ad7697f628eade9137e9c3bc"
+	EGIT_COMMIT="56359312644f76941de1878d33a1a0b840be8056"
 	SRC_URI="https://git.sr.ht/~sircmpwn/harec/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT}/build"
 
diff --git a/dev-util/deblob/deblob-9999.ebuild b/dev-util/deblob/deblob-9999.ebuild
index e58f82a29f..6aa1709b66 100644
--- a/dev-util/deblob/deblob-9999.ebuild
+++ b/dev-util/deblob/deblob-9999.ebuild
@@ -10,12 +10,9 @@ HOMEPAGE="https://git.sr.ht/~lanodan/deblob"
 EGIT_REPO_URI="https://git.sr.ht/~lanodan/deblob"
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-lang/hare:=
-	test? ( app-text/mandoc )
 "
 RDEPEND=""
 
diff --git a/games-emulation/yuzu/yuzu-0_p20220725.ebuild b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
index 8bc53d5fcc..a307582e55 100644
--- a/games-emulation/yuzu/yuzu-0_p20220725.ebuild
+++ b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 	qt5? (
 		>=dev-qt/qtcore-5.15:5
 		>=dev-qt/qtgui-5.15:5
+		>=dev-qt/qtmultimedia-5.15:5
 		>=dev-qt/qtwidgets-5.15:5
 	)
 	sdl? (
diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 953cae7e01..0860eda94d 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
 	qt5? (
 		>=dev-qt/qtcore-5.15:5
 		>=dev-qt/qtgui-5.15:5
+		>=dev-qt/qtmultimedia-5.15:5
 		>=dev-qt/qtwidgets-5.15:5
 	)
 	sdl? (
diff --git a/gui-apps/fnott/Manifest b/gui-apps/fnott/Manifest
index abf14c4a86..d54eeb504e 100644
--- a/gui-apps/fnott/Manifest
+++ b/gui-apps/fnott/Manifest
@@ -1 +1,2 @@
 DIST fnott-1.2.1.tar.gz 377573 BLAKE2B ed167a7a8d069c75acc8cf7c8ad80afb88b2ed13f590b61f70cd6b8355c77ae25bd95f7401388dbf4650311e8514a9e0c52fa13f500eb18c4f9f0de79de78884 SHA512 7818a01893dd2e8ea7a55355981f83e2d358ce68e36af81fe062c05e1a3405662fb5e221a0509b7212c57ce431e3591d6e4c5d2a1242f2b76c48a00c66e23932
+DIST fnott-1.3.0.tar.gz 380852 BLAKE2B ba1ef8210ec9ade6dbaa7a3f3e7ad6e283a8838b11e845e7dae481c0429e64984778a3add947b53a6c32be7c8ec630846c1fd7c2a99e56ec3126083a42787808 SHA512 701823cc50e8432b72e1b17ffb62cd3de7b7e6d08e571c2fbe301bd024820eb72dcb49d9d2e07cf62a81b27175072683dec54d9d8ac9fec0dda0cdf90a23d8c0
diff --git a/gui-apps/fnott/fnott-1.3.0.ebuild b/gui-apps/fnott/fnott-1.3.0.ebuild
new file mode 100644
index 0000000000..65451529a2
--- /dev/null
+++ b/gui-apps/fnott/fnott-1.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Keyboard driven and lightweight Wayland notification daemon."
+HOMEPAGE="https://codeberg.org/dnkl/fnott"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://codeberg.org/dnkl/fnott.git"
+else
+	SRC_URI="https://codeberg.org/dnkl/fnott/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT ZLIB"
+SLOT="0"
+
+DEPEND="
+	x11-libs/pixman
+	media-libs/libpng
+	dev-libs/wayland
+	sys-apps/dbus
+	media-libs/fcft
+	media-libs/freetype
+	media-libs/fontconfig
+"
+RDEPEND="${DEPEND}
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	dev-libs/wayland-protocols
+	app-text/scdoc
+	dev-libs/tllist
+"
+
+src_install() {
+	local DOCS=( CHANGELOG.md README.md LICENSE )
+	meson_src_install
+
+	rm -r "${ED}"/usr/share/doc/"${PN}" || die
+}
diff --git a/gui-apps/fnott/fnott-9999.ebuild b/gui-apps/fnott/fnott-9999.ebuild
index 5f1d72055a..65451529a2 100644
--- a/gui-apps/fnott/fnott-9999.ebuild
+++ b/gui-apps/fnott/fnott-9999.ebuild
@@ -8,7 +8,7 @@ inherit meson
 DESCRIPTION="Keyboard driven and lightweight Wayland notification daemon."
 HOMEPAGE="https://codeberg.org/dnkl/fnott"
 
-if [ "${PV}" -eq "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://codeberg.org/dnkl/fnott.git"
 else
@@ -39,7 +39,7 @@ BDEPEND="
 "
 
 src_install() {
-	local DOCS=( CHANGELOG.md README.md )
+	local DOCS=( CHANGELOG.md README.md LICENSE )
 	meson_src_install
 
 	rm -r "${ED}"/usr/share/doc/"${PN}" || die
diff --git a/media-gfx/heatshrink/Manifest b/media-gfx/heatshrink/Manifest
new file mode 100644
index 0000000000..b237930935
--- /dev/null
+++ b/media-gfx/heatshrink/Manifest
@@ -0,0 +1 @@
+DIST heatshrink-0.4.1.tar.gz 36945 BLAKE2B 526e3f88ddaec8116e5eef1a73a4450454ca808545dfe4a36069be8a0d771ca92c850c51f9b3c3e73f244454ba17d03da8fb0be4849728300c7eb8181e39651e SHA512 bb9610b963da0762b1ac21d0907f3801b525431abff495b66cadc244a2b2b334441de2b14442b722bfeb56cb4459fe4021eae0d0454f9e26a80e6efa11f079d2
diff --git a/media-gfx/heatshrink/files/Makefile.patch b/media-gfx/heatshrink/files/Makefile.patch
new file mode 100644
index 0000000000..a858ec0c1e
--- /dev/null
+++ b/media-gfx/heatshrink/files/Makefile.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile b/Makefile
+index d0c4dbe6..5cd8977a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,8 @@ WARN += -Wmissing-declarations
+ #THEFT_INC=	-I${THEFT_PATH}/include/
+ #LDFLAGS += -L${THEFT_PATH}/lib -ltheft
+ 
+-CFLAGS += -std=c99 -g ${WARN} ${THEFT_INC} ${OPTIMIZE}
++MY_CFLAGS := -std=c99 ${WARN} ${THEFT_INC} ${OPTIMIZE} ${CFLAGS}
++CFLAGS := ${MY_CFLAGS}
+ 
+ all: heatshrink test_runners libraries
+ 
+@@ -66,8 +67,6 @@ RM ?=		rm
+ 
+ install: libraries heatshrink
+ 	${INSTALL} -c heatshrink ${PREFIX}/bin/
+-	${INSTALL} -c libheatshrink_static.a ${PREFIX}/lib/
+-	${INSTALL} -c libheatshrink_dynamic.a ${PREFIX}/lib/
+ 	${INSTALL} -c heatshrink_common.h ${PREFIX}/include/
+ 	${INSTALL} -c heatshrink_config.h ${PREFIX}/include/
+ 	${INSTALL} -c heatshrink_encoder.h ${PREFIX}/include/
diff --git a/media-gfx/heatshrink/heatshrink-0.4.1.ebuild b/media-gfx/heatshrink/heatshrink-0.4.1.ebuild
new file mode 100644
index 0000000000..9c7bffdf4e
--- /dev/null
+++ b/media-gfx/heatshrink/heatshrink-0.4.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="data compression library for embedded/real-time systems"
+HOMEPAGE="https://github.com/atomicobject/heatshrink"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/atomicobject/${PN}.git"
+else
+	inherit verify-sig
+	SRC_URI="https://github.com/atomicobject/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/Makefile.patch"
+)
+
+src_install() {
+	local MY_ED="${ED}/usr"
+	mkdir "${MY_ED%/}"{,/bin,/include} || die
+	emake PREFIX="${MY_ED%/}/" install
+}
diff --git a/media-gfx/nsxiv/nsxiv-9999.ebuild b/media-gfx/nsxiv/nsxiv-9999.ebuild
index 0b27fee7f6..cea408441e 100644
--- a/media-gfx/nsxiv/nsxiv-9999.ebuild
+++ b/media-gfx/nsxiv/nsxiv-9999.ebuild
@@ -65,7 +65,7 @@ src_install() {
 		EGPREFIX="/usr/share/doc/${P}/examples" \
 		install install-icon
 	dodoc README.md
-	domenu nsxiv.desktop
+	domenu etc/nsxiv.desktop
 
 	save_config config.h
 }
diff --git a/media-sound/nulloy/nulloy-0.9.5.ebuild b/media-sound/nulloy/nulloy-0.9.5.ebuild
index b282c00be1..9149309fdd 100644
--- a/media-sound/nulloy/nulloy-0.9.5.ebuild
+++ b/media-sound/nulloy/nulloy-0.9.5.ebuild
@@ -25,6 +25,7 @@ BDEPEND="
 DEPEND="
 	dev-qt/qtcore
 	dev-qt/designer
+	dev-qt/qtsvg
 	dev-qt/linguist
 	dev-qt/qtscript
 	dev-qt/qtx11extras
diff --git a/media-sound/nulloy/nulloy-9999.ebuild b/media-sound/nulloy/nulloy-9999.ebuild
index 21fdf4c5f1..74428110ca 100644
--- a/media-sound/nulloy/nulloy-9999.ebuild
+++ b/media-sound/nulloy/nulloy-9999.ebuild
@@ -23,6 +23,7 @@ BDEPEND="
 DEPEND="
 	dev-qt/qtcore
 	dev-qt/designer
+	dev-qt/qtsvg
 	dev-qt/linguist
 	dev-qt/qtscript
 	dev-qt/qtx11extras
diff --git a/media-video/wlrobs/Manifest b/media-video/wlrobs/Manifest
index 4070c07a00..3194722136 100644
--- a/media-video/wlrobs/Manifest
+++ b/media-video/wlrobs/Manifest
@@ -1 +1 @@
-DIST wlrobs-1.0.tar.gz 54998 BLAKE2B b4e3975d9bc7b0b8dc5721448b29aa95a2c17284fbab5db738ede9998ae9add2a984fa1f1e1d9fa5fe281cef58edd0dd525a358f12c3271cad9a357a101a7b48 SHA512 846f0c0ca780296c2704bfc05c96dd1cb9579bcd29b24abe03567abad4c3d8276712c524e79080c8f0632726ad3b6b1e793d4cea0a81a1aa3e7689595fec01cf
+DIST wlrobs-1.0.tar.gz 54980 BLAKE2B bf5579593c9afb19f1c9d3d5cc34608483626e25b0b60d5834fc799a10293aca248aa2f9c36c43c0a92df4c376708b7a507b806dcee156e92388464c070bebf9 SHA512 a6ca293b0d21dee1264cbecfa3c10db3f696faa09c1cd445ced2fc17440a45677e07018c7a4eb0e72880b444bb2f1e0db9307a07c9117e56ff07043d1e6a758d
diff --git a/net-p2p/yggdrasil-go/Manifest b/net-p2p/yggdrasil-go/Manifest
index 1a74c37c26..e91336917f 100644
--- a/net-p2p/yggdrasil-go/Manifest
+++ b/net-p2p/yggdrasil-go/Manifest
@@ -1,67 +1,2 @@
-DIST github.com%2F!arceliar%2Fphony%2F@v%2Fv0.0.0-20191006174943-d0c68492aca0.mod 42 BLAKE2B 113b161c3362f86482e8e107940c202a2870c2b722a6226dd9cde65dc4d39a7610b17d014a152c939df9c5433801d334c93e5233cf77fd6160d075c84aa37e20 SHA512 7b93619432e39da924cac8312148fe7dcb4bb760bb8f01e2285db806410532f85ebbe3983b7b5d5227fe3dfc28a9db8b86669f2c0f40cc319cb4590380c70dbb
-DIST github.com%2F!arceliar%2Fphony%2F@v%2Fv0.0.0-20191006174943-d0c68492aca0.zip 9460 BLAKE2B ee30c74923e624720d1b5d7c3c8b3b377212ff0567da7b5b0af78aa248e137a198453f9d0692c0086115503d2e3ebdec547b3c130b20a720e2dd98b97a04de5d SHA512 9c72e11aff4b17a79e836a42fc9cb478921214da2b3d088545d3183c0025e89e8b31d90a829ac3f879f3db0c508e58b48a605b7b288f26379f8c1b43689d3edc
-DIST github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.mod 35 BLAKE2B 7b5030936400bbff37dc3e2c1d6b7224df6d5f5f97a2e22fd1dc08f3d6ef08894eec30004589dbe81e56a9e71b3ca391e088996a84c98ddabc4d934db7c9fa22 SHA512 e6d91e44ed614c66a668e8423e7657d0696cdd5c6fc0fc4d6ecf741849f1e4891e47262376d4787c967c88c907c5bc668d437d613afaf628fcbbcb352f5d2033
-DIST github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.zip 8064 BLAKE2B 3fb2dca3bf31d7c8e0bfa67193ca30e7ed76e270fc6ee5e1f1acadaf5be7047dc63afed2f4e55a16d3a641ebbcb8111a6a580b91964081b3e3621e8d62d70f9d SHA512 0a6ea5758fd0d42e2ce8366405eb0ed42da5737c830b36a9cc24cf99541d7d7760a2ee868c99901fb9a103f8113183771f0dbe139deac3667222692c4d025eb9
-DIST github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.4.mod 299 BLAKE2B c5607f7f89dbb49d7f898e867e366f88ac28149f4ff76e02885a3c5f216140367f57c62cd1fc11205f76e8d83b1ce1bf52ec8f1bcfbc04e797e7c0fb4f193690 SHA512 51b80b95e070e37852ff192ee85c01f2b2ee42c7bdc2aa2740af092026d734bf0a58baf64c23aa83747a1f9b1b130ad89922fa3b83c5e12b43696e317f259b65
-DIST github.com%2Fcheggaaa%2Fpb%2Fv3%2F@v%2Fv3.0.4.zip 24036 BLAKE2B 72cc21eea465daf676d9fd6775208800aa3a5367489458c95a8a66b68a1e1711f69985a1e08c01c1cfffe4f6773660f771bb79d115b182f21328728dfbab420c SHA512 8e7f6777fea0b593b211dad35502685145e144a246820bb6439e3975eb46735c2f904b68f45e882500345fa8bb161bfc5f2087d82c0e5bafcb8bfbd821759c4e
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
-DIST github.com%2Fgologme%2Flog%2F@v%2Fv0.0.0-20181207131047-4e5d8ccb38e8.mod 30 BLAKE2B 185b19379cfee2e8e6cd66bb7aa63504f3207635a6f718a20010d52c4a1319b571755cd68fc908812ceb32d964f9110ec2dd8032f41be9efeaeaa12aa97b1b46 SHA512 16a1a6865e352be1835b2307c44798da5391d6762998d4ba45960513fb69445b1fe60cf1e9685763d9e9ca8546717fe1539258519051ae0fbf454525ea9fb0b4
-DIST github.com%2Fgologme%2Flog%2F@v%2Fv0.0.0-20181207131047-4e5d8ccb38e8.zip 6194 BLAKE2B 04fccf366cbe5ee21292df9c2698a6445cc31e623cf976d5bac1685c61080a449b07e49fa3db38241eae377562ac3ec53bc89127dd8fa34c84f3744652f9e126 SHA512 df3ff1123736f3bd0a1fdab192ac90067291236031418a19d0029ce996624db99d596c06a0db19264f8bf936125ea894ca62545e4b1d45add9fe6ed6e8aaf0b3
-DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
-DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip 6210 BLAKE2B b5d3b234531523546445cfc48d9c4198fd0ffe8c91ad6d2b3349f28d5073a6d3cd76f0db36380d69ea5617357a8677a81ef8cebe04c0dbc4538bec1810f817ae SHA512 50519f8c8efb7b3494c857373cb119b924f2ace674f07bd0d0da5939a75f8c154b5cc8875fd35135228a9e8e221fccc174aa298d21bd490b89a0f2d9aeb38e09
-DIST github.com%2Fhjson%2Fhjson-go%2F@v%2Fv3.0.2-0.20200316202735-d5d0e8b0617d+incompatible.mod 33 BLAKE2B bceae19c6e4e177c60765f599505f171f9d1f0892ce22ed83c7ccb9a1b81eb4d8ff309ea515eeff01f4bfb73f8fe2f99892defb59782bda42ab66fc33d79d0e7 SHA512 238ad3f212a290cde835411cd249073f2298f54e54dd247e0ab4fa8ee43e7115fc568837ef59e287df6e3c2ebce7c3b4b103883133228582067e7ec0410a9e55
-DIST github.com%2Fhjson%2Fhjson-go%2F@v%2Fv3.0.2-0.20200316202735-d5d0e8b0617d+incompatible.zip 81214 BLAKE2B 1b72756fb94beeca4e384274d2725b2b53c3ef7e0bdff5124c38682058ebfff2e734b212d115a9a3edbb8c8b0a09f1383713d03033f3bbd71347b0b67f63df31 SHA512 fce823a807b30c9fd9aa85a4e29252ee5425e0c2f06839c834574426a60f8233dff5e017b07fa1f987358ba37ca871862af4910c7d47b2cd58e7add7ebb39ede
-DIST github.com%2Fkardianos%2Fminwinsvc%2F@v%2Fv0.0.0-20151122163309-cad6b2b879b0.mod 38 BLAKE2B 95a4671c309d5cf3caea17c4c00f0a2b85509c51df3c7f3239003b5a334478069824e502668082182b575e87e9dc391d94ce719d512025e15f049aa24f935827 SHA512 10ba8711f0f70e69c6327756324325c56013727391f25f44f7e682a6cbdd688f3ed9494cb52c365eaf8a023be1d0b5403120adee86424825b3145e6063b4b404
-DIST github.com%2Fkardianos%2Fminwinsvc%2F@v%2Fv0.0.0-20151122163309-cad6b2b879b0.zip 3205 BLAKE2B f7899ab369e03bda292a95e7b07e1536e22852cc5dc3b116d525cd39299a0684f46755a2005558c0f9ad2b5036aa0991e4a3202f491ad8a3360c1a7356970f98 SHA512 235752ce45ccb51b05fe5a4b24085d915d1a8084ba9cfafc5b0ef4fb73e9343038a8117219608986b219f0e6bb0943293b9023213c85852ad49c99a1215c05b2
-DIST github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20191128110447-55ccb3a9f5c1.mod 27 BLAKE2B 368c43817afe890ec61cfb738f0f5a581fe3408482c47af72e77d83c3da11d8b47e537ba776c8304eed0684db8ff9dd7f5ab9e36130b3e4b28714c0d3764fdf5 SHA512 d8790a7e63be36bada6ccd06e63378669bc5492841da9bd1eb52e77eab2d76affc3080ffbfdf1a2e9c5a6263b5de8a5ad790032399cb084826398b930965a2c8
-DIST github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20191128110447-55ccb3a9f5c1.zip 529573 BLAKE2B 49a52a0b6e4123cfa2e0d7859ac82a932c53dca29431349bc86d13311ee82f07cf5f9aef3a8aff1fb3be33c1cb7d19363dcab82052ab2fec31fb5c59b592118a SHA512 333b7c57bba521a1fc6b1d8f356a0b171fb0487fe13c53888209e558bb3d69ab12a75c9d9957791f11bb9d754933542f25f55d3f979860e98fe7e86175b81af9
-DIST github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20191128105842-2da648fda5b4.mod 96 BLAKE2B 91c8ec7d947ed483830f0347b359eff1b1198fb537732d76966a1264ed63366be9d4ada0b9e22ef6e7bb05b1af6e63342305b8f75f10261931c3f871059f1fdd SHA512 6d66838befea66dfd964bcafe2719c74b6f51bf0a287b4fdd4d80c523229e57c3f42921645868c07972899fc0628bb015684500c4499b3c948238e09f1fc4ce6
-DIST github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20191128105842-2da648fda5b4.zip 101227 BLAKE2B d40552b288047dde87033b2074ad020a7d62597694436072c83290a98c20068616e8960b2eea186cbafa3696c03ea2e4ee57898396c4b70db3ee5235d6a07fe2 SHA512 358e88017af683985db1f3b6f0ed381599b0f2b42234ffeb392d5a259c7be56eeb2685e78e643aa88c0f7fd84610793bea1865f306482047de73bff7cdeee8ea
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip 12177 BLAKE2B 8089c6123a976fc954dc76f74aadea87031bef339aa263aa38e80d3f3ee0fe87c58d9986b2961e29b746618617e2cb6b2cfbacb5c413acf963a2464d36dd0bc0 SHA512 54509ddbb3aecd1980215f73a53739d2f3c757daf67c78e54c508474678cb5df929a3b8e17f8d2b66438c1e78989a2268db2b32d6a0a6d5236abb6936a09ac04
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod 104 BLAKE2B ee5067e0e89fe2d374ea852dac828c094db84c3a3d2d8a991abeaf40385431015577eeb6b11a66033e8da599e808f9385a84843fd8f87dea487bd3bc9ba233da SHA512 f144089cc85271c7d91b9a6faf169018bb12177dd770db0092dfd0b4c71846e5cc6dea385c0158a974cfe86971e5642858a6d633c64d3b598f1ab254fd47db28
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.zip 8941 BLAKE2B 05c57c2e7c8d4fa2dadbbade6ec314e3f33b81ca372681632cb507008473f54b6b0a8fccfe9c3729d1e2188a155ed88c9730998121c351d0622d91ad3bb04360 SHA512 43308d5e89c1284c3b00ff0fd85885cfed0ddf76174ab7ac1d70d4c2bdeb377552c390723c51ca0f7e3a50ef32899679fd01d741766b0b60e195568ae7f92e25
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip 19130 BLAKE2B 85321c6a52022df0bdd9672de52cb5b7c1a652432047d94c088a71d612a81fa71d0cf9fa611c713f8f57c4e540ee0212223e987eae040e95014bea07e135171e SHA512 9ea745a6ca03c046d7b77707616fa756c01f58862286fa9805e99e3a0090be2fbdafd763f432f3c9ca927518db73ee0ef74e0b95248e515f50c2c2c1d9b14065
-DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
-DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
-DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.mod 38 BLAKE2B 3ade12a1ed924c4e12dd9422b763bf2cadf710ef072d593dc40923d48477b792d87aaa3035e020bcab860da3ceeddcadc44afd74d9e11c3902a5d6241c8826b9 SHA512 637521629966c8f1b3d711a2b2b7b1753bed946f26570cd8e5e55ee3da5b106d418e0b80f48cac7a2651b71103c0d09116707d7b9d8cfb2d78d7bac2e908560a
-DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.0.0.zip 160183 BLAKE2B fc6ac9b8beb1c1edad738f821182d572e2e655442c32d4dddc27c0213a5d13dffe3c107f6f947a528a4741972d72af879963f1503266628f365a96ab8eb21d83 SHA512 d6b124a270150ab54764406789f23955f5ffc09effaa2b7f4ae0c2d3b69ad916fbf8377f48ee5650bb57a0e9ee2079a481d4fbf146409aeb29c15eaac260f3ef
-DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20190625233234-7109fa855b0f.mod 36 BLAKE2B 89b77c2e7582554fd3a63f99bc03f2886e9f554e579ee4e0a99160385d8704b5f983e5680da06accae6bab806d303b726b22f2b4a6c2b03e82bd6bf9a9ddde7e SHA512 8f581beb7e676d082a76b9bf47b7d04c486d5e96e4f69f17fd99efc101e408cd7cd1c8d51a46ab1cbb55f7bb35b08ba8dd875f18e430f30ba9c88c43e44056fb
-DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20190625233234-7109fa855b0f.zip 9520 BLAKE2B 74fca0b8f4a6b28f0d67aba5aaea999d8f214474e5affa4f57865a3ebc292703f3e93d0d08671990e6257607c9052d53536e659240033ba3905e80130be80090 SHA512 6944277013b71f72bf54fc5f3fc5aab1768d66fddb8e243cae91a4061ea06e9e3ded58bfab75e4c44ddaf14c14c816b0ae3f097577ebfbe1700af2b65368e919
-DIST github.com%2Fyggdrasil-network%2Fyggdrasil-extras%2F@v%2Fv0.0.0-20200525205615-6c8a4a2e8855.mod 53 BLAKE2B 26bcd74a4d1c69fe4460c81da61b8961f4e508223d4cd786034c994bc0f056e1a6a5c4159afdf03217b668938afb427e174658a58153b5312cc9c829cd06d6d2 SHA512 4ff2ecc66cce7bf95a5cec7b1c3fd5b0ebb984fcab04e2d6fb82bd967c5d2b5ef7f77c255cb8292a940f8dc80e4a70e727d28784a000a55329414941e57d3529
-DIST github.com%2Fyggdrasil-network%2Fyggdrasil-extras%2F@v%2Fv0.0.0-20200525205615-6c8a4a2e8855.zip 12839 BLAKE2B 83408a4f23ec867a13f2726febeed0c353bd463285fe557272f8392812acce6bbe22d92b8c451c3e5fbc9741566ea1c88cf1a96e5e60eb1fbe65023744bf4787 SHA512 bc4a2e6daf55eb25ea252559ab0fffe012f354405d227f555fbadb700476fb7f3ca92320aabc17fcee7317176ebaa1c68fd43d0b187c61c86eb81bc92d6efc85
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.zip 1870169 BLAKE2B d77b65d467395373431c09d1318cd73d2dded32c6c7bbcaee6e59aaeed4b8ce1c183e32747f8da207762d82aa07c186af4b9c06dca9d4b5cfcaeef3bd07b3e16 SHA512 abd93a766353b4c36ff9527df785cf9789317755de2fd1d951a1847c4a9b43de197f6d7cb41ec6f17fd3b50617cfbf8e1d8c93f59f671be578a0152da0754ff3
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip 1500173 BLAKE2B 6b2b9d94b3d6dd87fe74caceeb75254930831b14e03a54c4774374c96e74ee05917bc2e92aa38ccaa2ec41a02134b6303b668947ac336e3635aa43b7e97d2272 SHA512 63daa5add6fb2c5d315b507208a42a08a65d122b7ee1ce5772087453940b25c2c59e404ba283fc543b4814df9f1bd900e18c5c3cc4e2acd9c70fb26e46949ae8
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191003212358-c178f38b412c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200301040627-c5d0d7b4ec88.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.zip 1462438 BLAKE2B b3781ba8026ce86feeeda8f46f3ab17b1c19968c13de5aac924f9110a828eed6e93f5fd3be901e74a70a98480070e7b990913a27dea21afe50bea9c745ff983a SHA512 930afe0d09f5e4e08c716e83a0d4072181519400a92c08004ddc29cfed716e5c8fbe7bd4e6d53a1baec73d9c5f578ff01029163571508bd3c04b34ba157d0f25
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3-0.20191230102452-929e72ca90de.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3-0.20191230102452-929e72ca90de.zip 8040175 BLAKE2B ad07b359c2c95ffb79b6c15deae68ac8df636814d34502df420991aa5d995f45b74aa968c6383501d4d9538e97675ee8785c5ebce48ff5b20b50ec26f227f3b8 SHA512 d99aa12d886876f957aeed2b7e5eac4b2dc27278515c2ff9c5d537d79ec6c19b26a85faff001e2166ecb8394cc9097e239e6b84095704185c7646bf6a7df690b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200122-0.20200214175355-9cbcff10dd3e.mod 244 BLAKE2B e6ad7b1df6c02ad10598b6015b858ab86f8b04b1c52975bf3656305dfe7a1185af76b7abbdf8cebe3ed90d60b5c90cde8d8dc2b5f0491332a7540c2286e73be7 SHA512 a66e915386e51051527ad94bd37834df9cf91af8a97e2b95792bf22de1e261f7120160bc808d3980c45f3111f1f0d7e383e3875afb5c72a7ec6dcf0b1aa3e6b2
-DIST golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200320.mod 244 BLAKE2B e72b1e0a29090a60ba8ecbb3a70a3de1fc4fac68551ae58e686f26251ef7ff2a33924c2a43266e956b7142b40701a7977d25fd26fb8ebaddfdc58679949efe18 SHA512 9a94095bd3728ccfc88d311dbe90637806f5f3a95def76e1980c5eefe3022ef198855fecb3e3a8818ec2a85a61eea983e432bca0ffc1baac8cbee9a4189148ea
-DIST golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200320.zip 146832 BLAKE2B 99a9b5665f9c9f6d43548db728c0aca718287e83642d2cb9d145770c2126ea26f911669aa17daaaf5011b00f23386817da00b2f3cda238875d9d86b8d66bc09d SHA512 4725444493f03483f1b6d929617786e8475e2d0f5f1aac1a92ef39c2c70a79fbae7c38327bf9ed7857c20add351f7c3b0c21b9bb10ef27ebf147607f7e1ccab6
-DIST golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.0.mod 677 BLAKE2B 8d6dcae94321a2495f9ef9be5eadf503c7e53de3fececaaa35fa2cd462f4d3286168c2606de103cf9d4e8e43895f81a18aa843d093db0a728510c2804bc59e15 SHA512 b00baab7efde4ba31f3cac2e4ba14c8e7678b1273538dd1d19951e3b6cd380a31b1f49518be57d4048a3101a18aa21887701c942274aa58217884d713bc7f812
-DIST golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.0.zip 257029 BLAKE2B ca5e6b076624bf9cb12252f3b8736ffa81d1f2e969793ceed16f250ca26711e264c11a109f91276c3ce35444ef72953231b16e402d2dbb8197e35235723bbd44 SHA512 a7ecec8842fced40ecda8acd303725c16c90f45d3c0568d4efb0075d99a7f0281bbc9900ebd506083bf1c10859afafc9b7e38bef778decd846c1b93b67c4d7df
-DIST yggdrasil-go-0.3.15.tar.gz 166072 BLAKE2B 8375a6f731ec175b98d68155c1cabb3af7bc3dd6efee93701bd74acbc5ef2a6a724284abb99792ecb65e423b66a47d6f291f19f287e220435000115689b3fcd7 SHA512 1b59fecfa210a3d8d41776e4cb4b5399121e820389a64f4f1df893a9c537b67b1a26ca68c735fcae3208f24163ac809fa278f2ee2a1102c88145fdb6ac4c9db4
 DIST yggdrasil-go-0.4.4-deps.tar.bz2 36254982 BLAKE2B 40fa8fac4d04dabcb3b514cfb1163e815f0daa2101e4f1c000f891e444cb1ba8a4792c309896c02003ada8d01c8ed0caa850b8692253bf2460f0c7a0f2f5484c SHA512 cbd56752a929f1611ed1fee45a60e08fc089e0183eade81fdd4f7245236b6fe80e1aaf331f2f1d38a98b99cf5104644b7f52ce24fcb13c084738730e69b17bea
 DIST yggdrasil-go-0.4.4.tar.gz 95207 BLAKE2B 3cba1302419af4cda0f6960d2a1b12e2c62d9ab68443ccf4cc328b2d7bd7d96145197a3eb895bb9df2976efed8b1a19e71d3ea05404d400c2b72effd62539f90 SHA512 b61e5a22534d181ef48bde708c36eca83197a25e7e758dda7e81215e9e97db1a536f728fd4170784f6bdaf0742dbb1e3396fe71c06938272b0436cdb8665c0e0
diff --git a/net-p2p/yggdrasil-go/yggdrasil-go-0.3.15.ebuild b/net-p2p/yggdrasil-go/yggdrasil-go-0.3.15.ebuild
deleted file mode 100644
index 662d0e0253..0000000000
--- a/net-p2p/yggdrasil-go/yggdrasil-go-0.3.15.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info systemd
-
-EGO_SUM=(
-	"github.com/Arceliar/phony v0.0.0-20191006174943-d0c68492aca0"
-	"github.com/Arceliar/phony v0.0.0-20191006174943-d0c68492aca0/go.mod"
-	"github.com/VividCortex/ewma v1.1.1"
-	"github.com/VividCortex/ewma v1.1.1/go.mod"
-	"github.com/cheggaaa/pb/v3 v3.0.4"
-	"github.com/cheggaaa/pb/v3 v3.0.4/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/gologme/log v0.0.0-20181207131047-4e5d8ccb38e8"
-	"github.com/gologme/log v0.0.0-20181207131047-4e5d8ccb38e8/go.mod"
-	"github.com/hashicorp/go-syslog v1.0.0"
-	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-	"github.com/hjson/hjson-go v3.0.2-0.20200316202735-d5d0e8b0617d+incompatible"
-	"github.com/hjson/hjson-go v3.0.2-0.20200316202735-d5d0e8b0617d+incompatible/go.mod"
-	"github.com/kardianos/minwinsvc v0.0.0-20151122163309-cad6b2b879b0"
-	"github.com/kardianos/minwinsvc v0.0.0-20151122163309-cad6b2b879b0/go.mod"
-	"github.com/lxn/walk v0.0.0-20191128110447-55ccb3a9f5c1"
-	"github.com/lxn/walk v0.0.0-20191128110447-55ccb3a9f5c1/go.mod"
-	"github.com/lxn/win v0.0.0-20191128105842-2da648fda5b4"
-	"github.com/lxn/win v0.0.0-20191128105842-2da648fda5b4/go.mod"
-	"github.com/mattn/go-colorable v0.1.2"
-	"github.com/mattn/go-colorable v0.1.2/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.10"
-	"github.com/mattn/go-isatty v0.0.10/go.mod"
-	"github.com/mattn/go-runewidth v0.0.7"
-	"github.com/mattn/go-runewidth v0.0.7/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/vishvananda/netlink v1.0.0"
-	"github.com/vishvananda/netlink v1.0.0/go.mod"
-	"github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f"
-	"github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f/go.mod"
-	"github.com/yggdrasil-network/yggdrasil-extras v0.0.0-20200525205615-6c8a4a2e8855"
-	"github.com/yggdrasil-network/yggdrasil-extras v0.0.0-20200525205615-6c8a4a2e8855/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
-	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d"
-	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod"
-	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a"
-	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
-	"golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod"
-	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
-	"golang.org/x/sys v0.0.0-20200301040627-c5d0d7b4ec88/go.mod"
-	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527"
-	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/text v0.3.3-0.20191230102452-929e72ca90de"
-	"golang.org/x/text v0.3.3-0.20191230102452-929e72ca90de/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.zx2c4.com/wireguard v0.0.20200122-0.20200214175355-9cbcff10dd3e/go.mod"
-	"golang.zx2c4.com/wireguard v0.0.20200320"
-	"golang.zx2c4.com/wireguard v0.0.20200320/go.mod"
-	"golang.zx2c4.com/wireguard/windows v0.1.0"
-	"golang.zx2c4.com/wireguard/windows v0.1.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="An experiment in scalable routing as an encrypted IPv6 overlay network"
-HOMEPAGE="https://yggdrasil-network.github.io/"
-SRC_URI="
-	https://github.com/yggdrasil-network/yggdrasil-go/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-
-LICENSE="LGPL-3 MIT Apache-2.0 BSD ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-BDEPEND=">=dev-lang/go-1.13"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if ! linux_config_exists; then
-		eerror "Unable to check your kernel for TUN support"
-	else
-		CONFIG_CHECK="~TUN"
-		ERROR_TUN="Your kernel lacks TUN support."
-	fi
-}
-
-src_compile() {
-	local PKGSRC="github.com/yggdrasil-network/yggdrasil-go/src/version"
-	local PKGNAME="${PN}-${PV}"
-	local PKGVER="v${PV}"
-	local LDGOFLAGS="-X ${PKGSRC}.buildName=${PKGNAME} -X ${PKGSRC}.buildVersion=${PKGVER}"
-	for CMD in yggdrasil yggdrasilctl ; do
-		go build -v -x -ldflags="${LDGOFLAGS}" -o ${CMD} ./cmd/${CMD}
-	done
-}
-
-src_install() {
-	dobin {yggdrasil,yggdrasilctl}
-	systemd_dounit "contrib/systemd/yggdrasil.service"
-	doinitd "contrib/openrc/yggdrasil"
-	einstalldocs
-}
diff --git a/net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild b/net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild
index 726c544830..f8bfdf2650 100644
--- a/net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild
+++ b/net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module linux-info systemd
+inherit go-module linux-info systemd fcaps
 
 DESCRIPTION="An experiment in scalable routing as an encrypted IPv6 overlay network"
 HOMEPAGE="https://yggdrasil-network.github.io/"
@@ -24,6 +24,10 @@ DEPEND="
 
 BDEPEND=">=dev-lang/go-1.17.0"
 
+FILECAPS=(
+	cap_net_admin,cap_net_bind_service "usr/bin/yggdrasil"
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 	if ! linux_config_exists; then
@@ -35,15 +39,19 @@ pkg_setup() {
 }
 
 src_compile() {
-	PKGNAME="${PN}" PKGVER="${PV}" \
-	GOFLAGS="-trimpath -buildmode=pie -mod=readonly" \
-	./build -l "-linkmode external -extldflags \"${LDFLAGS}\""
+	local package="github.com/yggdrasil-network/yggdrasil-go/src/version"
+
+	for CMD in yggdrasil yggdrasilctl ; do
+		ego build -buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}' -X ${package}.buildName=${PN} -X ${package}.buildVersion=v${PV}" -trimpath ./cmd/$CMD
+	done
+
 }
 
 src_install() {
 	dobin {yggdrasil,yggdrasilctl}
+	dodoc README.md
+	dodoc CHANGELOG.md
 	systemd_dounit "contrib/systemd/yggdrasil.service"
 	systemd_dounit "contrib/systemd/yggdrasil-default-config.service"
 	doinitd "contrib/openrc/yggdrasil"
-	einstalldocs
 }
diff --git a/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild b/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild
index d803f16d4a..20419a6730 100644
--- a/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild
+++ b/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=8
 
-inherit go-module linux-info systemd git-r3
+inherit go-module linux-info systemd git-r3 fcaps
 
 EGIT_REPO_URI="https://github.com/yggdrasil-network/yggdrasil-go"
 
 DESCRIPTION="An experiment in scalable routing as an encrypted IPv6 overlay network"
 HOMEPAGE="https://yggdrasil-network.github.io/"
-DOCS=( README.md )
 
 LICENSE="LGPL-3 MIT Apache-2.0 BSD ZLIB"
 SLOT="0"
@@ -20,7 +19,11 @@ DEPEND="
 	acct-group/yggdrasil
 "
 
-BDEPEND=">=dev-lang/go-1.16.0"
+BDEPEND=">=dev-lang/go-1.17.0"
+
+FILECAPS=(
+	cap_net_admin,cap_net_bind_service "usr/bin/yggdrasil"
+)
 
 pkg_setup() {
 	linux-info_pkg_setup
@@ -38,12 +41,17 @@ src_unpack() {
 }
 
 src_compile() {
-	GOFLAGS="-trimpath -buildmode=pie -mod=readonly" \
-	./build -l "-linkmode external -extldflags \"${LDFLAGS}\""
+	local package="github.com/yggdrasil-network/yggdrasil-go/src/version"
+
+	for CMD in yggdrasil yggdrasilctl ; do
+		ego build -buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}' -X ${package}.buildName=${PN} -X ${package}.buildVersion=v${PV}" -trimpath ./cmd/$CMD
+	done
 }
 
 src_install() {
 	dobin {yggdrasil,yggdrasilctl}
+	dodoc README.md
+	dodoc CHANGELOG.md
 	systemd_dounit "contrib/systemd/yggdrasil.service"
 	systemd_dounit "contrib/systemd/yggdrasil-default-config.service"
 	doinitd "contrib/openrc/yggdrasil"
diff --git a/sci-electronics/liblxi/metadata.xml b/sci-electronics/liblxi/metadata.xml
index f62351af67..2f006ff931 100644
--- a/sci-electronics/liblxi/metadata.xml
+++ b/sci-electronics/liblxi/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>gentoo@taujhe.de</email>
-    <description>Jan Henke</description>
+    <name>Jan Henke</name>
   </maintainer>
   <upstream>
     <remote-id type="github">lxi-tools/liblxi</remote-id>
diff --git a/sci-electronics/lxi-tools/Manifest b/sci-electronics/lxi-tools/Manifest
new file mode 100644
index 0000000000..3f3137ef99
--- /dev/null
+++ b/sci-electronics/lxi-tools/Manifest
@@ -0,0 +1 @@
+DIST lxi-tools-2.1.tar.gz 937946 BLAKE2B 25de9b879bd5db4e664aa2420598b22838477f10485247d6f435249dbc7c3d866c439362a99252c7fee329b7cf2a24c2bd72f523aac55a5cb70db914031daf0c SHA512 ddf54826aa3f50a575d2c5f6e62d6a1a813adde275530b19c4e7465e689f43fea290aab4c5762498e2437e67bade577ace4f12cd24ae41c99f811772c38ad307
diff --git a/sci-electronics/lxi-tools/lxi-tools-2.1.ebuild b/sci-electronics/lxi-tools/lxi-tools-2.1.ebuild
new file mode 100644
index 0000000000..f069b84ec1
--- /dev/null
+++ b/sci-electronics/lxi-tools/lxi-tools-2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Tools to access devices with LXI"
+HOMEPAGE="https://github.com/lxi-tools/lxi-tools"
+SRC_URI="https://github.com/lxi-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bash-completion +gui"
+
+RDEPEND="
+	bash-completion? ( >=app-shells/bash-completion-2.11 )
+	>=sys-libs/readline-8.1_p2
+	>=dev-lang/lua-5.3.6-r2:5.3
+	>=sci-electronics/liblxi-1.13
+	gui? (
+		>=dev-libs/glib-2.70
+		>=gui-libs/gtk-4.5.0
+		>=gui-libs/gtksourceview-5.3.3
+		>=gui-libs/libadwaita-1.0.1
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gui)
+	)
+	meson_src_configure
+}
diff --git a/sci-electronics/lxi-tools/metadata.xml b/sci-electronics/lxi-tools/metadata.xml
new file mode 100644
index 0000000000..4b1b4bbc36
--- /dev/null
+++ b/sci-electronics/lxi-tools/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@taujhe.de</email>
+    <name>Jan Henke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lxi-tools/lxi-tools</remote-id>
+  </upstream>
+  <longdescription>
+	lxi-tools are open source software tools for managing network attached LXI 
+	compatible test instruments such as modern oscilloscopes, power supplies, 
+	spectrum analyzers etc.
+
+	Features include automatic discovery of test instruments, sending SCPI 
+	commands, grabbing screenshots from supported instruments, benchmarking 
+	SCPI message performance, and powerful scripting for test automation. Both 
+	a commandline tool and a GUI tool are available.
+  </longdescription>
+</pkgmetadata>