[x11-plugins/cd-plugins-core] Remove old.

6 files changed, 7 insertions, 545 deletions

diff --git a/x11-plugins/cd-plugins-core/ChangeLog b/x11-plugins/cd-plugins-core/ChangeLog
index 60b36e1..8f71fd4 100644
--- a/x11-plugins/cd-plugins-core/ChangeLog
+++ b/x11-plugins/cd-plugins-core/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 May 2012; Dustin Polke <DuPol@gmx.de> -cd-plugins-core-2.4.0.2.ebuild,
+  -files/cd-plugins-core-2.4.0-CMakeLists.txt,
+  -files/cd-plugins-core-2.4.0-Dbus_CMakeLists.patch,
+  -files/cd-plugins-core-2.4.0-xfce-integration_CMakeLists.patch:
+  Drop old.
+
 *cd-plugins-core-3.0.0 (28 Apr 2012)
 
   28 Apr 2012; Dustin Polke <DuPol@gmx.de> cd-plugins-core-2.4.0.2.ebuild,
diff --git a/x11-plugins/cd-plugins-core/Manifest b/x11-plugins/cd-plugins-core/Manifest
index ab8325a..6ab3ee6 100644
--- a/x11-plugins/cd-plugins-core/Manifest
+++ b/x11-plugins/cd-plugins-core/Manifest
@@ -1,12 +1,7 @@
-AUX cd-plugins-core-2.4.0-CMakeLists.txt 14402 RMD160 3bb445f5271e04113b9a4f71baa7b930978b7b6c SHA1 a9b66a280e75105213e76db66b497a6b98b0b403 SHA256 74907629ab1b677a61541f4216c2dd0b2abde53e83aa22dc9c181645a93a93b5
-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 604 RMD160 625e232433175471468e3f475434b8d5bd662f26 SHA1 8a5961746341e620f9840d316fdb813772e0e078 SHA256 09606a693469f27e3ec81080fcf6d369c36e8d47c8d4f26bf90eebc7c3a2743f
 AUX cd-plugins-core-3.0.0-CMakeLists.txt 14860 RMD160 b7d14ec191d9847b7b5deeed9997ccfeabd60bc3 SHA1 758911d25dfd5f62ec476bc3b7e9ec28b14ea7a8 SHA256 69e4443a04f32ddd8def4fc09034006f42769a1406092bb376129f065b2ef68b
 AUX cd-plugins-core-3.0.0-python_Dbus.patch 3019 RMD160 8bcf960ea41ccd29d3c731a0ea9d6d221d3d2916 SHA1 c4b25e6fd702e3f1da6bf0f4c341dd110a70b706 SHA256 fcfed2f5d9585029950b71c00a2bbea7f0645fca828829b1b27552688e06f457
 AUX cd-plugins-core-3.0.0-xfce-integration_CMakeLists.patch 1344 RMD160 781cc9b8ca3d5dbcd17ff1209aa57c94630da10f SHA1 d773cb679c0f7047016aee0a75e9382d9cacfb56 SHA256 97034e73c8cc149656eb8c5361a40fd6575a1016b24db3c2f15cfd8bf5d918d1
-DIST cairo-dock-plugins-2.4.0~2.tar.gz 6039150 RMD160 9f53cd22bf341b7f1b7ee5d308150c4f1dde5100 SHA1 0989556b79e245094d40379a6ee17a4a8aa501b3 SHA256 f042fab774351087908f99e5598765b858489a0fc8481e672897887bd6d08230
 DIST cairo-dock-plugins-3.0.0.tar.gz 6230574 RMD160 6c1358627768303ed386f62328ff598a77c9617f SHA1 448f4c9300f0652e16d5a41afabd8ea6e4dd9338 SHA256 8040f0a7865592436b57bc1d867f0ee001ae45350255aafe4786a80fc9a981ef
-EBUILD cd-plugins-core-2.4.0.2.ebuild 2838 RMD160 9342acc3c1a6aa89b58b36e2c0ae99bfd0a25fce SHA1 6bb103d3187f6b0f66cf06bf64d5a3fa8c207183 SHA256 5a1bebf07533727179e03cd83b5cfaa282b430c05aaa582c4c6ab59709265ef5
 EBUILD cd-plugins-core-3.0.0.ebuild 3152 RMD160 8a70c2f67da5ed95df28f249ddabc26eb0b6d783 SHA1 e5c2041c38e14177f6b95c74741036829b2c41e4 SHA256 41f29daafcf078da894969400ef9ea57cf5465ba5b0b7e78a52fefed3223b717
-MISC ChangeLog 2952 RMD160 2608f413b6e7515d7213aed308c9d2351ba1492b SHA1 5c95442d9acebeec768181dae85558d823ab20e3 SHA256 82d23b75050a6c9f20f5f5c714ecacea2cd5e6ee17b3711be6fb32b4f882250f
+MISC ChangeLog 3208 RMD160 6fcaaf3bbceffae1a9f01a497a500175242c0e5c SHA1 c89244cc5d563636ca66abb1986dfa75be91c7f7 SHA256 16a222451fe1678f9a651c2ffecdab01dda05c3f6c04fe99e6fe899baf016948
 MISC metadata.xml 856 RMD160 4b53cdf49d505b4fc66b7b639faab518704fa053 SHA1 0dea5403a26bc2387cfe6c61c491fbb1fcd632b1 SHA256 312686bfef2ef78f0443a33156f514119f89c827fa37bffa98e137f2b1c44dfd
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
deleted file mode 100644
index b58b8f7..0000000
--- a/x11-plugins/cd-plugins-core/cd-plugins-core-2.4.0.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 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 ~x86"
-CD_PLUGINS_IUSE="gnome xfce"
-IUSE="${CD_PLUGINS_IUSE} mono python ruby vala"
-
-CDP_DEPEND="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}
-	!x11-misc/cairo-dock-plugins"
-RDEPEND="${CDP_DEPEND}
-	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 )"
-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
deleted file mode 100644
index dbc788f..0000000
--- a/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-CMakeLists.txt
+++ /dev/null
@@ -1,346 +0,0 @@
-########### 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_GVFS_FOUND}" STREQUAL "")
-		message (FATAL_ERROR "Could not find gio!")
-	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()
-
-############# 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
deleted file mode 100644
index 61205f8..0000000
--- a/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-Dbus_CMakeLists.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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
deleted file mode 100644
index b28a2e4..0000000
--- a/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-xfce-integration_CMakeLists.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- xfce-integration/src/CMakeLists.txt.orig
-+++ xfce-integration/src/CMakeLists.txt
-@@ -8,13 +8,6 @@ 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()
- 
- add_library(${PACKAGE_XFCE_INTEGRATION} SHARED ${cd_xfce-integration_LIB_SRCS})
-