4 files changed, 70 insertions, 22 deletions

diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 7e3199ef2ced..311a94a0309c 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cairo-dock-plugins
-DISTVERSION=	2.2.0-4
-PORTREVISION=	1
+DISTVERSION=	2.3.0~3
 CATEGORIES=	deskutils
-MASTER_SITES=	http://launchpadlibrarian.net/56955156/
+MASTER_SITES=	http://launchpadlibrarian.net/73753265/
 
 MAINTAINER=	fidaj@ukr.net
 COMMENT=	Cairo-Dock-Plugins for Cairo-Dock
@@ -25,11 +24,13 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2
 USE_LDCONFIG=	yes
+USE_PYTHON=	yes
 USE_XORG=	xrender
 USE_DOS2UNIX=	YES
 USE_CMAKE=	yes
 USE_GCC=	4.5+
 MAKE_JOBS_SAFE=	YES
+PLIST_SUB+=	PYVER="${PYTHON_VERSION:S/thon//}"
 
 OPTIONS=	GMENU "Common Applications menu" On \
 		KEYBOARD_INDICATOR "Control the keyboard layout" Off \
diff --git a/deskutils/cairo-dock-plugins/distinfo b/deskutils/cairo-dock-plugins/distinfo
index d8ec90468320..847bf5883e66 100644
--- a/deskutils/cairo-dock-plugins/distinfo
+++ b/deskutils/cairo-dock-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cairo-dock-plugins-2.2.0-4.tar.gz) = e8905dc6f397c89b53b6e6a15489bf4d78e19427bd95e01f7c1b3df21a564ce2
-SIZE (cairo-dock-plugins-2.2.0-4.tar.gz) = 5533523
+SHA256 (cairo-dock-plugins-2.3.0~3.tar.gz) = 2bcfae5b6876a0a9a36ce7e0deb42a2d72234299da651c24f34e398f956a25cf
+SIZE (cairo-dock-plugins-2.3.0~3.tar.gz) = 5959407
diff --git a/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt b/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt
index 736b8ac4f853..020d984c96ed 100644
--- a/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt
+++ b/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt
@@ -1,16 +1,18 @@
---- CMakeLists.txt.orig	2011-01-07 23:03:06.000000000 +0200
-+++ CMakeLists.txt	2011-01-07 23:42:55.000000000 +0200
-@@ -121,19 +121,6 @@
+--- CMakeLists.txt.orig	2011-07-12 14:07:10.000000000 +0300
++++ CMakeLists.txt	2011-07-12 14:09:57.000000000 +0300
+@@ -148,21 +148,6 @@
  configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Clipper/data/Clipper.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Clipper/data/Clipper.conf)
  add_subdirectory (Clipper)
  
 -############# CLOCK #################
+-set (with_ical "yes")
 -pkg_check_modules ("LIBICAL_PACKAGE" "libical")
 -if ("${LIBICAL_PACKAGE_FOUND}" STREQUAL "")
+-	set (with_ical "no")
 -	message (STATUS "Could not find libical; Clock plugin won't be built with iCal support.")
 -endif()
 -set (GETTEXT_CLOCK ${GETTEXT_PLUGINS})
--set (VERSION_CLOCK "2.1.1")
+-set (VERSION_CLOCK "2.1.2")
 -set (PACKAGE_CLOCK "cd-clock")
 -set (clockuserdirname "clock")
 -set (clockdatadir "${pluginsdatadir}/clock")
@@ -19,16 +21,25 @@
 -
  ############# COMPIZ_ICON #################
  set (GETTEXT_COMPIZ_ICON ${GETTEXT_PLUGINS})
- set (VERSION_COMPIZ_ICON "1.1.5")
-@@ -299,6 +286,7 @@
+ set (VERSION_COMPIZ_ICON "1.1.6")
+@@ -224,7 +209,7 @@
+ 
+ # Valac is only riquired to convert vala files to C files.
+ #  So we can directly use produced files (c, h, vapi) without using valac.
+-set (with_vala "yes")
++set (with_vala "no")
+ set (with_valac "no")
+ find_program (VALAC_EXE valac)
+ message (STATUS "VALAC_EXE: ${VALAC_EXE}")
+@@ -470,6 +455,7 @@
  endif()
  
  ############# KEYBOARD_INDICATOR #################
 +if (NOT "${enable_keyboard_indicator}" STREQUAL "no")
+ set (with_keyboard_indicator "no")
  pkg_check_modules (KEYBOARD_INDICATOR_PACKAGE libxklavier)
  if ("${KEYBOARD_INDICATOR_PACKAGE_FOUND}" STREQUAL "")
- 	message (STATUS "Could not find libxklavier; Cairo-Dock won't be built with keyboard-indicator applet.")
-@@ -310,6 +298,7 @@
+@@ -483,6 +469,7 @@
  	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/keyboard-indicator/data/keyboard-indicator.conf.in ${CMAKE_CURRENT_BINARY_DIR}/keyboard-indicator/data/keyboard-indicator.conf)
  	add_subdirectory ("keyboard-indicator")
  endif()
@@ -36,7 +47,7 @@
  
  ############# LOGOUT #################
  set (GETTEXT_LOGOUT ${GETTEXT_PLUGINS})
-@@ -546,6 +535,7 @@
+@@ -800,6 +787,7 @@
  add_subdirectory (systray)
  
  ############# TERMINAL #################
@@ -44,7 +55,7 @@
  pkg_check_modules (TERMINAL_PACKAGE vte)
  if ("${TERMINAL_PACKAGE_FOUND}" STREQUAL "")
  	message (STATUS "Could not find libvte; Cairo-Dock won't be built with terminal applet.")
-@@ -557,6 +547,7 @@
+@@ -813,6 +801,7 @@
  	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/terminal/data/terminal.conf.in ${CMAKE_CURRENT_BINARY_DIR}/terminal/data/terminal.conf)
  	add_subdirectory (terminal)
  endif()
@@ -52,15 +63,15 @@
  
  ############# TOMBOY #################
  set (GETTEXT_TOMBOY ${GETTEXT_PLUGINS})
-@@ -585,6 +576,7 @@
+@@ -841,6 +830,7 @@
  add_subdirectory (weather)
  
  ############# WEBLETS #################
 +if (NOT "${enable_weblets}" STREQUAL "no")
- pkg_check_modules (WEBKIT webkit-1.0)
- if (NOT "${enable_weblets}" STREQUAL "no")
- 	if ("${WEBKIT_FOUND}" STREQUAL "")
-@@ -598,6 +590,7 @@
+ set (with_weblets "no")
+ if (NOT "${enable-weblets}" STREQUAL "no")
+ 	pkg_check_modules (WEBKIT webkit-1.0)
+@@ -856,6 +846,7 @@
  		add_subdirectory ("weblets")
  	endif()
  endif()
@@ -68,3 +79,19 @@
  
  ############# WIFI #################
  set (GETTEXT_WIFI ${GETTEXT_PLUGINS})
+@@ -866,6 +857,7 @@
+ add_subdirectory (wifi)
+ 
+ ############# XFCE-INTEGRATION #################
++if (NOT "${enable_xfce_integration}" STREQUAL "no")
+ set (with_xfce_integration "no")
+ if (NOT "${enable-xfce-integration}" STREQUAL "no")
+ 	pkg_check_modules (XFCE_INTEGRATION_THUNAR thunar-vfs-1)
+@@ -880,6 +872,7 @@
+ 		add_subdirectory ("xfce-integration")
+ 	endif()
+ endif()
++endif()
+ 
+ ############# XGAMMA #################
+ pkg_check_modules (XGAMMA_PACKAGE x11 xxf86vm)
diff --git a/deskutils/cairo-dock-plugins/pkg-plist b/deskutils/cairo-dock-plugins/pkg-plist
index a43fd2f64244..fb947c68f47d 100644
--- a/deskutils/cairo-dock-plugins/pkg-plist
+++ b/deskutils/cairo-dock-plugins/pkg-plist
@@ -27,6 +27,7 @@ lib/cairo-dock/libcd-netspeed.so
 lib/cairo-dock/libcd-powermanager.so
 lib/cairo-dock/libcd-quick-browser.so
 lib/cairo-dock/libcd-rendering.so
+lib/cairo-dock/libcd-Remote-Control.so
 lib/cairo-dock/libcd-shortcuts.so
 lib/cairo-dock/libcd-showDesktop.so
 lib/cairo-dock/libcd-show_mouse.so
@@ -41,10 +42,18 @@ lib/cairo-dock/libcd-weather.so
 lib/cairo-dock/libcd-wifi.so
 lib/cairo-dock/libcd_gnome-integration.so
 %%XFCE_INTEGRATION%%lib/cairo-dock/libcd_xfce-integration.so
+%%PYTHON_SITELIBDIR%%/CDApplet.py
+%%PYTHON_SITELIBDIR%%/CDApplet.pyc
+%%PYTHON_SITELIBDIR%%/CDApplet-1.0-%%PYVER%%.egg-info
+%%PYTHON_SITELIBDIR%%/CDBashApplet.py
+%%PYTHON_SITELIBDIR%%/CDBashApplet.pyc
+%%PYTHON_SITELIBDIR%%/CDBashApplet-1.0-%%PYVER%%.egg-info
 share/locale/fr/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/id/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/it/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/ja/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/nl/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/pl/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/pt/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/ru/LC_MESSAGES/cairo-dock-plugins.mo
@@ -58,7 +67,9 @@ share/locale/hu/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/uk/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/zh_TW/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/ar/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/el/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/et/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/eu/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/sk/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/sr/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/tr/LC_MESSAGES/cairo-dock-plugins.mo
@@ -132,6 +143,7 @@ share/cairo-dock/plug-ins/compiz-icon/4.svg
 share/cairo-dock/plug-ins/compiz-icon/icon.png
 share/cairo-dock/plug-ins/compiz-icon/preview.jpg
 share/cairo-dock/plug-ins/Dbus/Dbus.conf
+share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh
 share/cairo-dock/plug-ins/Dbus/icon.svg
 share/cairo-dock/plug-ins/desklet-rendering/icon.svg
 share/cairo-dock/plug-ins/desklet-rendering/branche1.svg
@@ -164,6 +176,7 @@ share/cairo-dock/plug-ins/drop-indicator/default-hover-indicator.svg
 share/cairo-dock/plug-ins/dustbin/dustbin.conf
 share/cairo-dock/plug-ins/dustbin/preview.jpg
 share/cairo-dock/plug-ins/dustbin/icon.png
+share/cairo-dock/plug-ins/dustbin/themes/default/preview
 share/cairo-dock/plug-ins/dustbin/themes/default/trashcan_full.svg
 share/cairo-dock/plug-ins/dustbin/themes/default/trashcan_empty.svg
 share/cairo-dock/plug-ins/gnome-integration/icon.png
@@ -188,6 +201,7 @@ share/cairo-dock/plug-ins/kde-integration/icon.png
 %%KEYBOARD_INDICATOR%%share/cairo-dock/plug-ins/keyboard-indicator/keyboard-indicator.conf
 %%KEYBOARD_INDICATOR%%share/cairo-dock/plug-ins/keyboard-indicator/icon.png
 %%KEYBOARD_INDICATOR%%share/cairo-dock/plug-ins/keyboard-indicator/preview.jpg
+share/cairo-dock/plug-ins/logout/emblem-reboot.png
 share/cairo-dock/plug-ins/logout/logout.conf
 share/cairo-dock/plug-ins/logout/icon.svg
 share/cairo-dock/plug-ins/logout/icon-scheduling.png
@@ -241,6 +255,10 @@ share/cairo-dock/plug-ins/powermanager/preview.jpg
 share/cairo-dock/plug-ins/quick_browser/quick-browser.conf
 share/cairo-dock/plug-ins/quick_browser/icon.svg
 share/cairo-dock/plug-ins/quick_browser/preview.jpg
+share/cairo-dock/plug-ins/Remote-Control/Remote-Control.conf
+share/cairo-dock/plug-ins/Remote-Control/preview.jpg
+share/cairo-dock/plug-ins/Remote-Control/icon.png
+share/cairo-dock/plug-ins/Remote-Control/arrows.svg
 share/cairo-dock/plug-ins/rendering/rendering.conf
 share/cairo-dock/plug-ins/rendering/icon.svg
 share/cairo-dock/plug-ins/rendering/preview-caroussel.jpg
@@ -282,10 +300,10 @@ share/cairo-dock/plug-ins/switcher/workspaces.svg
 share/cairo-dock/plug-ins/switcher/switcher.conf
 share/cairo-dock/plug-ins/System-monitor/nvidia-config
 share/cairo-dock/plug-ins/System-monitor/System-Monitor.conf
+share/cairo-dock/plug-ins/System-monitor/button-cpu.svg
+share/cairo-dock/plug-ins/System-monitor/button-ram.svg
 share/cairo-dock/plug-ins/System-monitor/icon.png
 share/cairo-dock/plug-ins/System-monitor/preview.jpg
-share/cairo-dock/plug-ins/System-monitor/button-cpu.png
-share/cairo-dock/plug-ins/System-monitor/button-ram.png
 share/cairo-dock/plug-ins/systray/systray.conf
 share/cairo-dock/plug-ins/systray/icon.png
 share/cairo-dock/plug-ins/systray/preview.jpg
@@ -378,6 +396,7 @@ share/cairo-dock/plug-ins/wifi/preview.jpg
 share/cairo-dock/plug-ins/Xgamma/Xgamma.conf
 share/cairo-dock/plug-ins/Xgamma/icon.png
 share/cairo-dock/plug-ins/Xgamma/preview.jpg
+@dirrmtry lib/pkgconfig
 %%ALSA_MIXER%%@dirrm share/cairo-dock/plug-ins/AlsaMixer
 @dirrm share/cairo-dock/plug-ins/Animated-icons
 @dirrm share/cairo-dock/plug-ins/Cairo-Penguin/themes/Classic
@@ -416,6 +435,7 @@ share/cairo-dock/plug-ins/Xgamma/preview.jpg
 @dirrm share/cairo-dock/plug-ins/netspeed
 @dirrm share/cairo-dock/plug-ins/powermanager
 @dirrm share/cairo-dock/plug-ins/quick_browser
+@dirrm share/cairo-dock/plug-ins/Remote-Control
 @dirrm share/cairo-dock/plug-ins/RSSreader
 @dirrm share/cairo-dock/plug-ins/rendering
 @dirrm share/cairo-dock/plug-ins/shortcuts