diff --git a/games-util/multimc5/Manifest b/games-util/multimc5/Manifest
index 28f54c7..b6ccd70 100644
--- a/games-util/multimc5/Manifest
+++ b/games-util/multimc5/Manifest
@@ -1,5 +1,5 @@
 DIST multimc5-0.6.11.tar.gz 2555593 BLAKE2B e615fce5525bef1491fff93fdafac24dafb22fe214501b4e7d7024531c3613cf318e738a21b640f94c0b11c36fd7cabe1bad8b792fc4eb8272d0df67dc0c9e74 SHA512 0b6d0750d91cc69117d8543c5cd0ea48feb15cb97a269aa2f8bcc0341af6f1ae6c963754f60e62660f3bc0c59ec1b96b48fdd97cda56bf0bf01e28eb712c58b1
 DIST multimc5-0.6.8.tar.gz 2555147 BLAKE2B 631a4e4f3b0e8b8320ec0c30cda70eaad33db0ab44188354eaa7857d08122c0d849dc502dc67b62a31af31c296e8db3eb1b25f23f98c4bd5aa4bb978abb4c5be SHA512 d49626730f9f743d29e1e182695b761ee5a5875f27ab8453f69366bf943538189aeb0cdc7ed545da2577a7c03d4d209cd62508dd4f0924778a8baf7ec48bd725
-EBUILD multimc5-0.6.11.ebuild 752 BLAKE2B 8c417e145fc8a9428ee8edaa94960b097f9e38c70186250e4875e458685e4ad347fc151e3b673e60b08aa397684e09407bdc4c4e824970a3db32c640419e2ce9 SHA512 46759c84c95a8234383d2716adcdeb6d155c1da59aa28f69dbceac9796a1c9ac2d3009ddf478f9795edbb9b15fd5ebda89bcf3d271e0ec4bf3f5fabf53ee9062
-EBUILD multimc5-0.6.8.ebuild 752 BLAKE2B 8c417e145fc8a9428ee8edaa94960b097f9e38c70186250e4875e458685e4ad347fc151e3b673e60b08aa397684e09407bdc4c4e824970a3db32c640419e2ce9 SHA512 46759c84c95a8234383d2716adcdeb6d155c1da59aa28f69dbceac9796a1c9ac2d3009ddf478f9795edbb9b15fd5ebda89bcf3d271e0ec4bf3f5fabf53ee9062
-EBUILD multimc5-9999.ebuild 752 BLAKE2B 8c417e145fc8a9428ee8edaa94960b097f9e38c70186250e4875e458685e4ad347fc151e3b673e60b08aa397684e09407bdc4c4e824970a3db32c640419e2ce9 SHA512 46759c84c95a8234383d2716adcdeb6d155c1da59aa28f69dbceac9796a1c9ac2d3009ddf478f9795edbb9b15fd5ebda89bcf3d271e0ec4bf3f5fabf53ee9062
+EBUILD multimc5-0.6.11.ebuild 740 BLAKE2B 3f833949df2ff119aaffe1c304ffceb0187516fc387fb071e1d49cf483e448da65540a9f5086b0385abefb387e3bf5472b78f4ce6a05cc6eb8e770981d289033 SHA512 cab8d8c352fb2f09cf17131f3f0dc450bcf3aae7b17672604b195043d2b71abb576064f591f2f55bf485a281d5048d8407ea61a0ef73c4430f1291e8cbd8da40
+EBUILD multimc5-0.6.8.ebuild 740 BLAKE2B 3f833949df2ff119aaffe1c304ffceb0187516fc387fb071e1d49cf483e448da65540a9f5086b0385abefb387e3bf5472b78f4ce6a05cc6eb8e770981d289033 SHA512 cab8d8c352fb2f09cf17131f3f0dc450bcf3aae7b17672604b195043d2b71abb576064f591f2f55bf485a281d5048d8407ea61a0ef73c4430f1291e8cbd8da40
+EBUILD multimc5-9999.ebuild 740 BLAKE2B 3f833949df2ff119aaffe1c304ffceb0187516fc387fb071e1d49cf483e448da65540a9f5086b0385abefb387e3bf5472b78f4ce6a05cc6eb8e770981d289033 SHA512 cab8d8c352fb2f09cf17131f3f0dc450bcf3aae7b17672604b195043d2b71abb576064f591f2f55bf485a281d5048d8407ea61a0ef73c4430f1291e8cbd8da40
diff --git a/games-util/multimc5/multimc5-0.6.11.ebuild b/games-util/multimc5/multimc5-0.6.11.ebuild
index c3333a8..4b8abb1 100644
--- a/games-util/multimc5/multimc5-0.6.11.ebuild
+++ b/games-util/multimc5/multimc5-0.6.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://files.2a03.party/~flewkey/distfiles/${P}.tar.gz"
@@ -34,5 +34,5 @@ src_configure() {
 		"-DCMAKE_INSTALL_PREFIX:PATH=/usr"
 		"-DMultiMC_LAYOUT:STRING=lin-system"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/games-util/multimc5/multimc5-0.6.8.ebuild b/games-util/multimc5/multimc5-0.6.8.ebuild
index c3333a8..4b8abb1 100644
--- a/games-util/multimc5/multimc5-0.6.8.ebuild
+++ b/games-util/multimc5/multimc5-0.6.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://files.2a03.party/~flewkey/distfiles/${P}.tar.gz"
@@ -34,5 +34,5 @@ src_configure() {
 		"-DCMAKE_INSTALL_PREFIX:PATH=/usr"
 		"-DMultiMC_LAYOUT:STRING=lin-system"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/games-util/multimc5/multimc5-9999.ebuild b/games-util/multimc5/multimc5-9999.ebuild
index c3333a8..4b8abb1 100644
--- a/games-util/multimc5/multimc5-9999.ebuild
+++ b/games-util/multimc5/multimc5-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://files.2a03.party/~flewkey/distfiles/${P}.tar.gz"
@@ -34,5 +34,5 @@ src_configure() {
 		"-DCMAKE_INSTALL_PREFIX:PATH=/usr"
 		"-DMultiMC_LAYOUT:STRING=lin-system"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-plugins/geonkick/Manifest b/media-plugins/geonkick/Manifest
index 3ec53a0..c701696 100644
--- a/media-plugins/geonkick/Manifest
+++ b/media-plugins/geonkick/Manifest
@@ -1,4 +1,4 @@
 AUX fix_libdir.patch 1750 BLAKE2B d50557ac373f3b328d2467a9a583a50a76a258f40cc6051c1a535087aa42b5fb28b89526dbdb168f93a1a7c592c0a2c63bfbfadaaa05edcad716da6288432ff1 SHA512 d7a9deda5543754043e2d40db6be31bfd0844943dfdff178500d140bd26e6573836b7c154856c3d0c8147678a717eb51263f1ade27e13918d5e22b0f643dd999
 DIST geonkick-2.2.3.tar.gz 1973800 BLAKE2B 9d2cf0db0155bb1cb7800542f8908cdb838018492630e018f9ee3a31632dc1ed9a344b950d1273f978e149469a851b4ab84a9b7842471a4c03c66c4e5e67ffe6 SHA512 4867244db1f2ae31cc36b8985da038831f88e105e47545741d98654e419fcd064d7fb9a5fbe057b77faae6dcfadebafa206f5bb6f873c54ca3ed74e0313b8c72
-EBUILD geonkick-2.2.3.ebuild 850 BLAKE2B f21c88469129578688ece0998e04cfc4f9a5000667c8091415d42ff53c50f7582de49370483229687e5ae7faf5f75672f96ce45d43f6ca6e51ced55d0b372173 SHA512 f4704dbf7aae8bec47d643de0f111f204c6f927b7709172bf367065e339fbcbb3236d75880f51d47ec41ebef632358e7b440f02ce1fcac35d687e1f72b42bb3c
-EBUILD geonkick-9999.ebuild 806 BLAKE2B 503459615dc6bed8795025ca0617eff30b78944cf7edf049d2274dcf047ab2dcae19a0eacbbec90a42fe0ce3cc0009c6e4413e52866a60cf264c621c62898e62 SHA512 fa7d85ba6e9f01b8d3cc426b811ab507b2b8f0fd1cffa41b2b8900b5602b8bd8740b6a14d9a09698fac4decd65063019108a83f9bdc69964e2c61b0ef95a69f4
+EBUILD geonkick-2.2.3.ebuild 844 BLAKE2B a6d364320cd361241ecba12df6a45b5720adece387ec961d648426f5645506ae18453b7560fe40cc3c759379befdf5b30eaf2b1d2b4d24da0f33a719f5e8694d SHA512 bd406281b0272c49ee0e8115ed16174693e4cd031d9701c0deb8b1478e9bc38a48226b0724cb7335682d2528a1cebca17ead23078dee8907a8f018dabaee5559
+EBUILD geonkick-9999.ebuild 800 BLAKE2B 30936b2bf05bc5c808852e5893f8f3d54efa1977d85b533d5a37f8e3f41fe24bb9f381ebda2b7d1707ea9beaa3e782cebad16e08e8a89f7f138dbd86baba6ecd SHA512 abf36e7f320bca757d41d16800f039c195183eb56f516fc797819e4566b58cbcb6b2885b722029abadbf58ad7b4d642e8b2131f366699e98583a4898c1e6f8ce
diff --git a/media-plugins/geonkick/geonkick-2.2.3.ebuild b/media-plugins/geonkick/geonkick-2.2.3.ebuild
index 2a5e8b7..28c3ae9 100644
--- a/media-plugins/geonkick/geonkick-2.2.3.ebuild
+++ b/media-plugins/geonkick/geonkick-2.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/iurie-sw/geonkick/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
diff --git a/media-plugins/geonkick/geonkick-9999.ebuild b/media-plugins/geonkick/geonkick-9999.ebuild
index d84cc41..6fc73c3 100644
--- a/media-plugins/geonkick/geonkick-9999.ebuild
+++ b/media-plugins/geonkick/geonkick-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/iurie-sw/geonkick/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
diff --git a/x11-libs/redkite/Manifest b/x11-libs/redkite/Manifest
index bc0954b..42b40b3 100644
--- a/x11-libs/redkite/Manifest
+++ b/x11-libs/redkite/Manifest
@@ -1,3 +1,3 @@
 DIST redkite-1.0.0.tar.gz 143785 BLAKE2B d25271823d352d1d4e4e7b0b91f01eb87a80546e1d70403081d718afc9b8cb2f1c91d5f851ded0e339b6f984ee88c5c96c24bbd06045ee4fa510a6b963a1c04f SHA512 4dabd8c75a06caf59e87bb7d65e5b8fb7a5200fcbc3ab79d6a4048cdbeca5364093b485195fe045e9b2ae892e2bfa2c50be83b0022c61ffc9cdd488faad9b349
-EBUILD redkite-1.0.0.ebuild 494 BLAKE2B cfa88013ef747fc3c2965d427ae928d8e75d737e8e3074e59498a4c0c6e73d2b5e05d94fe2c1ef4b8f04ab08aa85ef4f7a4f74a26023c92895a312b604f7adba SHA512 7cb35ce6f9b9a683a533d5818ef0397813f4e972299136b56701c77813ed4d5c6f6dfed9db1c025a7ec6202e180cf74a15db12c6c890a2fb54dbd57c354a3b43
-EBUILD redkite-9999.ebuild 494 BLAKE2B cfa88013ef747fc3c2965d427ae928d8e75d737e8e3074e59498a4c0c6e73d2b5e05d94fe2c1ef4b8f04ab08aa85ef4f7a4f74a26023c92895a312b604f7adba SHA512 7cb35ce6f9b9a683a533d5818ef0397813f4e972299136b56701c77813ed4d5c6f6dfed9db1c025a7ec6202e180cf74a15db12c6c890a2fb54dbd57c354a3b43
+EBUILD redkite-1.0.0.ebuild 488 BLAKE2B 5705f72237370af6d158cfcd67edaa305230ddb8cffa3ea359de960ec27e5288556f8e28c26572b5516df9865ae7ad262818bed5b77cfe9ad38877f4a0bb3d44 SHA512 e51952d8e03935dc9146f9aa9aef53c9ca0b1574c5e0146030338f83c4dab67366dc2b941aed4bacbb2bdf7acd4b7e058a5dc89dcd47de5d803dde5ba98f3c6f
+EBUILD redkite-9999.ebuild 488 BLAKE2B 5705f72237370af6d158cfcd67edaa305230ddb8cffa3ea359de960ec27e5288556f8e28c26572b5516df9865ae7ad262818bed5b77cfe9ad38877f4a0bb3d44 SHA512 e51952d8e03935dc9146f9aa9aef53c9ca0b1574c5e0146030338f83c4dab67366dc2b941aed4bacbb2bdf7acd4b7e058a5dc89dcd47de5d803dde5ba98f3c6f
diff --git a/x11-libs/redkite/redkite-1.0.0.ebuild b/x11-libs/redkite/redkite-1.0.0.ebuild
index a6dda7f..66f55b0 100644
--- a/x11-libs/redkite/redkite-1.0.0.ebuild
+++ b/x11-libs/redkite/redkite-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/iurie-sw/redkite/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
diff --git a/x11-libs/redkite/redkite-9999.ebuild b/x11-libs/redkite/redkite-9999.ebuild
index a6dda7f..66f55b0 100644
--- a/x11-libs/redkite/redkite-9999.ebuild
+++ b/x11-libs/redkite/redkite-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/iurie-sw/redkite/archive/v${PV}.tar.gz  -> ${P}.tar.gz"