[x11-plugins/cd-plugins-experimental] Version bump to 3.0.1.

4 files changed, 339 insertions, 1 deletions

diff --git a/x11-plugins/cd-plugins-experimental/ChangeLog b/x11-plugins/cd-plugins-experimental/ChangeLog
index a5dcc18..b1c039a 100644
--- a/x11-plugins/cd-plugins-experimental/ChangeLog
+++ b/x11-plugins/cd-plugins-experimental/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cd-plugins-experimental-3.0.1 (23 May 2012)
+
+  23 May 2012; Dustin Polke <DuPol@gmx.de>
+  +cd-plugins-experimental-3.0.1.ebuild,
+  +files/cd-plugins-experimental-3.0.1-CMakeLists.txt:
+  Version bump to 3.0.1.
+
   23 May 2012; Dustin Polke <DuPol@gmx.de>
   -cd-plugins-experimental-2.4.0.2.ebuild,
   -files/cd-plugins-experimental-2.4.0-CMakeLists.txt:
diff --git a/x11-plugins/cd-plugins-experimental/Manifest b/x11-plugins/cd-plugins-experimental/Manifest
index 2b62544..c1c40f5 100644
--- a/x11-plugins/cd-plugins-experimental/Manifest
+++ b/x11-plugins/cd-plugins-experimental/Manifest
@@ -1,5 +1,8 @@
 AUX cd-plugins-experimental-3.0.0-CMakeLists.txt 10040 RMD160 20102cf2183d1e4e8c219cf87521905433508eb0 SHA1 cc73ffb65104a534aa9f8e02da72d4aa8234a8af SHA256 f6c1d8f56d6e3a27f62868b89d1b2943b8c8b7e91eca7129f676033787030acc
+AUX cd-plugins-experimental-3.0.1-CMakeLists.txt 10040 RMD160 dcade81aebbaa158d1c61f079712abe2b25b0706 SHA1 74d10c7759552220fa42c698ee3f1d352c45bf94 SHA256 56945c51ecea3e0659f007c1076fbf344fc3a57250bae5954327d3bbe178d0f7
 DIST cairo-dock-plugins-3.0.0.tar.gz 6230574 RMD160 6c1358627768303ed386f62328ff598a77c9617f SHA1 448f4c9300f0652e16d5a41afabd8ea6e4dd9338 SHA256 8040f0a7865592436b57bc1d867f0ee001ae45350255aafe4786a80fc9a981ef
+DIST cairo-dock-plugins-3.0.1.tar.gz 6232909 RMD160 91926b5c9578eeac9b3c81ce3d862358d810c148 SHA1 f3f828d19fa23d3ca18a8666df6c7af9ef296c8a SHA256 4b6dcf77013c96ef4d04f4d7f2c5e2daf3d7a7009edc5a2729b4ead75bb983ce
 EBUILD cd-plugins-experimental-3.0.0.ebuild 1691 RMD160 d2f3c6d439b63f95bb2098aa563a365e66f852a6 SHA1 0cd24373e8a31a4f0fdbb0bfe4f8bc21d721c104 SHA256 a01e2ba1deab005dd09a78081f43d459b807bd391f39fa1ef819295489c7f4ab
-MISC ChangeLog 2214 RMD160 2bf9b6d9379a73c952b667e32375ffb1070c0563 SHA1 5c0bfc07ce22cc9c2045989126479475914b70d9 SHA256 1acbe4e87cd7d3b73685c493ef4440f409ad7918e57fa4faca4bd315555ca3bd
+EBUILD cd-plugins-experimental-3.0.1.ebuild 1691 RMD160 d2f3c6d439b63f95bb2098aa563a365e66f852a6 SHA1 0cd24373e8a31a4f0fdbb0bfe4f8bc21d721c104 SHA256 a01e2ba1deab005dd09a78081f43d459b807bd391f39fa1ef819295489c7f4ab
+MISC ChangeLog 2425 RMD160 92f8cb21a3eb3eac5e575b6bc9144dd7ecf22c6b SHA1 ebff79cc83b4d9600e65e0a13852b254ef8672b4 SHA256 c360d26768f10c00858b2bbe545bcd33ba015226d36e8eeef8523ecccd15bb4d
 MISC metadata.xml 762 RMD160 2e5e0d96c00a0dc5bac6f9903b086c819e536c67 SHA1 31ae254f4ce6a16c88d57643da407b43553ccfa4 SHA256 8cd84113b57b42e0a381ae726c4972a390e4de65670aa077809a6ae85097fd39
diff --git a/x11-plugins/cd-plugins-experimental/cd-plugins-experimental-3.0.1.ebuild b/x11-plugins/cd-plugins-experimental/cd-plugins-experimental-3.0.1.ebuild
new file mode 100644
index 0000000..f05db4a
--- /dev/null
+++ b/x11-plugins/cd-plugins-experimental/cd-plugins-experimental-3.0.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI="4"
+
+inherit cmake-utils cairo-dock
+
+DESCRIPTION="Official unstable 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_PLUGIN_IUSE="disks doncky network-monitor scoobydo" #kde
+IUSE="${CD_PLUGIN_IUSE} gtk2"
+REQUIRED_USE="|| ( ${CD_PLUGIN_IUSE} )"
+
+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-misc/cairo-dock-${PV}[gtk2=]
+	!x11-misc/cairo-dock-plugins
+	!x11-plugins/cairo-dock-plugins
+	!gtk2? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )"
+RDEPEND="${CDP_DEPEND}"
+#	kde? ( 
+#		kde-base/kdelibs
+#		x11-libs/qt-core
+#	)
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	use disks && CD_PLUGINS+=( "Disks" )
+	use doncky && CD_PLUGINS+=( "Doncky" )
+#	use kde && CD_PLUGINS+=( "kde-integration" ) #"gvfs-integration" )
+	use network-monitor && CD_PLUGINS+=( "Network-Monitor" )
+	use scoobydo && CD_PLUGINS+=( "Scooby-Do" )
+}
+
+src_unpack() {
+	cairo-dock_src_unpack
+}
+
+src_prepare() {
+	cairo-dock_src_prepare
+}
+
+src_configure() {
+#		"$(cmake-utils_use_enable kde NEWKDE-INTEGRATION)"
+	mycmakeargs+=(
+		"$(cmake-utils_use_enable disks DISKS-PLUGIN)"
+		"$(cmake-utils_use_enable doncky DONCKY-PLUGIN)"
+		"$(cmake-utils_use_enable network-monitor NETWORK-MONITOR-PLUGIN)"
+		"$(cmake-utils_use_enable scoobydo SCOOBY-DO-PLUGIN)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/x11-plugins/cd-plugins-experimental/files/cd-plugins-experimental-3.0.1-CMakeLists.txt b/x11-plugins/cd-plugins-experimental/files/cd-plugins-experimental-3.0.1-CMakeLists.txt
new file mode 100644
index 0000000..2bf65b1
--- /dev/null
+++ b/x11-plugins/cd-plugins-experimental/files/cd-plugins-experimental-3.0.1-CMakeLists.txt
@@ -0,0 +1,256 @@
+########### requirements ###############
+
+cmake_minimum_required (VERSION 2.6)
+find_package (PkgConfig)
+include (CheckLibraryExists)
+include (CheckIncludeFiles)
+include (CheckFunctionExists)
+include (CheckSymbolExists)
+include ("${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/GNUInstallDirs.cmake")
+
+########### project ###############
+
+project ("cairo-dock-plugins")
+set (VERSION "3.0.1")
+
+add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration -Wstrict-prototypes) # 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 # or /usr/lib/x86_64-linux-gnu/cairo-dock
+    OUTPUT_VARIABLE pluginsdir)
+STRING (REGEX REPLACE "\n" "" pluginsdir ${pluginsdir})  # remove the \n
+# 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})
+# get prefix dir
+execute_process(
+    COMMAND pkg-config gldi --variable=prefix  # /usr/share/cairo-dock/plug-ins
+    OUTPUT_VARIABLE prefix)
+STRING (REGEX REPLACE "\n" "" prefix ${prefix})
+# get GTK version (must be the same as the core, as GTK2 and GTK3 can't coexist at runtime)
+execute_process(
+    COMMAND pkg-config gldi --variable=gtkversion  # 2 or 3
+    OUTPUT_VARIABLE gtkversion)
+STRING (REGEX REPLACE "\n" "" gtkversion ${gtkversion})
+# 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()
+
+# check that installation dir matches with the core
+GET_FILENAME_COMPONENT(libdir "${pluginsdir}/.." ABSOLUTE)  # /usr/lib # or /usr/lib/x86_64-linux-gnu
+GET_FILENAME_COMPONENT(datadir "${pluginsdatadir}/../.." ABSOLUTE)  # /usr/share
+if (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "${prefix}"
+		OR NOT "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" STREQUAL "${libdir}"
+		OR NOT "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}" STREQUAL "${datadir}")
+	message (STATUS "It seems that the current CMAKE_INSTALL_{PREFIX,LIBDIR,DATAROOTDIR} flags are 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 "${prefix}/${CMAKE_INSTALL_LOCALEDIR}")
+set (gaugesdir "${datadir}/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 "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0")
+#pkg_check_modules ("PACKAGE" REQUIRED "ig")
+pkg_check_modules ("GLDI" REQUIRED "gldi")  # we don't want to link with gldi, so we check it separately.
+set (PACKAGE_INCLUDE_DIRS "${GLDI_INCLUDE_DIRS}")
+
+add_definitions (-DGTK_DISABLE_DEPRECATED="1")
+
+#############    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}")
+
+############# DISKS #################
+if (ENABLE_DISKS-PLUGIN)
+	message (STATUS "> Disks:")
+	set (GETTEXT_DISKS ${GETTEXT_PLUGINS})
+	set (VERSION_DISKS "0.0.4")
+	set (PACKAGE_DISKS "cd-disks")
+	set (with_disks "yes")
+	set (disksdatadir "${pluginsdatadir}/Disks")
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Disks/data/Disks.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Disks/data/Disks.conf)
+	add_subdirectory ("Disks")
+else()
+	set (with_disks "no")
+endif()
+
+############# DONCKY #################
+if (ENABLE_DONCKY-PLUGIN)
+	message (STATUS "> Doncky:")
+	set (GETTEXT_DONCKY ${GETTEXT_PLUGINS})
+	set (VERSION_DONCKY "0.0.6")
+	set (PACKAGE_DONCKY "cd-doncky")
+	set (with_doncky "yes")
+	set (donckydatadir "${pluginsdatadir}/Doncky")
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Doncky/data/Doncky.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Doncky/data/Doncky.conf)
+	add_subdirectory (Doncky)
+else()
+	set (with_doncky "no")
+endif()
+
+############## 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()
+
+############# KDE-INTEGRATION #################
+if (ENABLE_NEWKDE-INTEGRATION)
+	message (STATUS "> KDE-Integration:")
+	set (with_kde_integration "no")
+	#find_package(KDE4)
+	find_package(Qt4)
+	if (QT4_FOUND)
+		message (STATUS " * Qt Includes: ${QT_INCLUDES}")
+		message (STATUS " * Qt Definitions: ${QT_DEFINITIONS}")
+		message (STATUS " * QtCore Library: ${QT_QTCORE_LIBRARY} / ${PACKAGE_LIBRARIES}")
+	else()
+		message (STATUS " * Qt unavailable")
+	endif()
+
+	find_path(KDECORE_INCLUDE_DIR "kdecore_export.h")
+	find_library(KDECORE_LIBRARY NAMES "kdecore")
+	GET_FILENAME_COMPONENT(KDECORE_LIBRARY ${KDECORE_LIBRARY} PATH)
+
+	find_path(KIO_INCLUDE_DIR "kio_export.h" PATH_SUFFIXES "kio")
+	find_library(KIO_LIBRARY NAMES "kio")
+	GET_FILENAME_COMPONENT(KIO_LIBRARY ${KIO_LIBRARY} PATH)
+
+	find_path(KDE_INCLUDE_DIR "KDirWatch" PATH_SUFFIXES "KDE")
+
+	if (NOT "${KDECORE_LIBRARY}" STREQUAL "")
+		message (STATUS " * KDECORE Dir: ${KDECORE_INCLUDE_DIR}")
+		message (STATUS " * KDECORE Library: ${KDECORE_LIBRARY}")
+	else()
+		message (STATUS " * KDECORE unavailable")
+	endif()
+	if (NOT "${KIO_LIBRARY}" STREQUAL "")
+		message (STATUS " * KIO Dir: ${KIO_INCLUDE_DIR}")
+		message (STATUS " * KIO Library: ${KIO_LIBRARY}")
+	else()
+		message (STATUS " * KIO unavailable")
+	endif()
+	if (NOT "${KDE_LIBRARY}" STREQUAL "") ## always empty?
+		message (STATUS " * KDE4 Dir: ${KDE_INCLUDE_DIR}")
+		message (STATUS " * KDE4 Library: ${KDE_LIBRARY}")
+	else()
+		message (STATUS " * KDE4 unavailable")
+	endif()
+
+	if (QT4_FOUND
+		 AND KDECORE_INCLUDE_DIR
+		 AND KDECORE_LIBRARY
+		 AND KIO_INCLUDE_DIR
+		 AND KIO_LIBRARY
+		 AND KDE_INCLUDE_DIR)
+		message (STATUS "  KDE: OK")
+		set (VERSION_KDE_INTEGRATION "0.0.3")
+		set (PACKAGE_KDE_INTEGRATION "cd_kde-integration")
+		set (with_kde_integration2 "yes")
+		set (kde_integrationdatadir "${pluginsdatadir}/kde-integration2")
+		add_subdirectory ("kde-integration2")
+	else()
+		message (STATUS "Could not find kde libs; Cairo-Dock won't be built with KDE support.")
+		message (STATUS "These libraries are required to compile KDE experimental applet: kdecore, kio, kde4")
+		set (MODULES_INTEGRATION_MISSING "${MODULES_INTEGRATION_MISSING} kdecore, kio, kde4")
+	endif()
+else()
+	set (with_kde_integration2 "no")
+endif()
+
+############# NETWORK_MONITOR #################
+if (ENABLE_NETWORK-MONITOR-PLUGIN)
+	message (STATUS "> Network Monitor:")
+	set (GETTEXT_NETWORK_MONITOR ${GETTEXT_PLUGINS})
+	set (VERSION_NETWORK_MONITOR "0.2.7")
+	set (PACKAGE_NETWORK_MONITOR "cd-network-monitor")
+	set (with_network_monitor "yes")
+	set (network_monitordatadir "${pluginsdatadir}/Network-Monitor")
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Network-Monitor/data/Network-Monitor.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Network-Monitor/data/Network-Monitor.conf)
+	add_subdirectory (Network-Monitor)
+else()
+	set (with_network_monitor "no")
+endif()
+
+############# SCOOBY_DO #################
+if (ENABLE_SCOOBY-DO-PLUGIN)
+	message (STATUS "> Scooby-Do:")
+	set (GETTEXT_SCOOBY_DO ${GETTEXT_PLUGINS})
+	set (VERSION_SCOOBY_DO "0.1.1")
+	set (PACKAGE_SCOOBY_DO "cd-scooby-do")
+	set (with_scooby_do "yes")
+	set (scooby_dodatadir "${pluginsdatadir}/Scooby-Do")
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Scooby-Do/data/Scooby-Do.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Scooby-Do/data/Scooby-Do.conf)
+	add_subdirectory (Scooby-Do)
+else()
+	set (with_scooby_do "no")
+endif()
+
+message ("")
+message (STATUS "===============")
+message (STATUS "Plug-ins build:")
+message (STATUS "===============")
+message ("")
+message (STATUS "Unstable:")
+message (STATUS " - with Disks applet:              ${with_disks}")
+message (STATUS " - with Doncky applet:             ${with_doncky}")
+message (STATUS " - with KDE experimental support:  ${with_kde_integration2}")
+message (STATUS " - with Network-Monitor applet:    ${with_network_monitor}")
+message (STATUS " - with Scooby-Do applet:          ${with_scooby_do}")
+message ("")