diff --git a/www-apps/libravatarserv/libravatarserv-9999.ebuild b/www-apps/libravatarserv/libravatarserv-9999.ebuild
index 8dce345..a0724b0 100644
--- a/www-apps/libravatarserv/libravatarserv-9999.ebuild
+++ b/www-apps/libravatarserv/libravatarserv-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -11,32 +11,23 @@ fi
 
 DESCRIPTION="Simple libravatar server"
 HOMEPAGE="https://schlomp.space/tastytea/libravatarserv"
-if [[ "${PV}" == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://schlomp.space/tastytea/libravatarserv.git"
 else
 	SRC_URI="https://schlomp.space/tastytea/libravatarserv/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ "${PV}" == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
 
 RDEPEND="
-	dev-libs/crypto++
-	media-gfx/imagemagick
-	dev-libs/libxdg-basedir
 	dev-cpp/identiconpp
+	dev-libs/crypto++:=
+	media-gfx/imagemagick:=
 "
 DEPEND="${RDEPEND}"
 
 DOCS=("README.md" "doc/nginx-example.conf")
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-fi