From 9ecb7c8c22481426bb0c3095763b43e4fa6618bf Mon Sep 17 00:00:00 2001 From: Thomas Sachau Date: Fri, 19 Mar 2010 17:23:17 +0000 Subject: [PATCH] Also add warning and dont install useless files without QEMU_SOFTMMU_TARGETS=x86_64 Package-Manager: portage-2.2_rc67-r2/cvs/Linux x86_64 --- app-emulation/qemu-kvm/ChangeLog | 7 ++++++- app-emulation/qemu-kvm/Manifest | 16 ++++++++-------- app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild | 12 +++++++++--- app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild | 12 +++++++++--- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index 631494153980..f38878f4620e 100644 --- a/app-emulation/qemu-kvm/ChangeLog +++ b/app-emulation/qemu-kvm/ChangeLog @@ -1,6 +1,11 @@ # 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.24 2010/03/19 17:09:07 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.25 2010/03/19 17:23:17 tommy Exp $ + + 19 Mar 2010; Thomas Sachau (Tommy[D]) + qemu-kvm-0.12.2-r2.ebuild, qemu-kvm-0.12.3.ebuild: + Also add warning and dont install useless files without + QEMU_SOFTMMU_TARGETS=x86_64 19 Mar 2010; Thomas Sachau (Tommy[D]) qemu-kvm-0.12.2-r2.ebuild, qemu-kvm-0.12.3.ebuild: diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest index 4592ce8f8f1f..bb1b5144ebe5 100644 --- a/app-emulation/qemu-kvm/Manifest +++ b/app-emulation/qemu-kvm/Manifest @@ -11,17 +11,17 @@ DIST qemu-kvm-0.12.2.tar.gz 4713699 RMD160 1581fa5ec5dc168de3667a3c28cd56ba0b2e2 DIST qemu-kvm-0.12.3.tar.gz 4718791 RMD160 fe88117e6e32188e097a86f95bffc4b74422a5e6 SHA1 235a790056a1b751791e64dd499129b2dbf55be8 SHA256 77cccdc8938b33f3ed74763d01deaad58918c85f04a06afd10f00857b504c2b2 EBUILD qemu-kvm-0.11.1-r1.ebuild 5797 RMD160 a3f4f239cd7a6cc9a7debfe6d347e0d9e1f288ff SHA1 60f6d85c50b14c3926e5e7e5f44e576bbf916d6a SHA256 a3d6efc3bcf9f169bbcad3ebe1dd0efbfb71ad1b185ab26c003191594b34edd4 EBUILD qemu-kvm-0.11.1.ebuild 5725 RMD160 87f907a96b5b7cc6387de9b738c6261c57605877 SHA1 5cb4172354f07be1c0b9199b1aa2d880d5b1ef54 SHA256 7bd18bfac7eaa453b5edacc4111426ceab8a8652b311ad97cb6310a42392f5ed -EBUILD qemu-kvm-0.12.2-r2.ebuild 7018 RMD160 b28c3f9286de1d5f93d523499cd941cbb526e777 SHA1 ba385de7c8d1f7166a1ae086eed4f7b02ab11269 SHA256 67c4721f6fe4b6ca0c80276d3c056c8c3e29382b12672df19fd95973e98451f4 -EBUILD qemu-kvm-0.12.3.ebuild 7016 RMD160 6fa33134702a53b50ef0cb5a7b15508b91d61c11 SHA1 103ce26039f8d66db3d98b33ad43c3efb42bc42b SHA256 0c8ed134a573b6c50370108e9654ef96faf8123c7c2ea6c408e0088d1a07e44b +EBUILD qemu-kvm-0.12.2-r2.ebuild 7293 RMD160 bb0b4f3cca10fffecde0bd210cf1bb53c264beb5 SHA1 f7a9a2f98d9c0b1d16cfee33b5520d3e6f62152c SHA256 b9fe14f8ab0ed322008b22fa044c53d22af6be7f43fbcc27f2ece6a4e0c3c3e0 +EBUILD qemu-kvm-0.12.3.ebuild 7291 RMD160 6a23cf04d27e8cb4a41586f64ef20ba96a1edd02 SHA1 aa72ec725c4facdcbf6b19880fdfc9114a9ea7c1 SHA256 6b27f2365f1114df96f45e3f5501aa5788a007db3619f55d9d678af69d5a2ed1 EBUILD qemu-kvm-9999.ebuild 6966 RMD160 ccddfa0584684e8a08a52656aa704afc59ba3da4 SHA1 abf1581414776ab93b44a69989f2502160b0cfbd SHA256 cc6d1bffac166fefe6832f7d465d6e9945df86d5de000a52105a24d44e7c43bb -MISC ChangeLog 5095 RMD160 28f4536c166955a33f404f332eeb05c6f54ada1a SHA1 439685e1cbecd04c66e661079604a09dbfc93163 SHA256 324422611c91fd8c603cffc5ba8afb5487d429b8dee3c226abaed4ae7e7ec854 +MISC ChangeLog 5296 RMD160 4694ffa787bd658bf02f532194dc389a2116382a SHA1 356f7871d8ebd8dc29139f3f1febcb4d849c6abc SHA256 443e659bc36fca77a2cfaaf14361b0b0538937081b2b5f007b5a66104c1e39e4 MISC metadata.xml 978 RMD160 2e120b8332c7fc1d6b4baa4149b0f13a73c74fb2 SHA1 5fe37c22d64ca52ef6d26debc46b23b415e04a7a SHA256 76676f1a327e743dd3579109250ace6012ac93ffea5d1daab0a24b194b55164f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iJwEAQECAAYFAkujr8EACgkQG7kqcTWJkGfURwQAqETZQWafXPO1MnX/Ea97OZQJ -vrz4HeCyqi2Y7KJKyxFrvMHis684vj/aLrHaK2HhThkY7NhPBS/5X8prOrV6EVi6 -IqnYjgD+8MSWM5zPaPSj1OjBSFLTm1e5eAOO5B4lTwmxbwTeJGex0hCVrpilfadX -YQDJdpyQNP8XpgKnZZ8= -=kBAX +iJwEAQECAAYFAkujsxMACgkQG7kqcTWJkGfp5AP+Ot4NMmgHAIS8J7Nu1LPKPVxk +CWssg/iZ14icvBS8RONR8WeGapJOf2lwNZkonwJ2ElF3JNA+uxDUaabDLgNusqk8 +YA75j023UzMeDuA8HE8meSSmw4dYeeFLcw4jZJjutNqaopXqw80Oe98L0/aTSD3O +7evak2iQza64c238DDM= +=SC+1 -----END PGP SIGNATURE----- diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild index 0739c6318d69..43b0b5252478 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.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-0.12.2-r2.ebuild,v 1.3 2010/03/19 17:09:07 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild,v 1.4 2010/03/19 17:23:17 tommy Exp $ EAPI="2" @@ -82,6 +82,7 @@ kvm_kern_warn() { 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 @@ -204,8 +205,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() { diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild index b647b0a8b780..497a4f99abc4 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.3.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-0.12.3.ebuild,v 1.3 2010/03/19 17:09:07 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild,v 1.4 2010/03/19 17:23:17 tommy Exp $ EAPI="2" @@ -81,6 +81,7 @@ kvm_kern_warn() { 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 @@ -203,8 +204,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() { -- 2.26.2