13 files changed, 90 insertions, 15 deletions
diff --git a/system/vice/doinst.sh b/system/vice/doinst.sh
new file mode 100644
index 0000000000000..5fb28930db0b9
--- /dev/null
+++ b/system/vice/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/system/vice/gnome-palemu.diff.gz b/system/vice/gnome-palemu.diff.gz
deleted file mode 100644
index 3de9586ce540d..0000000000000
--- a/system/vice/gnome-palemu.diff.gz
+++ /dev/null
diff --git a/system/vice/vice-fix-help.patch b/system/vice/vice-fix-help.patch
index e4793c4251f5f..1312fe8399b91 100644
--- a/system/vice/vice-fix-help.patch
+++ b/system/vice/vice-fix-help.patch
@@ -1,7 +1,7 @@
 diff -urpN vice-1.22/man/vice.1 vice-1.22-fixdoc/man/vice.1
 --- vice-1.22/man/vice.1	2005-08-21 21:15:04.000000000 +0200
 +++ vice-1.22-fixdoc/man/vice.1	2008-02-16 19:40:11.000000000 +0100
-@@ -34,7 +34,7 @@ a Commodore BASIC de-tokenizer;
+@@ -40,7 +40,7 @@ a Commodore BASIC de-tokenizer;
  .PP
  The whole documentation for these programs is available in HTML
  format; the main file should be installed on your system as
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 2d21966bc118f..871ea9600a889 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vice
-VERSION=2.0
+VERSION=2.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -56,13 +56,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix PAL emulation.
-# This is an official patch to release 2.0 and has been applied upstream.
-zcat $CWD/gnome-palemu.diff.gz |patch -p0
-
 # Set the help path correctly with respect to the actually installed doc
 # folder (the folder set up by "make install" is quite broken).
-# This also changes the HTML help viewer from "firefox" to "htmlview".
 patch -p1 <$CWD/vice-fix-help.patch
 
 CFLAGS="$SLKCFLAGS" \
@@ -79,7 +74,8 @@ make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -98,18 +94,24 @@ cp -R doc $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -name "Makefile*" -exec rm -f {} \;
 find $PKG/usr/doc/$PRGNAM-$VERSION -name "tex*" -exec rm -f {} \;
 # Copy additional program documentation
-cp -a AUTHORS ChangeLog COPYING FEEDBACK INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING FEEDBACK INSTALL NEWS README \
+   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 # Create link to documentation folder in the place VICE expects
-# to find it (looks like the VICE team does something strange with
-# the build scripts, as it resulted very difficult to actually set
-# a different doc folder)
+# to find it.
 ( cd $PKG/usr/lib/$PRGNAM
   ln -s /usr/doc/$PRGNAM-$VERSION doc
 )
 
+# Install icon and menu entries
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cp $CWD/*.desktop $PKG/usr/share/applications
+cp $CWD/vice.png $PKG/usr/share/pixmaps
+
 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.tgz
diff --git a/system/vice/vice.info b/system/vice/vice.info
index fb6a63ff550a3..1a05c156184d2 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,8 +1,8 @@
 PRGNAM="vice"
-VERSION="2.0"
+VERSION="2.1"
 HOMEPAGE="http://www.viceteam.org/"
-DOWNLOAD="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz"
-MD5SUM="e4af3962469cb2279429718946528f1d"
+DOWNLOAD="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz"
+MD5SUM="a4cca1aad12e12ac7f37d6c85310ade8"
 MAINTAINER="Mauro Giachero"
 EMAIL="mauro dot giachero at gmail dot com"
 APPROVED="dsomero"
diff --git a/system/vice/vice.png b/system/vice/vice.png
new file mode 100644
index 0000000000000..e001fc8620372
--- /dev/null
+++ b/system/vice/vice.png
diff --git a/system/vice/x128.desktop b/system/vice/x128.desktop
new file mode 100644
index 0000000000000..c72fd07a2ad35
--- /dev/null
+++ b/system/vice/x128.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=VICE C128 emulator
+Comment=Commodore 128 emulator from the VICE team
+StartupNotify=true
+Exec=x128
+Icon=vice.png
+Terminal=false
+Type=Application
+Categories=System
diff --git a/system/vice/x64.desktop b/system/vice/x64.desktop
new file mode 100644
index 0000000000000..99f4c4941b6fd
--- /dev/null
+++ b/system/vice/x64.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=VICE C64 emulator
+Comment=Commodore 64 emulator from the VICE team
+StartupNotify=true
+Exec=x64
+Icon=vice.png
+Terminal=false
+Type=Application
+Categories=System
diff --git a/system/vice/x64dtv.desktop b/system/vice/x64dtv.desktop
new file mode 100644
index 0000000000000..3a64e94124fc3
--- /dev/null
+++ b/system/vice/x64dtv.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=VICE C64DTV emulator
+Comment=Commodore 64 DTV emulator from the VICE team
+StartupNotify=true
+Exec=x64dtv
+Icon=vice.png
+Terminal=false
+Type=Application
+Categories=System
diff --git a/system/vice/xcbm2.desktop b/system/vice/xcbm2.desktop
new file mode 100644
index 0000000000000..c0ec685c3b017
--- /dev/null
+++ b/system/vice/xcbm2.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=VICE CBM2 emulator
+Comment=Commodore CBM2 emulator from the VICE team
+StartupNotify=true
+Exec=xcbm2
+Icon=vice.png
+Terminal=false
+Type=Application
+Categories=System
diff --git a/system/vice/xpet.desktop b/system/vice/xpet.desktop
new file mode 100644
index 0000000000000..c36301e02310a
--- /dev/null
+++ b/system/vice/xpet.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=VICE PET emulator
+Comment=Commodore PET emulator from the VICE team
+StartupNotify=true
+Exec=xpet
+Icon=vice.png
+Terminal=false
+Type=Application
+Categories=System
diff --git a/system/vice/xplus4.desktop b/system/vice/xplus4.desktop
new file mode 100644
index 0000000000000..5eba55e71094a
--- /dev/null
+++ b/system/vice/xplus4.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=VICE PLUS4 emulator
+Comment=Commodore PLUS4 emulator from the VICE team
+StartupNotify=true
+Exec=xplus4
+Icon=vice.png
+Terminal=false
+Type=Application
+Categories=System
diff --git a/system/vice/xvic.desktop b/system/vice/xvic.desktop
new file mode 100644
index 0000000000000..7e96c4c5e5b02
--- /dev/null
+++ b/system/vice/xvic.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=VICE VIC-20 emulator
+Comment=Commodore VIC-20 emulator from the VICE team
+StartupNotify=true
+Exec=xvic
+Icon=vice.png
+Terminal=false
+Type=Application
+Categories=System