[x11-plugins/cd-plugins-core] Version bump to 2.4.0.2.

6 files changed, 575 insertions, 1 deletions

diff --git a/x11-plugins/cd-plugins-core/ChangeLog b/x11-plugins/cd-plugins-core/ChangeLog
index c2f87be..d519b93 100644
--- a/x11-plugins/cd-plugins-core/ChangeLog
+++ b/x11-plugins/cd-plugins-core/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cd-plugins-core-2.4.0.2 (09 Oct 2011)
+
+  09 Oct 2011; Dustin Polke <dustin.polke@uni-siegen.de>
+  +cd-plugins-core-2.4.0.2.ebuild,
+  +files/cd-plugins-core-2.4.0.2-CMakeLists.txt,
+  +files/cd-plugins-core-2.4.0.2-Dbus_CMakeLists.patch,
+  +files/cd-plugins-core-2.4.0.2-xfce-integration_CMakeLists.patch:
+  Version bump to 2.4.0.2.
+
 *cd-plugins-core-2.3.0.3 (06 Oct 2011)
 
   06 Oct 2011; Dustin Polke <dustin.polke@uni-siegen.de>
diff --git a/x11-plugins/cd-plugins-core/Manifest b/x11-plugins/cd-plugins-core/Manifest
index 90866d2..9745d96 100644
--- a/x11-plugins/cd-plugins-core/Manifest
+++ b/x11-plugins/cd-plugins-core/Manifest
@@ -1,7 +1,12 @@
 AUX cd-plugins-core-2.3.0.3-CMakeLists.txt 13139 RMD160 2b698df932660eebabf59b4a8c92cd226312ca7c SHA1 925c4a5be631dd9d53e37267b6fb6d65fbe5eca5 SHA256 960886d49981fad04d313ef2c55dbe6d84bc6f29e71b2b172d714974eb87c779
 AUX cd-plugins-core-2.3.0.3-Dbus_CMakeLists.patch 3691 RMD160 bafe1ac6243e8acacec80c9c9b723d4f08fdb236 SHA1 9cd20cf7b6ae09c417e2788b1e1217e2143e9c51 SHA256 db3dd4b6d31d9ff4ca32401493166643f03bbc4044329c5cdec23f5ee3652f48
 AUX cd-plugins-core-2.3.0.3-xfce-integration_CMakeLists.patch 826 RMD160 afea9d4e551a845f23287abad77f4853c7347c3f SHA1 f7b5c43de2ba42669c50c18ff98acbdf4879d535 SHA256 f0679a390212d9023c0e10ad48a6919d82370e3005ff8dcb0bb69fea94b09cab
+AUX cd-plugins-core-2.4.0-CMakeLists.txt 15029 RMD160 9497c15a081b0912fa32dcef565e3f09dea1cd7c SHA1 2cc687690627e39c5957dfb40fef912b00c6790b SHA256 7ad1d60d439feeba3058ddc6e69a42aac2d57eff9d00e05bade042586810d95d
+AUX cd-plugins-core-2.4.0-Dbus_CMakeLists.patch 3603 RMD160 0acb39f173b1b061a082b664c57e2cedf573d9d8 SHA1 2ac61bec9d9001bb45acc3f90a45d02f8d9199e6 SHA256 f419b25bb3aeeca91e92c16a7d15eab0d85bc80f4f3646a704f563945e3b659f
+AUX cd-plugins-core-2.4.0-xfce-integration_CMakeLists.patch 704 RMD160 65b09086a09f382a8b05723383416ad8ddfd759a SHA1 8d60e81c2c65678efd536eac51064a4158ec2db4 SHA256 9a211043222de55ed7e71c70f6f29bc9a8b903166fd1c28e916f4b747db09499
 DIST cairo-dock-plugins-2.3.0~3.tar.gz 5959407 RMD160 2ae5301c36904e0183309347cf62725e333ac821 SHA1 216bda162362156e0bcae1aba8e5087d57605c64 SHA256 2bcfae5b6876a0a9a36ce7e0deb42a2d72234299da651c24f34e398f956a25cf
+DIST cairo-dock-plugins-2.4.0~2.tar.gz 6039150 RMD160 9f53cd22bf341b7f1b7ee5d308150c4f1dde5100 SHA1 0989556b79e245094d40379a6ee17a4a8aa501b3 SHA256 f042fab774351087908f99e5598765b858489a0fc8481e672897887bd6d08230
 EBUILD cd-plugins-core-2.3.0.3.ebuild 2774 RMD160 4714e0b6c6ef979011e9abf7f2e7f222b92e45e8 SHA1 4b2f5f570f5cd79127fbc86891efffea7d3503b2 SHA256 c73cc52fce7f8a018cab3a84ad66b8e010d55aa9474c462d87a0a194ac267f1a
-MISC ChangeLog 1122 RMD160 678d7b57716a2509437109541a09d9e66837a665 SHA1 7083641cd68d974daa6ee6f46f028d83abb10565 SHA256 dd1951bd8e0a633efc5cdde533e1dcba1899025a6658cd4b1fee49b6f42c681a
+EBUILD cd-plugins-core-2.4.0.2.ebuild 2840 RMD160 abd152e90b7454ec4b9fe0b6765bb0a27a570b31 SHA1 5e99f75d761b2104f7a552495b3bde0fe0fe66ef SHA256 12b8c2a99981c3bb5861a0b24c18b505a68baff27b4ddc3238b2dda83b21c282
+MISC ChangeLog 1455 RMD160 e9e41bba1d69c274cd484bf26e0d3cc900a65b8f SHA1 f0ddab86c6f9b0ac4e99785838b58f1ee0c7e315 SHA256 f24c26b6a02796c64de0d8148c8f21db65f6d6868be0b727973c49c87295e94f
 MISC metadata.xml 807 RMD160 4e5a642bddb16a54a6f39c383bcb4a7e0d604245 SHA1 86949c4c2c9378ff841f7af0aff6d616c13c35e7 SHA256 0407740780508ad706630981717964e936c87e9da4d3aefb97f5a3712e691f91
diff --git a/x11-plugins/cd-plugins-core/cd-plugins-core-2.4.0.2.ebuild b/x11-plugins/cd-plugins-core/cd-plugins-core-2.4.0.2.ebuild
new file mode 100644
index 0000000..634b6da
--- /dev/null
+++ b/x11-plugins/cd-plugins-core/cd-plugins-core-2.4.0.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit cmake-utils cairo-dock python
+
+DESCRIPTION="Official recommended plugins for cairo-dock"
+HOMEPAGE="http://www.glx-dock.org"
+
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 ) GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+CD_PLUGINS_IUSE="gnome xfce"
+IUSE="${CD_PLUGINS_IUSE} mono python ruby vala"
+
+RDEPEND="dev-libs/dbus-glib
+	>=dev-libs/glib-2.22:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+	~x11-misc/cairo-dock-${PV}
+	mono? ( dev-dotnet/glib-sharp
+		dev-dotnet/ndesk-dbus
+		dev-dotnet/ndesk-dbus-glib
+		dev-lang/mono )
+	ruby? ( dev-lang/ruby )
+	vala? ( dev-lang/vala
+		>=dev-libs/glib-2.26:2 )
+	xfce? ( xfce-extra/thunar-vfs )
+	!x11-misc/cairo-dock-plugins"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	CD_PLUGINS=(
+		"dock-rendering"
+		"desklet-rendering"
+		"dialog-rendering"
+		"Dbus"
+		"Animated-icons"
+		"icon-effect"
+		"illusion"
+		"drop-indicator"
+		"shared-images"
+	)
+	use gnome && CD_PLUGINS+=( "gnome-integration" )
+	use xfce && CD_PLUGINS+=( "xfce-integration" )
+	use gnome || use xfce && CD_PLUGINS+=( "gvfs-integration" )
+}
+
+src_unpack() {
+	cairo-dock_src_unpack
+}
+
+src_prepare() {
+	cairo-dock_src_prepare
+	epatch "${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN_MIC}-Dbus_CMakeLists.patch
+	use xfce &&	epatch \
+		"${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN_MIC}-xfce-integration_CMakeLists.patch
+	use python && python_copy_sources Dbus/interfaces/{bash,python}
+}
+
+src_configure() {
+	mycmakeargs+=(
+		"$(cmake-utils_use_enable gnome GNOME-INTEGRATION)"
+		"$(cmake-utils_use_enable xfce XFCE-INTEGRATION)"
+		"$(cmake-utils_use_with mono MONO-INTERFACE)"
+		"$(cmake-utils_use_with python PYTHON-INTERFACE)"
+		"$(cmake-utils_use_with ruby RUBY-INTERFACE)"
+		"$(cmake-utils_use_with vala VALA-INTERFACE)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use python; then
+		build_bindings() {
+			"$(PYTHON)" setup.py -q build
+		}
+		local target sdir="Dbus/interfaces/"
+		for target in "bash" "python"; do
+			python_execute_function -s --source-dir ${sdir}${target} build_bindings
+		done
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use python; then
+		install_bindings() {
+			insinto "$(python_get_sitedir)"/cairodock
+			doins build/lib/*.py
+			touch "${D}/$(python_get_sitedir)"/cairodock/__init__.py
+		}
+		local target sdir="Dbus/interfaces/"
+		for target in "bash" "python"; do
+			python_execute_function -s --source-dir ${sdir}${target} install_bindings
+		done
+	fi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize cairodock
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup cairodock
+}
diff --git a/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-CMakeLists.txt b/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-CMakeLists.txt
new file mode 100644
index 0000000..0eae664
--- /dev/null
+++ b/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-CMakeLists.txt
@@ -0,0 +1,364 @@
+########### requirements ###############
+
+cmake_minimum_required (VERSION 2.6)
+find_package (PkgConfig)
+include (CheckLibraryExists)
+include (CheckIncludeFiles)
+include (CheckFunctionExists)
+include (CheckSymbolExists)
+
+########### project ###############
+
+project ("cairo-dock-plugins")
+set (VERSION "@CD_VER@")
+
+add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall
+add_definitions (-DGL_GLEXT_PROTOTYPES="1")
+
+############ sources tarball #############
+
+set (CPACK_SOURCE_GENERATOR "TGZ")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
+set (CPACK_SOURCE_IGNORE_FILES
+	"/build/;/.bzr/;bzrignore$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}")
+include (CPack)
+
+add_custom_target(dist
+	COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+add_custom_target(dist-bzr
+	COMMAND bzr export ${CMAKE_PROJECT_NAME}-${VERSION}.tar.gz
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
+########### global variables ###############
+
+if( WIN32 )
+	message(FATAL_ERROR "Cairo-Dock requires an air-conditioned room. Please close Windows!")
+endif( WIN32 )
+
+set (PACKAGE ${CMAKE_PROJECT_NAME})
+set (GETTEXT_PACKAGE ${PACKAGE})
+
+# get plug-ins install dir
+execute_process(
+    COMMAND pkg-config gldi --variable=pluginsdir		# /usr/lib/cairo-dock
+    OUTPUT_VARIABLE pluginsdir)
+STRING (REGEX REPLACE "\n" "" pluginsdir ${pluginsdir})  # la commande rajoute un retour chariot ...
+# get plug-ins data dir
+execute_process(
+    COMMAND pkg-config gldi --variable=pluginsdatadir	# /usr/share/cairo-dock/plug-ins
+    OUTPUT_VARIABLE pluginsdatadir)
+STRING (REGEX REPLACE "\n" "" pluginsdatadir ${pluginsdatadir})
+# check that version matches with the core
+execute_process(
+    COMMAND pkg-config --modversion gldi			# 2.2.0-3
+    OUTPUT_VARIABLE dock_version)
+STRING (REGEX REPLACE "\n" "" dock_version ${dock_version})
+if (NOT "${dock_version}" STREQUAL "${VERSION}")		# Version
+	if ("${PACKAGEMENT}" STREQUAL "")
+		MESSAGE (FATAL_ERROR "Error : version mismatch with the core : " ${VERSION} <> ${dock_version})
+	else ()
+		MESSAGE (WARNING "Warning : version mismatch with the core : " ${VERSION} <> ${dock_version})
+	endif ()
+endif()
+
+#if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_LIB64}" STREQUAL "")  # 64bits and force install in lib64
+#	set (libname "lib64")
+#else()
+#	set (libname "lib${LIB_SUFFIX}")
+#endif()
+#set (libdir "${CMAKE_INSTALL_PREFIX}/${libname}/cairo-dock")	# /usr/lib
+
+# check that installation dir matches with the core
+GET_FILENAME_COMPONENT(libdir "${pluginsdir}/.." ABSOLUTE)  # /usr/lib
+GET_FILENAME_COMPONENT(prefix "${pluginsdir}/../.." ABSOLUTE)  # /usr
+if (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "${prefix}")
+	message (STATUS "It seems that the current CMAKE_INSTALL_PREFIX flag is not the same that you have used with the core.")
+	message (STATUS " It will be replaced by this value: ${prefix}")
+	message (WARNING "Plug-ins should be installed in the same directory as the core, that is to say in ${pluginsdir}")
+	set (CMAKE_INSTALL_PREFIX "${prefix}")
+	#set (libdir "${CMAKE_INSTALL_PREFIX}/${libname}/cairo-dock")
+endif()
+
+# set internationalisation
+set (GETTEXT_PLUGINS "cairo-dock-plugins")
+set (localedir "${CMAKE_INSTALL_PREFIX}/share/locale")
+set (gaugesdir "${CMAKE_INSTALL_PREFIX}/share/cairo-dock/gauges")
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")  # additionnal FindPackage files
+
+########### dependencies ###############
+
+message ("")
+message (STATUS "=====================")
+message (STATUS "Check dependencies...")
+message (STATUS "=====================")
+message ("")
+
+pkg_check_modules ("PACKAGE" REQUIRED "gtk+-2.0" "gthread-2.0" "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0" "gtkglext-1.0")
+pkg_check_modules ("GLDI" REQUIRED "gldi")  # we don't want to link with gldi
+set (PACKAGE_INCLUDE_DIRS "${GLDI_INCLUDE_DIRS}")
+#message (STATUS "PACKAGE: ${PACKAGE_INCLUDE_DIRS}")
+
+#############    GLIB    #################
+pkg_check_modules (GLIB glib-2.0)
+	STRING (REGEX REPLACE "\\..*" "" GLIB_MAJOR "${GLIB_VERSION}") # 2.28.3 => 2
+	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" GLIB_MINOR "${GLIB_VERSION}")  # 2.28.3 => 2.28
+	STRING (REGEX REPLACE "\\.[0-9]*" "" GLIB_MINOR "${GLIB_MINOR}") # 2.28 => 28
+	STRING (REGEX REPLACE ".*\\." "" GLIB_NANO "${GLIB_VERSION}") # 2.28.3 => 3
+	STRING (REGEX REPLACE "-.*" "" GLIB_NANO "${GLIB_NANO}")
+
+############# ANIMATED ICONS #################
+message (STATUS "> Animated Icons:")
+set (GETTEXT_ANIMATED_ICONS ${GETTEXT_PLUGINS})
+set (VERSION_ANIMATED_ICONS "1.0.10")
+set (PACKAGE_ANIMATED_ICONS "cd-Animated-icons")
+set (animated_iconsdatadir "${pluginsdatadir}/Animated-icons")
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Animated-icons/data/Animated-icons.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Animated-icons/data/Animated-icons.conf)
+add_subdirectory (Animated-icons)
+
+############# DBUS #################
+message (STATUS "> DBus:")
+if (WITH_PYTHON-INTERFACE)
+	message (STATUS " * Python:")
+	find_program (PYTHON_EXECUTABLE python)
+	EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print sys.version" OUTPUT_VARIABLE PYTHON_VERSION)
+	if ("${PYTHON_VERSION}" STREQUAL "") 
+		message (FATAL_ERROR "Could not find Python!") 
+	endif() 
+	STRING (REGEX REPLACE "\n" "" PYTHON_VERSION ${PYTHON_VERSION})
+	message (STATUS "   Python Version: ${PYTHON_VERSION}")
+	GET_FILENAME_COMPONENT(DEBIAN_VERSION /etc/debian_version ABSOLUTE) 
+	if (EXISTS ${DEBIAN_VERSION}) 
+		message (STATUS "   will use '--install-layout deb' with 'python setup.py install'")
+		set (DEBIAN_INSTALL_LAYOUT "--install-layout deb")
+	endif()
+	set (PYTHON_FOUND "TRUE")
+	set (with_python "yes")
+else()
+	set (with_python "no")
+endif()
+
+# find_package(Ruby) found libs of ruby-dev but we only need a directory where we can install ruby libs.
+if (WITH_RUBY-INTERFACE)
+	message (STATUS " * Ruby:")
+	find_program (RUBY_EXECUTABLE ruby)
+	EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']"
+		OUTPUT_VARIABLE RUBY_LIB_DIR)
+	message (STATUS "   Ruby library dir: ${RUBY_LIB_DIR}")
+	if ("${RUBY_LIB_DIR}" STREQUAL "" OR "${RUBY_LIB_DIR}" STREQUAL "nil")
+		message (FATAL_ERROR "Could not find ruby libs!")
+	endif()
+	string (REGEX REPLACE "lib/ruby/[0-9].[0-9]" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
+	string (REGEX REPLACE "${RUBY_LIB_DIR_INSTALL}" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
+	set (RUBY_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${RUBY_LIB_DIR_INSTALL}")
+	message (STATUS "   will be installed in: ${RUBY_LIB_DIR}")
+	set (RUBY_FOUND "TRUE")
+	set (with_ruby "yes")
+else()
+	set (with_ruby "no")
+endif()
+
+#find_package (Mono)
+if (WITH_MONO-INTERFACE)
+	message (STATUS " * Mono:")
+	find_program (GMCS_EXECUTABLE gmcs)
+	if ("${GMCS_EXECUTABLE}" STREQUAL "" OR NOT EXISTS ${GMCS_EXECUTABLE})
+		message (FATAL_ERROR "Could not find Mono compiler gmcs!")
+	endif()
+	pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0)
+	if ("${MONO_PACKAGE_FOUND}" STREQUAL "")
+		message (FATAL_ERROR "Could not find glib-sharp-2.0, ndesk-dbus-1.0 or ndesk-dbus-glib-1.0!")
+	endif()
+	set (MONO_FOUND "TRUE")
+	set (with_mono "yes")
+else()
+	set (with_mono "no")
+endif()
+
+# Valac is only riquired to convert vala files to C files.
+#  So we can directly use produced files (c, h, vapi) without using valac.
+if (WITH_VALA-INTERFACE)
+	message (STATUS " * Vala:")
+	set (with_vala "yes")
+	
+	find_program (VALAC_EXE valac)
+	message (STATUS "   Path to valac: ${VALAC_EXE}")
+
+	if (NOT "${VALAC_EXE}" STREQUAL "VALAC_EXE-NOTFOUND") # now it works with 0.10 and 0.11 (= next 0.12)
+		execute_process(COMMAND ${VALAC_EXE} "--version"
+			OUTPUT_VARIABLE "VALA_VERSION")
+		string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
+		string(STRIP ${VALA_VERSION} "VALA_VERSION")
+		message (STATUS "VALA_VERSION: ${VALA_VERSION}")
+
+		STRING (REGEX REPLACE "\\..*" "" VALA_MAJOR "${VALA_VERSION}")
+		# message (STATUS "VALA_MAJOR : ${VALA_MAJOR}")
+	
+		STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" VALA_MINOR "${VALA_VERSION}")  # 0.1.7 => 1.7
+		STRING (REGEX REPLACE "\\.[0-9]*" "" VALA_MINOR "${VALA_MINOR}")
+		# message (STATUS "VALA_MINOR : ${VALA_MINOR}")
+
+		STRING (REGEX REPLACE ".*\\." "" VALA_NANO "${VALA_VERSION}")
+		STRING (REGEX REPLACE "-.*" "" VALA_NANO "${VALA_NANO}")
+		# message (STATUS "VALA_NANO  : ${VALA_NANO}")
+
+		if (${VALA_MAJOR} GREATER 0 OR ${VALA_MINOR} GREATER 9) # vala >= 0.10 
+			# AND (${VALA_MAJOR} LESS 1 AND ${VALA_MINOR} LESS 13)) # and <= 0.12
+			message (STATUS "   Vala compiler OK (>= 0.10).")# and <= 0.12).")
+			set (VALAC_FOUND "TRUE")
+			set (with_valac "yes")
+		else()
+			set (with_valac "no")
+			message (STATUS "   Vala compiler is too old (0.10 required) or too new (> 0.12), won't build Vala interface.")
+		endif()
+	endif()
+else()
+	set (with_vala "no")
+	set (with_valac "no")
+endif()
+
+set (GETTEXT_DBUS ${GETTEXT_PLUGINS})
+set (VERSION_DBUS "1.2.1")
+set (PACKAGE_DBUS "cd-Dbus")
+set (dbusdatadir "${pluginsdatadir}/Dbus")
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Dbus/data/Dbus.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Dbus/data/Dbus.conf)
+add_subdirectory (Dbus)
+
+############# DESKLET_RENDERING #################
+message (STATUS "> Desklet Rendering:")
+set (GETTEXT_DESKLET_RENDERING ${GETTEXT_PLUGINS})
+set (VERSION_DESKLET_RENDERING "1.5.6")
+set (PACKAGE_DESKLET_RENDERING "cd-desklet-rendering")
+set (desklet_renderingdatadir "${pluginsdatadir}/desklet-rendering")
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/desklet-rendering/data/desklet-rendering.conf.in ${CMAKE_CURRENT_BINARY_DIR}/desklet-rendering/data/desklet-rendering.conf)
+add_subdirectory (desklet-rendering)
+
+############# DIALOG_RENDERING #################
+message (STATUS "> Dialog Rendering:")
+set (GETTEXT_DIALOG_RENDERING ${GETTEXT_PLUGINS})
+set (VERSION_DIALOG_RENDERING "0.5.1")
+set (PACKAGE_DIALOG_RENDERING "cd-dialog-rendering")
+set (dialog_renderingdatadir "${pluginsdatadir}/dialog-rendering")
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/dialog-rendering/data/dialog-rendering.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dialog-rendering/data/dialog-rendering.conf)
+add_subdirectory (dialog-rendering)
+
+############# DOCK RENDERING #################
+message (STATUS "> Dock Rendering:")
+set (GETTEXT_RENDERING ${GETTEXT_PLUGINS})
+set (VERSION_RENDERING "1.5.9")
+set (PACKAGE_RENDERING "cd-rendering")
+set (renderingdatadir "${pluginsdatadir}/rendering")
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/dock-rendering/data/rendering.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dock-rendering/data/rendering.conf)
+add_subdirectory (dock-rendering)
+
+############# DROP INDICATOR #################
+message (STATUS "> Drop Indicator:")
+set (GETTEXT_DROP_INDICATOR ${GETTEXT_PLUGINS})
+set (VERSION_DROP_INDICATOR "1.1.4")
+set (PACKAGE_DROP_INDICATOR "cd-drop_indicator")
+set (drop_indicatordatadir "${pluginsdatadir}/drop-indicator")
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/drop-indicator/data/drop_indicator.conf.in ${CMAKE_CURRENT_BINARY_DIR}/drop-indicator/data/drop_indicator.conf)
+add_subdirectory (drop-indicator)
+
+############# GVFS-INTEGRATION #################
+if (ENABLE_GNOME-INTEGRATION OR ENABLE_XFCE-INTEGRATION)
+	message (STATUS "> GVFS-Integration:")
+	pkg_check_modules ("LIBGIO" "gio-2.0")
+	add_subdirectory (gvfs-integration)
+endif()
+
+############# GNOME-INTEGRATION #################
+if (ENABLE_GNOME-INTEGRATION)
+	message (STATUS "> Gnome-Integration:")
+	pkg_check_modules (GNOME_INTEGRATION gio-2.0)
+	if ("${GNOME_INTEGRATION_FOUND}" STREQUAL "")
+		message (ERROR_FATAL "Could not find gio!")
+	endif()
+	set (VERSION_GNOME_INTEGRATION "1.0.3")
+	set (PACKAGE_GNOME_INTEGRATION "cd_gnome-integration")
+	set (with_gnome_integration "yes")
+	set (gnome_integrationdatadir "${pluginsdatadir}/gnome-integration")
+	add_subdirectory ("gnome-integration")
+else()
+	set (with_gnome_integration "no")
+endif()
+
+############# ICON EFFECTS #################
+message (STATUS "> Icon Effects:")
+set (GETTEXT_ICON_EFFECTS ${GETTEXT_PLUGINS})
+set (VERSION_ICON_EFFECTS "1.2.4")
+set (PACKAGE_ICON_EFFECTS "cd-icon-effect")
+set (icon_effectsdatadir "${pluginsdatadir}/icon-effect")
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/icon-effect/data/icon-effect.conf.in ${CMAKE_CURRENT_BINARY_DIR}/icon-effect/data/icon-effect.conf)
+add_subdirectory (icon-effect)
+
+############# ILLUSION #################
+message (STATUS "> Illusion:")
+set (GETTEXT_ILLUSION ${GETTEXT_PLUGINS})
+set (VERSION_ILLUSION "1.0.7")
+set (PACKAGE_ILLUSION "cd-illusion")
+set (illusiondatadir "${pluginsdatadir}/illusion")
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/illusion/data/illusion.conf.in ${CMAKE_CURRENT_BINARY_DIR}/illusion/data/illusion.conf)
+add_subdirectory (illusion)
+
+############# XFCE-INTEGRATION #################
+if (ENABLE_XFCE-INTEGRATION)
+	message (STATUS "> XFCE-Integration:")
+	pkg_check_modules (XFCE_INTEGRATION_THUNAR thunar-vfs-1)
+#	pkg_check_modules (XFCE_INTEGRATION_GVFS gio-2.0)
+#	if ("${XFCE_INTEGRATION_THUNAR_FOUND}" STREQUAL "" AND "${XFCE_INTEGRATION_GVFS_FOUND}" STREQUAL "")
+	if ("${XFCE_INTEGRATION_THUNAR_FOUND}" STREQUAL "")
+		message (FATAL_ERROR "Could not find thunar-vfs!")
+	endif()
+	set (VERSION_XFCE_INTEGRATION "1.0.3")
+	set (PACKAGE_XFCE_INTEGRATION "cd_xfce-integration")
+	set (with_xfce_integration "yes")
+	set (xfce_integrationdatadir "${pluginsdatadir}/xfce-integration")
+	add_subdirectory ("xfce-integration")
+else()
+	set (with_xfce_integration "no")
+endif()
+
+############# XGAMMA #################
+if (ENABLE_XGAMMA-PLUGIN)
+	message (STATUS "> XGamma:")
+	pkg_check_modules (XGAMMA_PACKAGE x11 xxf86vm)
+	if ("${XGAMMA_PACKAGE_FOUND}" STREQUAL "")
+		message (FATAL_ERROR "Could not find xxf86vm!")
+	endif()
+	set (GETTEXT_XGAMMA ${GETTEXT_PLUGINS})
+	set (VERSION_XGAMMA "1.2.1")
+	set (PACKAGE_XGAMMA "cd-Xgamma")
+	set (with_xgamma "yes")
+	set (xgammadatadir "${pluginsdatadir}/Xgamma")
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Xgamma/data/Xgamma.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Xgamma/data/Xgamma.conf)
+	add_subdirectory ("Xgamma")
+else()
+	set (with_xgamma "no")
+endif()
+
+############# SHARED-IMAGES #################
+set (shared_imagesdatadir "${pluginsdatadir}/shared-images")
+add_subdirectory (shared-images)
+
+message ("")
+message (STATUS "===============")
+message (STATUS "Language build:")
+message (STATUS "===============")
+message ("")
+add_subdirectory (po)
+
+message ("")
+message (STATUS "===============")
+message (STATUS "Plug-ins build:")
+message (STATUS "===============")
+message ("")
+message (STATUS "Stable:")
+message (STATUS " - with Gnome support:             ${with_gnome_integration}")
+message (STATUS " - with XFCE support:              ${with_xfce_integration}")
+message (STATUS " - with Python interface:          ${with_python}")
+message (STATUS " - with Ruby interface:            ${with_ruby}")
+message (STATUS " - with Mono interface:            ${with_mono}")
+message (STATUS " - with Vala interface:            ${with_vala}")
+message (STATUS " - with Vala Translator (valac) :  ${with_valac}")
+message ("")
diff --git a/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-Dbus_CMakeLists.patch b/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-Dbus_CMakeLists.patch
new file mode 100644
index 0000000..61205f8
--- /dev/null
+++ b/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-Dbus_CMakeLists.patch
@@ -0,0 +1,57 @@
+--- Dbus/interfaces/python/CMakeLists.txt.orig
++++ Dbus/interfaces/python/CMakeLists.txt
+@@ -1,13 +1,13 @@
+ 
+ ########### install files ###############
+-
+-if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+-	# copy *.py to current binary dir (cleaner)
+-	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.py" "${CMAKE_CURRENT_SOURCE_DIR}/CairoDock.py" ${CMAKE_CURRENT_BINARY_DIR})
+-	exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build")
+-endif()
+-# Run a custom script with 'make install' 
+-add_custom_target(python_pyc ALL)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PythonInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake)
+-set_target_properties(python_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake)
+-# execute_process(COMMAND python setup.py install ${DEBIAN_INSTALL_LAYOUT})
++### handle python stuff in ebuild
++#if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
++#	# copy *.py to current binary dir (cleaner)
++#	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.py" "${CMAKE_CURRENT_SOURCE_DIR}/CairoDock.py" ${CMAKE_CURRENT_BINARY_DIR})
++#	exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build")
++#endif()
++## Run a custom script with 'make install' 
++#add_custom_target(python_pyc ALL)
++#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PythonInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake)
++#set_target_properties(python_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake)
++## execute_process(COMMAND python setup.py install ${DEBIAN_INSTALL_LAYOUT})
+--- Dbus/interfaces/bash/CMakeLists.txt.orig
++++ Dbus/interfaces/bash/CMakeLists.txt
+@@ -1,16 +1,16 @@
+ 
+ ########### install files ###############
+-
+-# the python script goes with other python scripts.
+-if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+-	# copy *.py to current binary dir (cleaner)
+-	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_CURRENT_SOURCE_DIR}/CDBashApplet.py" ${CMAKE_CURRENT_BINARY_DIR})
+-	exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build")
+-endif()
+-# Run a custom script with 'make install' 
+-add_custom_target(bash_pyc ALL)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BashInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake)
+-set_target_properties(bash_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake)
++### handle python stuff in ebuild
++## the python script goes with other python scripts.
++#if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
++#	# copy *.py to current binary dir (cleaner)
++#	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_CURRENT_SOURCE_DIR}/CDBashApplet.py" ${CMAKE_CURRENT_BINARY_DIR})
++#	exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build")
++#endif()
++## Run a custom script with 'make install' 
++#add_custom_target(bash_pyc ALL)
++#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BashInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake)
++#set_target_properties(bash_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake)
+ 
+ # and the bash functions goes into the data dir of the applet (didn't find a better place).
+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/CDBashApplet.sh
diff --git a/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-xfce-integration_CMakeLists.patch b/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-xfce-integration_CMakeLists.patch
new file mode 100644
index 0000000..c9ff3c2
--- /dev/null
+++ b/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-xfce-integration_CMakeLists.patch
@@ -0,0 +1,18 @@
+--- xfce-integration/src/CMakeLists.txt.orig
++++ xfce-integration/src/CMakeLists.txt
+@@ -8,13 +8,8 @@ SET(cd_xfce-integration_LIB_SRCS
+ 	applet-utils.c
+ 	applet-utils.h
+ )
+-if(${XFCE_INTEGRATION_GVFS_FOUND})
+-	MESSAGE(STATUS "  GVFS found: source file applet-thunar-vfs.c NOT included for compilation.")
+-else()
+-	LIST(APPEND cd_xfce-integration_LIB_SRCS applet-thunar-vfs.c)
+-	add_definitions (-DHAVE_THUNAR="1")
+-	MESSAGE(STATUS "  GVFS NOT found: source file applet-thunar-vfs.c included for compilation.")
+-endif()
++LIST(APPEND cd_xfce-integration_LIB_SRCS applet-thunar-vfs.c)
++add_definitions (-DHAVE_THUNAR="1")
+ 
+ add_library(${PACKAGE_XFCE_INTEGRATION} SHARED ${cd_xfce-integration_LIB_SRCS})
+