20170110.1 global branch merge.current-20170110.1

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

71 files changed, 1803 insertions, 848 deletions

diff --git a/README b/README
index 24b6db9f83..84f40cd77e 100644
--- a/README
+++ b/README
@@ -1,3 +1,19 @@
+SBo-git - slackbuilds repository for slackware-current
+- - -
+
+this is a unofficial fork of master branch from slackbuilds.org's
+git repository (http://slackbuilds.org/cgit/slackbuilds/).
+
+here I put my unofficial mods to their slackbuilds to run on
+slackware-current with sbopkg (http://www.sbopkg.org).
+
+Check https://github.com/Ponce/slackbuilds/wiki for additional informations.
+
+See https://github.com/Ponce/slackbuilds/wiki/configuring-the-current-repository-with-sbopkg
+for instructions on how to use this repository with sbopkg.
+
+original README from slackbuilds.org follows:
+---------------------------------------------
 
 See https://slackbuilds.org/howto/ for instructions on 
 how to use the contents of this directory.
diff --git a/desktop/lxhotkey/README b/desktop/lxhotkey/README
new file mode 100644
index 0000000000..e8343cc1b6
--- /dev/null
+++ b/desktop/lxhotkey/README
@@ -0,0 +1,8 @@
+lxhotkey is a plugin-based shortcuts editor for window managers.
+
+openbox is an optional dependency (and ATM the only window
+manager supported).
+
+at the moment this is a command-line only application: the
+developer, Andrej N. Gritsenko, invites interested users to
+write theirselves the GUI plugins (gtk+, Qt) they need.
diff --git a/network/sshfs-fuse/sshfs-fuse.SlackBuild b/desktop/lxhotkey/lxhotkey.SlackBuild
index a105f69798..6337151890 100644
--- a/network/sshfs-fuse/sshfs-fuse.SlackBuild
+++ b/desktop/lxhotkey/lxhotkey.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-# Copyright 2012, Michiel van Wessem, Leicester, United Kingdom
-# Copyright 2006-2009  Alan Hicks, Lizella, GA
+# Slackware build script for lxhotkey
+
+# Copyright 2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -10,7 +11,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -21,9 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=sshfs-fuse
-SRCNAM=sshfs
-VERSION=${VERSION=2.8}
+PRGNAM=lxhotkey
+VERSION=${VERSION:-20160311_4dd3520}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,20 +54,24 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="CONCEPT COPYING ChangeLog"
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
 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 {} \;
+
+sh autogen.sh || true
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -77,6 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
 make
@@ -85,11 +90,8 @@ make install DESTDIR=$PKG
 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
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/lxhotkey/lxhotkey.info b/desktop/lxhotkey/lxhotkey.info
new file mode 100644
index 0000000000..6d327592a3
--- /dev/null
+++ b/desktop/lxhotkey/lxhotkey.info
@@ -0,0 +1,10 @@
+PRGNAM="lxhotkey"
+VERSION="20160311_4dd3520"
+HOMEPAGE="http://lxde.org"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxhotkey-20160311_4dd3520.tar.xz"
+MD5SUM="6a7fcec3c174ee3e53a0cb77748613e1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/desktop/lxhotkey/slack-desc b/desktop/lxhotkey/slack-desc
new file mode 100644
index 0000000000..d4845d4620
--- /dev/null
+++ b/desktop/lxhotkey/slack-desc
@@ -0,0 +1,19 @@
+# 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 ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+lxhotkey: lxhotkey (global shortcuts editor)
+lxhotkey:
+lxhotkey: lxhotkey is a plugin-based shortcuts editor for window managers.
+lxhotkey:
+lxhotkey: homepage: http://lxde.org
+lxhotkey:
+lxhotkey:
+lxhotkey:
+lxhotkey:
+lxhotkey:
+lxhotkey:
diff --git a/games/etlegacy-from-source/README b/games/etlegacy-from-source/README
new file mode 100644
index 0000000000..4d6185212f
--- /dev/null
+++ b/games/etlegacy-from-source/README
@@ -0,0 +1,25 @@
+Wolfenstein Enemy Territory: Legacy is a project that aims to create
+a fully compatible client and server for the popular online FPS game
+Wolfenstein: Enemy Territory.
+
+It's based on its source code released under the GPLv3 license.
+
+The main goal of this project is to fix bugs, remove old dependencies
+and make it playable on all major operating systems while still
+remaining compatible with the ET 2.60b version and as many of its mods
+as possible.
+
+This script builds the server with omni-bot support (x86 32bit only).
+(http://www.omni-bot.com/)
+
+To play you *need* also the data files from the original game
+(etlegacy-data).
+
+* WARNING *
+
+To have a client/server compatible with the existing ones (to play
+on the existing online servers), build it on/for a 32bit platform.
+
+This version of the game is built from source: the resulting package
+conflicts with the etlegacy SlackBuild you can find on SBo so install
+only one of the two.
diff --git a/games/etlegacy-from-source/doinst.sh b/games/etlegacy-from-source/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/etlegacy-from-source/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/etlegacy-from-source/etlegacy-from-source.SlackBuild b/games/etlegacy-from-source/etlegacy-from-source.SlackBuild
new file mode 100644
index 0000000000..0f0cdcc0a4
--- /dev/null
+++ b/games/etlegacy-from-source/etlegacy-from-source.SlackBuild
@@ -0,0 +1,168 @@
+#!/bin/sh
+
+# Slackware build script for etlegacy-from-source
+# Copyright 2013-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=etlegacy-from-source
+SRCNAM=etlegacy
+VERSION=${VERSION:-20160701_478dab2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i*86) ARCH=i686 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+w_omnibot=1
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=core2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  w_omnibot=0
+else
+  SLKCFLAGS="-O2"
+  w_omnibot=0
+fi
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $SRCNAM-$VERSION
+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 \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix location of the omnibot.zip, man install path
+# and leave the relative path to binaries off
+sed -i "s|share/man|man|" CMakeLists.txt
+sed -i "s|^\.\/etl|etl|" misc/etl_bot.sh misc/etlded_bot.sh
+
+mkdir -p build/legacy
+cd build
+  ln -s $CWD/omnibot-linux-latest.tar.gz legacy/
+  # We have to use bundled lua and sdl
+  cmake \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DINSTALL_DEFAULT_BINDIR="bin" \
+    -DINSTALL_DEFAULT_MODDIR="share/$SRCNAM" \
+    -DINSTALL_DEFAULT_BASEDIR="/usr/share/$SRCNAM" \
+    -DBUILD_CLIENT=1 \
+    -DBUILD_SERVER=1 \
+    -DBUILD_MOD=1 \
+    -DBUILD_MOD_PK3=1 \
+    -DBUILD_PAK3_PK3=1 \
+    -DFEATURE_ANTICHEAT=1 \
+    -DFEATURE_CURL=1 \
+    -DFEATURE_LUA=1 \
+    -DFEATURE_TRACKER=1 \
+    -DFEATURE_OMNIBOT=$w_omnibot \
+    -DINSTALL_OMNIBOT=$w_omnibot \
+    -DFEATURE_MULTIVIEW=0 \
+    -DFEATURE_CURSES=0 \
+    -DCROSS_COMPILE32=0 \
+    -DFEATURE_OGG_VORBIS=1 \
+    -DFEATURE_FREETYPE=1 \
+    -DFEATURE_AUTOUPDATE=0 \
+    -DFEATURE_IPV6=0 \
+    -DFEATURE_GETTEXT=1 \
+    -DRENDERER_DYNAMIC=0 \
+    -DBUNDLED_LIBS=1 \
+    -DBUNDLED_SDL=1 \
+    -DBUNDLED_LUA=1 \
+    -DBUNDLED_SQLITE3=1 \
+    -DBUNDLED_JANSSON=1 \
+    -DBUNDLED_CURL=0 \
+    -DBUNDLED_ZLIB=0 \
+    -DBUNDLED_JPEG=0 \
+    -DBUNDLED_GLEW=0 \
+    -DBUNDLED_FREETYPE=0 \
+    -DBUNDLED_OGG_VORBIS=0 \
+    -DBUNDLED_THEORA=0 \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+  # JIC, sanitize the just-uncompressed omnibot stuff
+  chown -R root:root legacy
+  find -L legacy \
+   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+   -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 {} \;
+  make 
+  make install DESTDIR=$PKG
+cd ..
+
+# Move man pages in the proper place
+mv $PKG/usr/share/man $PKG/usr/man
+
+# Install a script to open urls, and move two scripts to launch the client and
+# the dedicated server with omnibot support in the binaries folder
+install -m 0755 $CWD/files/openurl.sh $PKG/usr/bin/openurl.sh
+mv $PKG/usr/share/$SRCNAM/etl*.sh $PKG/usr/bin/
+chmod 755 $PKG/usr/bin/etl*.sh
+
+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
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Install an icon, a desktop file and man pages
+install -m 0644 -D $CWD/files/$SRCNAM.svg \
+  $PKG/usr/share/pixmaps/$SRCNAM.svg
+install -m 0644 -D $CWD/files/$SRCNAM.desktop \
+  $PKG/usr/share/applications/$SRCNAM.desktop
+mkdir -p $PKG/usr/man/man6
+gzip -9 -c docs/linux/man/man6/etl.6 > $PKG/usr/man/man6/etl.6.gz
+gzip -9 -c docs/linux/man/man6/etlded.6 > $PKG/usr/man/man6/etlded.6.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv \
+  $PKG/usr/share/$SRCNAM/*.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cp README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/etlegacy-from-source/etlegacy-from-source.info b/games/etlegacy-from-source/etlegacy-from-source.info
new file mode 100644
index 0000000000..9cc3e705c4
--- /dev/null
+++ b/games/etlegacy-from-source/etlegacy-from-source.info
@@ -0,0 +1,12 @@
+PRGNAM="etlegacy"
+VERSION="20160701_478dab2"
+HOMEPAGE="http://www.etlegacy.com"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/etlegacy-20160701_478dab2.tar.xz \
+          http://ponce.cc/slackware/sources/repo/omnibot-linux-latest.tar.gz"
+MD5SUM="8e09210b0db802113dd3825d02b5d631 \
+        3bf0c7c972da08463040117dc6f6fe88"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README% OpenAL etlegacy-data zenity"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/games/etlegacy-from-source/files/etlegacy.desktop b/games/etlegacy-from-source/files/etlegacy.desktop
new file mode 100644
index 0000000000..2618c0c13e
--- /dev/null
+++ b/games/etlegacy-from-source/files/etlegacy.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=ETLegacy
+Comment=ET: Legacy (Collaborative online FPS)
+Exec=etl
+Icon=etl
+Terminal=false
+Type=Application
+Categories=Game;
+StartupNotify=false
diff --git a/games/etlegacy-from-source/files/etlegacy.svg b/games/etlegacy-from-source/files/etlegacy.svg
new file mode 100644
index 0000000000..51754d1889
--- /dev/null
+++ b/games/etlegacy-from-source/files/etlegacy.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="273.6875"
+   height="173.40625"
+   viewBox="0 0 218.95 138.72526"
+   id="svg2">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14">
+    <linearGradient
+       id="linearGradient5430">
+      <stop
+         id="stop5432"
+         style="stop-color:#df3323;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5434"
+         style="stop-color:#3d0000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="134.5764"
+       y1="2.2628517"
+       x2="134.5764"
+       y2="150.06567"
+       id="linearGradient5438"
+       xlink:href="#linearGradient5430"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.80000151,0,0,0.80000151,1.4747917,2.0250038)"
+       spreadMethod="pad" />
+  </defs>
+  <path
+     d="m 141.47506,0 -2.025,0.025 -2.20001,0.025 -0.025,0 -0.05,0 c -0.56094,0.029611 -1.70494,0.1655976 -3.625,0.4000007 -1.92006,0.2344032 -4.43694,0.566477 -7.10002,1.0000019 -2.76457,0.4500476 -5.64229,1.0096873 -8.15001,1.6750032 -2.39466,0.6353177 -4.73741,1.1624015 -6.65002,3.0750058 -1.11785,1.1178567 -1.76614,2.3933294 -2.175,3.6250069 C 109.06614,8.5933348 108.41785,7.3178683 107.3,6.2000117 105.38739,4.2874074 103.04464,3.7603236 100.64998,3.1250059 98.142257,2.45969 95.264537,1.9000503 92.499964,1.4500027 89.859095,1.0200941 87.367626,0.683809 85.474951,0.4500008 83.582275,0.2161926 82.445337,0.0816673 81.924944,0.0500001 c -0.002,2.358e-4 -0.0219,2.018e-4 -0.025,0 -0.05436,-0.00354 -0.104368,0.00167 -0.15,0 -0.09126,-0.00334 -0.182568,0.00226 -0.300001,0 -0.234863,-0.00451 -0.536171,-0.022255 -0.825001,-0.025 -0.577661,-0.00549 -1.150002,0 -1.150002,0 l -2.000004,0 0,2.0000038 0,13.0000251 -72.650138,0 -4.82500917679,0 0,8.000015 L 3.3997953,26.45005 42.39987,65.450124 l 0.600001,0.575001 0.825001,0 35.650068,0 0,58.850115 0,4.85001 3.425006,-3.45001 13.575026,-13.62503 0,21.22504 0,4.85001 3.425005,-3.45 14.575033,-14.62503 0,4.22501 0,4.82501 3.42501,-3.40001 21.00004,-21.00004 0.575,-0.60001 0,-0.825 0,-37.850065 35.65006,0 0.825,0 0.6,-0.575001 39.00008,-39.000074 3.4,-3.425006 0,-8.000015 -4.82501,0 -72.65013,0 0,-13.0000251 z m -59.875116,4.0500076 0.075,0 c 0.01691,0.00103 1.091842,0.132738 1.725003,0.2000004 z m 55.700106,0 0.075,0 0.1,0 0,0.2250004 -2,0 c 0.72505,-0.076119 1.78584,-0.2215776 1.825,-0.2250004 z M 83.824948,4.3000081 c 0.505641,0.055705 0.521361,0.044253 1.175002,0.1250002 1.655203,0.2044728 3.853399,0.5170549 6.125012,0.8750017 C 88.120084,4.8294493 85.543799,4.4927178 83.824948,4.3000081 z m 50.925102,0.05 c -1.61252,0.1827352 -3.91957,0.4916419 -6.57501,0.9000017 2.14817,-0.332921 4.26472,-0.6314689 5.85001,-0.8250016 0.40573,-0.049532 0.36769,-0.034762 0.725,-0.075 z m -34.950073,2.675005 c 1.462323,0.389813 2.501633,0.7939944 3.350013,1.2250023 -0.15979,-0.072953 -0.27743,-0.1411677 -0.475,-0.2250004 -0.73852,-0.313363 -1.74502,-0.6878195 -2.875013,-1.0000019 z m 19.350043,0 c -1.12999,0.3121818 -2.13649,0.686639 -2.87501,1.0000019 -0.19757,0.083833 -0.31521,0.1520469 -0.475,0.2250004 0.84838,-0.4310079 1.88769,-0.8351893 3.35001,-1.2250023 z m -33.675069,1.550003 c 1.673843,0.2029118 3.290574,0.3746285 5.750011,0.7750014 2.615437,0.4257684 5.275002,0.9244885 7.350015,1.4750025 0.97355,0.25829 1.877973,0.600456 2.525003,0.875002 0.2086,0.08851 0.35117,0.155736 0.50001,0.225 0.0575,0.137843 0.13205,0.275764 0.2,0.475002 0.0976,0.286085 0.1654,0.634726 0.25,0.975001 -0.97037,0.241444 -2.243943,0.668929 -3.400013,1.825004 -1.3422,1.342202 -1.77999,2.924928 -1.975005,3.900007 -0.207144,1.03545 -0.201016,1.881533 -0.2,1.925004 2.4e-5,0.0011 0,0.05 0,0.05 l 0,16.950032 -65.325124,0 -3.000005,-3.000006 27.325051,0 0.825002,0 0.600001,-0.575001 4.000008,-4.000007 3.400006,-3.425007 -4.825009,0 -39.325074,0 -4.000008,-4.000007 58.47511,0 -5.57501,5.57501 -3.400007,3.425007 4.82501,0 13.000024,0 2.000004,0 0,-2.000004 z m 48.000099,0 0,21.4500409 0,2.000004 2,0 13.00002,0 4.82501,0 -3.4,-3.425007 -5.57501,-5.57501 58.47511,0 -4.00001,4.000007 -39.32508,0 -4.825,0 3.4,3.425007 4.00001,4.000007 0.6,0.575001 0.825,0 27.32505,0 -3,3.000006 -65.32513,0 0,-16.950032 c 0,0 -2e-5,-0.04888 0,-0.05 0.001,-0.04347 0.007,-0.889474 -0.2,-1.925004 -0.19501,-0.975067 -0.63279,-2.557801 -1.975,-3.900007 -1.15607,-1.156066 -2.42964,-1.583559 -3.40001,-1.825004 0.0846,-0.340275 0.15244,-0.688916 0.25,-0.975001 0.0679,-0.199238 0.14251,-0.337159 0.20001,-0.475002 0.14882,-0.06926 0.2914,-0.136491 0.5,-0.225 0.64703,-0.274545 1.55145,-0.616712 2.525,-0.875002 2.07501,-0.550514 4.73458,-1.0492341 7.35001,-1.4750025 2.45944,-0.4003729 4.07617,-0.5720896 5.75002,-0.7750014 z M 105.44999,10.75002 c 0.36286,0.911786 0.61428,1.899778 0.775,3.025006 0.11508,0.806639 0.13951,1.402629 0.2,1.950004 l 0.025,1.300002 -1.975,0 1.725,-0.025 0.1,-1.875003 c 0,0 0.031,-0.608393 -0.075,-1.350003 -0.13725,-0.96083 -0.38475,-1.897196 -0.65,-2.675005 -0.0439,-0.128608 -0.0802,-0.229896 -0.125,-0.350001 z m 8.05002,0 c -0.0448,0.120105 -0.0811,0.221393 -0.125,0.350001 -0.26525,0.777809 -0.51275,1.714175 -0.65,2.675005 0.16075,-1.125247 0.41213,-2.113214 0.775,-3.025006 z m -0.875,4.125008 -0.1,1.575003 0,-0.725001 c 0.0264,-0.239123 0.0753,-0.570767 0.1,-0.850002 z m -0.125,2.125004 1.975,0.025 -1,0 -0.975,0 z m -8.17502,0.025 c -0.041,0.0024 -0.4443,0.04387 -0.975,0.150001 -0.36337,0.07267 -0.66015,0.160047 -0.9,0.25 -0.0624,0.02341 -0.11939,0.02704 -0.175,0.05 0.33272,-0.161248 0.70162,-0.275325 1.075,-0.35 0.48654,-0.09731 0.975,-0.100001 0.975,-0.100001 z m 10.27502,0 c 0.17915,0.0019 0.4303,-0.01394 1,0.100001 0.37338,0.07468 0.74228,0.188751 1.075,0.35 -0.0556,-0.02295 -0.11256,-0.02659 -0.175,-0.05 -0.23984,-0.08995 -0.53662,-0.177325 -0.9,-0.25 -0.54393,-0.108764 -0.97882,-0.148809 -1,-0.150001 z m -13.67503,1.800004 c -0.0229,0.0556 -0.0266,0.112574 -0.05,0.175 -0.0899,0.239816 -0.17732,0.536711 -0.25,0.900002 -0.10298,0.515223 -0.12122,0.888151 -0.125,0.950002 2.7e-4,-0.09844 -0.0292,-0.429085 0.075,-0.950002 0.0747,-0.373381 0.18875,-0.742282 0.35,-1.075002 z m 17.10004,0 c 0.16124,0.332717 0.27532,0.701615 0.35,1.075002 0.1042,0.520844 0.0747,0.851573 0.075,0.950002 -0.004,-0.06189 -0.0219,-0.434562 -0.125,-0.950002 -0.0727,-0.36332 -0.16004,-0.660121 -0.25,-0.900002 -0.0234,-0.06244 -0.027,-0.119368 -0.05,-0.175 z m -13.55003,10.200019 c 0.0155,-0.0012 0.1,0 0.1,0 l 1.9,0 1.97501,0 0.025,0 2,0 0.025,0 2.97501,0 0.9,0 c 0,0 0.0845,-0.0012 0.1,0 l 0,0.1 0,8.900017 -10.00002,0 0,-8.900017 z m -23.000047,-7.150014 0,6.150012 -6.150011,0 5.57501,-5.57501 z m 56.000107,0 0.575,0.575002 5.57501,5.57501 -6.15001,0 z m -98.325187,24.150046 57.325109,0 0,38.000072 0,4.825009 3.425005,-3.400007 4.000013,-4.000007 0.575,-0.600001 0,-0.825002 0,-34.000064 10.00002,0 0,38.000072 0,4.825009 3.42501,-3.400007 4,-4.000007 0.575,-0.600001 0,-0.825002 0,-34.000064 57.32511,0 -4,4.000008 -42.32508,0 -2.00001,0 0,2.000003 0,41.325078 -9.00002,9.000014 0,-12.32502 0,-4.825009 -3.425,3.400006 -4.00001,4.000008 -0.575,0.600001 0,0.825002 0,7.325012 -10.00002,10.00002 0,-21.17504 0,-4.825009 -3.42501,3.400007 -13.575025,13.600022 0,-50.325092 0,-2.000003 -2.000004,0 -42.32508,0 z"
+     id="path3892"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  <path
+     d="m 80.899942,3.4500065 0,13.5750255 c 0.0057,0.747658 -0.677344,1.430652 -1.425003,1.425003 l -74.4251406,0 36.1500686,36.150068 40.275076,0 c 0.747658,-0.0057 1.430651,0.677345 1.425003,1.425003 l 0,57.425104 14.575031,-14.625023 c 0.39153,-0.399953 1.03245,-0.531513 1.54988,-0.318145 0.51742,0.213376 0.87931,0.758473 0.87512,1.318146 l 0,22.625042 15.575033,-15.62503 c 0.39153,-0.39995 1.03246,-0.53151 1.54988,-0.31814 0.51743,0.21337 0.87932,0.75847 0.87512,1.31814 l 0,5.62501 18.15004,-18.15003 0,-39.275074 c -0.006,-0.747658 0.67734,-1.430652 1.425,-1.425003 l 40.27508,0 36.15007,-36.150068 -74.42514,0 c -0.74766,0.0057 -1.43066,-0.677345 -1.42501,-1.425003 l 0,-13.5500255 -0.75,0 0,-0.025 c -0.12117,0.00807 -1.49587,0.1472265 -3.35,0.3750007 -1.88147,0.2311324 -4.34424,0.5758045 -6.95002,1.0000019 -2.69691,0.4390327 -5.46733,0.9811276 -7.80001,1.600003 -2.41264,0.6400874 -3.98999,1.0649805 -5.12501,2.2000042 -1.33333,1.3333278 -1.65391,3.1773877 -1.92501,5.0750097 -0.12252,0.857658 -0.14082,1.502959 -0.2,2.025004 l -0.025,1.875003 1.55001,0 1,0 c 0.0252,0.0076 0.0502,0.01597 0.075,0.025 0,0 0.40683,0.02138 0.925,0.125 0.31902,0.0638 0.5829,0.143578 0.8,0.225001 0.10855,0.04071 0.21314,0.08552 0.3,0.125 0.0434,0.01974 0.0715,0.02167 0.125,0.05 0.0535,0.02833 0.0276,-0.07243 0.375,0.275001 0.34819,0.347604 0.24662,0.321414 0.275,0.375 0.0284,0.05358 0.0302,0.08154 0.05,0.125001 0.0395,0.08692 0.0843,0.191437 0.125,0.3 0.0814,0.217128 0.16121,0.481024 0.225,0.800002 0.10364,0.518223 0.125,0.925002 0.125,0.925002 0.009,0.02476 0.0174,0.04978 0.025,0.075 l 0,19.000036 c 0.006,0.747644 -0.67732,1.430629 -1.42496,1.425002 l -14.00002,0 c -0.74766,0.0057 -1.43065,-0.677344 -1.42501,-1.425002 l 0,-19.000036 c 0.008,-0.02522 0.016,-0.05024 0.025,-0.075 0,0 0.0214,-0.406945 0.125,-0.925002 0.0638,-0.318958 0.1436,-0.582921 0.225,-0.800002 0.0407,-0.10854 0.0855,-0.213147 0.125,-0.3 0.0198,-0.04342 0.0217,-0.0715 0.05,-0.125001 0.0283,-0.0535 -0.0723,-0.02764 0.275,-0.375 0.34793,-0.348311 0.32148,-0.246652 0.37501,-0.275001 0.0535,-0.02835 0.0816,-0.03026 0.125,-0.05 0.0869,-0.03949 0.19144,-0.08429 0.3,-0.125 0.21711,-0.08142 0.48099,-0.161197 0.8,-0.225001 0.51824,-0.103637 0.925,-0.125 0.925,-0.125 0.0247,-0.009 0.0498,-0.01737 0.075,-0.025 l 2,0 0.55,0 -0.025,-1.875003 c -0.0591,-0.521651 -0.0776,-1.167032 -0.2,-2.025004 -0.271,-1.897581 -0.59162,-3.7416741 -1.92496,-5.0750097 C 103.73996,7.4899926 102.16262,7.0650995 99.749977,6.4250121 97.417297,5.8061367 94.64688,5.2640418 91.949963,4.8250091 89.364134,4.4040604 86.933122,4.0566076 85.07495,3.8250072 83.216778,3.5934068 81.821792,3.4558999 81.724944,3.4500065 c -0.01664,2.946e-4 -0.03336,2.946e-4 -0.05,0 -5.04e-4,-3.11e-5 -0.05432,-0.00264 -0.05,0 -0.0108,-3.603e-4 -0.03648,3.705e-4 -0.05,0 -0.05408,-0.00148 -0.114734,0.00133 -0.2,0 -0.130649,-0.00204 -0.307376,0.00137 -0.475001,0 z"
+     id="path3885"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient5438);fill-opacity:1;stroke:none;stroke-width:4.00000763;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  <path
+     d="m 79.474939,2.0250038 0,15.0000282 -77.850147,0 39.000074,39.000074 40.850077,0 0,60.850114 17.000034,-17.050032 c 0,8.683352 0,17.366702 0,26.050052 l 18.000033,-18.05004 0,9.05002 21.00004,-21.000039 0,-39.850075 40.85008,0 39.00007,-39.000074 -77.85014,0 0,-15.0000282 -2.19342,0.030005 c -0.56842,0.030005 -5.24819,0.5139758 -10.50661,1.3699977 -2.72494,0.4435953 -5.54482,0.9868914 -7.95001,1.6250031 -2.40519,0.6381117 -4.29291,1.1178968 -5.75001,2.5750049 -1.70711,1.7071081 -2.05238,3.9666185 -2.32501,5.8750105 -0.14279,0.999532 -0.19036,1.874272 -0.23268,2.199639 l -0.0423,3.325372 3.00001,0 1,0 c 0,0 0.30115,0.01525 0.725,0.1 0.42385,0.08477 0.84641,0.271405 0.875,0.300001 0.0286,0.02859 0.21523,0.451146 0.3,0.875001 0.0848,0.423855 0.1,0.725002 0.1,0.725002 l 0,19.000036 -14.00002,0 0,-19.000036 c 0,0 0.0153,-0.301147 0.1,-0.725002 0.0848,-0.423855 0.2714,-0.846406 0.3,-0.875001 0.0286,-0.02859 0.45115,-0.21523 0.875,-0.300001 0.4239,-0.08477 0.725,-0.1 0.725,-0.1 l 2,0 2.00001,0 -0.0424,-3.325372 c -0.0423,-0.325367 -0.0901,-1.200107 -0.23264,-2.199639 -0.27262,-1.908392 -0.61788,-4.1679025 -2.32499,-5.8750106 -1.4571,-1.4571081 -3.34482,-1.9368932 -5.75001,-2.5750049 C 97.719787,4.4118978 94.899905,3.8686017 92.174963,3.4250064 86.958546,2.5758217 82.355913,2.0923049 81.802928,2.0586543 81.714408,2.034763 79.474939,2.0250038 79.474939,2.0250038 z m 4.000008,4.250008 c 1.883196,0.2104537 4.619937,0.537548 8.075015,1.1000021 2.650061,0.4314048 5.361455,0.9443646 7.550015,1.5250029 2.188563,0.5806383 3.932123,1.4821112 3.975013,1.5250032 0.29289,0.292891 0.94763,2.033399 1.175,3.625006 0.0742,0.519018 0.05,0.975002 0.05,0.975002 0,0 -0.64839,0.0097 -1.34996,0.150001 -0.82616,0.165229 -1.90361,0.478597 -2.87501,1.450002 -0.971403,0.971405 -1.284773,2.048861 -1.450003,2.875006 -0.16527,0.826145 -0.15004,1.525003 -0.15004,1.525003 l 0,19.000036 -68.17513,0 -7.000014,-7.000014 32.175061,0 4.000008,-4.000007 -40.175076,0 -8.000015,-8.000015 68.175128,0 -9.000017,9.000017 13.000025,0 z m 52.000103,0 0,23.7500452 13.00002,0 -9.00001,-9.000017 68.17512,0 -8.00001,8.000015 -40.17508,0 4.00001,4.000007 32.17506,0 -7.00001,7.000014 -68.17513,0 0,-19.000036 c 0,0 0.0153,-0.698858 -0.15,-1.525003 -0.16523,-0.826145 -0.47859,-1.903601 -1.45,-2.875006 -0.97141,-0.971405 -2.04886,-1.284773 -2.87501,-1.450002 -0.74271,-0.148543 -1.25461,-0.148713 -1.375,-0.150001 0.034,-0.432859 8e-4,-0.455984 0.075,-0.975002 0.22737,-1.591607 0.88211,-3.332115 1.175,-3.625006 0.0429,-0.0429 1.78645,-0.9443649 3.97501,-1.5250032 2.18855,-0.5806383 4.89995,-1.0935981 7.55001,-1.5250029 3.45508,-0.5624541 6.19182,-0.8895484 8.07502,-1.1000021 z M 34.299854,44.025083 l 64.175123,0 0,40.000076 4.000013,-4.000008 0,-36.000068 14.00002,0 0,40.000076 4.00001,-4.000008 0,-36.000068 64.17512,0 -8.00001,8.000015 -43.17509,0 0,42.17508 -13.00002,13.000022 0,-17.17503 -4.00001,4.000007 0,8.175013 -14.00002,14.00003 0,-26.02505 -17.000039,17.02503 0,-55.175102 -43.175082,0 z"
+     id="stroke_curved_top_left"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  <g
+     transform="translate(1.4749954,152.42528)"
+     id="g3771">
+    <path
+       d="m 103,15 c 0,0 -2,0 -3,1 -1,1 -1,3 -1,3 M 80,2 c 0,0 20,2 23,5 2,2 2,8 2,8"
+       id="path3773"
+       style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       d="m 113,15 c 0,0 2,0 3,1 1,1 1,3 1,3 M 136,2 c 0,0 -20,2 -23,5 -2,2 -2,8 -2,8"
+       id="path3775"
+       style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       d="m 99,19 c 0,0 0,58 0,58 M 82,93 c 0,0 0,-41 0,-41 0,0 -42,0 -42,0 0,0 -35,-35 -35,-35 0,0 75,0 75,0 m 25,-2 c 0,0 -2,0 -2,0 M 80,2 c 0,0 0,24 0,24 m -27,3 c 0,0 -36,0 -36,0 m 91,11 c 0,0 -80,0 -80,0"
+       id="path3777"
+       style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       d="m 117,19 c 0,0 0,58 0,58 m 17,16 c 0,0 0,-41 0,-41 0,0 42,0 42,0 0,0 35,-35 35,-35 0,0 -75,0 -75,0 m -25,-2 c 0,0 2,0 2,0 M 136,2 c 0,0 0,24 0,24 m 27,3 c 0,0 36,0 36,0 m -91,11 c 0,0 80,0 80,0"
+       id="path3779"
+       style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       d="m 134,89 c 0,0 0,4 0,4 0,0 -17,17 -17,17 0,0 0,-9 0,-9 0,0 -18,18 -18,18 0,0 0,-26 0,-26 0,0 -17,17 -17,17 0,0 0,-17 0,-17 m 35,0 c 0,0 0,8 0,8"
+       id="path3781"
+       style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       d="m 138,2 c 0,0 0,-2 0,-2 0,0 -2,0 -2,0 0,0 0,2 0,2 0,0 2,0 2,0 z m -4,24 c 0,0 0,2 0,2 0,0 13,0 13,0 0,0 -9,-9 -9,-9 0,0 -4,0 -4,0 0,0 0,7 0,7 z m 30,5 c 0,0 -2,0 -2,0 0,0 -4,-4 -4,-4 0,0 6,0 6,0 0,0 0,4 0,4 z M 112,17 c 0,0 -3,0 -3,0 0,0 0,-3 0,-3 0,0 3,0 3,0 0,0 0,3 0,3 z"
+       id="path3783"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+    <path
+       d="m 78,2 c 0,0 0,-2 0,-2 0,0 2,0 2,0 0,0 0,2 0,2 0,0 -2,0 -2,0 z m 4,24 c 0,0 0,2 0,2 0,0 -13,0 -13,0 0,0 9,-9 9,-9 0,0 4,0 4,0 0,0 0,7 0,7 z m -30,5 c 0,0 2,0 2,0 0,0 4,-4 4,-4 0,0 -6,0 -6,0 0,0 0,4 0,4 z m 52,-14 c 0,0 3,0 3,0 0,0 0,-3 0,-3 0,0 -3,0 -3,0 0,0 0,3 0,3 z"
+       id="path3785"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+    <path
+       d="m 97,82 c 0,0 4,-4 4,-4 0,0 0,-1 0,-1 0,0 -4,0 -4,0 0,0 0,5 0,5 z m 18,0 c 0,0 4,-4 4,-4 0,0 0,-1 0,-1 0,0 -4,0 -4,0 0,0 0,5 0,5 z m 0,11 c 0,0 4,0 4,0 0,0 0,-5 0,-5 0,0 -4,4 -4,4 0,0 0,1 0,1 z"
+       id="path3787"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/games/etlegacy-from-source/files/get_tarball_from_git.sh b/games/etlegacy-from-source/files/get_tarball_from_git.sh
new file mode 100644
index 0000000000..42aaa1626d
--- /dev/null
+++ b/games/etlegacy-from-source/files/get_tarball_from_git.sh
@@ -0,0 +1,31 @@
+rm -fR /tmp/tmp-etlegacy
+mkdir -p /tmp/tmp-etlegacy
+cd /tmp/tmp-etlegacy
+git clone git://github.com/etlegacy/etlegacy.git
+cd etlegacy
+git submodule init
+git submodule update
+cd libs
+git archive master > ../../libs.tar
+cd ..
+cd scripts
+git archive master > ../../scripts.tar
+cd ..
+COMMIT=$( git log -1 | head -1 | cut -c 8-14 )
+COMMDATE=$( git log -1 --date=short | grep ^Date | awk '{print $2}' | sed 's/-//g' )
+rm -f /tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz
+git archive master > ../src.tar
+cd ..
+mkdir etlegacy-${COMMDATE}_${COMMIT}
+cd etlegacy-${COMMDATE}_${COMMIT}
+tar xf ../src.tar
+cd libs
+tar xf ../../libs.tar
+cd ..
+cd scripts
+tar xf ../../scripts.tar
+cd ..
+cd ..
+rm -f src.tar libs.tar scripts.tar
+tar Jcf /tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz etlegacy-${COMMDATE}_${COMMIT}
+echo "/tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz done."
diff --git a/games/etlegacy-from-source/files/openurl.sh b/games/etlegacy-from-source/files/openurl.sh
new file mode 100644
index 0000000000..274f12d08d
--- /dev/null
+++ b/games/etlegacy-from-source/files/openurl.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# use this script to customize the way the engine should open URLs
+
+for test_browser in firefox seamonkey opera
+do
+  browser=`which $test_browser`
+  if [ "x$browser" != "x" ]
+  then
+    $browser -remote "openURL($1,new-window)" || $browser "$1"
+    exit
+  fi
+done
+# xterm -e lynx "$1"
+
+exit 0
diff --git a/games/etlegacy-from-source/slack-desc b/games/etlegacy-from-source/slack-desc
new file mode 100644
index 0000000000..e6866b09b8
--- /dev/null
+++ b/games/etlegacy-from-source/slack-desc
@@ -0,0 +1,19 @@
+# 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 ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+etlegacy-from-source: etlegacy-from-source (collaborative FPS)
+etlegacy-from-source:
+etlegacy-from-source: Wolfenstein Enemy Territory : Legacy is a project that aims to create
+etlegacy-from-source: a fully compatible client and server for the popular online FPS game
+etlegacy-from-source: Wolfenstein: Enemy Territory.
+etlegacy-from-source: It's based on its source code released under the GPLv3 license.
+etlegacy-from-source: The main goal of this project is to fix bugs, remove old dependencies
+etlegacy-from-source: and make it playable on all major operating systems while still
+etlegacy-from-source: remaining compatible with the ET 2.60b version and as many of its mods
+etlegacy-from-source: as possible. This version is built from source.
+etlegacy-from-source: homepage: http://www.etlegacy.com/
diff --git a/games/pokerth/pokerth.SlackBuild b/games/pokerth/pokerth.SlackBuild
index 5412cb9fbe..bf67d8188c 100644
--- a/games/pokerth/pokerth.SlackBuild
+++ b/games/pokerth/pokerth.SlackBuild
@@ -77,6 +77,9 @@ find -L . \
 # Thanks ponce.
 sed -i "s|libircclient/||" src/net/common/ircthread.cpp
 
+# Fix for the newest boost
+patch -p1 < $CWD/std-ifstream-and-std-ofstream.patch
+
 qmake pokerth.pro
 
 make #CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
diff --git a/games/pokerth/std-ifstream-and-std-ofstream.patch b/games/pokerth/std-ifstream-and-std-ofstream.patch
new file mode 100644
index 0000000000..37030c331d
--- /dev/null
+++ b/games/pokerth/std-ifstream-and-std-ofstream.patch
@@ -0,0 +1,151 @@
+From: Jonathan Wakely <github@kayari.org>
+Date: Thu, 26 Nov 2015 16:27:52 +0000
+Subject: Qualify std::ifstream and std::ofstream
+
+Starting with Boost 1.60.0 <boost/filesystem.hpp> includes
+<boost/filesystem/fstream.hpp>, which declares ifstream and ofstream
+types that make the unqualified names ifstream and ofstream ambiguous.
+The names must be qualified to refer to the std versions.
+
+Upstream pull request at: https://github.com/pokerth/pokerth/pull/299
+---
+ src/core/common/avatarmanager.cpp    | 4 ++--
+ src/core/common/loghelper_server.cpp | 6 +++---
+ src/net/common/clientstate.cpp       | 4 ++--
+ src/net/common/clientthread.cpp      | 4 ++--
+ src/net/common/downloaderthread.cpp  | 2 +-
+ src/pokerth_server.cpp               | 2 +-
+ src/zlib_compress.cpp                | 4 ++--
+ 7 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp
+index d9b9fd4..d137a5c 100644
+--- a/src/core/common/avatarmanager.cpp
++++ b/src/core/common/avatarmanager.cpp
+@@ -61,7 +61,7 @@ using namespace std;
+ using namespace boost::filesystem;
+ 
+ struct AvatarFileState {
+-	ifstream		inputStream;
++	std::ifstream		inputStream;
+ };
+ 
+ AvatarManager::AvatarManager(bool useExternalServer, const std::string &externalServerAddress,
+@@ -363,7 +363,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil
+ 				path tmpPath(cacheDir);
+ 				tmpPath /= (md5buf.ToString() + ext);
+ 				string fileName(tmpPath.file_string());
+-				ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc);
++				std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc);
+ 				if (!o.fail()) {
+ 					o.write((const char *)data, size);
+ 					o.close();
+diff --git a/src/core/common/loghelper_server.cpp b/src/core/common/loghelper_server.cpp
+index f79e4ca..a0d0350 100644
+--- a/src/core/common/loghelper_server.cpp
++++ b/src/core/common/loghelper_server.cpp
+@@ -67,7 +67,7 @@ void
+ internal_log_err(const string &msg)
+ {
+ 	if (!g_logFile.empty()) {
+-		ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app);
++		std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app);
+ 		if (!o.fail()) {
+ 			o << second_clock::local_time() << " ERR: " << msg;
+ 			o.flush();
+@@ -80,7 +80,7 @@ internal_log_msg(const std::string &msg)
+ {
+ 	if (g_logLevel) {
+ 		if (!g_logFile.empty()) {
+-			ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app);
++			std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app);
+ 			if (!o.fail())
+ 				o << second_clock::local_time() << " MSG: " << msg;
+ 		}
+@@ -92,7 +92,7 @@ internal_log_level(const std::string &msg, int logLevel)
+ {
+ 	if (g_logLevel >= logLevel) {
+ 		if (!g_logFile.empty()) {
+-			ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app);
++			std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app);
+ 			if (!o.fail())
+ 				o << second_clock::local_time() << " OUT: " << msg;
+ 		}
+diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp
+index 84921ce..58fd5fb 100644
+--- a/src/net/common/clientstate.cpp
++++ b/src/net/common/clientstate.cpp
+@@ -302,8 +302,8 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client)
+ 
+ 		// Unzip the file using zlib.
+ 		try {
+-			ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary);
+-			ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc);
++			std::ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary);
++			std::ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc);
+ 			boost::iostreams::filtering_streambuf<boost::iostreams::input> in;
+ 			in.push(boost::iostreams::zlib_decompressor());
+ 			in.push(inFile);
+diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp
+index c36e94a..45b79cb 100644
+--- a/src/net/common/clientthread.cpp
++++ b/src/net/common/clientthread.cpp
+@@ -1604,7 +1604,7 @@ void
+ ClientThread::ReadSessionGuidFromFile()
+ {
+ 	string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME);
+-	ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary);
++	std::ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary);
+ 	if (guidStream.good()) {
+ 		std::vector<char> tmpGuid(CLIENT_GUID_SIZE);
+ 		guidStream.read(&tmpGuid[0], CLIENT_GUID_SIZE);
+@@ -1616,7 +1616,7 @@ void
+ ClientThread::WriteSessionGuidToFile() const
+ {
+ 	string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME);
+-	ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary);
++	std::ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary);
+ 	if (guidStream.good()) {
+ 		guidStream.write(GetContext().GetSessionGuid().c_str(), GetContext().GetSessionGuid().size());
+ 	}
+diff --git a/src/net/common/downloaderthread.cpp b/src/net/common/downloaderthread.cpp
+index e58e3f8..56a9526 100644
+--- a/src/net/common/downloaderthread.cpp
++++ b/src/net/common/downloaderthread.cpp
+@@ -96,7 +96,7 @@ DownloaderThread::Main()
+ 				// Previous download was finished.
+ 				if (m_curDownloadData) {
+ 					path filepath(m_curDownloadData->filename);
+-					ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary);
++					std::ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary);
+ 					// Find out file size.
+ 					// Not fully portable, but works on win/linux/mac.
+ 					instream.seekg(0, ios_base::beg);
+diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp
+index 3b93d46..450a47e 100644
+--- a/src/pokerth_server.cpp
++++ b/src/pokerth_server.cpp
+@@ -161,7 +161,7 @@ main(int argc, char *argv[])
+ 		pidFile = tmpPidPath.directory_string();
+ 	}
+ 	{
+-		ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc);
++		std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc);
+ 		if (!pidStream.fail())
+ 			pidStream << getpid();
+ 		else
+diff --git a/src/zlib_compress.cpp b/src/zlib_compress.cpp
+index e3fd72d..4b04817 100644
+--- a/src/zlib_compress.cpp
++++ b/src/zlib_compress.cpp
+@@ -59,8 +59,8 @@ main(int argc, char *argv[])
+ 		return 2;
+ 	}
+ 	try {
+-		ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in);
+-		ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary);
++		std::ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in);
++		std::ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary);
+ 		boost::iostreams::filtering_streambuf<boost::iostreams::output> out;
+ 		out.push(boost::iostreams::zlib_compressor());
+ 		out.push(outFile);
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild
index 1e533773a2..a5eb19d58a 100644
--- a/graphics/inkscape/inkscape.SlackBuild
+++ b/graphics/inkscape/inkscape.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=inkscape
-VERSION=${VERSION:-0.91}
+VERSION=${VERSION:-0.92.0}
 BUILD=${BUILD:-1}
 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
@@ -40,8 +40,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"
@@ -69,6 +69,8 @@ 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 {} \;
 
+sh autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./configure \
@@ -83,7 +85,7 @@ CXXFLAGS="$SLKCFLAGS -std=c++11" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info
index ce678f1991..1c84bd42d7 100644
--- a/graphics/inkscape/inkscape.info
+++ b/graphics/inkscape/inkscape.info
@@ -1,8 +1,8 @@
 PRGNAM="inkscape"
-VERSION="0.91"
+VERSION="0.92.0"
 HOMEPAGE="http://www.inkscape.org/"
-DOWNLOAD="https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.91.tar.bz2"
-MD5SUM="278dfa4514adcde23546370ec2c84581"
+DOWNLOAD="https://inkscape.org/gallery/item/10552/inkscape-0.92.0.tar.bz2"
+MD5SUM="52117503fcf9aad43cf091c6401571d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lxml numpy"
diff --git a/libraries/libosinfo/Add-Slackware-metadata.patch b/libraries/libosinfo/Add-Slackware-metadata.patch
deleted file mode 100644
index 700c9166dc..0000000000
--- a/libraries/libosinfo/Add-Slackware-metadata.patch
+++ /dev/null
@@ -1,647 +0,0 @@
-From 58d5752ad609773136939b1a3d6b547d81c1ba65 Mon Sep 17 00:00:00 2001
-From: ponce <matteo.bernardini@gmail.com>
-Date: Tue, 9 Sep 2014 11:54:49 +0200
-Subject: [PATCH] Add Slackware metadata
-
----
- data/oses/Makefile.am                              |   1 +
- data/oses/slackware.xml.in                         | 166 +++++++++++++++++++++
- po/POTFILES.in                                     |   1 +
- .../slackware-13.0-install-dvd.iso.txt             |  33 ++++
- .../slackware64-13.0-install-dvd.iso.txt           |  33 ++++
- .../slackware-13.1-install-dvd.iso.txt             |  33 ++++
- .../slackware64-13.1-install-dvd.iso.txt           |  33 ++++
- .../slackware-13.37-install-dvd.iso.txt            |  33 ++++
- .../slackware64-13.37-install-dvd.iso.txt          |  33 ++++
- .../slackware-14.0-install-dvd.iso.txt             |  33 ++++
- .../slackware64-14.0-install-dvd.iso.txt           |  33 ++++
- .../slackware-14.1-install-dvd.iso.txt             |  33 ++++
- .../slackware64-14.1-install-dvd.iso.txt           |  33 ++++
- test/test-isodetect.c                              |   7 +
- 14 files changed, 505 insertions(+)
- create mode 100644 data/oses/slackware.xml.in
- create mode 100644 test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt
- create mode 100644 test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt
- create mode 100644 test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt
- create mode 100644 test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt
- create mode 100644 test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt
- create mode 100644 test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt
- create mode 100644 test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt
- create mode 100644 test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt
- create mode 100644 test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt
- create mode 100644 test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt
-
-diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
-index e1fb6fb..35769e2 100644
---- a/data/oses/Makefile.am
-+++ b/data/oses/Makefile.am
-@@ -18,6 +18,7 @@ database_in_files =	\
- 	opensuse.xml.in \
- 	rhl.xml.in      \
- 	rhel.xml.in     \
-+	slackware.xml.in \
- 	solaris.xml.in  \
- 	suse.xml.in     \
- 	ubuntu.xml.in   \
-diff --git a/data/oses/slackware.xml.in b/data/oses/slackware.xml.in
-new file mode 100644
-index 0000000..645d390
---- /dev/null
-+++ b/data/oses/slackware.xml.in
-@@ -0,0 +1,166 @@
-+<libosinfo version="0.0.1">
-+
-+  <os id="http://mirrors.slackware.com/slackware/slackware-13.0">
-+    <short-id>slackware13.0</short-id>
-+    <_name>Slackware 13.0</_name>
-+    <version>13.0</version>
-+    <_vendor>Slackware</_vendor>
-+    <family>linux</family>
-+    <distro>slackware</distro>
-+    <release-date>2009-08-26</release-date>
-+
-+    <media arch="i486">
-+      <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.0-iso/slackware-13.0-install-dvd.iso</url>
-+      <iso>
-+        <volume-id>SlackDVD</volume-id>
-+        <application-id>Slackware 13.0 DVD</application-id>
-+        <publisher-id></publisher-id>
-+      </iso>
-+      <kernel>kernels/hugesmp.s/bzImage</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+    <media arch="x86_64">
-+      <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.0-iso/slackware64-13.0-install-dvd.iso</url>
-+      <iso>
-+        <volume-id>SlackDVD</volume-id>
-+        <application-id>Slackware 13.0 DVD</application-id>
-+        <publisher-id></publisher-id>
-+      </iso>
-+      <kernel>kernels/huge.s/bzImage</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+  </os>
-+
-+  <os id="http://mirrors.slackware.com/slackware/slackware-13.1">
-+    <short-id>slackware13.1</short-id>
-+    <_name>Slackware 13.1</_name>
-+    <version>13.1</version>
-+    <_vendor>Slackware</_vendor>
-+    <family>linux</family>
-+    <distro>slackware</distro>
-+    <upgrades id="http://mirrors.slackware.com/slackware/slackware-13.0"/>
-+    <derives-from id="http://mirrors.slackware.com/slackware/slackware-13.0"/>
-+    <release-date>2010-05-19</release-date>
-+
-+    <media arch="i486">
-+      <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.1-iso/slackware-13.1-install-dvd.iso</url>
-+      <iso>
-+        <volume-id>SlackDVD</volume-id>
-+        <application-id>Slackware 13.1 DVD</application-id>
-+        <publisher-id></publisher-id>
-+      </iso>
-+      <kernel>kernels/hugesmp.s/bzImage</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+    <media arch="x86_64">
-+      <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.1-iso/slackware64-13.1-install-dvd.iso</url>
-+      <iso>
-+        <volume-id>SlackDVD</volume-id>
-+        <application-id>Slackware 13.1 DVD</application-id>
-+        <publisher-id></publisher-id>
-+      </iso>
-+      <kernel>kernels/huge.s/bzImage</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+  </os>
-+
-+  <os id="http://mirrors.slackware.com/slackware/slackware-13.37">
-+    <short-id>slackware13.37</short-id>
-+    <_name>Slackware 13.37</_name>
-+    <version>13.37</version>
-+    <_vendor>Slackware</_vendor>
-+    <family>linux</family>
-+    <distro>slackware</distro>
-+    <upgrades id="http://mirrors.slackware.com/slackware/slackware-13.1"/>
-+    <derives-from id="http://mirrors.slackware.com/slackware/slackware-13.1"/>
-+    <release-date>2011-04-25</release-date>
-+
-+    <media arch="i486">
-+      <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware-13.37-iso/slackware-13.37-install-dvd.iso</url>
-+      <iso>
-+        <volume-id>SlackDVD</volume-id>
-+        <application-id>Slackware 13.37 DVD</application-id>
-+        <publisher-id></publisher-id>
-+      </iso>
-+      <kernel>kernels/hugesmp.s/bzImage</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+    <media arch="x86_64">
-+      <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware64-13.37-iso/slackware64-13.37-install-dvd.iso</url>
-+      <iso>
-+        <volume-id>SlackDVD</volume-id>
-+        <application-id>Slackware 13.37 DVD</application-id>
-+        <publisher-id></publisher-id>
-+      </iso>
-+      <kernel>kernels/huge.s/bzImage</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+  </os>
-+
-+  <os id="http://mirrors.slackware.com/slackware/slackware-14.0">
-+    <short-id>slackware14.0</short-id>
-+    <_name>Slackware 14.0</_name>
-+    <version>14.0</version>
-+    <_vendor>Slackware</_vendor>
-+    <family>linux</family>
-+    <distro>slackware</distro>
-+    <upgrades id="http://mirrors.slackware.com/slackware/slackware-13.37"/>
-+    <derives-from id="http://mirrors.slackware.com/slackware/slackware-13.37"/>
-+    <release-date>2012-09-26</release-date>
-+
-+    <media arch="i486">
-+      <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware-14.0-iso/slackware-14.0-install-dvd.iso</url>
-+      <iso>
-+        <volume-id>SlackDVD</volume-id>
-+        <application-id>Slackware 14.0 DVD</application-id>
-+        <publisher-id></publisher-id>
-+      </iso>
-+      <kernel>kernels/hugesmp.s/bzImage</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+    <media arch="x86_64">
-+      <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware64-14.0-iso/slackware64-14.0-install-dvd.iso</url>
-+      <iso>
-+        <volume-id>SlackDVD</volume-id>
-+        <application-id>Slackware 14.0 DVD</application-id>
-+        <publisher-id></publisher-id>
-+      </iso>
-+      <kernel>kernels/huge.s/bzImage</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+  </os>
-+
-+  <os id="http://mirrors.slackware.com/slackware/slackware-14.1">
-+    <short-id>slackware14.1</short-id>
-+    <_name>Slackware 14.1</_name>
-+    <version>14.1</version>
-+    <_vendor>Slackware</_vendor>
-+    <family>linux</family>
-+    <distro>slackware</distro>
-+    <upgrades id="http://mirrors.slackware.com/slackware/slackware-14.0"/>
-+    <derives-from id="http://mirrors.slackware.com/slackware/slackware-14.0"/>
-+    <release-date>2013-11-04</release-date>
-+
-+    <media arch="i486">
-+      <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware-14.1-iso/slackware-14.1-install-dvd.iso</url>
-+      <iso>
-+        <volume-id>SlackDVD</volume-id>
-+        <application-id>Slackware 14.1 DVD</application-id>
-+        <publisher-id></publisher-id>
-+      </iso>
-+      <kernel>kernels/hugesmp.s/bzImage</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+    <media arch="x86_64">
-+      <url>http://mirrors.slackware.com/slackware/slackware-iso/slackware64-14.1-iso/slackware64-14.1-install-dvd.iso</url>
-+      <iso>
-+        <volume-id>SlackDVD</volume-id>
-+        <application-id>Slackware 14.1 DVD</application-id>
-+        <publisher-id></publisher-id>
-+      </iso>
-+      <kernel>kernels/huge.s/bzImage</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+  </os>
-+
-+</libosinfo>
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index a1a551f..7fb4aa2 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -1,6 +1,7 @@
- data/oses/netware.xml.in
- data/oses/solaris.xml.in
- data/oses/dos.xml.in
-+data/oses/slackware.xml.in
- data/oses/mageia.xml.in
- data/oses/mandrake.xml.in
- data/oses/mandriva.xml.in
-diff --git a/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt b/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt
-new file mode 100644
-index 0000000..0402219
---- /dev/null
-+++ b/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt
-@@ -0,0 +1,33 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: SlackDVD
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: Slackware 13.0 DVD
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1914167
-+El Torito VD version 1 found, boot catalog is in sector 2351
-+
-+Joliet with UCS level 3 found.
-+SUSP signatures version 1 found
-+Rock Ridge signatures version 1 found
-+Rock Ridge id 'RRIP_1991A'
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Cksum AA 55 OK
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 930 2352
-diff --git a/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt b/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt
-new file mode 100644
-index 0000000..ad1a4ec
---- /dev/null
-+++ b/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt
-@@ -0,0 +1,33 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: SlackDVD
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: Slackware 13.0 DVD
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1926212
-+El Torito VD version 1 found, boot catalog is in sector 2251
-+
-+Joliet with UCS level 3 found.
-+SUSP signatures version 1 found
-+Rock Ridge signatures version 1 found
-+Rock Ridge id 'RRIP_1991A'
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Cksum AA 55 OK
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 8CC 2252
-diff --git a/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt b/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt
-new file mode 100644
-index 0000000..ca1eca9
---- /dev/null
-+++ b/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt
-@@ -0,0 +1,33 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: SlackDVD
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: Slackware 13.1 DVD
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 2108672
-+El Torito VD version 1 found, boot catalog is in sector 2380
-+
-+Joliet with UCS level 3 found.
-+SUSP signatures version 1 found
-+Rock Ridge signatures version 1 found
-+Rock Ridge id 'RRIP_1991A'
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Cksum AA 55 OK
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 94D 2381
-diff --git a/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt b/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt
-new file mode 100644
-index 0000000..9126fdd
---- /dev/null
-+++ b/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt
-@@ -0,0 +1,33 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: SlackDVD
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: Slackware64 13.1 DVD
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 2134723
-+El Torito VD version 1 found, boot catalog is in sector 2333
-+
-+Joliet with UCS level 3 found.
-+SUSP signatures version 1 found
-+Rock Ridge signatures version 1 found
-+Rock Ridge id 'RRIP_1991A'
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Cksum AA 55 OK
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 91E 2334
-diff --git a/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt b/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt
-new file mode 100644
-index 0000000..316b1c3
---- /dev/null
-+++ b/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt
-@@ -0,0 +1,33 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: SlackDVD
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: Slackware 13.37 DVD
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 2218788
-+El Torito VD version 1 found, boot catalog is in sector 2471
-+
-+Joliet with UCS level 3 found.
-+SUSP signatures version 1 found
-+Rock Ridge signatures version 1 found
-+Rock Ridge id 'RRIP_1991A'
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Cksum AA 55 OK
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 9A8 2472
-diff --git a/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt b/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt
-new file mode 100644
-index 0000000..e1fbdd6
---- /dev/null
-+++ b/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt
-@@ -0,0 +1,33 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: SlackDVD
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: Slackware64 13.37 DVD
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 2254040
-+El Torito VD version 1 found, boot catalog is in sector 2424
-+
-+Joliet with UCS level 3 found.
-+SUSP signatures version 1 found
-+Rock Ridge signatures version 1 found
-+Rock Ridge id 'RRIP_1991A'
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Cksum AA 55 OK
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 979 2425
-diff --git a/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt b/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt
-new file mode 100644
-index 0000000..249b665
---- /dev/null
-+++ b/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt
-@@ -0,0 +1,33 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: SlackDVD
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: Slackware 14.0 DVD
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1200676
-+El Torito VD version 1 found, boot catalog is in sector 681
-+
-+Joliet with UCS level 3 found.
-+SUSP signatures version 1 found
-+Rock Ridge signatures version 1 found
-+Rock Ridge id 'RRIP_1991A'
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Cksum AA 55 OK
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 2AA 682
-diff --git a/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt b/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt
-new file mode 100644
-index 0000000..6fd67cf
---- /dev/null
-+++ b/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt
-@@ -0,0 +1,33 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: SlackDVD
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: Slackware64 14.0 DVD
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1177016
-+El Torito VD version 1 found, boot catalog is in sector 664
-+
-+Joliet with UCS level 3 found.
-+SUSP signatures version 1 found
-+Rock Ridge signatures version 1 found
-+Rock Ridge id 'RRIP_1991A'
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Cksum AA 55 OK
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 299 665
-diff --git a/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt b/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt
-new file mode 100644
-index 0000000..0636efc
---- /dev/null
-+++ b/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt
-@@ -0,0 +1,33 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: SlackDVD
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: Slackware 14.1 DVD
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1213132
-+El Torito VD version 1 found, boot catalog is in sector 709
-+
-+Joliet with UCS level 3 found.
-+SUSP signatures version 1 found
-+Rock Ridge signatures version 1 found
-+Rock Ridge id 'RRIP_1991A'
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Cksum AA 55 OK
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 2C6 710
-diff --git a/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt b/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt
-new file mode 100644
-index 0000000..3b8df93
---- /dev/null
-+++ b/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt
-@@ -0,0 +1,33 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: SlackDVD
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: Slackware64 14.1 DVD
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1190715
-+El Torito VD version 1 found, boot catalog is in sector 698
-+
-+Joliet with UCS level 3 found.
-+SUSP signatures version 1 found
-+Rock Ridge signatures version 1 found
-+Rock Ridge id 'RRIP_1991A'
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Cksum AA 55 OK
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 58B 1419
-diff --git a/test/test-isodetect.c b/test/test-isodetect.c
-index 5bd211a..4288cf0 100644
---- a/test/test-isodetect.c
-+++ b/test/test-isodetect.c
-@@ -408,6 +408,12 @@ START_TEST(test_mageia)
- }
- END_TEST
- 
-+START_TEST(test_slackware)
-+{
-+    test_one("slackware");
-+}
-+END_TEST
-+
- static Suite *
- list_suite(void)
- {
-@@ -424,6 +430,7 @@ list_suite(void)
-     tcase_add_test(tc, test_opensuse);
-     tcase_add_test(tc, test_centos);
-     tcase_add_test(tc, test_gnome);
-+    tcase_add_test(tc, test_slackware);
-     tcase_add_test(tc, test_altlinux);
-     tcase_add_test(tc, test_mageia);
-     suite_add_tcase(s, tc);
--- 
-2.1.0
-
diff --git a/libraries/libosinfo/add_slackware_data.patch b/libraries/libosinfo/add_slackware_data.patch
new file mode 100644
index 0000000000..98163966f4
--- /dev/null
+++ b/libraries/libosinfo/add_slackware_data.patch
@@ -0,0 +1,468 @@
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.0/slackware-13.0-install-dvd.iso.txt	2016-12-27 09:56:28.709944162 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware 13.0 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1914167
++El Torito VD version 1 found, boot catalog is in sector 2351
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 930 2352
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.0/slackware64-13.0-install-dvd.iso.txt	2016-12-27 09:56:28.709944162 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware 13.0 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1926212
++El Torito VD version 1 found, boot catalog is in sector 2251
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 8CC 2252
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.1/slackware-13.1-install-dvd.iso.txt	2016-12-27 09:56:28.709944162 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware 13.1 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 2108672
++El Torito VD version 1 found, boot catalog is in sector 2380
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 94D 2381
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.1/slackware64-13.1-install-dvd.iso.txt	2016-12-27 09:56:28.709944162 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware64 13.1 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 2134723
++El Torito VD version 1 found, boot catalog is in sector 2333
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 91E 2334
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.37/slackware-13.37-install-dvd.iso.txt	2016-12-27 09:56:28.709944162 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware 13.37 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 2218788
++El Torito VD version 1 found, boot catalog is in sector 2471
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 9A8 2472
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware13.37/slackware64-13.37-install-dvd.iso.txt	2016-12-27 09:56:28.710944162 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware64 13.37 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 2254040
++El Torito VD version 1 found, boot catalog is in sector 2424
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 979 2425
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.0/slackware-14.0-install-dvd.iso.txt	2016-12-27 09:56:28.710944162 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware 14.0 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1200676
++El Torito VD version 1 found, boot catalog is in sector 681
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 2AA 682
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.0/slackware64-14.0-install-dvd.iso.txt	2016-12-27 09:56:28.710944162 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware64 14.0 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1177016
++El Torito VD version 1 found, boot catalog is in sector 664
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 299 665
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.1/slackware-14.1-install-dvd.iso.txt	2016-12-27 09:56:28.710944162 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware 14.1 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1213132
++El Torito VD version 1 found, boot catalog is in sector 709
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 2C6 710
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.1/slackware64-14.1-install-dvd.iso.txt	2016-12-27 09:56:28.710944162 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware64 14.1 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1190715
++El Torito VD version 1 found, boot catalog is in sector 698
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 58B 1419
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.2/slackware-14.2-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.2/slackware-14.2-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.2/slackware-14.2-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.2/slackware-14.2-install-dvd.iso.txt	2016-12-27 10:16:02.015968444 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware 14.2 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1373842
++El Torito VD version 1 found, boot catalog is in sector 745
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 2EA 746
+diff -Naur libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.2/slackware64-14.2-install-dvd.iso.txt libosinfo-1.0.0/test/isodata/slackware/slackware14.2/slackware64-14.2-install-dvd.iso.txt
+--- libosinfo-1.0.0.orig/test/isodata/slackware/slackware14.2/slackware64-14.2-install-dvd.iso.txt	1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-1.0.0/test/isodata/slackware/slackware14.2/slackware64-14.2-install-dvd.iso.txt	2016-12-27 10:16:02.017968444 +0100
+@@ -0,0 +1,33 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: SlackDVD
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: Slackware64 14.2 DVD
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1354097
++El Torito VD version 1 found, boot catalog is in sector 736
++
++Joliet with UCS level 3 found.
++SUSP signatures version 1 found
++Rock Ridge signatures version 1 found
++Rock Ridge id 'RRIP_1991A'
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Cksum AA 55 OK
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 5B1 1457
+diff -Naur libosinfo-1.0.0.orig/test/test-isodetect.c libosinfo-1.0.0/test/test-isodetect.c
+--- libosinfo-1.0.0.orig/test/test-isodetect.c	2016-08-10 11:13:10.000000000 +0200
++++ libosinfo-1.0.0/test/test-isodetect.c	2016-12-27 10:21:24.928975127 +0100
+@@ -450,6 +450,12 @@
+ }
+ END_TEST
+ 
++START_TEST(test_slackware)
++{
++    test_one("slackware");
++}
++END_TEST
++
+ static Suite *
+ list_suite(void)
+ {
+@@ -471,6 +477,7 @@
+     tcase_add_test(tc, test_mageia);
+     tcase_add_test(tc, test_sles);
+     tcase_add_test(tc, test_sled);
++    tcase_add_test(tc, test_slackware);
+     suite_add_tcase(s, tc);
+     return s;
+ }
diff --git a/libraries/libosinfo/libosinfo.SlackBuild b/libraries/libosinfo/libosinfo.SlackBuild
index f30f02dfd2..4cc01104f9 100644
--- a/libraries/libosinfo/libosinfo.SlackBuild
+++ b/libraries/libosinfo/libosinfo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libosinfo
 
-# Copyright 2014 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2014-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # 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=libosinfo
-VERSION=${VERSION:-0.2.11}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,8 +72,7 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # add slackware metadata
-patch -p1 < $CWD/Add-Slackware-metadata.patch
-autoreconf -fi
+patch -p1 < $CWD/add_slackware_data.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/libraries/libosinfo/libosinfo.info b/libraries/libosinfo/libosinfo.info
index 4f5f334f5d..d737b90bd2 100644
--- a/libraries/libosinfo/libosinfo.info
+++ b/libraries/libosinfo/libosinfo.info
@@ -1,10 +1,10 @@
 PRGNAM="libosinfo"
-VERSION="0.2.11"
+VERSION="1.0.0."
 HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.11.tar.gz"
-MD5SUM="acfcddc6a3f577524fd705947fb5abbc"
+DOWNLOAD="https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-1.0.0.tar.gz"
+MD5SUM="22a09db53246e4a54be14d82a59b15db"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="vala"
+REQUIRES="osinfo-db vala"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/libvirt-glib/libvirt-glib.SlackBuild b/libraries/libvirt-glib/libvirt-glib.SlackBuild
index 3c51adc40d..17baca6b79 100644
--- a/libraries/libvirt-glib/libvirt-glib.SlackBuild
+++ b/libraries/libvirt-glib/libvirt-glib.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libvirt-glib
-VERSION=${VERSION:-0.2.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/libraries/libvirt-glib/libvirt-glib.info b/libraries/libvirt-glib/libvirt-glib.info
index 2ec56673ac..19201fde99 100644
--- a/libraries/libvirt-glib/libvirt-glib.info
+++ b/libraries/libvirt-glib/libvirt-glib.info
@@ -1,8 +1,8 @@
 PRGNAM="libvirt-glib"
-VERSION="0.2.3"
+VERSION="1.0.0"
 HOMEPAGE="http://libvirt.org/"
-DOWNLOAD="ftp://libvirt.org/libvirt/glib/libvirt-glib-0.2.3.tar.gz"
-MD5SUM="a19c9b644dd5f2b9e3e1a4a21f34e2e0"
+DOWNLOAD="ftp://libvirt.org/libvirt/glib/libvirt-glib-1.0.0.tar.gz"
+MD5SUM="cb1332e97c175606306fe8966f8243af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libvirt vala"
diff --git a/libraries/libvirt-python/libvirt-python.SlackBuild b/libraries/libvirt-python/libvirt-python.SlackBuild
index 3747feddaf..b2810e9897 100644
--- a/libraries/libvirt-python/libvirt-python.SlackBuild
+++ b/libraries/libvirt-python/libvirt-python.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libvirt-python
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-2.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libvirt-python/libvirt-python.info b/libraries/libvirt-python/libvirt-python.info
index 7698b63179..daa68439df 100644
--- a/libraries/libvirt-python/libvirt-python.info
+++ b/libraries/libvirt-python/libvirt-python.info
@@ -1,8 +1,8 @@
 PRGNAM="libvirt-python"
-VERSION="2.2.0"
+VERSION="2.5.0"
 HOMEPAGE="http://libvirt.org"
-DOWNLOAD="ftp://libvirt.org/libvirt/python/libvirt-python-2.2.0.tar.gz"
-MD5SUM="fde20090374d7631ac8ea2bdab6ba510"
+DOWNLOAD="ftp://libvirt.org/libvirt/python/libvirt-python-2.5.0.tar.gz"
+MD5SUM="6a064196181adcb7769e42c312a65610"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libvirt"
diff --git a/libraries/libvirt/README b/libraries/libvirt/README
index 55b664a2e7..8a737608ef 100644
--- a/libraries/libvirt/README
+++ b/libraries/libvirt/README
@@ -30,4 +30,4 @@ Have a look at the commented part of rc.libvirt for some gotchas.
 
 netcat-openbsd is an optional dependency (needed if you
 want to connect from a remote host using virt-manager).
-Other optional dependencies include avahi and xen.
+Other optional dependencies include avahi, xen and wireshark.
diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild
index 80867d87b4..2e4614e81b 100644
--- a/libraries/libvirt/libvirt.SlackBuild
+++ b/libraries/libvirt/libvirt.SlackBuild
@@ -5,7 +5,7 @@
 # Maintained by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=libvirt
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-2.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info
index c41a95286d..52a7d1c274 100644
--- a/libraries/libvirt/libvirt.info
+++ b/libraries/libvirt/libvirt.info
@@ -1,8 +1,8 @@
 PRGNAM="libvirt"
-VERSION="2.2.0"
+VERSION="2.5.0"
 HOMEPAGE="http://libvirt.org"
-DOWNLOAD="ftp://libvirt.org/libvirt/libvirt-2.2.0.tar.xz"
-MD5SUM="2462e768e1518026c3105a0466b5fece"
+DOWNLOAD="ftp://libvirt.org/libvirt/libvirt-2.5.0.tar.xz"
+MD5SUM="001af1ca2545971c6b46628678fd4afa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yajl urlgrabber"
diff --git a/libraries/lua-curl/README b/libraries/lua-curl/README
new file mode 100644
index 0000000000..9a93e32abf
--- /dev/null
+++ b/libraries/lua-curl/README
@@ -0,0 +1,8 @@
+lua-curl (lua curl library)
+
+The intent of Lua-cURL is to adapt the
+ * Easy Interface
+ * Multi Interface
+ * Shared Interface
+of libcurl to the functionality of Lua (for example by using iterators
+instead of callbacks when possible).
diff --git a/libraries/lua-curl/liblua-curl.pc b/libraries/lua-curl/liblua-curl.pc
new file mode 100644
index 0000000000..4b02e4caf7
--- /dev/null
+++ b/libraries/lua-curl/liblua-curl.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+includedir=${prefix}/include
+libdir=${exec_prefix}/lib/lua/5.1
+
+Name: liblua-curl
+Description: liblua-curl - libcurl binding to Lua
+Version: 0.3.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -L/usr/lib -llua-curl -llua -lm
+
diff --git a/libraries/lua-curl/lua-curl.SlackBuild b/libraries/lua-curl/lua-curl.SlackBuild
new file mode 100644
index 0000000000..c39e255630
--- /dev/null
+++ b/libraries/lua-curl/lua-curl.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# Slackware build script for lua-curl
+# Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy, 2012
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=lua-curl
+VERSION=${VERSION:-0.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# This is from Debian, thanks
+patch -p1 < $CWD/make.patch
+
+sed -i \
+  -e "s|usr/local/|usr|" \
+  -e "s|lua5\.1|lua|" \
+  -e "s|-Wall -O2|-Wall|" \
+  -e "s|includedir)/lua|includedir)|" \
+  -e "s|share/doc/curl|doc/curl-$VERSION|" \
+  -e "s|/lib/|/lib$LIBDIRSUFFIX|" \
+  -e "s|liblua5.1-curl|liblua-curl|" \
+  -e "s|\ \$(shell getconf LFS_CFLAGS)|${SLKCFLAGS}|" \
+  Makefile
+
+make
+install -m 0755 -D curl.so $PKG/usr/lib$LIBDIRSUFFIX/lua/5.1/lib$PRGNAM.so
+( cd $PKG/usr/lib$LIBDIRSUFFIX ; ln -s lua/5.1/lib$PRGNAM.so lib$PRGNAM.so.0 )
+
+install -m 0644 -D $CWD/lib$PRGNAM.pc $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/lib$PRGNAM.pc
+install -m 0644 -D $PRGNAM.h $PKG/usr/include/$PRGNAM.h
+sed -i "s|/lib|/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/lib$PRGNAM.pc
+
+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
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/curl.html $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/lua-curl/lua-curl.info b/libraries/lua-curl/lua-curl.info
new file mode 100644
index 0000000000..d441fcff18
--- /dev/null
+++ b/libraries/lua-curl/lua-curl.info
@@ -0,0 +1,10 @@
+PRGNAM="lua-curl"
+VERSION="0.3.0"
+HOMEPAGE="http://msva.github.com/lua-curl/"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lua-curl_0.3.0.orig.tar.gz"
+MD5SUM="2a174d81bcfa7d663406b633195f2e89"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="lua"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/libraries/lua-curl/make.patch b/libraries/lua-curl/make.patch
new file mode 100644
index 0000000000..441e62e1cb
--- /dev/null
+++ b/libraries/lua-curl/make.patch
@@ -0,0 +1,17 @@
+Author: Enrico Tassi <gareuselesinge@debian.org>
+Description: fix regex to get auth options from curl.h
+Index: lua-curl-0.3.0/Makefile
+===================================================================
+--- lua-curl-0.3.0.orig/Makefile	2008-10-25 17:26:26.000000000 +0200
++++ lua-curl-0.3.0/Makefile	2012-05-30 21:57:54.000000000 +0200
+@@ -119,8 +119,8 @@
+ 		> curl_netrcopt.h
+ 
+ curl_authopt.h:$(HEADER)
+-	$(H)cat $(HEADER) | grep "CURLAUTH_" | \
+-		sed "s/#define *CURL/{\"/" | sed "s/ *\/\*.*\*\///" | \
++	$(H)cat $(HEADER) | grep "define *CURLAUTH_" | \
++		sed "s/#define *CURL/{\"/" | sed "s/ *\/\*.*//" | \
+ 		sed "s/ /\",/" | sed "s/$$/},/" > curl_authopt.h
+ 
+ curl_ftpauthopt.h:$(HEADER)
diff --git a/libraries/lua-curl/slack-desc b/libraries/lua-curl/slack-desc
new file mode 100644
index 0000000000..8c19468350
--- /dev/null
+++ b/libraries/lua-curl/slack-desc
@@ -0,0 +1,19 @@
+# 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 ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+lua-curl: lua-curl (lua curl library)
+lua-curl:
+lua-curl: The intent of Lua-cURL is to adapt the
+lua-curl:  * Easy Interface
+lua-curl:  * Multi Interface
+lua-curl:  * Shared Interface
+lua-curl: of libcurl to the functionality of Lua (for example by using
+lua-curl: iterators instead of callbacks when possible).
+lua-curl:
+lua-curl: homepage: http://msva.github.com/lua-curl/
+lua-curl:
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index d15469a167..56816b6820 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=avidemux
-VERSION=${VERSION:-2.6.12}
+VERSION=${VERSION:-2.6.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -33,7 +33,7 @@ DOCS="AUTHORS License.txt COPYING scripts/automkv.py"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,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"
diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info
index 02ce56afc4..54fa0568c9 100644
--- a/multimedia/avidemux/avidemux.info
+++ b/multimedia/avidemux/avidemux.info
@@ -1,8 +1,8 @@
 PRGNAM="avidemux"
-VERSION="2.6.12"
+VERSION="2.6.18"
 HOMEPAGE="http://avidemux.org"
-DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.6.12.tar.gz"
-MD5SUM="354d8ddf75d48d1f698786e8243ecc54"
+DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.6.18.tar.gz"
+MD5SUM="947176e91a2a7fcd6790da7c0f19d5e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faac faad2 lame libdca x264 xvidcore"
diff --git a/network/aMule/0001-desktop-files-GenericName.patch b/network/aMule/0001-desktop-files-GenericName.patch
new file mode 100644
index 0000000000..e33b437bbc
--- /dev/null
+++ b/network/aMule/0001-desktop-files-GenericName.patch
@@ -0,0 +1,65 @@
+diff -Naur a/amule.desktop b/amule.desktop
+--- a/amule.desktop	2015-12-05 12:17:44.000000000 +0800
++++ b/amule.desktop	2016-01-28 17:59:27.159722045 +0800
+@@ -5,6 +5,6 @@
+ Terminal=false
+ Type=Application
+ Categories=Network;P2P;
+-Comment=A client for the eD2k network
+-Comment[fr]=Un client pour le réseau eD2k
+-Comment[tr]=eD2k ağı için istemci
++GenericName=A client for the eD2k network
++GenericName[fr]=Un client pour le réseau eD2k
++GenericName[tr]=eD2k ağı için istemci
+diff -Naur a/amulegui.desktop b/amulegui.desktop
+--- a/amulegui.desktop	2015-12-05 12:17:44.000000000 +0800
++++ b/amulegui.desktop	2016-01-28 18:00:09.484782640 +0800
+@@ -5,8 +5,8 @@
+ Terminal=false
+ Type=Application
+ Categories=Network;P2P;
+-Comment=aMule remote control
+-Comment[de]=aMule-Fernsteuerung
+-Comment[fr]=Contrôle à distance d'aMule
+-Comment[hu]=aMule távoli vezérlő
+-Comment[tr]=aMule uzaktan kumandası
++GenericName=aMule remote control
++GenericName[de]=aMule-Fernsteuerung
++GenericName[fr]=Contrôle à distance d'aMule
++GenericName[hu]=aMule távoli vezérlő
++GenericName[tr]=aMule uzaktan kumandası
+diff -Naur a/src/utils/aLinkCreator/alc.desktop b/src/utils/aLinkCreator/alc.desktop
+--- a/src/utils/aLinkCreator/alc.desktop	2015-12-05 12:17:44.000000000 +0800
++++ b/src/utils/aLinkCreator/alc.desktop	2016-01-28 17:56:59.532032109 +0800
+@@ -5,8 +5,8 @@
+ Terminal=false
+ Type=Application
+ Categories=Network;P2P;
+-Comment=aMule ed2k link creator
+-Comment[de]=ed2k-Linkersteller
+-Comment[fr]=Créateur de liens ed2k d'aMule
+-Comment[hu]=ed2k hivatkozás készítő
+-Comment[tr]=aMule için ed2k bağlantı yaratıcısı
++GenericName=aMule ed2k link creator
++GenericName[de]=ed2k-Linkersteller
++GenericName[fr]=Créateur de liens ed2k d'aMule
++GenericName[hu]=ed2k hivatkozás készítő
++GenericName[tr]=aMule için ed2k bağlantı yaratıcısı
+diff -Naur a/src/utils/wxCas/wxcas.desktop b/src/utils/wxCas/wxcas.desktop
+--- a/src/utils/wxCas/wxcas.desktop	2015-12-05 12:17:44.000000000 +0800
++++ b/src/utils/wxCas/wxcas.desktop	2016-01-28 17:58:46.434702658 +0800
+@@ -5,8 +5,8 @@
+ Terminal=false
+ Type=Application
+ Categories=Network;P2P;
+-Comment=aMule online statistics
+-Comment[de]=aMule-Onlinestatistik
+-Comment[fr]=Statistiques d'aMule en ligne
+-Comment[hu]=aMule online statisztikák
+-Comment[tr]=Çevrim içi aMule istatistikleri
++GenericName=aMule online statistics
++GenericName[de]=aMule-Onlinestatistik
++GenericName[fr]=Statistiques d'aMule en ligne
++GenericName[hu]=aMule online statisztikák
++GenericName[tr]=Çevrim içi aMule istatistikleri
+
diff --git a/network/aMule/aMule.SlackBuild b/network/aMule/aMule.SlackBuild
index 296b1e5b39..b0640dde81 100644
--- a/network/aMule/aMule.SlackBuild
+++ b/network/aMule/aMule.SlackBuild
@@ -5,7 +5,8 @@
 # Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmial.com
 
 PRGNAM=aMule
-VERSION=${VERSION:-2.3.1}
+VERSION=${VERSION:-2.3.1.r10983}
+SRCVER=${SRCVER:-SVN-r10983}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -112,9 +113,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -122,8 +123,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix for gcc-4.7.x
-sed -i "s|NotifyObservers|this->NotifyObservers|" src/ObservableQueue.h
+patch -p1 < $CWD/0001-desktop-files-GenericName.patch
+
+sh autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/aMule/aMule.info b/network/aMule/aMule.info
index ad125272ab..acdec2a9da 100644
--- a/network/aMule/aMule.info
+++ b/network/aMule/aMule.info
@@ -1,10 +1,10 @@
 PRGNAM="aMule"
-VERSION="2.3.1"
+VERSION="2.3.1.r10983"
 HOMEPAGE="http://www.amule.org"
-DOWNLOAD="http://downloads.sourceforge.net/amule/aMule-2.3.1.tar.xz"
-MD5SUM="5f5707ad2073d37100409870aa5d3f93"
+DOWNLOAD="http://amule.sourceforge.net/tarballs/aMule-SVN-r10983.tar.bz2"
+MD5SUM="38a4b6dd5615a80e05568f17679e175c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cryptopp wxPython"
+REQUIRES="cryptopp wxGTK3"
 MAINTAINER="Ozan Türkyılmaz"
 EMAIL="ozan.turkyilmaz@gmail.com"
diff --git a/network/sshfs-fuse/README b/network/sshfs-fuse/README
deleted file mode 100644
index 300d34090d..0000000000
--- a/network/sshfs-fuse/README
+++ /dev/null
@@ -1,10 +0,0 @@
-SSHFS (Secure SHell FileSystem) is a file system for Linux capable of 
-operating on files on a remote computer using just a secure shell login 
-on the remote computer. On the local computer where the SSHFS is mounted, 
-the implementation makes use of the FUSE (Filesystem in Userspace) 
-kernel module. 
-
-The practical effect of this is that the end user can seamlessly interact 
-with remote files being securely served over SSH just as if they were 
-local files on his/her computer. On the remote computer the SFTP subsystem 
-of SSH is used.
diff --git a/network/sshfs-fuse/slack-desc b/network/sshfs-fuse/slack-desc
deleted file mode 100644
index 7e342f6fac..0000000000
--- a/network/sshfs-fuse/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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 ':' except on otherwise blank lines.
-
-          |-----handy-ruler------------------------------------------------------|
-sshfs-fuse: sshfs-fuse (ssh file system module for FUSE)
-sshfs-fuse:
-sshfs-fuse: This is a filesystem client based on the SSH File Transfer
-sshfs-fuse: Protocol. Since most SSH servers already support this protocol it
-sshfs-fuse: is very easy to set up: i.e. on the server side there's nothing
-sshfs-fuse: to do.  On the client side mounting the filesystem is as easy as
-sshfs-fuse: logging into the server with ssh.
-sshfs-fuse:
-sshfs-fuse:
-sshfs-fuse:
-sshfs-fuse:
diff --git a/network/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info
deleted file mode 100644
index ec97eeb668..0000000000
--- a/network/sshfs-fuse/sshfs-fuse.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sshfs-fuse"
-VERSION="2.8"
-HOMEPAGE="https://github.com/libfuse/sshfs"
-DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs_2.8/sshfs-2.8.tar.gz"
-MD5SUM="0ba25e848ee59e2595d6576c8f6284b6"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
diff --git a/system/file-roller/file-roller.SlackBuild b/system/file-roller/file-roller.SlackBuild
index 3681bd406f..b453df630d 100644
--- a/system/file-roller/file-roller.SlackBuild
+++ b/system/file-roller/file-roller.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=file-roller
-VERSION=${VERSION:-2.32.2}
+VERSION=${VERSION:-3.16.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,8 +81,7 @@ CFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --localedir=/usr/share/locale \
-  --disable-scrollkeeper \
-  --with-gtk=2.0 \
+  --enable-libarchive \
   --disable-static \
   --enable-shared \
   --build=$ARCH-slackware-linux
diff --git a/system/file-roller/file-roller.info b/system/file-roller/file-roller.info
index ce41193bee..c02e91b637 100644
--- a/system/file-roller/file-roller.info
+++ b/system/file-roller/file-roller.info
@@ -1,8 +1,8 @@
 PRGNAM="file-roller"
-VERSION="2.32.2"
+VERSION="3.16.5"
 HOMEPAGE="http://fileroller.sourceforge.net/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/file-roller/2.32/file-roller-2.32.2.tar.bz2"
-MD5SUM="2ec596e237c2f3af1d7d3f5b9c12884f"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.16/file-roller-3.16.5.tar.xz"
+MD5SUM="c3101815baf7b81ebbb25b8fc36bedf5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/guefi/README b/system/guefi/README
new file mode 100644
index 0000000000..63caa688ed
--- /dev/null
+++ b/system/guefi/README
@@ -0,0 +1,3 @@
+GUEFI is a Python/GTK+3 application that acts as a frontend for
+efibootmgr. It provides an easy to use interface for managing
+UEFI boot options.
diff --git a/system/guefi/guefi.SlackBuild b/system/guefi/guefi.SlackBuild
new file mode 100644
index 0000000000..a515d4ceb6
--- /dev/null
+++ b/system/guefi/guefi.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Slackware build script for guefi
+
+# Copyright 2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=guefi
+VERSION=${VERSION:-0.1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS COPYING README.md"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+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 \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make prefix=/usr
+
+make install DESTDIR=$PKG
+
+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
+
+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
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/guefi/guefi.info b/system/guefi/guefi.info
new file mode 100644
index 0000000000..b91af7b998
--- /dev/null
+++ b/system/guefi/guefi.info
@@ -0,0 +1,10 @@
+PRGNAM="guefi"
+VERSION="0.1.3"
+HOMEPAGE="https://github.com/gapan/guefi"
+DOWNLOAD="https://github.com/gapan/guefi/archive/0.1.3.tar.gz"
+MD5SUM="08355512dd019d93f8809c66fb00132b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/guefi/slack-desc b/system/guefi/slack-desc
new file mode 100644
index 0000000000..e0df51a295
--- /dev/null
+++ b/system/guefi/slack-desc
@@ -0,0 +1,19 @@
+# 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 ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+guefi: guefi (GTK+3 frontend for efibootmgr)
+guefi:
+guefi: GUEFI is a Python/GTK+3 application that acts as a frontend for
+guefi: efibootmgr. It provides an easy to use interface for managing
+guefi: UEFI boot options.
+guefi:
+guefi: homepage: https://github.com/gapan/guefi
+guefi:
+guefi:
+guefi:
+guefi:
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 2040c422e8..d89873bd2d 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -26,7 +26,7 @@
 # see changelog.txt
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-367.44}
+VERSION=${VERSION:-375.26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CPROXY=${CPROXY:-yes}
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index f7c4d8bc51..2476c9ceba 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-driver"
-VERSION="367.44"
+VERSION="375.26"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/367.44/NVIDIA-Linux-x86-367.44.run \
-	  ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-367.44.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-367.44.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-367.44.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-367.44.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-367.44.tar.bz2"
-MD5SUM="93ff8e1fe32939ca4fd6522b93825edc \
-	f51a71ff7fcd4d5497ff0845f8cffe3a \
-        d770941b0e0cd125edf2efdebbc1f1a0 \
-        e30b2ff6481e188fcba57aa123c1584a \
-        2e729b8bf966d0f7239202a3f1ddf2c1 \
-        aef95c4f92612770772140a11432c4d3"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/367.44/NVIDIA-Linux-x86_64-367.44.run \
-	         ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-367.44.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-367.44.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-367.44.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-367.44.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-367.44.tar.bz2"
-MD5SUM_x86_64="d34b42e64b25bf2a8d7b9a157723a3bd \
-               f51a71ff7fcd4d5497ff0845f8cffe3a \
-               d770941b0e0cd125edf2efdebbc1f1a0 \
-               e30b2ff6481e188fcba57aa123c1584a \
-               2e729b8bf966d0f7239202a3f1ddf2c1 \
-               aef95c4f92612770772140a11432c4d3"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/375.26/NVIDIA-Linux-x86-375.26.run \
+          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-375.26.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-375.26.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-375.26.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.26.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-375.26.tar.bz2"
+MD5SUM="b0706e88ad173f6b9c7bd2e5a838c163 \
+        9b947d02b174763291f8a42c915d04f6 \
+        1283efd13fe23498b3e9bb47048f9b59 \
+        846fed040276803b7651feec3d750bad \
+        f630ddd768af0520436c54dabed285ab \
+        f324b65f00b61f274d32862698de368f"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/375.26/NVIDIA-Linux-x86_64-375.26.run \
+                 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-375.26.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-375.26.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-375.26.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.26.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-375.26.tar.bz2"
+MD5SUM_x86_64="d60819b2e377398c7296999ab5e7c1a4 \
+               9b947d02b174763291f8a42c915d04f6 \
+               1283efd13fe23498b3e9bb47048f9b59 \
+               846fed040276803b7651feec3d750bad \
+               f630ddd768af0520436c54dabed285ab \
+               f324b65f00b61f274d32862698de368f"
 REQUIRES="nvidia-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
index 79f0b67a9c..68a40e5e4e 100644
--- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
+++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
@@ -28,9 +28,9 @@
 # See changelog.txt
 
 PRGNAM=nvidia-legacy304-driver
-VERSION=${VERSION:-304.131}
+VERSION=${VERSION:-304.134}
 MVERS=304
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CPROXY=${CPROXY:-no}
 
diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
index 25653d466e..62748d2ef6 100644
--- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
+++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
@@ -1,22 +1,22 @@
 PRGNAM="nvidia-legacy304-driver"
-VERSION="304.131"
+VERSION="304.134"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.131/NVIDIA-Linux-x86-304.131.run \
-          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.131.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.131.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.131.tar.bz2"
-MD5SUM="9f3222fd7287d9b31f54f1d75760e183 \
-        682e392770b5763fb018d6e2193b2bbd \
-        fd5535623e840330cd05fe7e05278ec4 \
-        e3c8f8c3918449728a8da09863a03d3c"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.131/NVIDIA-Linux-x86_64-304.131.run \
-		 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.131.tar.bz2 \
-		 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.131.tar.bz2 \
-		 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.131.tar.bz2"
-MD5SUM_x86_64="e80db7eaf32294d4066f841f0870a85a \
-        682e392770b5763fb018d6e2193b2bbd \
-        fd5535623e840330cd05fe7e05278ec4 \
-        e3c8f8c3918449728a8da09863a03d3c"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.134/NVIDIA-Linux-x86-304.134.run \
+          ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.134.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.134.tar.bz2 \
+          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.134.tar.bz2"
+MD5SUM="9abd7e9272382bd0e6939c3a367cc1a6 \
+        66f847a612e7c82d5801f5f351f0072e \
+        2569a4a7183aa33904bb6beefa5e381c \
+        dea3254eb33b42f1e896c890c5f60aca"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.134/NVIDIA-Linux-x86_64-304.134.run \
+		 ftp://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.134.tar.bz2 \
+		 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.134.tar.bz2 \
+		 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.134.tar.bz2"
+MD5SUM_x86_64="b522935af0bd2aa3f26c6ccd567029b5 \
+	       66f847a612e7c82d5801f5f351f0072e \
+	       2569a4a7183aa33904bb6beefa5e381c \
+	       dea3254eb33b42f1e896c890c5f60aca"
 REQUIRES="nvidia-legacy304-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
index ad1af699e1..a8f8bea298 100644
--- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
+++ b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
@@ -26,8 +26,8 @@
 # See changelog.txt
 
 PRGNAM=nvidia-legacy304-kernel
-VERSION=${VERSION:-304.131}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-304.134}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 KERNEL=${KERNEL:-$(uname -r)}
diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info
index f580ecddde..b214f2de59 100644
--- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info
+++ b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-legacy304-kernel"
-VERSION="304.131"
+VERSION="304.134"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.131/NVIDIA-Linux-x86-304.131.run"
-MD5SUM="9f3222fd7287d9b31f54f1d75760e183"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.131/NVIDIA-Linux-x86_64-304.131.run"
-MD5SUM_x86_64="e80db7eaf32294d4066f841f0870a85a"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/304.134/NVIDIA-Linux-x86-304.134.run"
+MD5SUM="9abd7e9272382bd0e6939c3a367cc1a6"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/304.134/NVIDIA-Linux-x86_64-304.134.run"
+MD5SUM_x86_64="b522935af0bd2aa3f26c6ccd567029b5"
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
index a6ca6cdb29..2bd748962d 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
@@ -26,7 +26,7 @@
 # See changelog.txt
 
 PRGNAM=nvidia-legacy340-driver
-VERSION=${VERSION:-340.96}
+VERSION=${VERSION:-340.101}
 MVERS=340
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
index 3a5d232efd..abfad7f6cc 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
@@ -1,26 +1,26 @@
 PRGNAM="nvidia-legacy340-driver"
-VERSION="340.96"
+VERSION="340.101"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.96/NVIDIA-Linux-x86-340.96.run \
-	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.96.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.96.tar.bz2 \
-	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.96.tar.bz2 \
-          ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.96.tar.bz2"
-MD5SUM="cb64b165b638671bcdc75bcf297b8d90 \
-        36e7509064a3900139c3dbda05e04283 \
-        7174be57b82be6a875e5cb21b0d1fe92 \
-        ea8a4563ffb751141037c82958d19c43 \
-        c4456cffe24d88ecde5782f981b540ee"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.96/NVIDIA-Linux-x86_64-340.96.run \
-                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.96.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.96.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.96.tar.bz2 \
-                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.96.tar.bz2"
-MD5SUM_x86_64="f66b4f01a1edab6ce7d7b90d9b209cd1 \
-        36e7509064a3900139c3dbda05e04283 \
-        7174be57b82be6a875e5cb21b0d1fe92 \
-        ea8a4563ffb751141037c82958d19c43 \
-        c4456cffe24d88ecde5782f981b540ee"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.101/NVIDIA-Linux-x86-340.101.run \
+	  ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.101.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.101.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.101.tar.bz2 \
+	  ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.101.tar.bz2"
+MD5SUM="b2b33b50cf375ccba7d3b959b9f509ec \
+        1be256d8809e8b62d9126ba7634b3e42 \
+        105e7334c10419222857e20f551c70eb \
+        8de36f2301bab7b2fff4bf923ef20a24 \
+        027d41dbbbb0adfadfded25f17fa2b84"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.101/NVIDIA-Linux-x86_64-340.101.run \
+                 ftp://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.101.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.101.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.101.tar.bz2 \
+                 ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.101.tar.bz2"
+MD5SUM_x86_64="ee46a2ffc5f42c2fc02850933f84a707 \
+	       1be256d8809e8b62d9126ba7634b3e42 \
+	       105e7334c10419222857e20f551c70eb \
+	       8de36f2301bab7b2fff4bf923ef20a24 \
+	       027d41dbbbb0adfadfded25f17fa2b84"
 REQUIRES="nvidia-legacy340-kernel"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
index beab29b121..116e69ed43 100644
--- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
+++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
@@ -28,7 +28,7 @@
 # See changelog.txt
 
 PRGNAM=nvidia-legacy340-kernel
-VERSION=${VERSION:-340.96}
+VERSION=${VERSION:-340.101}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info
index b609cab375..b2039666b5 100644
--- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info
+++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-legacy340-kernel"
-VERSION="340.96"
+VERSION="340.101"
 HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.96/NVIDIA-Linux-x86-340.96.run"
-MD5SUM="cb64b165b638671bcdc75bcf297b8d90"
-DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.96/NVIDIA-Linux-x86_64-340.96.run"
-MD5SUM_x86_64="f66b4f01a1edab6ce7d7b90d9b209cd1"
+DOWNLOAD="ftp://download.nvidia.com/XFree86/Linux-x86/340.101/NVIDIA-Linux-x86-340.101.run"
+MD5SUM="b2b33b50cf375ccba7d3b959b9f509ec"
+DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/340.101/NVIDIA-Linux-x86_64-340.101.run"
+MD5SUM_x86_64="ee46a2ffc5f42c2fc02850933f84a707"
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@gmail.com"
diff --git a/system/osinfo-db-tools/README b/system/osinfo-db-tools/README
new file mode 100644
index 0000000000..891cee55cf
--- /dev/null
+++ b/system/osinfo-db-tools/README
@@ -0,0 +1,2 @@
+This package provides tools for managing the osinfo database of
+information about operating systems for use with virtualization
diff --git a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
new file mode 100644
index 0000000000..940fcd5952
--- /dev/null
+++ b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Slackware build script for osinfo-db-tools
+
+# Copyright 2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=osinfo-db-tools
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS ChangeLog COPYING NEWS README"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+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 \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+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
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+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
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/osinfo-db-tools/osinfo-db-tools.info b/system/osinfo-db-tools/osinfo-db-tools.info
new file mode 100644
index 0000000000..61e168a7c9
--- /dev/null
+++ b/system/osinfo-db-tools/osinfo-db-tools.info
@@ -0,0 +1,10 @@
+PRGNAM="osinfo-db-tools"
+VERSION="1.1.0"
+HOMEPAGE="http://libosinfo.org"
+DOWNLOAD="https://fedorahosted.org/releases/l/i/libosinfo/osinfo-db-tools-1.1.0.tar.gz"
+MD5SUM="5b346d7e361a7f510aa62da923cbdd8b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/osinfo-db-tools/slack-desc b/system/osinfo-db-tools/slack-desc
new file mode 100644
index 0000000000..de15373dd6
--- /dev/null
+++ b/system/osinfo-db-tools/slack-desc
@@ -0,0 +1,19 @@
+# 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 ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+osinfo-db-tools: osinfo-db-tools (operating systems database tools)
+osinfo-db-tools:
+osinfo-db-tools: This package provides tools for managing the osinfo database of
+osinfo-db-tools: information about operating systems for use with virtualization
+osinfo-db-tools:
+osinfo-db-tools: homepage: http://libosinfo.org
+osinfo-db-tools:
+osinfo-db-tools:
+osinfo-db-tools:
+osinfo-db-tools:
+osinfo-db-tools:
diff --git a/system/osinfo-db/README b/system/osinfo-db/README
new file mode 100644
index 0000000000..62661343c9
--- /dev/null
+++ b/system/osinfo-db/README
@@ -0,0 +1,3 @@
+The osinfo database provides information about operating systems and
+hypervisor platforms to facilitate the automated configuration and
+provisioning of new virtual machines.
diff --git a/system/osinfo-db/osinfo-db.SlackBuild b/system/osinfo-db/osinfo-db.SlackBuild
new file mode 100644
index 0000000000..c2cae0248c
--- /dev/null
+++ b/system/osinfo-db/osinfo-db.SlackBuild
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+# Slackware build script for osinfo-db
+
+# Copyright 2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=osinfo-db
+VERSION=${VERSION:-20161026}
+SLVERSION=${SLVERSION:-20161227}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+osinfo-db-import --root $PKG --dir /usr/share/osinfo $CWD/$PRGNAM-$VERSION.tar.xz
+osinfo-db-import --root $PKG --dir /usr/share/osinfo $CWD/$PRGNAM-slackware-$SLVERSION.tar.xz
+chown -R root:root $PKG
+find -L $PKG \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -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 {} \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/osinfo/{VERSION,LICENSE} $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/osinfo-db/osinfo-db.info b/system/osinfo-db/osinfo-db.info
new file mode 100644
index 0000000000..071373ae30
--- /dev/null
+++ b/system/osinfo-db/osinfo-db.info
@@ -0,0 +1,12 @@
+PRGNAM="osinfo-db"
+VERSION="20161026"
+HOMEPAGE="http://libosinfo.org"
+DOWNLOAD="https://fedorahosted.org/releases/l/i/libosinfo/osinfo-db-20161026.tar.xz \
+          http://ponce.cc/slackware/sources/repo/osinfo-db-slackware-20161227.tar.xz"
+MD5SUM="d6091ff78cea522493dcc8028673a592 \
+        675fc5c40876b76c2d2924891863a697"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="osinfo-db-tools"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/osinfo-db/slack-desc b/system/osinfo-db/slack-desc
new file mode 100644
index 0000000000..268287f4f7
--- /dev/null
+++ b/system/osinfo-db/slack-desc
@@ -0,0 +1,19 @@
+# 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 ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+osinfo-db: osinfo-db (operating systems database)
+osinfo-db:
+osinfo-db: The osinfo database provides information about operating systems and
+osinfo-db: hypervisor platforms to facilitate the automated configuration and
+osinfo-db: provisioning of new virtual machines.
+osinfo-db:
+osinfo-db: homepage: http://libosinfo.org
+osinfo-db:
+osinfo-db:
+osinfo-db:
+osinfo-db:
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index 8c35972b49..49214c4cd0 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -48,7 +48,7 @@
 # 3.2	15-OCT-2016	upgraded to 2.7 release
 
 PRGNAM=qemu
-VERSION=${VERSION:-2.7.0}
+VERSION=${VERSION:-2.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index 9e7dce9d6b..de562ae1e9 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,8 @@
 PRGNAM="qemu"
-VERSION="2.7.0"
+VERSION="2.8.0"
 HOMEPAGE="http://wiki.qemu.org/Main_Page"
-DOWNLOAD="http://wiki.qemu-project.org/download/qemu-2.7.0.tar.bz2"
-MD5SUM="08d4d06d1cb598efecd796137f4844ab"
+DOWNLOAD="http://wiki.qemu-project.org/download/qemu-2.8.0.tar.bz2"
+MD5SUM="17940dce063b6ce450a12e719a6c9c43"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 768bf720ee..0243c2138c 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -24,13 +24,13 @@
 
 # Initialize variables
 PRGNAM=vice
-VERSION=${VERSION:-2.4.24}
+VERSION=${VERSION:-3.0}
 BUILD=${BUILD:-1}
 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,10 +41,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
@@ -140,7 +137,7 @@ mv $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
 ( cd $PKG/usr/doc/$PRGNAM-$VERSION
   chmod 644 *
   mkdir html
-  mv *.html *.png *.gif *.jpg *.css html/ )
+  mv *.html *.png *.gif *.css html/ )
 ( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION doc )
 
 # Copy additional program documentation
diff --git a/system/vice/vice.info b/system/vice/vice.info
index bb52733460..094b1ebd7e 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,8 +1,8 @@
 PRGNAM="vice"
-VERSION="2.4.24"
+VERSION="3.0"
 HOMEPAGE="http://vice-emu.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-2.4.24.tar.gz"
-MD5SUM="bd064f09908737951ccc75e734b6720c"
+DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-3.0.tar.gz"
+MD5SUM="c732d76a70ac1232a43456dae540b43a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""