diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index f6992aa52..577aa2a85 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1,2 +1,2 @@
-DIST cairo-dock-3.1.2.tar.gz 2449689 SHA256 a6600f9805006ea5bbaa178e2df16540130eeca62775a7ab57e88d2c51b6f694 SHA512 c5738086930a47e2635b110af9f782c10e7d0692f0b3374f53255239660ed77ae236efe0d109260db2d96bddbc1f12f0e21f4215142cc470fcabfe4c9f4f465e WHIRLPOOL 57ed1db8b0557b5d51cb601e09c0cb1bf9b816f705a874a86fbc29747c18487873f0fe606283694f4a46e839d3e5e78063ec038956d656c0f9072c56ad1124cc
 DIST cairo-dock-3.3.2.tar.gz 2592341 SHA256 a2d3854771d7ef5b262593b37aed216ece7eeacfc3e2a08deb4a797f175f6af8 SHA512 0850011ffb84ba611b89330ae0ea9915aa79691fdc809d0282994024e9fcb7c29967300fa93b93d642dea20cc6f077577c40e11aca5c0d8d7e4f9d7994a4a447 WHIRLPOOL da4a0bf96a28520f5188fe36fba5079fe9c41676ab8ab82554f1607bc9d7d99580226a2942ef0f378faa8dd9704777a05b3d52515da6cb26530c3c2bb7c5d750
+DIST cairo-dock-3.4.1.tar.gz 2663098 SHA256 dcadbbe089487f22b112f25a91d1c966275b245f248f950c6987de787eb95137 SHA512 427bb11fe447e76d4b82c89023321cfa3ebb3fcc5f1309f5454fd43b650404acfd53d576ff4f46765c51d5360bb32bac1bf454e2762547d3de031baa9c081345 WHIRLPOOL b9c5406f450aea586ed9fd0578bc1d5adba28cd789535904e2ef7182eedd62033cf81229278f59dc30676964bc11e2e51b105ff2093b17215cc56ef287e0fac7
diff --git a/x11-misc/cairo-dock/cairo-dock-3.1.2.ebuild b/x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild
similarity index 74%
rename from x11-misc/cairo-dock/cairo-dock-3.1.2.ebuild
rename to x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild
index a35ceddda..0ca0372fc 100644
--- a/x11-misc/cairo-dock/cairo-dock-3.1.2.ebuild
+++ b/x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,9 +16,9 @@ SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="xcomposite"
+IUSE="crypt xcomposite desktop_manager gtk3"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib:2
 	dev-libs/libxml2:2
@@ -27,36 +27,35 @@ COMMON_DEPEND="
 	sys-apps/dbus
 	x11-libs/cairo
 	x11-libs/pango
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
+	!gtk3? ( x11-libs/gtk+:2 )
 	x11-libs/gtkglext
-	x11-libs/libXrandr
 	x11-libs/libXrender
+	gtk3? ( x11-libs/gtk+:3 )
+	crypt? ( sys-libs/glibc )
 	xcomposite? (
 		x11-libs/libXcomposite
 		x11-libs/libXinerama
 		x11-libs/libXtst
 	)
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	dev-util/intltool
-	sys-devel/gettext
 	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/wget
-	x11-apps/xwininfo
-	x11-terms/xterm
+	sys-devel/gettext
 "
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-runpath.patch"
+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"`
+	)
+	cmake-utils_src_configure
 }
 
 pkg_postinst() {
 	elog "Additional plugins are available to extend the functionality"
 	elog "of Cairo-Dock. It is recommended to install at least"
-	elog "x11-plugins/cairo-dock-plugins-core."
+	elog "x11-pluings/cairo-dock-plugins."
 	elog
 	elog "Cairo-Dock is an app that draws on a RGBA GLX visual."
 	elog "Some users have noticed that if the dock is launched,"
diff --git a/x11-misc/cairo-dock/files/cairo-dock-runpath.patch b/x11-misc/cairo-dock/files/cairo-dock-runpath.patch
deleted file mode 100644
index 970858c9f..000000000
--- a/x11-misc/cairo-dock/files/cairo-dock-runpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- CMakeLists.txt	2013-02-22 11:38:10.686539486 +0100
-+++ CMakeLists.txt.new	2013-02-22 11:38:45.060912985 +0100
-@@ -49,6 +49,7 @@
- 	message(FATAL_ERROR "Cairo-Dock requires an air-conditioned room. Please close Windows!")
- endif( WIN32 )
- 
-+set (CMAKE_SKIP_RPATH TRUE)
- set (PACKAGE ${CMAKE_PROJECT_NAME})
- set (GETTEXT_PACKAGE ${PACKAGE})
- 
diff --git a/x11-plugins/cairo-dock-plugins/Manifest b/x11-plugins/cairo-dock-plugins/Manifest
index d8e7c9ac8..a8d35d1d5 100644
--- a/x11-plugins/cairo-dock-plugins/Manifest
+++ b/x11-plugins/cairo-dock-plugins/Manifest
@@ -1 +1 @@
-DIST cairo-dock-plugins-3.3.2.tar.gz 6838900 SHA256 48f0caddb0a563d8a64176f66610ca35df5c952071e5574486d39bb574994643 SHA512 ccf38032261668cd5012d5a521c42ed7279b7f0f33c1b52cfbb90d66927f9c3487eada29057349206b051f979fdbd9b3c83319647ce721712333ca1c3284bf9f WHIRLPOOL 2a7f7f1040766d2953740459c8ddbbf2173470c4fa5b77ba350605d448bc999e9268f695b9657e4608f7152eb9de829920253e4645338e9a3966948b395be9d5
+DIST cairo-dock-plug-ins-3.4.1.tar.gz 6827195 SHA256 e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e SHA512 0b6ab8f06f8e7f24787a6b87531434286276a3a626fcd31a136ff1e256241fbea96a72b673fd8a05bd5be772f6c3abcb7c593e30784c183f7be0c5b373e96f03 WHIRLPOOL fb083ad8d496ded403cbfb73e2a181350f00d3863ef4b119fe4442abd9d6c7d90743171663cf05c1ceef2e56adf51217d4e562c9a189a1550abac82cc23046b6
diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.3.2.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild
similarity index 85%
rename from x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.3.2.ebuild
rename to x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild
index a89d8c549..93c58707f 100644
--- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.3.2.ebuild
+++ b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="5"
 
 inherit cmake-utils eutils versionator
 
@@ -11,7 +11,7 @@ MM_PV=$(get_version_component_range '1-2')
 
 DESCRIPTION="Official plugins for cairo-dock"
 HOMEPAGE="http://www.glx-dock.org"
-SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
+SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -25,7 +25,7 @@ RDEPEND="
 	gnome-base/librsvg:2
 	sys-apps/dbus
 	x11-libs/cairo
-	x11-libs/gtk+:2
+	!gtk3? ( x11-libs/gtk+:2 )
 	x11-libs/gtkglext
 	~x11-misc/cairo-dock-${PV}
 	gtk3? ( x11-libs/gtk+:3 )
@@ -34,8 +34,8 @@ RDEPEND="
 	gmenu? ( gnome-base/gnome-menus )
 	kde? ( kde-base/kdelibs )
 	terminal? ( x11-libs/vte )
-	vala? ( dev-lang/vala:0.12 )
-	webkit? ( >=net-libs/webkit-gtk-1.0 )
+	vala? ( dev-lang/vala )
+	webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )
 	xfce? ( xfce-base/thunar )
 	xgamma? ( x11-libs/libXxf86vm )
 	xklavier? ( x11-libs/libxklavier )
@@ -52,13 +52,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-libs/libdbusmenu[gtk3]
 "
-
-S="${WORKDIR}/${PN}-${PV}"
-
 src_configure() {
-	# broken with 0.99.x
 	mycmakeargs=(
+		# broken with 0.99.x (as of cairo-dock 3.3.2)
 		"-Denable-upower-support=OFF"
+		`use gtk3 && echo "-Dforce-gtk2=OFF" || echo "-Dforce-gtk2=ON"`
 	)
 	cmake-utils_src_configure
 }