4 files changed, 74 insertions, 78 deletions
diff --git a/system/qemu/README b/system/qemu/README
index fd2868f0e4ea2..176f06bb5d268 100644
--- a/system/qemu/README
+++ b/system/qemu/README
@@ -1,14 +1,12 @@
-QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. 
+QEMU is a generic and open source machine emulator and virtualizer.
 
+This is a binary release, repacked for Slackware's package management
+system.
 
-QEMU has two operating modes: 
+It seems the /usr/bin/qemu is hard-coded to look for some files in 
+/usr/local/share - there are at least two ways to work around this
+after the package is installed:
+  1. cd /usr/local/share ; ln -s /usr/share/qemu qemu
+  2. replace -s /usr/local/ /usr/./././ /usr/bin/qemu
 
-Full system emulation. In this mode, QEMU emulates a full system (for example a PC), including a processor and various peripherials. It can be used to launch different Operating Systems without rebooting the PC or to debug system code. 
-
-User mode emulation (Linux host only). In this mode, QEMU can launch Linux processes compiled for one CPU on another CPU. 
-
-
-An optional proprietary QEMU Accelerator Module (kqemu) is available to optimize the case where a PC is emulated on a PC. This module enables QEMU to run most of the target application code directly on the host processor to achieve near native performance.
-
-This build of QEMU is built with support for kqemu.  To achieve this, the QEMU build process probes for current kernel path.  A different kernel path can be set by editing qemu.SlackBuild.  QEMU and kqemu should be built and used against the same kernel version.
-If you are not planning on using kqemu, you may edit the SlackBuild and remove the --enable-kqemu line if you wish.
-\ No newline at end of file
+The first method is the safest, but either should work relatively well.
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index ff00d26222948..eb12a0225be20 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -1,74 +1,59 @@
 #!/bin/sh
 
-## Written by hollywoodb (hollywoodb@fastmail.fm)
-## Feel free to use, modify, redistribute this script.
-## If you make changes please modify the "Written by"
-## so that I don't recieve emails about a script I
-## did not write.  Thanks.
-
-## Modified by the SlackBuilds.org project
-
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit
-fi
-
-NAME=qemu
-VERSION=0.8.2
-ARCHIVE=tar.gz
-
-ARCH=${ARCH:-i486}
-CWD=`pwd`
+# Slackware build script for qemu-bin
+
+# Copyright 2006  Andrew Brouwers <abrouwers@gmail.com>
+# 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.
+
+# Modified by the SlackBuilds.org project
+
+PRGNAM=qemu
+VERSION=0.9.1
+ARCH=i386 # Leave be for binary
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$NAME}
+PKG=${PKG:-/tmp/SBo/package-$PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
 
-rm -rf $PKG $TMP/$NAME-$VERSION
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-tar zxvf $CWD/$NAME-$VERSION.$ARCHIVE || exit 1
-cd $NAME-$VERSION
-
+cd $PKG || exit 1
+tar xvfz $CWD/$PRGNAM-$VERSION-$ARCH.tar.gz || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-    --prefix=/usr \
-    --enable-kqemu \
-    --enable-alsa \
-    --enable-system \
-    --enable-user \
-    || exit 1
-
-make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-find $PKG | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find $PKG | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mv $PKG/usr/share/man $PKG/usr/
-rm -rf $PKG/usr/share/man
-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
+mv $PKG/usr/local/share/man $PKG/usr/man
+mv $PKG/usr/local/bin $PKG/usr/bin
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/local/share/doc/qemu/* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
+mv $PKG/usr/local/share $PKG/usr/share
+rm -rf $PKG/usr/local $PKG/usr/share/doc
 
-mkdir -p $PKG/usr/doc/$NAME-$VERSION
-mv -v $PKG/usr/share/doc/$NAME/* $PKG/usr/doc/$NAME-$VERSION
-rm -rf $PKG/usr/share/doc
-cp -a {COPYING*,LICENSE,README*,TODO,VERSION} $PKG/usr/doc/$NAME-$VERSION
-cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
+gzip -9 $PKG/usr/man/man?/*
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$NAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index 855bac2199053..972c679103235 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,8 @@
 PRGNAM="qemu"
-VERSION="0.8.2"
+VERSION="0.9.1"
 HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-DOWNLOAD="http://fabrice.bellard.free.fr/qemu/qemu-0.8.2.tar.gz"
-MD5SUM="5b3a89eb2f256a8a6f3bb07f7b3f1b07"
-MAINTAINER="hollywoodb"
-EMAIL="hollywoodb@fastmail.fm"
-APPROVED="alien"
+DOWNLOAD="http://fabrice.bellard.free.fr/qemu/qemu-0.9.1-i386.tar.gz"
+MD5SUM="ff807f7b7627ada17bf06ae1638bd566"
+MAINTAINER="Andrew Brouwers"
+EMAIL="abrouwers@gmail.com"
+APPROVED="Michiel"
diff --git a/system/qemu/slack-desc b/system/qemu/slack-desc
index 9c6e4a342d88d..f69d4b85cd844 100644
--- a/system/qemu/slack-desc
+++ b/system/qemu/slack-desc
@@ -1,6 +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 ':'.
+
     |-----handy-ruler--------------------------------------------------------|
 qemu: qemu (open source processor emulator)
 qemu:
-qemu: QEMU is a generic and open source processor emulator which achieves a
-qemu: good emulation speed by using dynamic translation.
+qemu: QEMU is a generic and open source processor emulator which achieves
+qemu: a good emulation speed by using dynamic translation.
+qemu: 
+qemu: Be sure to read the README.Slackware file in /usr/doc/qemu-0.9.1
+qemu: 
+qemu: 
+qemu: 
+qemu: 
 qemu: