diff --git a/dev-libs/qhttpengine/qhttpengine-1.0.1.ebuild b/dev-libs/qhttpengine/qhttpengine-1.0.1.ebuild
index adbf1b3190..7c18be5230 100644
--- a/dev-libs/qhttpengine/qhttpengine-1.0.1.ebuild
+++ b/dev-libs/qhttpengine/qhttpengine-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="HTTP server for Qt applications"
 HOMEPAGE="https://github.com/nitroshare/qhttpengine"
@@ -47,5 +47,5 @@ src_configure() {
 		${CMAKE_CONF}
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/qhttpengine/qhttpengine-9999.ebuild b/dev-libs/qhttpengine/qhttpengine-9999.ebuild
index adbf1b3190..7c18be5230 100644
--- a/dev-libs/qhttpengine/qhttpengine-9999.ebuild
+++ b/dev-libs/qhttpengine/qhttpengine-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="HTTP server for Qt applications"
 HOMEPAGE="https://github.com/nitroshare/qhttpengine"
@@ -47,5 +47,5 @@ src_configure() {
 		${CMAKE_CONF}
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/x11-misc/i3lock-color/Manifest b/x11-misc/i3lock-color/Manifest
index 628803c1b2..c6c6ccb81c 100644
--- a/x11-misc/i3lock-color/Manifest
+++ b/x11-misc/i3lock-color/Manifest
@@ -1 +1 @@
-DIST i3lock-color-2.12_p1.tar.gz 206795 BLAKE2B e2f6c9054dc7a2dafba7aab868bc8dff0bad8c38192bcc85124af6e24c464d7753e586de4e43120ee0b1f1591f8e2d7a74f37ee5a84e84dbbc4fdc946cd5bb88 SHA512 906d90b9a8c8e17d0841a1e822ae1842e046fa2943c888257d2db80da7706e2861bb1305f332bc5d95bcd8f396a47921c5f6b20c26752323cdd6bb3ab37c6f76
+DIST i3lock-color-2.12_rc2.tar.gz 207936 BLAKE2B f86224a471733eec0b4db0c501277153ebcb89f9f0cf124591d7af46f8cfeb10cd21b0ff6da1ba2fa3930e820abab03d02338d1d255f88fcf0b64b8b04f12d7b SHA512 75bac65ad054fbe6021bdb2307eea283beb7f861efba8a4aaf8c082c8ce08c17d2088f5e6e7ca016234c4c280bc776c83d02b6788ab984980e4ca6cc851e80cc
diff --git a/x11-misc/i3lock-color/i3lock-color-2.12_p1.ebuild b/x11-misc/i3lock-color/i3lock-color-2.12_rc2.ebuild
similarity index 97%
rename from x11-misc/i3lock-color/i3lock-color-2.12_p1.ebuild
rename to x11-misc/i3lock-color/i3lock-color-2.12_rc2.ebuild
index be56488c83..9fa9f5bd5c 100644
--- a/x11-misc/i3lock-color/i3lock-color-2.12_p1.ebuild
+++ b/x11-misc/i3lock-color/i3lock-color-2.12_rc2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-MY_PV="${PV//_p1/.c.1}"
+MY_PV="${PV//_rc2/.c.2}"
 
 DESCRIPTION="Improved i3lock with color customization"
 HOMEPAGE="https://github.com/Raymo111/i3lock-color"