desktop/murrine-themes: Updated for version 0.98.5.

Comments: Version update and more... this now includes everything from
the Debian package (GTK2/GTK3 themes, XFWM themes and themes for
Metacity and Openbox, so users of these can benefit). I included also
the default Murrine XFWM theme from xfce-look.org and gave up on trying
to make the themes list names consistent.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

4 files changed, 21 insertions, 80 deletions

diff --git a/desktop/murrine-themes/README b/desktop/murrine-themes/README
index c02907d71fb3..f4e3a0769c81 100644
--- a/desktop/murrine-themes/README
+++ b/desktop/murrine-themes/README
@@ -1,6 +1,5 @@
-This includes the following themes for the Murrine GTK2 engine:
+This is a collection of Murrine family themes for GTK2, GTK3 and XFWM.
+Also, there are a few themes for metacity and openbox window managers
+that can be used if you have these installed.
 
-Albatros AquaIsh Azul Blau Bleu Blu Blue Bluebird Candido Candy
-Cappuccino Chrome Cream Crystal CrystalCurve CrystalHuman
-CrystalLine Ealm FancyCandy Gilouche Gray Greybird Kiwi Light
-LoveGray NeoGraphite NOX Orangine Shearwater Sky VerdeOlivo
+This includes also the default Murrina XFWM theme from xfce-look.org
diff --git a/desktop/murrine-themes/murrine-themes.SlackBuild b/desktop/murrine-themes/murrine-themes.SlackBuild
index 33052e438463..e7bc6152228c 100644
--- a/desktop/murrine-themes/murrine-themes.SlackBuild
+++ b/desktop/murrine-themes/murrine-themes.SlackBuild
@@ -25,11 +25,12 @@
 # Many thanks to Debian for bundling all these themes together!
 
 PRGNAM=murrine-themes
-VERSION=${VERSION:-0.98.4}
+VERSION=${VERSION:-0.98.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
+ORIGINAL=Murrine # Default theme for XFWM
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -43,7 +44,8 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION/usr/share/themes
+tar xvf $CWD/${ORIGINAL}Xfwm.tar.bz2
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -51,72 +53,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Include only the gtk-2.0 themes and give them more consistent names.
-cd usr/share/themes
-install -D -m644 Albatross/gtk-2.0/gtkrc 		 \
-                 $PKG/usr/share/themes/Murrine-Albatross/gtk-2.0/gtkrc
-install -D -m644 Bluebird/gtk-2.0/gtkrc			 \
-                 $PKG/usr/share/themes/Murrine-Bluebird/gtk-2.0/gtkrc
-install -D -m644 greybird/gtk-2.0/gtkrc			 \
-                 $PKG/usr/share/themes/Murrine-Greybird/gtk-2.0/gtkrc
-install -D -m644 Kiwi/gtk-2.0/gtkrc			 \
-                 $PKG/usr/share/themes/Murrine-Kiwi/gtk-2.0/gtkrc
-install -D -m644 MurrinaAquaIsh/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-AquaIsh/gtk-2.0/gtkrc
-install -D -m644 MurrinaAzul/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Azul/gtk-2.0/gtkrc
-install -D -m644 MurrinaBlau/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Blau/gtk-2.0/gtkrc
-install -D -m644 MurrinaBleu/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Bleu/gtk-2.0/gtkrc
-install -D -m644 MurrinaBlu/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Blu/gtk-2.0/gtkrc
-install -D -m644 MurrinaBlue/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Blue/gtk-2.0/gtkrc
-install -D -m644 MurrinaCandido/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Candido/gtk-2.0/gtkrc
-install -D -m644 MurrinaCandy/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Candy/gtk-2.0/gtkrc
-install -D -m644 MurrinaCappuccino/gtk-2.0/gtkrc	 \
-                 $PKG/usr/share/themes/Murrine-Cappuccino/gtk-2.0/gtkrc
-install -D -m644 MurrinaChrome/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Chrome/gtk-2.0/gtkrc
-install -D -m644 MurrinaCream/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Cream/gtk-2.0/gtkrc
-install -D -m644 MurrinaCrystal/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Crystal/gtk-2.0/gtkrc
-install -D -m644 MurrinaCrystalCurve/gtk-2.0/gtkrc	 \
-                 $PKG/usr/share/themes/Murrine-CrystalCurve/gtk-2.0/gtkrc
-install -D -m644 MurrinaCrystalHuman/gtk-2.0/gtkrc	 \
-                 $PKG/usr/share/themes/Murrine-CrystalHuman/gtk-2.0/gtkrc
-install -D -m644 MurrinaCrystalLine/gtk-2.0/gtkrc	 \
-                 $PKG/usr/share/themes/Murrine-CrystalLine/gtk-2.0/gtkrc
-install -D -m644 MurrinaEalm/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Ealm/gtk-2.0/gtkrc
-install -D -m644 MurrinaElement/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Element/gtk-2.0/gtkrc
-install -D -m644 MurrinaFancyCandy/gtk-2.0/gtkrc	 \
-                 $PKG/usr/share/themes/Murrine-FancyCandy/gtk-2.0/gtkrc
-install -D -m644 MurrinaGilouche/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Gilouche/gtk-2.0/gtkrc
-install -D -m644 MurrinaLoveGray/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-LoveGray/gtk-2.0/gtkrc
-install -D -m644 MurrinaNeoGraphite/gtk-2.0/gtkrc	 \
-                 $PKG/usr/share/themes/Murrine-NeoGraphite/gtk-2.0/gtkrc
-install -D -m644 MurrinaVerdeOlivo/gtk-2.0/gtkrc	 \
-                 $PKG/usr/share/themes/Murrine-VerdeOlivo/gtk-2.0/gtkrc
-install -D -m644 Murrine-Gray/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Gray/gtk-2.0/gtkrc
-install -D -m644 Murrine-Light/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Light/gtk-2.0/gtkrc
-install -D -m644 Murrine-Sky/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Sky/gtk-2.0/gtkrc
-install -D -m644 NOX/gtk-2.0/gtkrc			 \
-                 $PKG/usr/share/themes/Murrine-NOX/gtk-2.0/gtkrc
-install -D -m644 Orangine/gtk-2.0/gtkrc			 \
-                 $PKG/usr/share/themes/Murrine-Orangine/gtk-2.0/gtkrc
-install -D -m644 shearwater/gtk-2.0/gtkrc		 \
-                 $PKG/usr/share/themes/Murrine-Shearwater/gtk-2.0/gtkrc
+# Copy everything, including the original XFCE Murrina theme from here:
+# http://xfce-look.org/content/show.php/Murrine++Xfwm+Theme?content=43083
+mkdir -p $PKG/usr/share/themes
+cp -a * $PKG/usr/share/themes
 
 cd $TMP/$PRGNAM-$VERSION/debian
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/murrine-themes/murrine-themes.info b/desktop/murrine-themes/murrine-themes.info
index 5f2b72ae2a11..31f7c512456b 100644
--- a/desktop/murrine-themes/murrine-themes.info
+++ b/desktop/murrine-themes/murrine-themes.info
@@ -1,8 +1,10 @@
 PRGNAM="murrine-themes"
-VERSION="0.98.4"
+VERSION="0.98.5"
 HOMEPAGE="http://www.cimitan.com/murrine/"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/m/murrine-themes/murrine-themes_0.98.4.tar.gz"
-MD5SUM="d60aa9f256b85f13256c194622204a63"
+DOWNLOAD="http://ftp.debian.org/debian/pool/main/m/murrine-themes/murrine-themes_0.98.5.tar.gz \
+	http://cimi.netsons.org/media/download_gallery/MurrineXfwm.tar.bz2"
+MD5SUM="77a6c3482827548d383dd16d6172b0c0 \
+	f3b69e670c95639fc96d8a9ace7d36d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="murrine"
diff --git a/desktop/murrine-themes/slack-desc b/desktop/murrine-themes/slack-desc
index 54055ad2d239..805c1cf6d332 100644
--- a/desktop/murrine-themes/slack-desc
+++ b/desktop/murrine-themes/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
               |-----handy-ruler------------------------------------------------------|
-murrine-themes: murrine-themes (GTK2 themes for the Murrine engine)
-murrine-themes:
-murrine-themes: This package contains a collection of themes for the Murrine
-murrine-themes: GTK2 engine.
+murrine-themes: murrine-themes (Themes of the Murrine family)
 murrine-themes:
+murrine-themes: This includes a collection of Murrine themes for GTK2, GTK3
+murrine-themes: and XFWM. Also, there are a few themes for metacity and openbox
+murrine-themes: window managers that can be used if you have these installed.
 murrine-themes:
 murrine-themes:
 murrine-themes: