From bbc6ea6cc3069e927f6e63e265ee5453dddd867d Mon Sep 17 00:00:00 2001
From: Ruben Schuller <ruben@orgizm.net>
Date: Mon, 19 May 2014 08:49:09 +0700
Subject: multimedia/cantata: Updated for version 1.3.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 multimedia/cantata/README             | 14 +++++++-------
 multimedia/cantata/cantata.SlackBuild | 10 ++++++++--
 multimedia/cantata/cantata.info       |  6 +++---
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/multimedia/cantata/README b/multimedia/cantata/README
index b83412aa7d..b876ce9a3f 100644
--- a/multimedia/cantata/README
+++ b/multimedia/cantata/README
@@ -1,10 +1,10 @@
 Cantata is a feature-rich graphical client for MPD.
 
-The tarball in the .info file is created from the SVN found at
-http://cantata.googlecode.com/svn/trunk/
-and is not officially hosted by the cantata developers. If you are
-uncomfortable with this, you can use VERSION=svn to pull the sources
-directly from the svn.
+The download is from google drive, which when downloaded with wget
+results in ugly filenames. The slackbuild checks for either the
+"normal" filename or the ugly one, and uses the one it finds.
 
-Cantata can be build with some additional features.
-See the SlackBuild for information on how to enable them.
+You can use VERSION=svn to pull the sources directly from the svn.
+
+Cantata can be build with some additional features. See the SlackBuild for
+information on how to enable them.
diff --git a/multimedia/cantata/cantata.SlackBuild b/multimedia/cantata/cantata.SlackBuild
index 9677ada3ef..26d8a77239 100644
--- a/multimedia/cantata/cantata.SlackBuild
+++ b/multimedia/cantata/cantata.SlackBuild
@@ -24,7 +24,9 @@
 
 PRGNAM=cantata
 # this could be set to "svn" to automatically pull the newest source
-VERSION=${VERSION:-r4373}
+VERSION=${VERSION:-1.3.4}
+SRCFILE=${SRCFILE:-"uc?export=download&id=0Bzghs6gQWi60WTYtaXk3c1IzNVU"}
+
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -98,7 +100,11 @@ rm -rf $PRGNAM-$VERSION
 if [ "$VERSION" = "svn" ]; then
 	svn checkout http://cantata.googlecode.com/svn/trunk/ cantata-svn
 else
-	tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+	if [ -f "$PRGNAM-$VERSION.tar.bz2" ]; then
+		tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+	else
+		tar xvf $CWD/${SRCFILE}
+	fi
 fi
 
 cd $PRGNAM-$VERSION
diff --git a/multimedia/cantata/cantata.info b/multimedia/cantata/cantata.info
index da6452e49e..f3a7c7303e 100644
--- a/multimedia/cantata/cantata.info
+++ b/multimedia/cantata/cantata.info
@@ -1,8 +1,8 @@
 PRGNAM="cantata"
-VERSION="r4373"
+VERSION="1.3.4"
 HOMEPAGE="https://code.google.com/p/cantata/"
-DOWNLOAD="http://slackdemand.orgizm.net/files/cantata/cantata-r4373.tar.gz"
-MD5SUM="66656faba49aa9c66f81d6d27fd3cd05"
+DOWNLOAD="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WTYtaXk3c1IzNVU"
+MD5SUM="5b21329a4b00716f7feb827805f215b5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"
-- 
cgit v1.2.3