Bump versions of x11-misc/cairo-dock and x11-plugins/cairo-dock-plugins, ebuilds from Sabayon

x11-misc/cairo-dock/Manifest

@@ -1 +1 @@
-DIST cairo-dock-2.3.0~2.tar.gz 2478211 SHA256 d79b52590068128482588765795092db32b28005371bd76f8bb0fad48b281ff8
+DIST cairo-dock-3.4.1.tar.gz 2663098 SHA256 dcadbbe089487f22b112f25a91d1c966275b245f248f950c6987de787eb95137 SHA512 427bb11fe447e76d4b82c89023321cfa3ebb3fcc5f1309f5454fd43b650404acfd53d576ff4f46765c51d5360bb32bac1bf454e2762547d3de031baa9c081345 WHIRLPOOL b9c5406f450aea586ed9fd0578bc1d5adba28cd789535904e2ef7182eedd62033cf81229278f59dc30676964bc11e2e51b105ff2093b17215cc56ef287e0fac7

x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild

@@ -1,47 +1,36 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="2"
+EAPI="6"
 
 inherit cmake-utils eutils versionator
 
 MY_PN="${PN}-core"
-MY_PV=$(replace_version_separator 3 '~')
 MM_PV=$(get_version_component_range '1-2')
-MMD_PV=$(get_version_component_range '1-3')
 
 DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
-HOMEPAGE="https://launchpad.net/cairo-dock-core/"
-SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz"
+HOMEPAGE="http://www.glx-dock.org"
+SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="xcomposite"
-
-#"libcurl"
-#"gthread-2.0"
-
-#"dbus-glib-1"
-#"libxml-2.0"
-#"librsvg-2.0"
-#"dbus-1"
-#"cairo"
-#"gtk+-2.0"
-#"gtkglext-1.0"
-#"xrender"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt xcomposite desktop_manager gtk3"
 
 RDEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib:2
-	dev-libs/libxml2
-	gnome-base/librsvg
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	net-misc/curl
 	sys-apps/dbus
 	x11-libs/cairo
-	x11-libs/gtk+:2
+	x11-libs/pango
+	!gtk3? ( x11-libs/gtk+:2 )
 	x11-libs/gtkglext
 	x11-libs/libXrender
+	gtk3? ( x11-libs/gtk+:3 )
+	crypt? ( sys-libs/glibc )
 	xcomposite? (
 		x11-libs/libXcomposite
 		x11-libs/libXinerama
@@ -50,21 +39,23 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	sys-devel/gettext
 "
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-rpath.patch" || die
+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
 }
 
-#src_configure() {
-#	econf $(use_enable xcomposite xextend)
-#}
-
 pkg_postinst() {
+	elog "Additional plugins are available to extend the functionality"
+	elog "of Cairo-Dock. It is recommended to install at least"
+	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,"
 	elog "severals qt4-based applications could crash, like skype or vlc."

x11-misc/cairo-dock/files/cairo-dock-2.3.0.2-rpath.patch

@@ -1,14 +0,0 @@
-diff -urN cairo-dock-2.2.0-4/src/gldit/CMakeLists.txt cairo-dock-2.2.0-4-new//src/gldit/CMakeLists.txt
---- cairo-dock-2.2.0-4/src/gldit/CMakeLists.txt	2010-10-30 19:13:36.000000000 +0000
-+++ cairo-dock-2.2.0-4-new//src/gldit/CMakeLists.txt	2010-10-30 19:27:45.000000000 +0000
-@@ -84,9 +84,7 @@
- link_directories(
- 	${PACKAGE_LIBRARY_DIRS}
- 	${XEXTEND_LIBRARY_DIRS}
--	${CMAKE_SOURCE_DIR}/src/gldit
--	${CMAKE_SOURCE_DIR}/src/icon-factory
--	${CMAKE_SOURCE_DIR}/src/implementations)
-+	)
- 
- # Define the library
- add_library ("gldi" SHARED ${core_lib_SRCS})