From e61c411bed3ee397a7279f40edec0c00f60782c7 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Thu, 2 Jun 2011 22:47:58 +0200
Subject: [PATCH] qemu-kvm: changed to use a patch for mangling names for
 installed binaries to include '-kvm' suffix

---
 .../qemu-kvm/qemu-kvm-0.14.1-progname.patch   | 30 +++++++++++++++++++
 emulators/qemu-kvm/qemu-kvm.conf              |  5 ----
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 emulators/qemu-kvm/qemu-kvm-0.14.1-progname.patch

diff --git a/emulators/qemu-kvm/qemu-kvm-0.14.1-progname.patch b/emulators/qemu-kvm/qemu-kvm-0.14.1-progname.patch
new file mode 100644
index 000000000..edf3fcd58
--- /dev/null
+++ b/emulators/qemu-kvm/qemu-kvm-0.14.1-progname.patch
@@ -0,0 +1,30 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../qemu-kvm/qemu-kvm-0.14.1-progname.patch
+# Copyright (C) 2011 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- qemu-kvm-0.14.1/Makefile.target.orig	2011-06-01 19:42:21.004004948 +0200
++++ qemu-kvm-0.14.1/Makefile.target	2011-06-01 19:43:01.144004948 +0200
+@@ -24,9 +24,9 @@
+ else
+ # system emulator name
+ ifeq ($(TARGET_ARCH), i386)
+-QEMU_PROG=qemu$(EXESUF)
++QEMU_PROG=qemu-kvm$(EXESUF)
+ else
+-QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
++QEMU_PROG=qemu-kvm-system-$(TARGET_ARCH2)$(EXESUF)
+ endif
+ endif
+ 
diff --git a/emulators/qemu-kvm/qemu-kvm.conf b/emulators/qemu-kvm/qemu-kvm.conf
index 1a3842775..639bc21f3 100644
--- a/emulators/qemu-kvm/qemu-kvm.conf
+++ b/emulators/qemu-kvm/qemu-kvm.conf
@@ -16,9 +16,4 @@
 # installed at the right place and to avoid shared files with qemu
 datadir="$datadir/$pkg"
 
-# mangle names for installed binaries to include '-kvm' suffix for avoiding
-# name clashed with the binaries if the original qemu 
-var_append INSTALL_WRAPPER_FILTER "|" \
-	"sed -e 's,\(usr/bin/\)\(qemu\),\1\2-kvm,'"
-
 var_append GCC_WRAPPER_INSERT ' ' "-L$(pkgprefix libdir libx11)"