Merge branch 'master' of github.com:cycojesus/slackbuilds

.gitignore

@@ -4,6 +4,7 @@ repositories/
 *.deb
 *.zip
 *.tgz
+*.txz
 *.tar
 *.pdf
 *.ttf

d/rust/rust.SlackBuild

@@ -31,7 +31,7 @@ tar xvf $CWD/rust-${VERSION}-x86_64-unknown-linux-gnu.tar.gz
 cd rust-nightly-x86_64-unknown-linux-gnu
 ./install.sh --prefix=$PKG/usr
 
-echo "${ARCH}" | grep -q -o 64 && mv $PKG/usr/lib $PKG/usr/lib64
+#echo "${ARCH}" | grep -q -o 64 && mv $PKG/usr/lib $PKG/usr/lib64
 mv $PKG/usr/share/man $PKG/usr/
 find $PKG/usr/man/ -type f -name \*.\? -exec gzip -9 {} \;
 

e/emacs/emacs.SlackBuild

@@ -31,7 +31,7 @@ ONLY_X11=${ONLY_X11:=YES}
 
 PRGNAM=emacs
 BRANCH=${BRANCH:=trunk}
-VERSION=${VERSION:-${BRANCH}_$(date +"%Y.%m.%d_%H.%M")}
+VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")}
 ARCH=${ARCH:-$(uname -m)}
 NUMJOBS=${NUMJOBS:-" -j3 "}
 BUILD=${BUILD:-1}
@@ -88,6 +88,8 @@ find . \
     ./autogen.sh
 )
 
+EMACS_VERSION=$(grep "AC_INIT(GNU Emacs," $SRCDIR/configure.ac | sed 's|AC_INIT(GNU Emacs, \([0-9.]*\), bug-gnu-emacs@gnu.org)|\1|')
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 $SRCDIR/configure \
@@ -110,7 +112,6 @@ make bootstrap
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-EMACS_VERSION=$(echo "$(basename $(ls $PKG/usr/bin/emacs-2*))" | grep -o "[0-9\.]*")
 ( cd $PKG/usr/bin
     rm emacs
     mv emacs-${EMACS_VERSION} emacs-${EMACS_VERSION}-with-x11
@@ -180,9 +181,14 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 rm $PKG/usr/info/dir*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
+cp -a  BUGS \
-  AUTHORS COPYING* ChangeLog INSTALL README \
+   CONTRIBUTE \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+   COPYING \
+   ChangeLog \
+   INSTALL \
+   INSTALL.REPO \
+   README \
+   $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat <<EOF > $PKG/install/slack-desc
@@ -228,4 +234,4 @@ Categories=Application;Development;
 EOF
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.txz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${EMACS_VERSION}_$VERSION-$ARCH-$BUILD$TAG.txz

xap/calibre/calibre.SlackBuild

@@ -0,0 +1,52 @@
+#!/bin/sh -x
+
+CWD=$(pwd)
+
+PRGNAM=$(basename $CWD)
+VERSION=2.22.0
+ARCH=$(uname -m)
+BUILD=${BUILD:-1}
+TAG=${TAG:-cyco}
+TMP=${TMP:-/tmp/$TAG}
+PKG=$TMP/pkg-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+[ ! -e $CWD/${PRGNAM}-${VERSION}-${ARCH}.txz ] && wget -c -O $CWD/${PRGNAM}-${VERSION}-${ARCH}.txz http://download.calibre-ebook.com/${VERSION}/${PRGNAM}-${VERSION}-${ARCH}.txz
+
+rm -fr $PKG
+mkdir -p $PKG/opt/${PRGNAM}
+
+tar xvf $CWD/${PRGNAM}-${VERSION}-${ARCH}.txz -C $PKG/opt/${PRGNAM}
+
+mkdir -p $PKG/usr/bin
+
+$PKG/opt/calibre/calibre_postinstall --root=$PKG/usr
+
+cd $PKG/usr/bin
+find . -type l -exec sh -c 'rm "$1"; ln -s ../../opt/calibre/$(basename $1)' _ {} \;
+
+mkdir -p $PKG/install
+cat <<EOF > $PKG/install/slack-desc
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+	 |-----handy-ruler------------------------------------------------------|
+${PRGNAM}: ${PRGNAM} (e-book library management application)
+${PRGNAM}:
+${PRGNAM}: ${PRGNAM} is meant to be a complete e-library solution.
+${PRGNAM}: It includes library management, format conversion, news feeds to ebook
+${PRGNAM}: conversion as well as e-book reader sync features. ${PRGNAM} is
+${PRGNAM}: primarily a ebook cataloging program. It manages your ebook collection
+${PRGNAM}: for you. It is designed around the concept of the logical book, i.e.
+${PRGNAM}: a single entry in the database that may correspond to ebooks in
+${PRGNAM}: several formats. It also supports conversion to and from a dozen
+${PRGNAM}: different ebook formats.
+${PRGNAM}: ${PRGNAM} home: http://calibre-ebook.com/
+EOF
+
+cd $PKG
+/sbin/makepkg -l y -c n ${OUTPUT}/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz

xap/mozilla-firefox-nightly/mozilla-firefox.SlackBuild

@@ -22,6 +22,7 @@ ARCH=${ARCH:-$(uname -m)}
 BUILD=1
 
 BRANCH=${BRANCH:=latest-mozilla-central}
+TIMESTAMP=$(date +%F | tr - .)
 
 if [ $KEEP_TAR == "YES" ]; then
     [ -e firefox-*.en-US.linux-x86_64.tar.bz2 ] && for f in firefox-*.en-US.linux-x86_64.tar.bz2 ; do mv $f $f.orig ; done
@@ -29,13 +30,12 @@ else
     [ -e firefox-*.en-US.linux-x86_64.tar.bz2 ] && rm firefox-*.en-US.linux-x86_64.tar.bz2
 fi
 WHICH_TAR=$(lftp http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/$BRANCH/ -e "cls --date *.en-US.linux-x86_64.tar.bz2 ; quit" | awk '{print $4}' | sort | tail -n1)
-wget -c http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/$BRANCH/$WHICH_TAR
+wget -c http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/$BRANCH/$WHICH_TAR || exit -1
 
 VERSION=$(ls -ut firefox-*.tar.bz2 | head -n1 | cut -d - -f 2 | sed 's|.en||')
 
 LIBSUFFIX=$(echo "$ARCH" | grep -o "64")
 
-
 mkdir -p $TMP
 
 rm -rf $PKG
@@ -49,6 +49,13 @@ mkdir -p $PKG/usr/lib$LIBSUFFIX
   rm -f defaults/pref/firefox.js.orig
   ln -s ../mozilla/plugins
 ) || exit 1
+if [ ! "/usr/lib$LIBSUFFIX" == "/usr/lib" ]; then
+    mkdir -p $PKG/usr/lib
+    ( cd $PKG/usr/lib
+      ln -s ../lib$LIBSUFFIX/mozilla mozilla
+    )
+fi
+
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin
   ln -sf /usr/lib$LIBSUFFIX/firefox-$VERSION/firefox .
@@ -96,7 +103,7 @@ mozilla-firefox:
 mozilla-firefox:
 EOF
 
-VERSION=$(echo $BRANCH | sed 's|latest-mozilla-||g')_${VERSION}
+#VERSION=$(echo $BRANCH | sed 's|latest-mozilla-||g')_${VERSION}
 
 cd $PKG
-makepkg -l y -c n $OUTPUT/mozilla-firefox-$VERSION-$ARCH-$BUILD$TAG.txz
+makepkg -l y -c n $OUTPUT/mozilla-firefox-${VERSION}_$TIMESTAMP-$ARCH-$BUILD$TAG.txz