diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index eb5a254..f4882a7 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1 +1 @@
-DIST cairo-dock-3.4.1.tar.gz 2663098 SHA256 dcadbbe089487f22b112f25a91d1c966275b245f248f950c6987de787eb95137 SHA512 427bb11fe447e76d4b82c89023321cfa3ebb3fcc5f1309f5454fd43b650404acfd53d576ff4f46765c51d5360bb32bac1bf454e2762547d3de031baa9c081345 WHIRLPOOL b9c5406f450aea586ed9fd0578bc1d5adba28cd789535904e2ef7182eedd62033cf81229278f59dc30676964bc11e2e51b105ff2093b17215cc56ef287e0fac7
+DIST cairo-dock-3.4.1.tar.gz 2663098 BLAKE2B ef2dc3d5f61c82245f91f6209ff0620009b9cd18bc1f5fe61a562ab7a7c5084ecd76245b2c2e77ebd0e91e100b5bb88e51797bad4b24b4e4d151f50385696c66 SHA512 427bb11fe447e76d4b82c89023321cfa3ebb3fcc5f1309f5454fd43b650404acfd53d576ff4f46765c51d5360bb32bac1bf454e2762547d3de031baa9c081345
diff --git a/x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild b/x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild
index a5630ec..8be4333 100644
--- a/x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild
+++ b/x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
-inherit cmake-utils eutils versionator
+inherit cmake
 
 MY_PN="${PN}-core"
-MM_PV=$(get_version_component_range '1-2')
+MM_PV=$(ver_cut '1-2')
 
 DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
 HOMEPAGE="http://www.glx-dock.org"
@@ -15,7 +15,7 @@ SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crypt xcomposite desktop_manager gtk3"
+IUSE="crypt xcomposite desktop_manager"
 
 RDEPEND="
 	dev-libs/dbus-glib
@@ -26,10 +26,9 @@ RDEPEND="
 	sys-apps/dbus
 	x11-libs/cairo
 	x11-libs/pango
-	!gtk3? ( x11-libs/gtk+:2 )
 	x11-libs/gtkglext
 	x11-libs/libXrender
-	gtk3? ( x11-libs/gtk+:3 )
+	x11-libs/gtk+:3
 	crypt? ( sys-libs/glibc )
 	xcomposite? (
 		x11-libs/libXcomposite
@@ -43,12 +42,24 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
 
+src_prepare() {
+	# We will install man files manually
+	sed -i -e '/add_subdirectory(man)/d' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
-	mycmakeargs=(
-		`use gtk3 && echo "-Dforce-gtk2=OFF" || echo "-Dforce-gtk2=ON"`
-		`use desktop_manager && echo "-Denable-desktop-manager=ON" || echo "-Denable-desktop-manager=OFF"`
+	local mycmakeargs=(
+		$(use desktop_manager && echo "-Denable-desktop-manager=ON" || echo "-Denable-desktop-manager=OFF")
+		-DCMAKE_INSTALL_MANDIR="/usr/share/man/${PV}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
+}
+
+src_install() {
+	newman data/man/cairo-dock_en.1 cairo-dock_en.1
+	cmake_src_install
 }
 
 pkg_postinst() {
diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild
index b5c86c0..9d83c91 100644
--- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild
+++ b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-utils eutils
+inherit cmake
 
 MY_PN="${PN/plugins/plug-ins}"
 MM_PV=$(ver_cut 1-2)
@@ -53,10 +53,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		"-Denable-alsa-mixer=$(usex alsa)"
-		"-Denable-sound-effects=$(usex alsa)"
+		-Denable-alsa-mixer=$(usex alsa)
+		-Denable-sound-effects=$(usex alsa)
 		# broken with 0.99.x (as of cairo-dock 3.3.2)
-		"-Denable-upower-support=OFF"
+		-Denable-upower-support=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }