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 93c58707f..14ca01e4f 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,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id $
 
-EAPI="5"
+EAPI="6"
 
 inherit cmake-utils eutils versionator
 
@@ -32,16 +32,16 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	exif? ( media-libs/libexif )
 	gmenu? ( gnome-base/gnome-menus )
-	kde? ( kde-base/kdelibs )
-	terminal? ( x11-libs/vte )
-	vala? ( dev-lang/vala )
+	kde? ( kde-frameworks/kdelibs )
+	terminal? ( x11-libs/vte:= )
+	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 )
 	gnote? ( app-misc/gnote )
 	twitter? ( dev-python/oauth dev-python/simplejson )
-	indicator3? ( dev-libs/libindicator )
+	indicator3? ( dev-libs/libindicator:= )
 	zeitgeist? ( dev-libs/libzeitgeist )
 	mail? ( net-libs/libetpan )
 "
diff --git a/x11-plugins/cairo-dock-plugins/metadata.xml b/x11-plugins/cairo-dock-plugins/metadata.xml
new file mode 100644
index 000000000..30e41f3f5
--- /dev/null
+++ b/x11-plugins/cairo-dock-plugins/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>skullbocks@sabayon.org</email>
+		<name>Francesco Ferretti</name>
+	</maintainer>
+	<longdescription>
+		Cairo-dock is a kind of dock applet, which doesn't depend on any gnome package.
+	</longdescription>
+	<use>
+		<flag name="gmenu">Add support for <pkg>gnome-base/gnome-menus</pkg>.</flag>
+		<flag name="gnote">Add support for <pkg>app-misc/gnote</pkg>.</flag>
+		<flag name="xgamma">Add support for <pkg>x11-libs/libXxf86vm</pkg>.</flag>
+		<flag name="indicator3">Add support for <pkg>dev-libs/libindicator</pkg>.</flag>
+		<flag name="gtk3">Link against version 3 of the GIMP Toolkit (x11-libs/gtk+).</flag>
+		<flag name="terminal">Enable terminal plugin.</flag>
+		<flag name="xfce">Add support for XFCE thunar.</flag>
+		<flag name="xklavier">Enable keyboard layout selection support using <pkg>x11-libs/libxklavier</pkg>.</flag>
+		<flag name="twitter">Enable Twitter support.</flag>
+		<flag name="zeitgeist">Add support for Zeitgeist event tracking system.</flag>
+		<flag name="mail">Add an extension to support e-mail functionality.</flag>
+	</use>
+</pkgmetadata>