3 files changed, 36 insertions, 25 deletions
diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild
index ba130e745f..515bbf6ce6 100644
--- a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild
+++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 
 # Slackware build script for cairo-dock-plugins
 # Written by Robert Goodall (cmd.line.geek@gmail.com)
@@ -22,12 +22,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cairo-dock-plugins
-VERSION=${VERSION:-2.2.0_4}
+VERSION=${VERSION:-2.3.0~2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRC_VERSION=$(printf $VERSION | tr _ -)
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -55,31 +53,44 @@ else
     LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUPUT
-cd $TMP || exit 1
-rm -rf $PRGNAM-$SRC_VERSION
-tar -xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz
-cd $PRGNAM-$SRC_VERSION
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 cmake \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
   -DLIB_SUFFIX=${LIBDIRSUFFIX} \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DCMAKE_BUILD_TYPE=Release .
 
-make VERBOSE=1 || exit
-make install DESTDIR=$PKG || exit 1
+make VERBOSE=1
+make install DESTDIR=$PKG
+
+# Sheesh.  Donchaloveruby?
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1
+if [ -d $PKG/usr/usr ]; then
+  mv $PKG/usr/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1/CDApplet.rb \
+     $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1
+  rm -rf $PKG/usr/usr
+elif [ -e $PKG/usr/CDApplet.rb ]; then
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1
+  mv $PKG/usr/CDApplet.rb $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1
+fi
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog LGPL-2 LICENSE copyright $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.Slackbuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/install
diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.info b/desktop/cairo-dock-plugins/cairo-dock-plugins.info
index 16d1235e9e..e0e4fdb230 100644
--- a/desktop/cairo-dock-plugins/cairo-dock-plugins.info
+++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.info
@@ -1,10 +1,10 @@
 PRGNAM="cairo-dock-plugins"
-VERSION="2.2.0_4"
+VERSION="2.3.0~2"
 HOMEPAGE="http://www.glx-dock.org"
-DOWNLOAD="http://launchpad.net/cairo-dock-plug-ins/2.2/2.2.0/+download/cairo-dock-plugins-2.2.0-4.tar.gz"
-MD5SUM="7585bf608773f3b8cc633c835ca2704f"
+DOWNLOAD="http://launchpad.net/cairo-dock-plug-ins/2.3/2.3.0/+download/cairo-dock-plugins-2.3.0~2.tar.gz"
+MD5SUM="737662dc05539b7431899f236f1ca0e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robert Goodall"
 EMAIL="cmd.line.geek@gmail.com"
-APPROVED="Michiel van Wessem"
+APPROVED="rworkman"
diff --git a/desktop/cairo-dock-plugins/slack-desc b/desktop/cairo-dock-plugins/slack-desc
index fbcb77f835..ed9318a05d 100644
--- a/desktop/cairo-dock-plugins/slack-desc
+++ b/desktop/cairo-dock-plugins/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct. It's also customary
 # to leave one space after the ':'.
 
-                  |----handy-ruler--------------------------------------------|
+                  |-----handy-ruler------------------------------------------------------|
 cairo-dock-plugins: cairo-dock-plugins (plugins for cairo-dock)
 cairo-dock-plugins:
-cairo-dock-plugins: This is the Plug-ins part of Cairo-Dock project. A set of 
-cairo-dock-plugins: official plug-ins for Cairo-Dock It provides some new 
-cairo-dock-plugins: functionnalities like controling music players or 
-cairo-dock-plugins: note-taking, a clock or a desktop switcher but also some 
-cairo-dock-plugins: views, dialogs and desklets skins, etc.
+cairo-dock-plugins: This package contains a set of official plug-ins for cairo-dock.
+cairo-dock-plugins: It provides some new functionality such as controling music players,
+cairo-dock-plugins: note-taking, a clock, and a desktop switcher, but also some views,
+cairo-dock-plugins: dialogs and desklets skins, etcetera.
+cairo-dock-plugins:
+cairo-dock-plugins: Homepage: http://www.glx-dock.org/tt_project.php
+cairo-dock-plugins:
 cairo-dock-plugins:
-cairo-dock-plugins: more informations about it, please see 
-cairo-dock-plugins: http://www.glx-dock.org/tt_project.php
 cairo-dock-plugins: