diff --git a/www-apps/libravatarserv/libravatarserv-0.7.2.ebuild b/www-apps/libravatarserv/libravatarserv-0.7.2.ebuild
index 7e5baeb7f..b7f1a5815 100644
--- a/www-apps/libravatarserv/libravatarserv-0.7.2.ebuild
+++ b/www-apps/libravatarserv/libravatarserv-0.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -45,7 +45,7 @@ if [[ "${PV}" != "9999" ]]; then
 fi
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i "s|\${CMAKE_INSTALL_DOCDIR}|\${CMAKE_INSTALL_DATAROOTDIR}/doc/${P}|" \
 		CMakeLists.txt || die "Build script modification failed"
 }
diff --git a/www-apps/libravatarserv/libravatarserv-9999.ebuild b/www-apps/libravatarserv/libravatarserv-9999.ebuild
index 7e5baeb7f..8dce3459e 100644
--- a/www-apps/libravatarserv/libravatarserv-9999.ebuild
+++ b/www-apps/libravatarserv/libravatarserv-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 fi
 
-DESCRIPTION="Simple libravatar server."
+DESCRIPTION="Simple libravatar server"
 HOMEPAGE="https://schlomp.space/tastytea/libravatarserv"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://schlomp.space/tastytea/libravatarserv.git"
@@ -33,19 +33,10 @@ RDEPEND="
 	dev-libs/libxdg-basedir
 	dev-cpp/identiconpp
 "
-DEPEND="
-	dev-util/cmake
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
-DOCS="README.md doc/nginx-example.conf"
+DOCS=("README.md" "doc/nginx-example.conf")
 
 if [[ "${PV}" != "9999" ]]; then
 	S="${WORKDIR}/${PN}"
 fi
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i "s|\${CMAKE_INSTALL_DOCDIR}|\${CMAKE_INSTALL_DATAROOTDIR}/doc/${P}|" \
-		CMakeLists.txt || die "Build script modification failed"
-}