diff --git a/games-util/chiaki/chiaki-2.1.1.ebuild b/games-util/chiaki/chiaki-2.1.1.ebuild
index d786ac5d20..e654bece34 100644
--- a/games-util/chiaki/chiaki-2.1.1.ebuild
+++ b/games-util/chiaki/chiaki-2.1.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit cmake xdg
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="Client for PlayStation 4 and PlayStation 5 Remote Play"
 HOMEPAGE="https://git.sr.ht/~thestr4ng3r/chiaki"
@@ -20,9 +21,11 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+cli +gui test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	dev-libs/jerasure
 	dev-libs/openssl
 	dev-qt/qtconcurrent
@@ -36,8 +39,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/protobuf-python[${PYTHON_USEDEP}]')
 	dev-libs/protobuf
-	dev-python/protobuf-python
 	virtual/pkgconfig
 "
 
@@ -45,6 +49,9 @@ 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 d786ac5d20..e654bece34 100644
--- a/games-util/chiaki/chiaki-9999.ebuild
+++ b/games-util/chiaki/chiaki-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit cmake xdg
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="Client for PlayStation 4 and PlayStation 5 Remote Play"
 HOMEPAGE="https://git.sr.ht/~thestr4ng3r/chiaki"
@@ -20,9 +21,11 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+cli +gui test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	dev-libs/jerasure
 	dev-libs/openssl
 	dev-qt/qtconcurrent
@@ -36,8 +39,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/protobuf-python[${PYTHON_USEDEP}]')
 	dev-libs/protobuf
-	dev-python/protobuf-python
 	virtual/pkgconfig
 "
 
@@ -45,6 +49,9 @@ 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)