[Lunar-commits] <moonbase> qemu-kvm: Revamped the module, the prior one was a copy of original qemu

[Stefan Wold]

commit a7e17fe307643d03deb43402059b571cf0b1628c
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Tue Apr 12 18:39:15 2011 +0200

    qemu-kvm: Revamped the module, the prior one was a copy of original qemu
    
    Conflicts:
    
    	virtual/qemu-kvm/DETAILS
---
 virtual/qemu-kvm/65-kvm.rules |    1 +
 virtual/qemu-kvm/BUILD        |   21 +++++++++++----------
 virtual/qemu-kvm/CONFLICTS    |    2 +-
 virtual/qemu-kvm/DEPENDS      |   18 +++++++++---------
 virtual/qemu-kvm/DETAILS      |    9 +++++----
 5 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/virtual/qemu-kvm/65-kvm.rules b/virtual/qemu-kvm/65-kvm.rules
new file mode 100644
index 0000000..c2f7317
--- /dev/null
+++ b/virtual/qemu-kvm/65-kvm.rules
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/virtual/qemu-kvm/BUILD b/virtual/qemu-kvm/BUILD
index d195f68..f70de08 100644
--- a/virtual/qemu-kvm/BUILD
+++ b/virtual/qemu-kvm/BUILD
@@ -1,16 +1,17 @@
 (
 
-  unset CFLAGS
+  OPTS+=" --audio-drv-list=alsa,sdl,oss,esd \
+          --audio-card-list=ac97,sb16,es1370,adlib"
 
-  OPTS+=" --extra-ldflags=-L/usr/X11R6/lib"
-  OPTS+=" --target-list=$(echo $TARGETLIST | sed s/\ /,/g)"
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              $OPTS &&
 
-  ./configure --prefix=/usr  \
-               $OPTS        &&
-
-  default_make  &&
-
-  # qemu-doc.html may not exist, but it will be ignored if that is the case
-  gather_docs TODO qemu-doc.html
+  default_make &&
+  install -D -m0644 $SCRIPT_DIRECTORY/65-kvm.rules /lib/udev/rules.d/65-kvm.rules &&
+  ln -s qemu-system-x86_64 /usr/bin/qemu-kvm &&
+  ln -s qemu-system-x86_64 /usr/bin/qemu &&
+  ln -s qemu-system-x86_64 /usr/bin/kvm &&
+  mv /usr/share/man/man1/qemu.1 /usr/share/man/man1/qemu-kvm.1
 
 ) > $C_FIFO 2>&1
diff --git a/virtual/qemu-kvm/CONFLICTS b/virtual/qemu-kvm/CONFLICTS
index 32a17bf..5d81d88 100644
--- a/virtual/qemu-kvm/CONFLICTS
+++ b/virtual/qemu-kvm/CONFLICTS
@@ -1 +1 @@
-conflicts  qemu
\ No newline at end of file
+conflicts qemu
diff --git a/virtual/qemu-kvm/DEPENDS b/virtual/qemu-kvm/DEPENDS
index b416e90..fc9479e 100644
--- a/virtual/qemu-kvm/DEPENDS
+++ b/virtual/qemu-kvm/DEPENDS
@@ -1,9 +1,9 @@
-depends  autoconf
-
-optional_depends  alsa-lib  ""  ""  "for ALSA sound support"
-optional_depends  bluez     ""  ""  "for bluetooth support"
-
-optional_depends  SDL  \
-                  ""  \
-                  "--disable-sdl --disable-gfx-check"  \
-                  "for gui qemu support"
+depends %JPEG
+depends libpng
+depends curl
+depends SDL
+depends alsa-lib
+depends esound
+depends gnutls
+depends vde2
+depends perl
diff --git a/virtual/qemu-kvm/DETAILS b/virtual/qemu-kvm/DETAILS
index 3a95178..1dca092 100644
--- a/virtual/qemu-kvm/DETAILS
+++ b/virtual/qemu-kvm/DETAILS
@@ -3,12 +3,13 @@
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/kvm
       SOURCE_VFY=sha1:7378f10ea04db19e5a5009cae1ecb65517e82877
-        WEB_SITE=http://www.linux-kvm.com
+        WEB_SITE="http://www.linux-kvm.org/"
          ENTERED=20110226
-         UPDATED=20110609
-           SHORT="An improved version of qemu"
+         UPDATED=20110618
+           SHORT="Qemu optimized for linux kvm"
+PSAFE=no
 
-cat << EOF
+cat <<EOF
 The qemu-kvm is a version of qemu which makes a better use of kvm support
 from the LInux kernel.
 EOF