diff --git a/games-util/chiaki/chiaki-2.1.1.ebuild b/games-util/chiaki/chiaki-2.1.1.ebuild
index e654bece34..6cd1e31f60 100644
--- a/games-util/chiaki/chiaki-2.1.1.ebuild
+++ b/games-util/chiaki/chiaki-2.1.1.ebuild
@@ -27,13 +27,17 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	dev-libs/jerasure
-	dev-libs/openssl
-	dev-qt/qtconcurrent
-	dev-qt/qtmultimedia
-	dev-qt/qtsvg
+	dev-libs/libevdev
+	dev-libs/openssl:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
 	media-libs/libsdl2
 	media-libs/opus
-	media-video/ffmpeg
+	media-video/ffmpeg:=
 "
 
 DEPEND="${RDEPEND}"
@@ -47,11 +51,7 @@ BDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_BUILD_TYPE=Release
 		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
 		-DCHIAKI_USE_SYSTEM_JERASURE=TRUE
 		-DCHIAKI_ENABLE_TESTS=$(usex test)
 		-DCHIAKI_ENABLE_CLI=$(usex cli)
diff --git a/games-util/chiaki/chiaki-9999.ebuild b/games-util/chiaki/chiaki-9999.ebuild
index e654bece34..6cd1e31f60 100644
--- a/games-util/chiaki/chiaki-9999.ebuild
+++ b/games-util/chiaki/chiaki-9999.ebuild
@@ -27,13 +27,17 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	dev-libs/jerasure
-	dev-libs/openssl
-	dev-qt/qtconcurrent
-	dev-qt/qtmultimedia
-	dev-qt/qtsvg
+	dev-libs/libevdev
+	dev-libs/openssl:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
 	media-libs/libsdl2
 	media-libs/opus
-	media-video/ffmpeg
+	media-video/ffmpeg:=
 "
 
 DEPEND="${RDEPEND}"
@@ -47,11 +51,7 @@ BDEPEND="
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_BUILD_TYPE=Release
 		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
 		-DCHIAKI_USE_SYSTEM_JERASURE=TRUE
 		-DCHIAKI_ENABLE_TESTS=$(usex test)
 		-DCHIAKI_ENABLE_CLI=$(usex cli)
diff --git a/games-util/chiaki/metadata.xml b/games-util/chiaki/metadata.xml
index a8ccfa81bf..4e10a1a0b0 100644
--- a/games-util/chiaki/metadata.xml
+++ b/games-util/chiaki/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cli">Build CLI interface</flag>
-		<flag name="gui">Build GUI interface</flag>
 	</use>
 	<longdescription lang="en">
 	Chiaki is a Free and Open Source Software Client for PlayStation 4 and