diff --git a/dev-qt/qhotkey/metadata.xml b/dev-libs/qhotkey/metadata.xml
similarity index 100%
rename from dev-qt/qhotkey/metadata.xml
rename to dev-libs/qhotkey/metadata.xml
diff --git a/dev-qt/qhotkey/qhotkey-9999.ebuild b/dev-libs/qhotkey/qhotkey-9999.ebuild
similarity index 66%
rename from dev-qt/qhotkey/qhotkey-9999.ebuild
rename to dev-libs/qhotkey/qhotkey-9999.ebuild
index a76b64ba..f4358894 100644
--- a/dev-qt/qhotkey/qhotkey-9999.ebuild
+++ b/dev-libs/qhotkey/qhotkey-9999.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 inherit cmake
 
 DESCRIPTION="A global shortcut/hotkey library for desktop Qt applications"
-HOMEPAGE="https://github.com/skycoder42/QHotkey"
+HOMEPAGE="https://github.com/Skycoder42/QHotkey"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
 
 MY_PN="QHotkey"
 
@@ -19,12 +22,23 @@ else
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 fi
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
+IUSE="qt6"
 
 DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
+	!qt6?	(
+			dev-qt/qtcore:5
+			dev-qt/qtx11extras:5
+		)
+	qt6?	(
+			dev-qt/qtbase:6
+		)
+	x11-libs/libX11
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_DEFAULT_MAJOR_VERSION:STRING=$(usex qt6 "6" "5")
+	)
+	cmake_src_configure
+}
diff --git a/dev-qt/qhotkey/Manifest b/dev-qt/qhotkey/Manifest
deleted file mode 100644
index 5c623339..00000000
--- a/dev-qt/qhotkey/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qhotkey-1.4.2.tar.gz 51500 BLAKE2B 5ae73f8f4c1ccf9cc38acdc38e91e2ed1f7a1c38408a42d4c997d3468357321c2314153498e2610365929810b87fe2788edfcc4a7a9467dcc06386848928fd13 SHA512 52c4ae501b4173459fe2accbc36011f988e993de30dcc9615daafdd7a1eb7930882aa0f976ffc0bc19eb6c57bb2c06e207f4aea19b39c75a31fd52508eff182e
diff --git a/dev-qt/qhotkey/qhotkey-1.4.2.ebuild b/dev-qt/qhotkey/qhotkey-1.4.2.ebuild
deleted file mode 100644
index a76b64ba..00000000
--- a/dev-qt/qhotkey/qhotkey-1.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A global shortcut/hotkey library for desktop Qt applications"
-HOMEPAGE="https://github.com/skycoder42/QHotkey"
-
-MY_PN="QHotkey"
-
-if [[ ${PV} == 9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Skycoder42/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/Skycoder42/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	MY_P="${MY_PN}-${PV}"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-"
-RDEPEND="${DEPEND}"
diff --git a/media-libs/vips/vips-9999.ebuild b/media-libs/vips/vips-9999.ebuild
index f48c983e..814357fa 100644
--- a/media-libs/vips/vips-9999.ebuild
+++ b/media-libs/vips/vips-9999.ebuild
@@ -7,15 +7,16 @@ PYTHON_COMPAT=( python3_{10..13} )
 inherit flag-o-matic meson-multilib python-single-r1 toolchain-funcs vala
 
 DESCRIPTION="VIPS Image Processing Library"
+HOMEPAGE="https://www.libvips.org/"
+
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lib${PN}/lib${PN}"
 else
 	SRC_URI="https://github.com/lib${PN}/lib${PN}/archive/v${PV//_rc/-rc}.tar.gz -> lib${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
 fi
-HOMEPAGE="https://www.libvips.org/"
 
+[[ "${PV}" == 9999 ]] || KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0/42"
 
diff --git a/media-sound/mellowplayer/mellowplayer-3.5.5.ebuild b/media-sound/mellowplayer/mellowplayer-3.5.5.ebuild
index 47f7920d..d41829fb 100644
--- a/media-sound/mellowplayer/mellowplayer-3.5.5.ebuild
+++ b/media-sound/mellowplayer/mellowplayer-3.5.5.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	>=dev-qt/qtwebengine-5.9:5[-bindist,widgets]
 	>=dev-qt/qttranslations-5.9:5
 	>=dev-qt/qtgraphicaleffects-5.9:5
-	dev-qt/qhotkey
+	dev-libs/qhotkey
 	dev-libs/libevent
 	dev-libs/spdlog
 	dev-libs/boost-di
diff --git a/media-sound/mellowplayer/mellowplayer-9999.ebuild b/media-sound/mellowplayer/mellowplayer-9999.ebuild
index 47f7920d..d41829fb 100644
--- a/media-sound/mellowplayer/mellowplayer-9999.ebuild
+++ b/media-sound/mellowplayer/mellowplayer-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	>=dev-qt/qtwebengine-5.9:5[-bindist,widgets]
 	>=dev-qt/qttranslations-5.9:5
 	>=dev-qt/qtgraphicaleffects-5.9:5
-	dev-qt/qhotkey
+	dev-libs/qhotkey
 	dev-libs/libevent
 	dev-libs/spdlog
 	dev-libs/boost-di
diff --git a/www-servers/nginx-unit/nginx-unit-1.32.1-r10.ebuild b/www-servers/nginx-unit/nginx-unit-1.32.1-r10.ebuild
index f6ff7d78..f95a8c69 100644
--- a/www-servers/nginx-unit/nginx-unit-1.32.1-r10.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.32.1-r10.ebuild
@@ -73,7 +73,10 @@ DEPEND="
 #	unit_modules_wasm? (
 #		dev-util/wasmer
 #	)
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	acct-user/nginx-unit
+	acct-group/nginx-unit
+"
 
 my_econf() {
 	echo ./configure "${@}"
diff --git a/www-servers/nginx-unit/nginx-unit-9999.ebuild b/www-servers/nginx-unit/nginx-unit-9999.ebuild
index f6ff7d78..f95a8c69 100644
--- a/www-servers/nginx-unit/nginx-unit-9999.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-9999.ebuild
@@ -73,7 +73,10 @@ DEPEND="
 #	unit_modules_wasm? (
 #		dev-util/wasmer
 #	)
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	acct-user/nginx-unit
+	acct-group/nginx-unit
+"
 
 my_econf() {
 	echo ./configure "${@}"