multimedia/musique: New maintainer, minor fixes.

Signed-off-by: B. Watson <yalhcru@gmail.com>

3 files changed, 40 insertions, 14 deletions

diff --git a/multimedia/musique/README b/multimedia/musique/README
index 63678006111b8..8961033c0bbe4 100644
--- a/multimedia/musique/README
+++ b/multimedia/musique/README
@@ -1,2 +1,19 @@
+musique (cross-platform music player)
+
 Musique is just another music player, only better.  Musique unclutters 
 your music listening experience with a clean and innovative interface.
+
+Notes:
+
+- musique is a Qt4 application. It integrates nicely with KDE, but doesn't
+  require KDE to run.
+
+- This is not the latest version of musique. This is deliberate: version
+  1.5 requires qt5. When musique notifies you that version 1.5 is available,
+  click "Close". Upgrading from within the app won't work.
+
+- The first time you run musique, it scans your music collection and
+  uses the Last.fm service to get metadata about the files (meaning, it
+  sends a list of all your music to a 3rd parts). This isn't optional,
+  so if you have privacy concerns about it, don't bother installing
+  this software.
diff --git a/multimedia/musique/musique.SlackBuild b/multimedia/musique/musique.SlackBuild
index 2e48eace2c495..179804670ea2a 100644
--- a/multimedia/musique/musique.SlackBuild
+++ b/multimedia/musique/musique.SlackBuild
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # Slackware build script for musique
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+
+# Formerly maintained by Ryan P.C. McQuen <email removed>
+# Now maintained by B. Watson <yalhcru@gmail.com>
 
 # Copyright 2010, 2012  Binh Nguyen <binhvng@gmail.com>
 # All rights reserved.
@@ -23,14 +25,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20170326 bkw:
+# - take over maintenance.
+# - i486=>i586.
+# - don't install INSTALL to docdir.
+# - actually use SLKCFLAGS.
+# - add some notes to README.
+# - BUILD=2.
+
 PRGNAM=musique
 VERSION=${VERSION:-1.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +51,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -66,20 +76,19 @@ cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+# I don't see how to force our flags via qmake, hence the sed stuff.
 qmake PREFIX=/usr
-
+sed -i "/C.*FLAGS/s,-O2,$SLKCFLAGS," Makefile
 make
 make INSTALL_ROOT=$PKG install
-
-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
+strip $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES COPYING INSTALL TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES COPYING TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/musique/musique.info b/multimedia/musique/musique.info
index 484d3f4103256..224c5d85843b3 100644
--- a/multimedia/musique/musique.info
+++ b/multimedia/musique/musique.info
@@ -6,5 +6,5 @@ MD5SUM="c8d7146913a91af4c5190084ac9f8182"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gst0-plugins-bad gst0-plugins-ugly"
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"