app-emulation/qemu: Make CONFIG_CHECK CPU-model dependent

Closes: https://github.com/gentoo/gentoo/pull/6285
Signed-off-by: George Gaydarov <git@gg7.io>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

diff --git a/app-emulation/qemu/qemu-2.10.1.ebuild b/app-emulation/qemu/qemu-2.10.1-r1.ebuild
similarity index 99%
rename from app-emulation/qemu/qemu-2.10.1.ebuild
rename to app-emulation/qemu/qemu-2.10.1-r1.ebuild
index 944fecea9676dce3cc2de5e5e55d626ddc3727da..dcf84b71ab6089b5ec5aef258682feb8ab71d633 100644 (file)
--- a/app-emulation/qemu/qemu-2.10.1.ebuild
+++ b/app-emulation/qemu/qemu-2.10.1-r1.ebuild
@@ -286,7 +286,11 @@ pkg_pretend() {
                        ERROR_VHOST_NET+=" support"
 
                        if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-                               CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+                               if grep -q AuthenticAMD /proc/cpuinfo; then
+                                       CONFIG_CHECK+=" ~KVM_AMD"
+                               elif grep -q GenuineIntel /proc/cpuinfo; then
+                                       CONFIG_CHECK+=" ~KVM_INTEL"
+                               fi
                        fi
 
                        use python && CONFIG_CHECK+=" ~DEBUG_FS"

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 1f09b78248a4ccbba32bee5be09c2bdc592d3a27..97e3556cc400a4ee99501d0c1c4e02ef6fcef69c 100644 (file)
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -283,7 +283,11 @@ pkg_pretend() {
                        ERROR_VHOST_NET+=" support"
 
                        if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-                               CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+                               if grep -q AuthenticAMD /proc/cpuinfo; then
+                                       CONFIG_CHECK+=" ~KVM_AMD"
+                               elif grep -q GenuineIntel /proc/cpuinfo; then
+                                       CONFIG_CHECK+=" ~KVM_INTEL"
+                               fi
                        fi
 
                        use python && CONFIG_CHECK+=" ~DEBUG_FS"