From: Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
Date: Sat, 12 Jun 2010 05:20:47 +0000 (+0000)
Subject: [app-emulation/qemu-kvm-9999] Restricted targets to x86_64-softmmu after upstream... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=297b2d770c7ae1e3172a5d5af3f8263073e151eb;p=gentoo.git

[app-emulation/qemu-kvm-9999] Restricted targets to x86_64-softmmu after upstream informed that's the only supported target for qemu-kvm.
Should fix bug 317205 and bug 318413.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 125d3cfe0a83..8b1cc429db02 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.28 2010/05/18 17:57:32 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.29 2010/06/12 05:20:47 jmbsvicetto Exp $
+
+  12 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  qemu-kvm-9999.ebuild:
+  [app-emulation/qemu-kvm-9999] Restricted targets to x86_64-softmmu after
+  upstream informed that's the only supported target for qemu-kvm.
+  Should fix bug 317205 and bug 318413.
 
 *qemu-kvm-0.12.4 (18 May 2010)
 
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index f14c499327df..98fe60208b44 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
 AUX qemu-kvm 61 RMD160 83882e881a067065258f562ad1e60440666c85d3 SHA1 a965f19031e303d583bd541c9d8fff2214262e6b SHA256 211d51f0a7d3d2ba8c53016c75e2b483feadbb65e383b1eec81d9cebf6a22c29
 AUX qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch 622 RMD160 d3add3022d9eba3ec07ccade6f169b4d758d23e8 SHA1 b41e9516d69c179701906f157750e72a82c650ca SHA256 f51a7b3ea49f814a5f7726daeac08e5ab641d2e0ea72e90b4b83dd914ca742ff
@@ -15,15 +12,6 @@ EBUILD qemu-kvm-0.11.1.ebuild 5725 RMD160 87f907a96b5b7cc6387de9b738c6261c576058
 EBUILD qemu-kvm-0.12.3-r1.ebuild 7452 RMD160 e4b2b3bf62be0147db6d03d34f033e87de4975f2 SHA1 a3b00b0646ce25c29439170f424328cde28ca98a SHA256 34373fec4dca921c1d1e9c19fa1335d70491283a5fc03544f735c7d9db9f3a60
 EBUILD qemu-kvm-0.12.3.ebuild 7291 RMD160 6a23cf04d27e8cb4a41586f64ef20ba96a1edd02 SHA1 aa72ec725c4facdcbf6b19880fdfc9114a9ea7c1 SHA256 6b27f2365f1114df96f45e3f5501aa5788a007db3619f55d9d678af69d5a2ed1
 EBUILD qemu-kvm-0.12.4.ebuild 7408 RMD160 8227b225228a4050331405da9a88522d3bd56f64 SHA1 f860cb9c27db03208f5bfc75f6f5605b62173d57 SHA256 c64e9a8f7e56ce55e81b98f7089406be18c5d63341414a66422d7dcd6e28c6aa
-EBUILD qemu-kvm-9999.ebuild 6920 RMD160 eef5085843cdf6ae4f371b6dd5b2d7e402261771 SHA1 637d69343fce2d2d55cfc3bda7ebac713d906369 SHA256 8011ec51134235d0219e96a45504e7519781eb1d0bb64f553255b656b3fbb3b3
-MISC ChangeLog 6172 RMD160 5eb7a88fbd5fcd9265abb3fa307cc115556104b3 SHA1 0ce8604f5e994c9870ecd85153aa31e694ce21ba SHA256 33ef5fd31ff18e51ae0f6f925ceb595921f926eb31845482c3838819beeb3b53
+EBUILD qemu-kvm-9999.ebuild 7578 RMD160 7308cf5d755cc0120b42cc32934122ea8a517836 SHA1 c475e51846ada54a25820f7de9dfbd8a4f1dd32f SHA256 3996be11e01042d2df9565ecc6ae0bb1df27cd4450732e7031a18f7309557d47
+MISC ChangeLog 6452 RMD160 c382faed2a223f2b7f13ce9a20826f2349865ef3 SHA1 7976ba6a5638b7ddc42418c524c8c12fa7a3664e SHA256 99e8ccb6c98b41f7c94029098a06f282eacfc86a8b53945b3409f89ad92c7871
 MISC metadata.xml 978 RMD160 2e120b8332c7fc1d6b4baa4149b0f13a73c74fb2 SHA1 5fe37c22d64ca52ef6d26debc46b23b415e04a7a SHA256 76676f1a327e743dd3579109250ace6012ac93ffea5d1daab0a24b194b55164f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iJwEAQECAAYFAkvy1RoACgkQG7kqcTWJkGeX5gP9FyfGFUWFwBDjJScrRUHZP7be
-WzOrFs/HDMSZOOCAk6Edz/j6xGwEsehcTRBFHILEyMvygzCZEAT149ppf/0AOPfT
-kyCQnS83IzYYUT3Wk2ZdVelBS/BuTr4T/cRtxZvjYHGH5ov4O8InAtyS302jWUu2
-AzE8GnEK+JSvLrMRMX4=
-=jEqj
------END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 71e7a8fa151c..b100f84b0dfa 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.6 2010/03/28 17:24:11 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.7 2010/06/12 05:20:47 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -28,9 +28,13 @@ SLOT="0"
 IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \
 pulseaudio qemu-ifup sasl sdl static vde"
 
-COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
+# Updated targets to use the only supported upstream target - x86_64-softmmu
+COMMON_TARGETS=""
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} x86_64"
+IUSE_USER_TARGETS=""
+#COMMON_TARGETS="i386 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
+#IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} x86_64 mips64 mips64el ppcemb"
+#IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
 
 for target in ${IUSE_SOFTMMU_TARGETS}; do
 	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
@@ -70,7 +74,7 @@ DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.29
 	gnutls? ( dev-util/pkgconfig )"
 
-kvm_kern_war() {
+kvm_kern_warn() {
 	eerror "Please enable KVM support in your kernel, found at:"
 	eerror
 	eerror "  Virtualization"
@@ -79,6 +83,14 @@ kvm_kern_war() {
 }
 
 pkg_setup() {
+
+	local counter="0" check
+	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	for check in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${check}" && counter="1"
+	done
+	[[ ${counter} == 0 ]] && die "You need to set at least 1 target in QEMU_SOFTMMU_TARGETS"
+
 	if kernel_is lt 2 6 25; then
 		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
 		eerror "Either upgrade your kernel"
@@ -141,7 +153,7 @@ src_configure() {
 	use static && conf_opts="${conf_opts} --static"
 
 	# Fix the $(prefix)/etc issue
-	conf_opts="${conf_opts} --sysconfdir=${D}/etc"
+	conf_opts="${conf_opts} --sysconfdir=/etc"
 
 	#config options
 	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
@@ -200,8 +212,13 @@ src_install() {
 	newdoc pc-bios/README README.pc-bios || die
 	dohtml qemu-doc.html qemu-tech.html || die
 
-	dobin "${FILESDIR}"/qemu-kvm
-	dosym /usr/bin/qemu-kvm /usr/bin/kvm
+	if use qemu_softmmu_targets_x86_64 ; then
+		dobin "${FILESDIR}"/qemu-kvm
+		dosym /usr/bin/qemu-kvm /usr/bin/kvm
+	else
+		elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+		elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
+	fi
 }
 
 pkg_postinst() {