diff --git a/app-misc/vocabsieve/Manifest b/app-misc/vocabsieve/Manifest
index b41c01ad84..1d1f58b931 100644
--- a/app-misc/vocabsieve/Manifest
+++ b/app-misc/vocabsieve/Manifest
@@ -1 +1 @@
-DIST vocabsieve-0.9.1.tar.gz 194866 BLAKE2B 5aa22146a3464d84cb125160e8917c7cdd2e9aab5fd3de9df24c677e1cb8aca91fa05f2af360178f94c762f1ded679608be90de2270411338a188ae854a56585 SHA512 8e60c8316b05b25fb21b3ed8c199dc3df95f55cb47d696e8813f908968985902633c9c6b171b6d044f0a4ce5b301b65c50ee4d44e0cf01ad93cdabcbb1a6fb2e
+DIST vocabsieve-0.9.2.tar.gz 195231 BLAKE2B 7dfdd1c58fa2eefaeffa56bb2558e4b2630c6f30a47285acbf4a99685c13a725e89a6950014a0fca1c274555ae27ac6f4829c3e2939d0aee30302bf1d6466b41 SHA512 a2862cae2f4e11010302e9816b897af29e70c247d1f2b25909d3abcb55bb93b1bcd52a2db3611e1f6fe384a7189e73694d37aa0fc08e006bc896b914466c2462
diff --git a/app-misc/vocabsieve/vocabsieve-0.9.1.ebuild b/app-misc/vocabsieve/vocabsieve-0.9.2.ebuild
similarity index 100%
rename from app-misc/vocabsieve/vocabsieve-0.9.1.ebuild
rename to app-misc/vocabsieve/vocabsieve-0.9.2.ebuild
diff --git a/dev-games/liblcf/liblcf-0.7.0.ebuild b/dev-games/liblcf/liblcf-0.7.0.ebuild
index aa0cbea458..a8fe6bf332 100644
--- a/dev-games/liblcf/liblcf-0.7.0.ebuild
+++ b/dev-games/liblcf/liblcf-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake xdg-utils
+inherit cmake xdg
 
 DESCRIPTION="Library to handle RPG Maker 2000/2003 and EasyRPG projects"
 HOMEPAGE="https://github.com/EasyRPG/liblcf"
@@ -33,6 +33,3 @@ src_configure() {
 src_test() {
 	cmake_build check
 }
-
-pkg_postrm() { xdg_mimeinfo_database_update; }
-pkg_postinst() { xdg_mimeinfo_database_update; }
diff --git a/dev-python/curio/curio-1.6.ebuild b/dev-python/curio/curio-1.6.ebuild
index 0cf35ad54d..17adf0b742 100644
--- a/dev-python/curio/curio-1.6.ebuild
+++ b/dev-python/curio/curio-1.6.ebuild
@@ -23,5 +23,10 @@ SLOT="0"
 
 DEPEND="test? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
+EPYTEST_DESELECT=(
+	# Needs net
+	"tests/test_network.py::test_ssl_outgoing"
+)
+
 distutils_enable_sphinx docs --no-autodoc
 distutils_enable_tests pytest
diff --git a/dev-python/glicko2/glicko2-2.0.0-r1.ebuild b/dev-python/glicko2/glicko2-2.0.0-r2.ebuild
similarity index 76%
rename from dev-python/glicko2/glicko2-2.0.0-r1.ebuild
rename to dev-python/glicko2/glicko2-2.0.0-r2.ebuild
index c6a18e6cbd..ce52f4be0a 100644
--- a/dev-python/glicko2/glicko2-2.0.0-r1.ebuild
+++ b/dev-python/glicko2/glicko2-2.0.0-r2.ebuild
@@ -17,3 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 distutils_enable_tests unittest
+
+src_prepare() {
+	sed -e "s/find_packages()/find_packages(exclude=['tests'])/" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/rstcheck/rstcheck-6.1.1.ebuild b/dev-python/rstcheck/rstcheck-6.1.1.ebuild
index 76c81d260f..c3a90f6c22 100644
--- a/dev-python/rstcheck/rstcheck-6.1.1.ebuild
+++ b/dev-python/rstcheck/rstcheck-6.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
diff --git a/games-engines/easyrpg-player/easyrpg-player-0.7.0.ebuild b/games-engines/easyrpg-player/easyrpg-player-0.7.0.ebuild
index a7b0d4c608..357407d280 100644
--- a/games-engines/easyrpg-player/easyrpg-player-0.7.0.ebuild
+++ b/games-engines/easyrpg-player/easyrpg-player-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake xdg-utils
+inherit cmake xdg
 
 DESCRIPTION="RPG Maker 2000/2003 and EasyRPG games interpreter"
 HOMEPAGE="https://easyrpg.org/player/"
@@ -71,6 +71,3 @@ src_configure() {
 src_test() {
 	cmake_build check
 }
-
-pkg_postrm() { xdg_mimeinfo_database_update; }
-pkg_postinst() { xdg_mimeinfo_database_update; }
diff --git a/games-puzzle/baba-is-you/metadata.xml b/games-puzzle/baba-is-you/metadata.xml
new file mode 100644
index 0000000000..e642e11eed
--- /dev/null
+++ b/games-puzzle/baba-is-you/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>watermanpaint@posteo.net</email>
+		<name>Lucio Sauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index ce25b0cf3c..007dad7cfa 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,4 +1,4 @@
 DIST contrib.tar.gz 7408 BLAKE2B 03c3733a0b7b747f759b1b13f6fbd5342bc5cdea31f142730f69af85abf576f2c35bd7ea01e1aafba8ad7ae63505d7a9372279538ffb8cea3d61839e2bf4ea21 SHA512 671ea675b8f3de9b6ff8cce62297b5c14947b458de88ffa4bca5c51aafb66fc475782d0ed609a18e5281147f89aa531d4480ee46bb888f98651e4620f58318b4
-DIST hyprland-0.21.0.tar.gz 714570 BLAKE2B 6576765ec28e918be9aefa1252ad70019e2d77ae6f07b61161692ed1d0016d52376f1aae30b4200ae003585ca8ff907e810c635dc639d360f4f22be52d313b0d SHA512 a1fcd015be10267503d9ca529a538a0eebe8c197e91134de8377cca150efd99d0e51e7c9751ef8e81587fe04a497edff9d18b0e9dc5751a0f3eb4b3775c8ecad
+DIST hyprland-0.21.0-r1.tar.gz 715422 BLAKE2B b001e246c48d6f92a779abb1aaa41c03ca4154cdebf31b8916147f917e9ba020f39090d5d7476b54b1a63f29ede28da2dd7b6d20a0304826b73d4ca46d462f7c SHA512 cc4e917889afe0a2a9a3f7d508e9dc27c4a21ba2a4fc2e809c54102c2f1458ba5ccf7d29c28c37ac5b4eb75a51f460c39e1654a752d47c1120cb4cef0e65b98a
 DIST hyprland-protocols.tar.gz 4858 BLAKE2B 565532803fe6975efdba621c9ef69e4a7c18f040a65818e9f0f61d1dda15a3927f4aca25972989172554d5be5332f014d57dc8e1d0bb207ea5ba64aaec0e65f2 SHA512 03e176149fb0749f63fc58aea1175bfed92f0a30895d17e022ebdf9bb6f786e3a1018244379d0a6d205c590b25eccba0d7bea273bb389dd1031fad3d8467ef23
 DIST wlr.tar.bz2 448534 BLAKE2B 35ff3e316ce5fa5d444e623597fdc61f143aa07440b8821faecc131aa5376b4ed691e84511ef438dfe4d429941d09fe0ab2d403414fd6a91e54a5bef890a4d68 SHA512 98af3902be681b11989f7d0c3b147ef3e4ef27dd377dd74b4e2a5151be1eeb0ff99d7738f2be4050116a7233820b0bb4f581ae0229d44043bfbd0f6af59108d4
diff --git a/gui-wm/hyprland/files/0.21.0-meson.patch b/gui-wm/hyprland/files/0.21.0-meson.patch
new file mode 100644
index 0000000000..30664610ef
--- /dev/null
+++ b/gui-wm/hyprland/files/0.21.0-meson.patch
@@ -0,0 +1,13 @@
+diff --git a/protocols/meson.build b/protocols/meson.build
+index 9d47e0a..c082845 100644
+--- a/protocols/meson.build
++++ b/protocols/meson.build
+@@ -29,7 +29,7 @@ protocols = [
+   ['pointer-constraints-unstable-v1.xml'],
+   ['tablet-unstable-v2.xml'],
+   ['idle.xml'],
+-  [hl_protocol_dir, 'protocols/hyprland-toplevel-export-v1.xml']
++  ['hyprland-toplevel-export-v1.xml']
+ ]
+ wl_protos_src = []
+ wl_protos_headers = []
diff --git a/gui-wm/hyprland/hyprland-0.21.0.ebuild b/gui-wm/hyprland/hyprland-0.21.0-r1.ebuild
similarity index 87%
rename from gui-wm/hyprland/hyprland-0.21.0.ebuild
rename to gui-wm/hyprland/hyprland-0.21.0-r1.ebuild
index 3901b75002..3669168cc7 100644
--- a/gui-wm/hyprland/hyprland-0.21.0.ebuild
+++ b/gui-wm/hyprland/hyprland-0.21.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/hyprwm/Hyprland/releases"
 PROTOCOMMIT=301733ae466b229066ba15a53e6d8b91c5dcef5b
 WLRCOMMIT=dc7cc98cf21a8dc19ab8895505500e3700646af0
 CONTRIBCOMMIT=37c8121f98d76f57caa00dd7106877876e0d7483
-SRC_URI="https://github.com/hyprwm/${PN^}/archive/v${PV}beta.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/hyprwm/${PN^}/archive/v${PV}beta.tar.gz -> ${PF}.tar.gz
 	https://github.com/hyprwm/hyprland-protocols/archive/${PROTOCOMMIT}.tar.gz -> hyprland-protocols.tar.gz
 	https://github.com/hyprwm/contrib/archive/${CONTRIBCOMMIT}.tar.gz -> contrib.tar.gz
 	https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${WLRCOMMIT}/wlroots-${WLRCOMMIT}.tar.bz2 -> wlr.tar.bz2"
@@ -48,9 +48,11 @@ RDEPEND="
 		 x11-libs/libnotify
 	)
 	X? (
+	   gui-libs/wlroots[x11-backend]
 	   x11-base/xwayland
 	   x11-libs/libxcb
 	   x11-libs/xcb-util-image
+	   x11-libs/xcb-util-renderutil
 	   x11-libs/xcb-util-wm
 	)
 "
@@ -60,6 +62,10 @@ BDEPEND="
 	shellevents? ( app-text/scdoc )
 "
 
+PATCHES=(
+	"${FILESDIR}/0.21.0-meson.patch"
+)
+
 src_unpack() {
 	default
 
@@ -67,6 +73,8 @@ src_unpack() {
 	rmdir "${S}/subprojects/hyprland-protocols"
 	mv "${WORKDIR}/wlroots-${WLRCOMMIT}" "${S}/subprojects/wlroots" || die
 	mv "${WORKDIR}/hyprland-protocols-${PROTOCOMMIT}" "${S}/subprojects/hyprland-protocols" || die
+	# Workaround for https://github.com/hyprwm/Hyprland/issues/1207
+	cp "${S}/subprojects/hyprland-protocols/protocols/hyprland-toplevel-export-v1.xml" "${S}/protocols" || die
 }
 
 src_prepare() {
@@ -89,7 +97,7 @@ src_configure() {
 }
 
 src_install() {
-	meson_src_install --skip-subprojects wlroots
+	meson_src_install --skip-subprojects
 
 	use grimblast && emake PREFIX="${ED}/usr" -C "${WORKDIR}/contrib-${CONTRIBCOMMIT}/grimblast" install
 	use shellevents && emake PREFIX="${ED}/usr" -C "${WORKDIR}/contrib-${CONTRIBCOMMIT}/shellevents" install
diff --git a/sci-electronics/verilator/Manifest b/sci-electronics/verilator/Manifest
index 095b5a8e18..e17c8e6f19 100644
--- a/sci-electronics/verilator/Manifest
+++ b/sci-electronics/verilator/Manifest
@@ -1,2 +1,3 @@
-DIST verilator-4.228.tar.gz 2623600 BLAKE2B 340807f3115799341561c3b62380d1c0f63a0628dfd609576b4fe84688ad964fc4d70764af0816ef68d855e8d264e40b71e28c2e5a26267c7ee21064035c5b8a SHA512 8d8c5382c03f3a390a5ce5e60846c69f19bc5b1b0861951fe7633de3378e4affc1b15b1a0f2729c0b0cc8c4c9a8b0e9115a95bc455c0d47b333091afbf06eced
+DIST verilator-4.106.tar.gz 2191982 BLAKE2B 9dbd0dad390b4a009a062a8405dc01a317fed68a2f0becd4bf088c566f2457a4cda04a4c276cf31cdbaa0efa6e64f5618b9439221f8cf4bb469f20f1de1af397 SHA512 b1840b294b22c0d4cf17a0a154e73a631c62b30055f324dca98839ab85e2a524f9e3b6e981b192b941c1dd9837f326ae38cc3fcf686c3f8731d376dc89dd46fe
 DIST verilator-5.004.tar.gz 2815642 BLAKE2B 5ae0317335e66faa71285a0027db4208a70b18e253405becff3db91ac591bb2590c827ab49bf4d0a794bd7fa631e3a025879b3919f47b9a2797c4db7cf6f9cef SHA512 4672b36aa00ea563b297be93344dcaaf533f23a2d4e82e61ed5b8e0f19f2f363bcf004aa6088a259b112a87dcfbf7cb10e85b68bb4370f3574cd2e01c921d29d
+DIST verilator-5.006.tar.gz 2866281 BLAKE2B 9a66b308e40f0bceb4f07906dbb65e4113494826bcad81d88047402f85fb38f6d2d0bcd2e36f9b32a6144505f13349723909020f3df7a4061397740841885c9f SHA512 a0b5d535ba89f17983a959002dc54b4c24d4c6442576113f2e3305cb0960d2564192f27639ccca33ee7026656b91ca0aa44f0c3efd4ffd75b3d19a8c4530418c
diff --git a/sci-electronics/verilator/verilator-4.228.ebuild b/sci-electronics/verilator/verilator-4.106.ebuild
similarity index 95%
rename from sci-electronics/verilator/verilator-4.228.ebuild
rename to sci-electronics/verilator/verilator-4.106.ebuild
index 2c41dd1ed9..74ea567ff7 100644
--- a/sci-electronics/verilator/verilator-4.228.ebuild
+++ b/sci-electronics/verilator/verilator-4.106.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
diff --git a/sci-electronics/verilator/verilator-5.006.ebuild b/sci-electronics/verilator/verilator-5.006.ebuild
new file mode 100644
index 0000000000..74ea567ff7
--- /dev/null
+++ b/sci-electronics/verilator/verilator-5.006.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="The fast free Verilog/SystemVerilog simulator"
+HOMEPAGE="
+	https://verilator.org
+	https://github.com/verilator/verilator
+"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="|| ( Artistic-2 LGPL-3 )"
+SLOT="0"
+
+RDEPEND="
+	dev-lang/perl
+	sys-libs/zlib
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	default
+	eautoconf --force
+}