diff --git a/dev-python/skel_python.ebuild b/dev-python/skel_python.ebuild
index 0e2959f11..7ea995667 100644
--- a/dev-python/skel_python.ebuild
+++ b/dev-python/skel_python.ebuild
@@ -18,3 +18,4 @@ IUSE="test"
 
 RDEPEND="dev-python/xyz[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-apps/openrazer/Manifest b/sys-apps/openrazer/Manifest
index 746a98964..0532dba70 100644
--- a/sys-apps/openrazer/Manifest
+++ b/sys-apps/openrazer/Manifest
@@ -1,3 +1,2 @@
-DIST openrazer-2.8.0.tar.gz 194516 BLAKE2B 69df4ffae15b559da4988846ad48a5df43f8d65e343d23ec189589dbab496816695263183e1b01eecb038019600b63f868425cfcf8b2be6ffdaaeecc03e8e632 SHA512 de16a3e3549d6824034f1bd239280ec6c89995e9d9a9b56312f5b625e6d220e95b6b10eaef91518c1d706718f582c48b202ad8f8787e3564b5f0c470472f18c2
 DIST openrazer-2.8.0_p20200712.zip 329235 BLAKE2B 2ba97660d2d618b1f22fd29ff1cf7105f6d34746dbd8f6ff39a874ef03ef612d538b8a9e3b9a808b582336df75a289d590c8c57cae48698085bd70301cb3edb7 SHA512 a35834f2b8635afdeabf04da27f56e3cd71f15c0496bc9f16f6a01fdbb5d8df44a6c526d77961d5dba5a5cbd560e4eb4d1200c72afff5bbea511b845f4902c1d
 DIST openrazer-2.9.0.tar.gz 193846 BLAKE2B c7e5028f7661de6152b85dc7b44058bac6d088780a07069460a40408652ffdc758efe59f60029ec8184ea35232f4d27963ab66c16a47c472328bcb2e33fa9596 SHA512 097b471df0f9aed0f3fc487298fc7ec5b0768de21168605447d016a1edf63d7b5f6f9c3602da2f8fd296b3b03f5bbffb4f946c8426ab48b6499de09feceecb60
diff --git a/sys-apps/openrazer/openrazer-2.8.0.ebuild b/sys-apps/openrazer/openrazer-2.8.0.ebuild
deleted file mode 100644
index f9373a2d6..000000000
--- a/sys-apps/openrazer/openrazer-2.8.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 linux-mod udev
-
-DESCRIPTION="Razer Drivers for Linux"
-HOMEPAGE="https://openrazer.github.io/"
-SRC_URI="https://github.com/openrazer/openrazer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="media-libs/libsdl2
-	media-libs/sdl2-image
-	sci-libs/fftw:3.0
-	dev-python/daemonize[$PYTHON_USEDEP]
-	dev-python/dbus-python[$PYTHON_USEDEP]
-	dev-python/notify2[$PYTHON_USEDEP]
-	dev-python/numpy[$PYTHON_USEDEP]
-	dev-python/pygobject:*[$PYTHON_USEDEP]
-	dev-python/python-evdev[$PYTHON_USEDEP]
-	dev-python/pyudev[$PYTHON_USEDEP]
-	dev-python/setproctitle[$PYTHON_USEDEP]
-	x11-misc/xautomation
-	x11-misc/xdotool"
-DEPEND="${RDEPEND}
-	app-misc/jq"
-
-BUILD_TARGETS="clean driver"
-BUILD_PARAMS="-C ${S} KERNELDIR=${KERNEL_DIR}"
-MODULE_NAMES="razerkbd(kernel/driver/hid:${S}/driver)
-	razermouse(kernel/driver/hid:${S}/driver)
-	razermousemat(kernel/driver/hid:${S}/driver)
-	razerkraken(kernel/driver/hid:${S}/driver)
-	razeraccessory(kernel/driver/hid:${S}/driver)
-	razercore(kernel/driver/hid:${S}/driver)"
-
-src_prepare() {
-	default
-	# Fix jobserver unavailable
-	sed -i  -e '/daemon install$/s/make/$(MAKE)/' \
-	-e '/pylib install$/s/@make/$(MAKE)/' \
-	Makefile || die "sed failed for Makefile"
-	# Do not to install compressed files
-	sed -i '/gzip/d' daemon/Makefile || die "sed failed for daemon/Makefile"
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	compile_python() {
-		pushd pylib
-		distutils-r1_python_compile
-		popd
-
-		pushd daemon
-		distutils-r1_python_compile
-		popd
-	}
-	python_foreach_impl compile_python
-}
-
-src_install() {
-	linux-mod_src_install
-
-	udev_dorules install_files/udev/99-razer.rules
-	exeinto "$(get_udevdir)"
-	doexe install_files/udev/razer_mount
-
-	mypython_install() {
-		pushd pylib
-		distutils-r1_python_install
-		popd
-
-		pushd daemon
-		distutils-r1_python_install
-		emake DESTDIR="${D}" install-resources
-		popd
-	}
-	python_foreach_impl mypython_install
-}
diff --git a/sys-apps/openrazer/openrazer-2.8.0_p20200712.ebuild b/sys-apps/openrazer/openrazer-2.8.0_p20200712.ebuild
index 70a580306..6221449ac 100644
--- a/sys-apps/openrazer/openrazer-2.8.0_p20200712.ebuild
+++ b/sys-apps/openrazer/openrazer-2.8.0_p20200712.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 linux-mod udev
 
@@ -30,6 +30,7 @@ RDEPEND="media-libs/libsdl2
 	x11-misc/xdotool"
 DEPEND="${RDEPEND}
 	app-misc/jq"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}/${PN}-${HASH_COMMIT}"
 
diff --git a/sys-apps/openrazer/openrazer-2.9.0.ebuild b/sys-apps/openrazer/openrazer-2.9.0.ebuild
index c0754ab05..17f8c520a 100644
--- a/sys-apps/openrazer/openrazer-2.9.0.ebuild
+++ b/sys-apps/openrazer/openrazer-2.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1 linux-mod udev
 
@@ -29,6 +29,7 @@ RDEPEND="media-libs/libsdl2
 	x11-misc/xdotool"
 DEPEND="${RDEPEND}
 	app-misc/jq"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BUILD_TARGETS="clean driver"
 BUILD_PARAMS="-C ${S} KERNELDIR=${KERNEL_DIR}"