diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index 95d5cbd..8bc9bdb 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1,4 +1,2 @@
-DIST cairo-dock-3.3.2.tar.gz 2592341 SHA256 a2d3854771d7ef5b262593b37aed216ece7eeacfc3e2a08deb4a797f175f6af8 SHA512 0850011ffb84ba611b89330ae0ea9915aa79691fdc809d0282994024e9fcb7c29967300fa93b93d642dea20cc6f077577c40e11aca5c0d8d7e4f9d7994a4a447 WHIRLPOOL da4a0bf96a28520f5188fe36fba5079fe9c41676ab8ab82554f1607bc9d7d99580226a2942ef0f378faa8dd9704777a05b3d52515da6cb26530c3c2bb7c5d750
 DIST cairo-dock-3.4.0.tar.gz 2662360 SHA256 7843390bddce79497343e8bd3b8fbe528b7c6a65968d31595fd62ee12e284270 SHA512 a7ba6d7b8e3ecc888fceb235a378fdb7185dc07f04566d69f8c6b21ca7c567ca4c3cd2550d10d7459750cf69617012d542b15756e447cadf50f73d4e5e3c3a1a WHIRLPOOL fda71dd6ff192639d85dd6874a094e821113e3e5d353d66670086f4259bcca10de73653bd51ebe900eba95507fc5eba810a51257f8dfb48c564fdcf3a4e1e13b
-EBUILD cairo-dock-3.3.2.ebuild 1584 SHA256 3c401525288d35a4feb7f6182ccff923833fe45b549b85aace3843959f3851a5 SHA512 613eb75d8a9a97f0973da3bd34ce58850794c3021aac55980b2987ff84a72420ef3cac78725853b29ba258f89b766cb20479ecba05a40a1413813b76c1b92a2a WHIRLPOOL 40615edfcd1488f1555d6482c17796470dc87efa32d127f8b4059fa77393adeab53f5e0a7624f0c1fc9211b4295a9f0dcdc23d238c83e77c6254ec9720b01df6
 EBUILD cairo-dock-3.4.0.ebuild 1552 SHA256 ad55a88f605c0cc2dc0c26039f3a7d4569d231947ca211c668baaa054c52b543 SHA512 00f8ca8b1402c3848a2339c7400e3864184f52124db2fd61a14be09af9b5d8e10fdc60e900cef4452624e02ca8749d4f2a9ae355907c0e8b84f843caf2e67775 WHIRLPOOL 6bd91955f66d24a4e3211b6351d437deccce6136d5ae4d8328f15126aff714a680265b90a96b753b6c47e288997fc8fda47d3b32d007385db5ebdc1eaf4df9db
diff --git a/x11-misc/cairo-dock/cairo-dock-3.3.2.ebuild b/x11-misc/cairo-dock/cairo-dock-3.3.2.ebuild
deleted file mode 100644
index 347863c..0000000
--- a/x11-misc/cairo-dock/cairo-dock-3.3.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit cmake-utils eutils versionator
-
-MY_PN="${PN}-core"
-MM_PV=$(get_version_component_range '1-2')
-
-DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
-HOMEPAGE="http://www.glx-dock.org"
-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 gtk3"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	gnome-base/librsvg:2
-	net-misc/curl
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/pango
-	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
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-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."
-	elog "If you have this problem, add the following line into your bashrc :"
-	echo
-	elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'"
-	elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details."
-}
diff --git a/x11-plugins/cairo-dock-plugins/Manifest b/x11-plugins/cairo-dock-plugins/Manifest
index d98ebb3..0df8b41 100644
--- a/x11-plugins/cairo-dock-plugins/Manifest
+++ b/x11-plugins/cairo-dock-plugins/Manifest
@@ -1,6 +1,2 @@
-AUX cairo-dock-plugins-3.3.2-upower-099-r3083-modified.patch 4080 SHA256 064a74d95e8b4015702049b4b4304938a745ebc65286ecb1c954344b5b23a8a8 SHA512 13d92fb83acc5cd9b729448c9f9141f130b159daf0eb5a20ce9419a639e6c1912915e7955dec4de6280b1bb5c6db6cbe9b9e2a8551018451ae4431e273e631d0 WHIRLPOOL 997e22c65a8b583cacf1ba233cf7ec9ade0bfdafc5eabba7d3b8912ef2091338d9a4cc1fdc9e925df2e78fc8309b246d9492bdbee208afc0c68d5192a610c763
-AUX cairo-dock-plugins-3.3.2-upower-099-r3084-modified.patch 6777 SHA256 8475e0a5e3e961d657df9b9a33ad0e5571eacdc88895f926928b96bb03973a78 SHA512 dd10052cace8e1d7aae65e65c12815490c97a2cca86e609fd269632f0a2a4e0a07d3d91a7a70a46cb9616b06e7322960da6ebd030a826b9a4a60f65eee2814ad WHIRLPOOL 3ad8db32c93493d5998d13d47ca9cae4bc88a6ba4ddff2de999aa15359bbd5f7b88812c7ceb0e4e6dc54f9a2763d1b06e9ffac34febe02009db3c26964628e2b
-DIST cairo-dock-plugins-3.3.2.tar.gz 6838900 SHA256 48f0caddb0a563d8a64176f66610ca35df5c952071e5574486d39bb574994643 SHA512 ccf38032261668cd5012d5a521c42ed7279b7f0f33c1b52cfbb90d66927f9c3487eada29057349206b051f979fdbd9b3c83319647ce721712333ca1c3284bf9f WHIRLPOOL 2a7f7f1040766d2953740459c8ddbbf2173470c4fa5b77ba350605d448bc999e9268f695b9657e4608f7152eb9de829920253e4645338e9a3966948b395be9d5
 DIST cairo-dock-plugins-3.4.0.tar.gz 6819610 SHA256 7ffcf40f07cd05bef826ad47f1f11940b9813d279c9e5117384f14f1f32d8dbd SHA512 4e0de372719385e559735238ce944adbb7d6c0c734fde18a5d19e95c3ddef59131848a6d0b1b535faadd3629a48ae47ce032124b348af99106d238f5add2e3eb WHIRLPOOL d0b44be61a2e412ddb7e24f547e29115bf46fb1ab9c10cccf2bf76f9699f322cb5272a588edbb83449e5effd7833c0d2117ab241df4457ebca51d3b51e8b12b0
-EBUILD cairo-dock-plugins-3.3.2.ebuild 1769 SHA256 c56e94e35fe4e6fe8dfef0af36df6c363d1b2c6b6a32fe6b245cbfe92fb06dea SHA512 864ac7740d69e9eb42188f4af5c8f758ca677b89a7e21b4b0a9c55cadf6c435b7f63ad9be6825a48379e8c3d3e30f590143fb09e0e74ec6d3d5f670dcb83fe7e WHIRLPOOL 56eaedf4bcd4dfd36ee842e11389348208b28458fc04a4bc1c2a23d08ec7f3ed608c242b19c4ac79890ba9f8880fb23e2fa84e657275c0a27cd6b4da6b3d737e
 EBUILD cairo-dock-plugins-3.4.0.ebuild 1556 SHA256 b4ccfe2f0f8351ca691fc0c7e0ffebae1f65bdcd501ab7bc19b83e01f1cb37d8 SHA512 86ca9cd2353593f3e9b792bc04633e0fa5a66fd011bfd0ac763d3e7bfe2f9852d8377031b8b288206c82122887c7c64f7af9bacb594ecfe625bc41f630de52f7 WHIRLPOOL 8278e1fd3284637cc20b1f6abf569a350283bd623d6f91ed7fdbf82f464295ccdaf011d41e28b46de2c488a7d1f29fad94357023a6d74b68d5c62d9caa27d27b
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.3.2.ebuild
deleted file mode 100644
index e519575..0000000
--- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.3.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit cmake-utils eutils versionator
-
-MY_PN="${PN/plugins/plug-ins}"
-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/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa exif gmenu gtk3 kde terminal gnote vala webkit xfce xgamma xklavier twitter indicator3 zeitgeist mail upower"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2
-	gnome-base/librsvg:2
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-	~x11-misc/cairo-dock-${PV}
-	gtk3? ( x11-libs/gtk+:3 )
-	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:0.12 )
-	webkit? ( >=net-libs/webkit-gtk-1.0 )
-	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 )
-	zeitgeist? ( dev-libs/libzeitgeist )
-	mail? ( net-libs/libetpan )
-	upower? ( sys-power/upower )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	dev-libs/libdbusmenu:3[gtk]
-"
-
-src_prepare() {
-	# Patch to disable features with upower > 0.99
-	epatch "${FILESDIR}/${P}-upower-099-r3083-modified.patch"
-	epatch "${FILESDIR}/${P}-upower-099-r3084-modified.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(use upower && echo "-Denable-upower-support=ON" || echo "-Denable-upower-support=OFF")
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3083-modified.patch b/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3083-modified.patch
deleted file mode 100644
index 1ec08e3..0000000
--- a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3083-modified.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- cairo-dock-plugins-3.3.2/CMakeLists.txt.upower0	2013-10-29 19:27:30.000000000 +0900
-+++ cairo-dock-plugins-3.3.2/CMakeLists.txt	2014-06-16 14:00:42.543802818 +0900
-@@ -152,6 +152,14 @@
- set (shared_filesdatadir "${pluginsdatadir}/shared-files")
- add_subdirectory (shared-files)
- 
-+
-+
-+################################################################################
-+#          STATIC LIBS AND DEPENDENCES USED BY MORE THAN ONE PLUG-IN           #
-+################################################################################
-+
-+
-+
- ############# STATIC LIBRARIES ################
- message (STATUS "> Static Libraries:")
- 
-@@ -337,6 +345,29 @@
- 	endif()
- endif()
- 
-+############# UPOWER #####################
-+message (STATUS "> UPower:")
-+enable_if_not_defined (enable-upower-support)
-+if (enable-upower-support)
-+	pkg_check_modules (UPOWER upower-glib)  # useful for Powermanager too.
-+endif()
-+if (UPOWER_FOUND)
-+	set (with_upower_support yes)
-+	STRING (REGEX REPLACE "\\..*" "" UPOWER_MAJOR "${UPOWER_VERSION}") # 2.28.3 => 2
-+	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" UPOWER_MINOR "${UPOWER_VERSION}")  # 2.28.3 => 2.28
-+	STRING (REGEX REPLACE "\\.[0-9]*" "" UPOWER_MINOR "${UPOWER_MINOR}") # 2.28 => 28
-+	if (${UPOWER_MAJOR} GREATER 0 OR ${UPOWER_MINOR} GREATER 89)
-+		message (STATUS "   Your version of UPower no longer supports logout features")
-+	else()
-+		set (UPOWER_SUPPORTS_LOGOUT 1)
-+	endif()
-+else()
-+	set (with_upower_support no)
-+	message (STATUS "Could not find upower-glib; Logout and PowerManager plugin won't be built with UPower support.")
-+	message (WARNING "This module is required to compile LogOut and PowerManager applet with UPower support: upower-glib")
-+	set (MODULES_MISSING "${MODULES_MISSING} upower-glib")
-+endif()
-+
- ############# DISTRIBUTION #################
- message (STATUS "> Distribution:")
- # We try to detect if the user is on Ubuntu to know which bus we have to use...
-@@ -965,18 +996,6 @@
- 
- ############# LOGOUT #################
- message (STATUS "> Logout:")
--enable_if_not_defined (enable-upower-support)
--if (enable-upower-support)
--	pkg_check_modules (UPOWER upower-glib)  # useful for Powermanager too.
--endif()
--if (UPOWER_FOUND)
--	set (with_upower_support yes)
--else()
--	set (with_upower_support no)
--	message (STATUS "Could not find upower-glib; Logout and PowerManager plugin won't be built with UPower support.")
--	message (WARNING "This module is required to compile LogOut and PowerManager applet with UPower support: upower-glib")
--	set (MODULES_MISSING "${MODULES_MISSING} upower-glib")
--endif()
- set (GETTEXT_LOGOUT ${GETTEXT_PLUGINS})
- set (VERSION_LOGOUT "2.0.3")
- set (PACKAGE_LOGOUT "cd-logout")
---- cairo-dock-plugins-3.3.2/logout/src/CMakeLists.txt.upower0	2013-10-03 20:04:33.000000000 +0900
-+++ cairo-dock-plugins-3.3.2/logout/src/CMakeLists.txt	2014-06-16 14:01:03.155216380 +0900
-@@ -20,22 +20,29 @@
- add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_LOGOUT}")
- add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
- add_definitions (-DMY_APPLET_ICON_FILE="icon.svg")
--if (${UPOWER_FOUND})
--	add_definitions (-DCD_UPOWER_AVAILABLE="1")
--endif()
- 
-+if (UPOWER_SUPPORTS_LOGOUT)
-+       add_definitions (-DCD_UPOWER_AVAILABLE="1")
-+
-+               include_directories (
-+               ${UPOWER_INCLUDE_DIRS}
-+               ${PACKAGE_INCLUDE_DIRS})
-+
-+       link_directories (
-+               ${UPOWER_LIBRARY_DIRS}
-+               ${PACKAGE_LIBRARY_DIRS})
-+
-+       target_link_libraries (${PACKAGE_LOGOUT}
-+               ${UPOWER_LIBRARIES}
-+               ${PACKAGE_LIBRARIES})
-+else()
-+       include_directories (${PACKAGE_INCLUDE_DIRS})
- 
--include_directories (
--	${UPOWER_INCLUDE_DIRS}
--	${PACKAGE_INCLUDE_DIRS})
--
--link_directories (
--	${UPOWER_LIBRARY_DIRS}
--	${PACKAGE_LIBRARY_DIRS})
--
--target_link_libraries (${PACKAGE_LOGOUT}
--	${UPOWER_LIBRARIES}
--	${PACKAGE_LIBRARIES})
-+       link_directories (${PACKAGE_LIBRARY_DIRS})
-+
-+       target_link_libraries (${PACKAGE_LOGOUT}
-+               ${PACKAGE_LIBRARIES})
-+endif()
- 
- ########### install files ###############
- 
diff --git a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3084-modified.patch b/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3084-modified.patch
deleted file mode 100644
index 5263a59..0000000
--- a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.3.2-upower-099-r3084-modified.patch
+++ /dev/null
@@ -1,204 +0,0 @@
---- cairo-dock-plugins-3.3.2/CMakeLists.txt.upower1	2014-06-16 14:01:49.819680691 +0900
-+++ cairo-dock-plugins-3.3.2/CMakeLists.txt	2014-06-16 14:01:49.821680926 +0900
-@@ -357,9 +357,10 @@
- 	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" UPOWER_MINOR "${UPOWER_VERSION}")  # 2.28.3 => 2.28
- 	STRING (REGEX REPLACE "\\.[0-9]*" "" UPOWER_MINOR "${UPOWER_MINOR}") # 2.28 => 28
- 	if (${UPOWER_MAJOR} GREATER 0 OR ${UPOWER_MINOR} GREATER 89)
--		message (STATUS "   Your version of UPower no longer supports logout features")
-+		message (STATUS "   Your version of UPower no longer supports suspend/hibernate features")
-+		set (with_upower_support "yes (0.99+)")
- 	else()
--		set (UPOWER_SUPPORTS_LOGOUT 1)
-+		set (UPOWER_SUPPORTS_SUSPEND_HIBERNATE 1)
- 	endif()
- else()
- 	set (with_upower_support no)
---- cairo-dock-plugins-3.3.2/logout/src/CMakeLists.txt.upower1	2014-06-16 14:01:49.822681043 +0900
-+++ cairo-dock-plugins-3.3.2/logout/src/CMakeLists.txt	2014-06-16 14:02:34.010855358 +0900
-@@ -21,7 +21,7 @@
- add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
- add_definitions (-DMY_APPLET_ICON_FILE="icon.svg")
- 
--if (UPOWER_SUPPORTS_LOGOUT)
-+if (UPOWER_SUPPORTS_SUSPEND_HIBERNATE)
-        add_definitions (-DCD_UPOWER_AVAILABLE="1")
- 
-                include_directories (
---- cairo-dock-plugins-3.3.2/powermanager/src/CMakeLists.txt.upower1	2013-10-03 20:04:33.000000000 +0900
-+++ cairo-dock-plugins-3.3.2/powermanager/src/CMakeLists.txt	2014-06-16 14:01:49.822681043 +0900
-@@ -25,7 +25,10 @@
- add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
- add_definitions (-DMY_APPLET_ICON_FILE="icon.png")
- if (${UPOWER_FOUND})
--	add_definitions (-DCD_UPOWER_AVAILABLE="1")
-+	add_definitions (-DCD_UPOWER_AVAILABLE=1)
-+	if (NOT UPOWER_SUPPORTS_SUSPEND_HIBERNATE)
-+		add_definitions (-DCD_UPOWER_0_99=1)
-+	endif()
- endif()
- 
- include_directories (
---- cairo-dock-plugins-3.3.2/powermanager/src/powermanager-menu-functions.c.upower1	2013-10-03 20:04:33.000000000 +0900
-+++ cairo-dock-plugins-3.3.2/powermanager/src/powermanager-menu-functions.c	2014-06-16 14:01:49.822681043 +0900
-@@ -90,19 +90,5 @@
- 	
- 	if (bAddSeparator)
- 		CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU);
--	
--	// Power actions (Hibernate/Suspend)
--	#ifdef CD_UPOWER_AVAILABLE  // if Upower is available, we should be able to suspend; if not, then it's probably just a problem with consolekit, which should be fixed by the user; so show the items to give the user a hint about the problem.
--	pMenuItem = CD_APPLET_ADD_IN_MENU (D_("Hibernate"), cd_power_hibernate, CD_APPLET_MY_MENU);
--	if (! cd_power_can_hibernate ())
--		gtk_widget_set_sensitive (pMenuItem, FALSE);
--	pMenuItem = CD_APPLET_ADD_IN_MENU (D_("Suspend"), cd_power_suspend, CD_APPLET_MY_MENU);
--	if (! cd_power_can_suspend ())
--		gtk_widget_set_sensitive (pMenuItem, FALSE);
--	#else
--	if (cd_power_can_hibernate ())
--		CD_APPLET_ADD_IN_MENU (D_("Hibernate"), cd_power_hibernate, CD_APPLET_MY_MENU);
--	if (cd_power_can_suspend ())
--		CD_APPLET_ADD_IN_MENU (D_("Suspend"), cd_power_suspend, CD_APPLET_MY_MENU);
--	#endif
-+
- CD_APPLET_ON_BUILD_MENU_END
---- cairo-dock-plugins-3.3.2/powermanager/src/powermanager-struct.h.upower1	2013-10-03 20:04:33.000000000 +0900
-+++ cairo-dock-plugins-3.3.2/powermanager/src/powermanager-struct.h	2014-06-16 14:01:49.823681160 +0900
-@@ -22,10 +22,6 @@
- 
- #include <cairo-dock.h>
- #ifdef CD_UPOWER_AVAILABLE
--/* to access suspend/resume functionality on Upower 0.9
-- * even if we use first logind, we only use logind via DBus
-- */
--#define UPOWER_ENABLE_DEPRECATED
- #include <upower.h>
- #endif
- 
---- cairo-dock-plugins-3.3.2/powermanager/src/powermanager-upower.c.upower1	2013-10-03 20:04:33.000000000 +0900
-+++ cairo-dock-plugins-3.3.2/powermanager/src/powermanager-upower.c	2014-06-16 14:01:49.823681160 +0900
-@@ -48,7 +48,11 @@
- 	UpClient *pUPowerClient = up_client_new ();
- 	
- 	// get the list of devices.
--	if (pUPowerClient == NULL || ! up_client_enumerate_devices_sync (pUPowerClient, NULL, NULL))
-+	if (pUPowerClient == NULL
-+	#ifndef CD_UPOWER_0_99 // no longer available with UPower 0.99+
-+		|| ! up_client_enumerate_devices_sync (pUPowerClient, NULL, NULL)
-+	#endif
-+		)
- 	{	
- 		cd_warning ("couldn't get devices from UPower daemon");
- 		if (pUPowerClient)
-@@ -182,6 +186,7 @@
- 	CD_APPLET_LEAVE ();
- }
- 
-+#ifndef CD_UPOWER_0_99 // no longer used with UPower 0.99+
- static void _on_device_changed (G_GNUC_UNUSED UpDevice *pDevice, G_GNUC_UNUSED gpointer data)
- {
- 	CD_APPLET_ENTER;
-@@ -194,6 +199,7 @@
- 	update_icon ();
- 	CD_APPLET_LEAVE ();
- }
-+#endif
- 
- // Can be launched the first time (with the Task) or when a device is added/removed after.
- static gboolean _cd_upower_update_state (CDSharedMemory *pSharedMemory)
-@@ -248,6 +254,7 @@
- 			g_free (cVendor);
- 			g_free (cModel);
- 
-+			#ifndef CD_UPOWER_0_99 // no longer used with UPower 0.99+
- 			if (myData.pTask != NULL // only the first time
- 				|| myData.pBatteryDeviceList == NULL // or if it's a new device
- 				|| g_list_find (myData.pBatteryDeviceList, pDevice) == NULL)
-@@ -262,6 +269,7 @@
- 				iSignalID = g_signal_connect (pDevice, "changed", G_CALLBACK (_on_device_changed), NULL);  
- 				myData.pSignalIDList = g_list_append (myData.pSignalIDList, GINT_TO_POINTER (iSignalID));
- 			}
-+			#endif
- 
- 			bFirst = FALSE;
- 		}
-@@ -364,38 +372,6 @@
- 	}
- }
- 
--gboolean cd_power_hibernate (void)
--{
--	if (myData.pUPowerClient != NULL)
--		return up_client_hibernate_sync (myData.pUPowerClient, NULL, NULL);
--	else
--		return FALSE;
--}
--
--gboolean cd_power_suspend (void)
--{
--	if (myData.pUPowerClient != NULL)
--		return up_client_suspend_sync (myData.pUPowerClient, NULL, NULL);
--	else
--		return FALSE;
--}
--
--gboolean cd_power_can_hibernate (void)
--{
--	if (myData.pUPowerClient != NULL)
--		return up_client_get_can_hibernate (myData.pUPowerClient);
--	else
--		return FALSE;
--}
--
--gboolean cd_power_can_suspend (void)
--{
--	if (myData.pUPowerClient != NULL)
--		return up_client_get_can_suspend (myData.pUPowerClient);
--	else
--		return FALSE;
--}
--
- #else // code without libupower
- 
- void cd_powermanager_start (void)
-@@ -408,24 +384,4 @@
- 
- }
- 
--gboolean cd_power_hibernate (void)
--{
--	return FALSE;
--}
--
--gboolean cd_power_suspend (void)
--{
--	return FALSE;
--}
--
--gboolean cd_power_can_hibernate (void)
--{
--	return FALSE;
--}
--
--gboolean cd_power_can_suspend (void)
--{
--	return FALSE;
--}
--
- #endif
---- cairo-dock-plugins-3.3.2/powermanager/src/powermanager-upower.h.upower1	2013-10-03 20:04:33.000000000 +0900
-+++ cairo-dock-plugins-3.3.2/powermanager/src/powermanager-upower.h	2014-06-16 14:01:49.823681160 +0900
-@@ -27,14 +27,4 @@
- 
- void cd_upower_stop (void);
- 
--
--gboolean cd_power_hibernate (void);
--
--gboolean cd_power_suspend (void);
--
--gboolean cd_power_can_hibernate (void);
--
--gboolean cd_power_can_suspend (void);
--
--
- #endif