diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index c7658e94df..df201ba8ca 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1,2 +1 @@
-DIST lua-language-server-3.6.11.zip 32022639 BLAKE2B 9e5a33b12e40f8b9f7b3eb5a8b049e09e8a7f0b5a5569ee15d5aa2a2035a13a6e75036321aac439a97c56c401914908f878e2f02a136c1de9413f2a9879a56c1 SHA512 6474ad8c84af034002e124a802a28afccb7f7ea439b00b508639a4a20471b5eed995dacf12fe0c8cb2313530fba787fa1127712093402e4e67c7d72e5118ce59
-DIST lua-language-server-3.6.13.zip 30691495 BLAKE2B 376b5f792d1002a0b1e0942e4d91aed4bbdccc5cf033cad56e9fafc6df3a5ef28247fc611c2563c6b3c499e491699bf6f21edc9ac6106440a7dc4662803f8aee SHA512 ce595dfe2e16bb468e90c2e73d5569eeac2cf093a0caaa0006e23ec876edcf491be92dad88e35369f9c250949c887850e8c1805736e8b8f20b0c643a56d6faed
+DIST lua-language-server-3.6.17.zip 30696826 BLAKE2B a6d65b45efd7e10afef4a48986a3e7f622885146830df26647653065efd35c8bada7421ad74ea990cfb3842756dd42fe304c6bfbb3346d00621dd1c4d1e653f8 SHA512 44cbdb25fbd90ca9931669a3cb90216bb6f33ac1e2dc0dea4c28a4340f9c2feb92c005b2212fadc33066481944bb27c03c541cd0c6d0cd7706eeeca34339d567
diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
index 5bd6ac1904..ff953cae39 100644
--- a/dev-util/lua-language-server/files/build.ninja.patch
+++ b/dev-util/lua-language-server/files/build.ninja.patch
@@ -1,6 +1,6 @@
 --- a/build/build.ninja
 +++ b/build/build.ninja
-@@ -12,17 +12,17 @@
+@@ -12,26 +12,26 @@
      3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $
      make/code_format.lua
  rule c_source_bee
@@ -16,15 +16,16 @@
      3rd/bee.lua/3rd/lua-seri/lua-seri.c
  rule cxx_source_bee
 -  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
--    -Werror -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
+-    -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd/3rd -DNDEBUG -fPIC $
+-    -o $out -c $in
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $
-+    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
++    -fvisibility=hidden -I3rd/bee.lua/bee/nonstd/3rd -DNDEBUG -fPIC $
++    -o $out -c $in CXXFLAGS
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -30,8 +30,8 @@
-     3rd/bee.lua/bee/nonstd/3rd/format.cc
- build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/3rd/os.cc
+ build $obj/source_bee/format.obj: cxx_source_bee $
+     3rd/bee.lua/bee/nonstd/3rd/fmt/format.cc
  rule cxx_source_bee_1
 -  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
 -    -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
@@ -33,7 +34,7 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -55,9 +55,9 @@
+@@ -57,9 +57,9 @@
  build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
      3rd/bee.lua/bee/utility/path_helper.cpp
  rule cxx_source_bee_2
@@ -46,7 +47,7 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -78,26 +78,26 @@
+@@ -80,26 +80,26 @@
  build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
      3rd/bee.lua/binding/lua_time.cpp
  rule c_source_lua
@@ -80,18 +81,18 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -107,7 +107,7 @@
+@@ -109,7 +109,7 @@
      3rd/bee.lua/bootstrap/progdir.cpp
  rule link_bootstrap
    command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $
 -    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -static-libgcc -s
 +    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -static-libgcc LDFLAGS
    description = Link    Exe $out
- build /bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
+ build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
      $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $
-@@ -145,10 +145,10 @@
+@@ -148,10 +148,10 @@
      3rd/bee.lua/test/test_thread.lua 3rd/bee.lua/test/test_time.lua | $
-     /bootstrap copy_script
+     $bin/bootstrap copy_script
  rule cxx_code_format
 -  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
 +  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
@@ -102,7 +103,7 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -243,9 +243,9 @@
+@@ -246,9 +246,9 @@
  build $obj/code_format/Utf8.obj: cxx_code_format $
      3rd/EmmyLuaCodeStyle/Util/src/Utf8.cpp
  rule c_lpeglabel
@@ -114,7 +115,7 @@
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
-@@ -255,9 +255,9 @@
+@@ -258,9 +258,9 @@
  build $obj/lpeglabel/lpltree.obj: c_lpeglabel 3rd/lpeglabel/lpltree.c
  build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
  rule cxx_lua_language_server
diff --git a/dev-util/lua-language-server/files/wrapper.sh b/dev-util/lua-language-server/files/wrapper.sh
new file mode 100644
index 0000000000..271f66ae77
--- /dev/null
+++ b/dev-util/lua-language-server/files/wrapper.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Thanks To tastytea for the script <https://schlomp.space/tastytea/overlay/src/branch/master/dev-util/lua-language-server/files/wrapper-r1.sh>
+
+# Some paths must be writable, so we put them into user-owned directories
+
+DATAPATH="${XDG_DATA_HOME:-${HOME}/.local/share}/lua-language-server"
+STATEPATH="${XDG_STATE_HOME:-${HOME}/.local/state}/lua-language-server"
+
+mkdir --parents ${DATAPATH} ${STATEPATH}
+
+exec @GENTOO_PORTAGE_EPREFIX@/opt/lua-language-server/bin/lua-language-server \
+	--logpath="${STATEPATH}/log" \
+	--metapath="${DATAPATH}/meta" \
+	"${@}"
diff --git a/dev-util/lua-language-server/lua-language-server-3.6.13.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.13.ebuild
deleted file mode 100644
index 823cceb468..0000000000
--- a/dev-util/lua-language-server/lua-language-server-3.6.13.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit ninja-utils toolchain-funcs
-
-DESCRIPTION="Lua language server"
-HOMEPAGE="https://github.com/LuaLS/lua-language-server"
-SRC_URI="https://github.com/LuaLS/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-BDPEND="
-	${NINJA_DEPEND}
-	app-arch/unzip
-	dev-util/ninja
-"
-RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}/linux.ninja.patch" "${FILESDIR}/build.ninja.patch" )
-
-src_prepare() {
-	# Remove hardcoded gcc references
-	sed -i "/lm.cxx/a lm.cc = '$(tc-getCC)'" \
-		make.lua || die
-	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
-		3rd/lpeglabel/makefile || die
-	# Shipped file doesn't respect CFLAGS/CXXFLAGS
-	eapply "${FILESDIR}/linux.ninja.patch"
-	eapply_user
-	sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
-		-e "s/CFLAGS/${CFLAGS}/" \
-		-e "s/CXXFLAGS/${CXXFLAGS}/" \
-		-e "s/LDFLAGS/${LDFLAGS}/" \
-		3rd/luamake/compile/ninja/linux.ninja || die
-}
-
-src_compile() {
-	eninja -C 3rd/luamake -f compile/ninja/linux.ninja "$(usex test "test" "luamake")"
-	use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
-	./3rd/luamake/luamake init || die
-
-	# Generated file doesn't respect CFLAGS/CXXFLAGS
-	sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \
-		-e "s/^luamake =.*./luamake = LUAMAKE_PATH/" \
-		build/build.ninja || die
-
-	eapply "${FILESDIR}/build.ninja.patch"
-	sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \
-		-e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \
-		-e "s/CFLAGS/${CFLAGS}/" \
-		-e "s/CXXFLAGS/${CXXFLAGS}/" \
-		-e "s/LDFLAGS/${LDFLAGS}/" \
-		-e "7d" \
-		build/build.ninja || die
-
-	# Tests are broken
-	eninja -f build/build.ninja all
-}
-
-src_install() {
-	dobin ./bin/{main.lua,lua-language-server}
-	dodoc changelog.md README.md
-}
diff --git a/dev-util/lua-language-server/lua-language-server-3.6.11.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.17.ebuild
similarity index 72%
rename from dev-util/lua-language-server/lua-language-server-3.6.11.ebuild
rename to dev-util/lua-language-server/lua-language-server-3.6.17.ebuild
index 823cceb468..ac2bf19c04 100644
--- a/dev-util/lua-language-server/lua-language-server-3.6.11.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.6.17.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit ninja-utils toolchain-funcs
+LUA_COMPAT=( lua{5-{1,3,4},jit} )
+
+inherit ninja-utils toolchain-funcs lua-single prefix
 
 DESCRIPTION="Lua language server"
 HOMEPAGE="https://github.com/LuaLS/lua-language-server"
@@ -14,8 +16,11 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+REQUIRE_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
 BDPEND="
-	${NINJA_DEPEND}
 	app-arch/unzip
 	dev-util/ninja
 "
@@ -28,7 +33,7 @@ src_prepare() {
 		make.lua || die
 	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
 		3rd/lpeglabel/makefile || die
-	# Shipped file doesn't respect CFLAGS/CXXFLAGS
+	# Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
 	eapply "${FILESDIR}/linux.ninja.patch"
 	eapply_user
 	sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
@@ -36,6 +41,8 @@ src_prepare() {
 		-e "s/CXXFLAGS/${CXXFLAGS}/" \
 		-e "s/LDFLAGS/${LDFLAGS}/" \
 		3rd/luamake/compile/ninja/linux.ninja || die
+
+	prefixify_ro "${FILESDIR}/wrapper.sh"
 }
 
 src_compile() {
@@ -43,7 +50,7 @@ src_compile() {
 	use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
 	./3rd/luamake/luamake init || die
 
-	# Generated file doesn't respect CFLAGS/CXXFLAGS
+	# Generated file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
 	sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \
 		-e "s/^luamake =.*./luamake = LUAMAKE_PATH/" \
 		build/build.ninja || die
@@ -57,11 +64,20 @@ src_compile() {
 		-e "7d" \
 		build/build.ninja || die
 
-	# Tests are broken
-	eninja -f build/build.ninja all
+	use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
 }
 
 src_install() {
-	dobin ./bin/{main.lua,lua-language-server}
-	dodoc changelog.md README.md
+	newbin "${T}/wrapper.sh" ${PN}
+
+	into /opt/${PN}
+	dobin bin/${PN}
+
+	insinto /opt/${PN}/bin
+	doins bin/main.lua
+
+	insinto /opt/${PN}
+	doins -r debugger.lua main.lua locale meta script
+
+	einstalldocs
 }
diff --git a/gui-apps/sfwbar/Manifest b/gui-apps/sfwbar/Manifest
index fed9baaff2..f9d38989c8 100644
--- a/gui-apps/sfwbar/Manifest
+++ b/gui-apps/sfwbar/Manifest
@@ -1,3 +1,2 @@
-DIST sfwbar-1.0_beta6.tar.gz 256121 BLAKE2B b10352c54340c36b03befa4b4f97391d0d688388b626f534d590e71d903f8f80b7aa0b8dd6345b2e72c8a1cc017ff60fc8a312e6473398faa0eebc8788742626 SHA512 fedebc219284ef4cc1188fc6f7c0c11560541ab33d10c22da52213bbba2f3acf9c6d7305d8a08a283b42c7f1928e9bd7b24fba966606745b6d292f7202128324
-DIST sfwbar-1.0_beta8.tar.gz 273381 BLAKE2B a27b3342e9e5116f3f599ab48d99020c16f28f5253453f693ebecebf37b2bc59f6d2db839d3acd282af9f0294c4963ea903ba691079845ca3d3459b31b116e19 SHA512 fa7849bbcb706b5dca56ffd9c560ac93283b02ed0eea7ca8da5cfd217005f976597cd78e5929180abddb59c6bf9f8d76ca506bb8ccddef2e6e737a5760b2bbc0
+DIST sfwbar-1.0_beta10.tar.gz 328768 BLAKE2B 9e3530bdb51de0baa997429dcaa5799db34827ccd412872c8f145ba7aef8a02776146e4a28c251968c8d9643a563201c7aa1ab8fbbbafb290c677526c9dfa5ac SHA512 d3671564a228419bca9a8cfa94939efd4c4455b7b80e7e06de023fb694366a267b012ad8167719cf8863bb1841cfba50b269924c4b23b447089ca587616d613f
 DIST sfwbar-1.0_beta9.tar.gz 290432 BLAKE2B 7d83ef6781b0d75c078cc12d9472bae094c428066a47aa000d9bc0ab9beee41f2ce9495a8eee3669e6fc59bf6f615d04b740bdf9548467c581e6fec13424226f SHA512 673c703de28ac3185e96f264a27c038204f9d6a7724a21f813d699f1bb6253da9ede379060d9a1d86217753584ddbcc51beb7401eacdb898862b1400863e2de3
diff --git a/gui-apps/sfwbar/sfwbar-1.0_beta6.ebuild b/gui-apps/sfwbar/sfwbar-1.0_beta10.ebuild
similarity index 59%
rename from gui-apps/sfwbar/sfwbar-1.0_beta6.ebuild
rename to gui-apps/sfwbar/sfwbar-1.0_beta10.ebuild
index 60d43643ed..a36f0a9d77 100644
--- a/gui-apps/sfwbar/sfwbar-1.0_beta6.ebuild
+++ b/gui-apps/sfwbar/sfwbar-1.0_beta10.ebuild
@@ -1,27 +1,41 @@
 # Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
-DESCRIPTION="Sway Floating Window Bar"
+DESCRIPTION="S* Floating Window Bar"
 HOMEPAGE="https://github.com/LBCrion/sfwbar"
 SRC_URI="https://github.com/LBCrion/sfwbar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="+mpd +pulse +net +xkb"
 
 DEPEND="
+	mpd? ( media-libs/libmpdclient )
+	pulse? ( media-libs/libpulse )
+	xkb? ( x11-libs/libxkbcommon )
 	>=x11-libs/gtk+-3.22.0:3[introspection,wayland]
 	gui-libs/gtk-layer-shell
 	dev-libs/json-c
 	dev-util/wayland-scanner
+	virtual/freedesktop-icon-theme
 	>=dev-libs/wayland-protocols-1.17
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 "
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature mpd)
+		$(meson_feature pulse)
+		$(meson_feature net network)
+	)
+
+	meson_src_configure
+}
diff --git a/gui-apps/sfwbar/sfwbar-1.0_beta8.ebuild b/gui-apps/sfwbar/sfwbar-1.0_beta8.ebuild
deleted file mode 100644
index 60d43643ed..0000000000
--- a/gui-apps/sfwbar/sfwbar-1.0_beta8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Sway Floating Window Bar"
-HOMEPAGE="https://github.com/LBCrion/sfwbar"
-SRC_URI="https://github.com/LBCrion/sfwbar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/gtk+-3.22.0:3[introspection,wayland]
-	gui-libs/gtk-layer-shell
-	dev-libs/json-c
-	dev-util/wayland-scanner
-	>=dev-libs/wayland-protocols-1.17
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/net-misc/maestral/Manifest b/net-misc/maestral/Manifest
index e1c66abea2..8eb6b280bd 100644
--- a/net-misc/maestral/Manifest
+++ b/net-misc/maestral/Manifest
@@ -1,2 +1,3 @@
 DIST maestral-1.5.3.gh.tar.gz 8280040 BLAKE2B dcda43880cea3fb00098b6bf87e43318a523a7c9d83886efff58be715cde17f67504b31735a006b951963e5cf0ef70b4b6431cb84200722cae186053a01edd63 SHA512 aa21277623f4e6f3283cd989be910eeb1caa3a842abca595b27a551c1c9bd1e7ef083e495ee0f096190accd91835939cb2f4a26624feae0046d8770d53aaac2f
 DIST maestral-1.7.1.gh.tar.gz 7986892 BLAKE2B 684600d8833ba1b04e32d2f56fdf9e348f3de58af9adbbbd52e2a490ccebc10e5b519c7d4795b1d7f07c4ae95806e9fed6fe5fa898352d8105572a8d2b6d2da9 SHA512 9369e72a3a044c1e985aa85980baca1c44f754eea788991d993868408ba886fcb2671fe1098865a3d10cced84793f74e36446f9cd882db968285525643c0b606
+DIST maestral-1.7.2_rc0.gh.tar.gz 7987730 BLAKE2B 9476b4b6e1cdc4de361e62478b23b630c430a50ba465331844fa6e41da7dc3043d7e552b2f4e095a1825166a4f9a43c59b3d8e739f4b6837a6cab8f410a3a640 SHA512 67595efa76e593602d6d969e05439c7416ad8730d26b92033cb9feb2367ab4e89038e90f68982ee3476309fd568276e8b97392e461d2138d86573ee1f91a83b4
diff --git a/net-misc/maestral/maestral-1.7.2_rc0.ebuild b/net-misc/maestral/maestral-1.7.2_rc0.ebuild
new file mode 100644
index 0000000000..33e31a844f
--- /dev/null
+++ b/net-misc/maestral/maestral-1.7.2_rc0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 xdg
+
+MY_PV=${PV/_rc/.dev}
+DESCRIPTION="Maestral is an open-source Dropbox client written in Python"
+HOMEPAGE="https://maestral.app"
+SRC_URI="https://github.com/samschott/maestral/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+if [[ ${PV} != *_rc* ]]; then
+	KEYWORDS="~amd64"
+fi
+
+RDEPEND="
+	>=dev-python/click-8.0.2[${PYTHON_USEDEP}]
+	>=dev-python/desktop-notifier-3.3.0[${PYTHON_USEDEP}]
+	=dev-python/dropbox-11*[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.15[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	>=dev-python/keyring-22.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keyrings-alt-3.1.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.5.8[${PYTHON_USEDEP}]
+	>=dev-python/Pyro5-5.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.16.2[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	=dev-python/survey-3*[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-2.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/build[${PYTHON_USEDEP}]
+"
+
+EPYTEST_DESELECT=(
+	# requires dev-python/pytest-benchmark not available for py3.11
+	tests/offline/test_clean_local_events.py::test_performance
+
+	# requires systemd
+	tests/offline/test_cli.py::test_autostart
+
+	# requires network
+	tests/offline/test_main.py::test_check_for_updates
+)
+
+distutils_enable_tests pytest
diff --git a/net-wireless/rtl8192eu/Manifest b/net-wireless/rtl8192eu/Manifest
index b4db24a7c1..e27d5faf3d 100644
--- a/net-wireless/rtl8192eu/Manifest
+++ b/net-wireless/rtl8192eu/Manifest
@@ -1 +1 @@
-DIST rtl8192eu-0_pre20220825.tar.gz 2487499 BLAKE2B 7eb9a4e67069a06e9efe210a2ccd68f647aa9c1eaa81ae7a60145d58cc4fb4c767f1adb4192cf816231532ddc59f6fda8b1b4838f5ac1bf48c4339e16eb1772b SHA512 2741b3bb76921510d5b56375d9cdc93bcec31df8e5b9fbceb3f4c97add78d1a02504d8a1842ac37a15234145ee6c0d575d6edc334de66e61f5a887b01765e576
+DIST rtl8192eu-0_pre20230313.tar.gz 2488230 BLAKE2B f22aaa0811fb44f7d587cf78be035516b864cb8777ec6aa819d040f072c30ba233ec4d4f08a8accd4cf6cd0ff82d443a4609fec07db5852f1357da99b5943fb5 SHA512 aaeacc7fdae709a062309cf71a03720cd93d80ec97cba8ca0d40f2105dec9c65120f2d9b65c9af4d45e32e82acc8e21a1ecd825f2f3a6503d649de918dfc501f
diff --git a/net-wireless/rtl8192eu/metadata.xml b/net-wireless/rtl8192eu/metadata.xml
index 0eb1fbb387..780bf84746 100644
--- a/net-wireless/rtl8192eu/metadata.xml
+++ b/net-wireless/rtl8192eu/metadata.xml
@@ -5,4 +5,8 @@
 		<email>abbat.2008@gmail.com</email>
 		<name>Aleksandr Batyuk</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">Mange/rtl8192eu-linux-driver</remote-id>
+		<bugs-to>https://github.com/Mange/rtl8192eu-linux-driver/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/rtl8192eu/rtl8192eu-0_pre20220825.ebuild b/net-wireless/rtl8192eu/rtl8192eu-0_pre20230313.ebuild
similarity index 87%
rename from net-wireless/rtl8192eu/rtl8192eu-0_pre20220825.ebuild
rename to net-wireless/rtl8192eu/rtl8192eu-0_pre20230313.ebuild
index 82d621dfc7..5a42e0d291 100644
--- a/net-wireless/rtl8192eu/rtl8192eu-0_pre20220825.ebuild
+++ b/net-wireless/rtl8192eu/rtl8192eu-0_pre20230313.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit linux-mod
 
-COMMIT="e39c4e7a66b05fab6eceb2bb251d399c003fb544"
+COMMIT="528ae31705764d78cc117abd604d9b799bd52543"
 
 DESCRIPTION="Realtek 8192EU driver module for Linux kernel"
 HOMEPAGE="https://github.com/Mange/rtl8192eu-linux-driver"
diff --git a/net-wireless/rtl8821ce/Manifest b/net-wireless/rtl8821ce/Manifest
index 085c1142c8..7414c41870 100644
--- a/net-wireless/rtl8821ce/Manifest
+++ b/net-wireless/rtl8821ce/Manifest
@@ -1 +1 @@
-DIST rtl8821ce-0_pre20220911.tar.gz 4521603 BLAKE2B fb89568b92bde64757217f2361da2400da4cf9b26976c8f53f0876b089b158dd471017d05f0144d3448e3f60b89bb6c8bece04fcefd189bf6e7b2ad1bedeeba8 SHA512 463fee47b6ec5b3a0ecf7e38c1cf12ff824ea7bff73aac02801697fb6539904ff71612fafcb3aeea381ca1fdd4634edc50b769f2d40bb4ea8af7d3ff544b6a7f
+DIST rtl8821ce-0_pre20230101.tar.gz 4523221 BLAKE2B f1eadcc3b7947d902ba6fe5dae0c8827f04a2a14353acf15fea4f14357b0d9b98e3ea9c79724c3a8f8256fed80e3804d588f749da3d50df3a424ded06322c017 SHA512 2270896d5ff41e067b2b57a2e33f6d020d324668674430be6381537c9db7d1fd7a78453187977026b43edef2a03ae7de6137d0910094cade839a73b5956ea637
diff --git a/net-wireless/rtl8821ce/metadata.xml b/net-wireless/rtl8821ce/metadata.xml
index 0eb1fbb387..7368ad7075 100644
--- a/net-wireless/rtl8821ce/metadata.xml
+++ b/net-wireless/rtl8821ce/metadata.xml
@@ -5,4 +5,8 @@
 		<email>abbat.2008@gmail.com</email>
 		<name>Aleksandr Batyuk</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">tomaspinho/rtl8821ce</remote-id>
+		<bugs-to>https://github.com/tomaspinho/rtl8821ce/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/rtl8821ce/rtl8821ce-0_pre20220911.ebuild b/net-wireless/rtl8821ce/rtl8821ce-0_pre20230101.ebuild
similarity index 87%
rename from net-wireless/rtl8821ce/rtl8821ce-0_pre20220911.ebuild
rename to net-wireless/rtl8821ce/rtl8821ce-0_pre20230101.ebuild
index 680cdd5d96..97003f1ed4 100644
--- a/net-wireless/rtl8821ce/rtl8821ce-0_pre20220911.ebuild
+++ b/net-wireless/rtl8821ce/rtl8821ce-0_pre20230101.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-mod toolchain-funcs
 BUILD_PARAMS="CC=$(tc-getCC) V=1 KSRC=${KERNEL_DIR}"
 
-COMMIT="50c1b120b06a3b0805e23ca9a4dbd274d74bb305"
+COMMIT="a3e2f7c1f91e92f2dc788e8fcd7f2986af3d19b6"
 
 DESCRIPTION="Realtek RTL8821CE Driver module for Linux kernel"
 HOMEPAGE="https://github.com/tomaspinho/rtl8821ce"