From 52a841e672ff5b09f61144b74b2cdb4f3e50601d Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Fri, 28 Sep 2012 04:51:06 -0600
Subject: [PATCH] qemu{,-kvm}: conflict, provide, replace eachother.

---
 srcpkgs/qemu-kvm/template | 3 ++-
 srcpkgs/qemu/template     | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qemu-kvm/template b/srcpkgs/qemu-kvm/template
index 65f276ebcc..1237ce19cc 100644
--- a/srcpkgs/qemu-kvm/template
+++ b/srcpkgs/qemu-kvm/template
@@ -1,10 +1,11 @@
 # Template file for 'qemu-kvm'
 pkgname=qemu-kvm
 version=1.2.0
-revision=1
+revision=2
 nostrip=yes
 conflicts="qemu>=0"
 provides="qemu-$version"
+replaces="qemu>=0"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-spice
 --enable-kvm --audio-drv-list=alsa,sdl,pa --disable-xen
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index be04c45c6f..63b25603c6 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,8 +1,11 @@
 # Template file for 'qemu'
 pkgname=qemu
 version=1.2.0
-revision=1
+revision=2
 nostrip=yes
+conflicts="qemu-kvm>=0"
+provides="qemu-kvm-$version"
+replaces="qemu-kvm>=0"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-spice
 --enable-kvm --audio-drv-list=alsa,sdl,pa --disable-xen