multimedia/acetoneiso: Updated for version 2.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 22 insertions, 17 deletions

diff --git a/multimedia/acetoneiso/README b/multimedia/acetoneiso/README
index 8d0e9daf06e3..6a29b3e2ca1e 100644
--- a/multimedia/acetoneiso/README
+++ b/multimedia/acetoneiso/README
@@ -6,3 +6,6 @@ proprietary images formats of the Windows world such as ISO BIN NRG
 MDF IMG and do plenty of other things.
 
 Some features you can see in /usr/doc/$PRGNAM-$VERSION/FEATURES.
+
+To create images from folders this suggest "xorriso" from  AlienBob's
+repository: http://www.slackware.com/~alien/slackbuilds/xorriso/
diff --git a/multimedia/acetoneiso/acetoneiso.SlackBuild b/multimedia/acetoneiso/acetoneiso.SlackBuild
index c2891be1aeff..b64f0925b624 100644
--- a/multimedia/acetoneiso/acetoneiso.SlackBuild
+++ b/multimedia/acetoneiso/acetoneiso.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for acetoneiso.
 #
-# Copyright 2016 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=acetoneiso
-VERSION=${VERSION:-2.3}
+VERSION=${VERSION:-2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,9 +60,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
-mv ${PRGNAM}_${VERSION} $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION/$PRGNAM
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+mv ${PRGNAM}${VERSION} $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,13 +70,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cd sources
-	sed -i 's#<Phonon/#<phonon/#' erase_cd.h erase_cd.cpp erase_dvd.cpp \
-	  burn_iso_2_cd.cpp burn_iso_2_cd.h burn_iso_2_dvd.cpp
+cd $PRGNAM/sources
+	sed -i 's#<Phonon/#<phonon/#' erase_cd.cpp erase_dvd.cpp \
+	  burn_iso_2_cd.cpp burn_iso_2_dvd.cpp
 cd ..
 
 qmake
-	sed -i 's|-I/usr/include/QtCore|-I/usr/include/qt4/QtCore -I/usr/include/qt4/KDE|' Makefile
 make 
 make install DESTDIR=$PKG
 
@@ -86,16 +85,19 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 install -d $PKG/usr/{bin,share/{acetoneiso,applications,pixmaps}}
 install -D -m755 $CWD/acetoneiso $PKG/usr/bin/acetoneiso
 install -D -m755 acetoneiso $PKG/usr/share/acetoneiso/acetoneiso
-cp -a {audio,images,locale,manual,ui} $PKG/usr/share/acetoneiso
+cp -a {images,locale,manual,ui} $PKG/usr/share/acetoneiso
 install -D -m644 menu/AcetoneISO.desktop $PKG/usr/share/applications/AcetoneISO.desktop
 install -D -m644 images/Acetino2.png $PKG/usr/share/pixmaps/Acetino2.png
 
-DOCS="../AUTHORS ../CHANGELOG ../FEATURES ../LICENSE ../README"
+DOCS="../AUTHORS ../CHANGELOG ../FEATURES ../LICENSE ../README ../TODO"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# create a symlink to unrar-nonfree:
+ln -s /usr/bin/unrar $PKG/usr/bin/unrar-nonfree
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/multimedia/acetoneiso/acetoneiso.info b/multimedia/acetoneiso/acetoneiso.info
index 9b8f0dc0209f..083dfae02bd2 100644
--- a/multimedia/acetoneiso/acetoneiso.info
+++ b/multimedia/acetoneiso/acetoneiso.info
@@ -1,10 +1,10 @@
 PRGNAM="acetoneiso"
-VERSION="2.3"
-HOMEPAGE="http://sourceforge.net/projects/acetoneiso"
-DOWNLOAD="http://sourceforge.net/projects/acetoneiso/files/AcetoneISO/AcetoneISO%202.3/acetoneiso_2.3.tar.gz"
-MD5SUM="225f7af687016690ff28b9771a1ce179"
+VERSION="2.4"
+HOMEPAGE="https://launchpad.net/acetoneiso"
+DOWNLOAD="https://launchpad.net/ubuntu/+archive/primary/+files/acetoneiso_2.4.orig.tar.gz"
+MD5SUM="354716f43e4a3866ece823e00f719959"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ffmpeg p7zip fuseiso cdrkit"
+REQUIRES="ffmpeg p7zip fuseiso cdrkit unrar"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/multimedia/acetoneiso/slack-desc b/multimedia/acetoneiso/slack-desc
index 83767c255bbc..3b2526be3b6d 100644
--- a/multimedia/acetoneiso/slack-desc
+++ b/multimedia/acetoneiso/slack-desc
@@ -13,7 +13,7 @@ acetoneiso: manage CD/DVD images. AcetoneISO will let You mount typical
 acetoneiso: proprietary images formats of the Windows world such as ISO BIN NRG
 acetoneiso: MDF IMG and do plenty of other things.
 acetoneiso:
-acetoneiso: Home page: http://sourceforge.net/projects/acetoneiso
+acetoneiso: Home page: https://launchpad.net/acetoneiso
 acetoneiso:
 acetoneiso:
 acetoneiso: