Bump to support two different builds for user targets and

system targets to allow you to build one static and one
dynamic. Additionally bump the patchset to include fixes for
bug #455552 and bug #454364

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

3 files changed, 24 insertions, 14 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 79e9c8fca497..b5c7d79dc84b 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.179 2013/02/10 20:15:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.180 2013/02/10 21:23:48 cardoe Exp $
+
+*qemu-1.2.2-r3 (10 Feb 2013)
+
+  10 Feb 2013; Doug Goldstein <cardoe@gentoo.org> +qemu-1.2.2-r3.ebuild,
+  -qemu-1.2.2-r100.ebuild:
+  Bump to support two different builds for user targets and
+  system targets to allow you to build one static and one
+  dynamic. Additionally bump the patchset to include fixes for
+  bug #455552 and bug #454364
 
   10 Feb 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.3.0.ebuild:
   Add back vgabios which was removed incorrectly qemu-1.3.0.ebuild
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 99ff04ed19cc..6821f59b26de 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -10,16 +10,17 @@ DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3
 DIST qemu-kvm-1.1.2-6cee76f0.tar.xz 13096 SHA256 0bf503a494d78cc5a59682d22341caa594fcf89a8ce5bd222dd7c45ad009e0c3 SHA512 bb1aa5f40b24cf9860f4af2cbab8bf8d5800ca57c1dccc05f446b5001d426021a3ccc423228ce9607a20dd1fb9e5d93a62f883d5bf56c4ac25b5ebfd3b60940d WHIRLPOOL 3916563bd76d9ae50ddd168863dfada0f44289355c82491a992d2d56c9398c8392fc69a67844154dafb13f9ea315affd27909e3b675ba8b5eab32ab176700b5b
 DIST qemu-kvm-1.1.2.tar.gz 6605075 SHA256 2be9cb9986c0b67ef97a2d21a51a945e91c4032b8c4229297461d8ed91f95178 SHA512 c1fc6a91276347ec2188c9fa8750b51ed14116ea0a7afc74e0ddf305e9f175a6c16d3dc6ef1ee52926c4d8b9bd0fd5465041f32ec24ce315059062a078e2df82 WHIRLPOOL f21af6107de2343c6a45cbd6aa97cbc58e36a37c37db42110397658a2c303d63e5af96b84b778b5f08e958a5e65a84088c596e1b83cbdcd4009efff64dab4d09
 DIST qemu-kvm-1.2.0-3a5940fb.tar.xz 238084 SHA256 031e290d85292e7fce1589fe492093069790c3094b7a302c71db8b2b98cbf3c6 SHA512 316a56a95c35cd304d63f6a444d0360510db79dbbf34c88f26f00998ddd0a1a35b6f6d7848abd6c7a8d7c65253e5449b3def0eefec17ad3989d2e02bc2743d8d WHIRLPOOL bcea3a5c22e7bc46b4c15580fde34de6ddcc3908dd8bb5b4d5f00724a960c5303db275c29b3741665bd47d9309d3d70294be27156958c5948cf17ece2af6da68
+DIST qemu-kvm-1.2.0-7c9a3a87.tar.xz 268436 SHA256 ed9d8f358cc82e920f6d424de25a82165503cd7e6715bc23312bc2eba6dda771 SHA512 dd5f69835c9fb00c7c36f90e83c7380ac1e3712ef8929f465ed18393da0187020f41d49963584a887199d032ec4783be14b8787c6165d723df94204a70346217 WHIRLPOOL c3e0760c6fdc68b616a0d6e654ec6fa8bdedda9a817fecd7723e168d293eb7bc864864c824b6bb3d61054a0b925302ca59a3c0850e98840dfbd0dbc06c254f82
 DIST qemu-kvm-1.2.0-9489a8c0-1.tar.xz 268020 SHA256 3ac9715a6bb50d8e363ea0a225a23472d326c31189637eb7ad25fef47afe526d SHA512 9ea7da5384af22525db40fef62a480e551395907df6bf2420e1ccdaceddb24515f0e463e16e929b6da34ab0c2f0e5e567ef097f186a46c0d2fcc2d0d17fc3045 WHIRLPOOL 89ece68af896212cb9a868f6bb0d0df397d22131e3ae147f575177b39f015860ea0895a1edf938f46d3e2322182f131abc0767b07d8c05565a7ff40420f65464
 DIST qemu-kvm-1.2.0-b6773f5e.tar.xz 264756 SHA256 fbb0c3fd17304d6fe2f12064ac354edb8ec67fe09f6f1ab2bfe5534949728d15 SHA512 c8c94bf534f4e844782ada677bc608425b4d209fd01f9d9eab8b9f3d758b03e48b8a02110793e3555421761f3bc36f1363f0f7a8cbe8f3f64455463ae43e23fa WHIRLPOOL a6bb4fe13526a780f0c46e2838fb721b9fcd5642b7412f454d70118e8db144f606bec0a9daf6ae5ddb9ec8140895b8407beaa807599df4503e6a16a16650c555
 DIST qemu-kvm-1.2.0.tar.gz 6839420 SHA256 e98ab96c24337e312864f2341016695ac11cb9a04be83548a8da89596d591b05 SHA512 c21354127d4585397ab400600ab1ac9aac80cc0431bbf615c8e906819075b00373f382954fbd9fa39bf6479126d8d8e3321b3713346d04abe2c249edfa4eb6fd WHIRLPOOL 3d0662b39174eee0cd8750f6bea5baf57e2dfa82b490c3f1e54f44720ddd05ad029c3011425f651e745973ddb03aaca310bc8acf9f8e656bbb8390a262f7013c
 EBUILD qemu-1.1.1-r1.ebuild 12063 SHA256 a3f92888f96d664c0dd26ca257ebce3dd1716c12156bd66a5baf9368f55d05d0 SHA512 6b516298b3819a1b4da1ddc23ea5ba7c6e71bbef44be976d8942f0b0ea474644549437cfb60c12b90d5ab3cfdbcb48e746f65603633a6b07d3f747e1eb6c5e3c WHIRLPOOL 66d8f516e0becd96dd6fa2b35590e7fc3968e8b26f3e51c17882bdc48c70015ac3e9dbfe79c79abaaf48e4c54593ca14a60834f8ff6974e092fac2cbf495655e
 EBUILD qemu-1.1.2-r2.ebuild 12149 SHA256 b73be920f461c0d416483776750668ce68deb4214049a29e600b6268a1e6fae2 SHA512 368d8086ec85fddc60189c8e53d9e407f1321a6ac7a98da04d048f436dbd56088eaca3fd77a5888ea8865b4f6a0311d75f82a736ecda5f9ca8e02a2c03931a25 WHIRLPOOL 943f6cb80fc610a4615783e1bd5b3152366ba80877cce142ef00709a5d8461ebee5c2bb975c8b9dca6452075fc810c3e601bb4aee01f6700b7c7aa8c149e8d6e
 EBUILD qemu-1.2.1.ebuild 12715 SHA256 bd53340e0d01ec18df8a47a7c8b314dfdb4a10b8548634197f8f417e7b282cf9 SHA512 191ee242d50f5811dc22dd58a8fec4475eb80d3e38b2cd959c04f4c086251e2764f49373e6d4247d828265e8abd423be80c8d4c272d7bf506ce58027c9c7a59b WHIRLPOOL e00d063577478b979062f6c6813614441f4ab90fac8bf296e42d579a6fba258c997d0637ebde89b4d276810d9639b38756b06aa03a526c763a60f16d36d9231f
-EBUILD qemu-1.2.2-r100.ebuild 15048 SHA256 cf3486756e66e58fd3fec68d7631bf857c8abecd951832372a8ca1c8b03eca52 SHA512 fc9a74ab7efd77f3ec34b94130e6491673988db583c0ec046eda2d182e1e19d892cefdea84bee61d228674d55c1299a28447c24a4a1d9b10d30cfbb1bb344d9b WHIRLPOOL c30cb80762f618152f78942a8dbb955ae8bf499bf4bcba854194425da8fa23c40fda4e7b5871fc550bdffbceb8a50ebab2474f288b4f7c0bc4b483b87c1b517f
 EBUILD qemu-1.2.2-r2.ebuild 13797 SHA256 fed8d1598f3f6087029a89b2d263c9c5cb43dc3a451087d4ab7aadc21514d263 SHA512 7d2bec002f0f470bb10d08d54ca133395a68f1d6eb2827211c27f84c05f5282c3a33712b2d657ed3f3bfbc5629dd39d00b6fb1b1dc62410984413919ca57b714 WHIRLPOOL b48726f91f9e92cbd648661c60be64208c260da05651591863292b7f3ee91f7fa0f791d46c3e3b19be2b533b92b795741cb358de8c2a694477c94d2f23f6aacf
+EBUILD qemu-1.2.2-r3.ebuild 15059 SHA256 8f764a0f698c21d9ae7cd5b24c79bb106595a6eb86e47c155d1642213b4f0563 SHA512 26bbc8e6c54111e0313303d86bd0b7913b82550616725de6407316db9fe300a6e957d50daeb0e147da6e365dc5b8b7574d0e1aea05e00d917ae879415c8bc31c WHIRLPOOL 0cf9422a27ab1813f09d52909a9962a9bf2a88c1a7c132756c1bbc2380c2190a2e4de368dd74ef18c4f7ab4f1b0ba6c60f0b4a78977d5c499c8b1da6152c6af1
 EBUILD qemu-1.2.2.ebuild 13797 SHA256 b2a41e93a14fb42c80bdb137b1fdc6ccf5bdf362a55d0736fd7676593a25bd2e SHA512 bef1597bd1042cbe3fa7caefd80dd6c3252099fe433d9a1250d7a4ee4796f8d1ab960f39d2a0d7b66360e1be5bb77e7250001dd54cccb32a308ec66ee037849e WHIRLPOOL 56f29553a370ef3a16c700a69c26797e44abeb43d06303760fe15651328a6175202f8c17e628cd7784cdd9896f49c0f82732f68630316291f35a8d1e4d23ef94
 EBUILD qemu-1.3.0.ebuild 13711 SHA256 bda7012b27a54fc2cc0d0bb800a9192226237ab0fd04279304dea2bc15f5a9b9 SHA512 fd149229fd46f829490331cf48abf46e9ea1c59992d1bd7c4350ce7d1a70bcb4f7ffc14923130ad974ae9124a468cfafa6f746020f4c0e034d8ea50810681076 WHIRLPOOL 1ba4505219a2c28f14b303adae83b4474a40c424eae06b7ec2b0d20a12d14600251f495bb18e6bee498b4d51304a1675d3c7b61b8f959bbd8cf63757b21b1ed6
 EBUILD qemu-9999.ebuild 13648 SHA256 c55c088f37cb6e563cd4b748638a65e19b5503fad0503b4c9a6802833647eb63 SHA512 b5e491c0b3fb4c3ac7b74181597f00abd37e837ecb7f408ac5ddd19c6964ccb56a4614b695b216650384b934db7fcd9ce6076f95653dc617663c8876f4fd59f4 WHIRLPOOL 97036cbd377d4a7a09e6fdbf6aaf9142599dcffa62555f53c3a929a71da1a62deddb7f9f5bf51aef09b3a6a0b0ce8ea1f240b9be6a3662a4f9cd2e0b6cdf6f1a
-MISC ChangeLog 29258 SHA256 b64e7dc3f590280a2463629d5f3303034343bd35dd2d27e7e0d83a4e213f0b29 SHA512 0688896c6264f16dfdc1b07bdc460ac3b752c9a84706a5a3f4e9ac14e8f314ae8976cba7ce3eedd963db88dcf4e16def8ef88395a50717795577094ca3f3bbb4 WHIRLPOOL 8b78b8fbfa615c64e3bf506bb8aff44fa6f8780f53754c12c70768b2a4d51a0dd2aee89a2fed50ee0e363ca6e8c6f867e4c662b558348e468b1dbfec84ec33ef
+MISC ChangeLog 29600 SHA256 b9dbcd310aac4e4abee6aa657c31f0e96f70203cae1997850005811192e3740c SHA512 31dbb446a15d36f115d2feb157c57d5e8470d037f0d70cc9533c5ffea9098d35b56c629ca81576158c911fd28c6ad0d586f9f5f0a1c6b95a804b688d0fe92a75 WHIRLPOOL 900489ac2911f030ef085570fb0424a70517525cd61ec89b31be00c3a803411cbcfaecd9fcc011959b30da06e0c10198ab76d6ef7c46c2343f2325097506c13a
 MISC metadata.xml 2969 SHA256 9495aaec1c617cecbd822c10da0e53e7c9a17bab2e68c1c66e134f47bcd7c0ce SHA512 bf03f0e60734551dfe32909a7aea4737d08488e7452ad2e0426f3150573459adc6324809bf797a6943030e567672172a9cd7b32be50e5d246cf33046bea66e9c WHIRLPOOL 987c938ab4d5bb54e0af0ef13d295ac3c0004ebba8b2e1f8a7116d38b5db9590bbfef4bd1154e9e5e7a1f91ae2b816e4c572885d90910975df191c77d56ebaec
diff --git a/app-emulation/qemu/qemu-1.2.2-r100.ebuild b/app-emulation/qemu/qemu-1.2.2-r3.ebuild
index 33aae06b4cae..1dbac9c935d8 100644
--- a/app-emulation/qemu/qemu-1.2.2-r100.ebuild
+++ b/app-emulation/qemu/qemu-1.2.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r100.ebuild,v 1.2 2013/02/02 01:14:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r3.ebuild,v 1.1 2013/02/10 21:23:48 cardoe Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ MY_P=${MY_PN}-1.2.0
 
 PYTHON_DEPEND="2"
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
-BACKPORTS=9489a8c0-1
+BACKPORTS=7c9a3a87
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
@@ -348,31 +348,31 @@ src_configure() {
 		einfo "Building the following user targets: ${user_targets}"
 
 	if [[ -n ${softmmu_targets} ]]; then
-		mkdir ${S}/softmmu-build
+		mkdir "${S}/softmmu-build"
 		qemu_src_configure "softmmu" "${S}/softmmu-build"
 	fi
 
 	if [[ -n ${user_targets} ]]; then
-		mkdir ${S}/user-build
+		mkdir "${S}/user-build"
 		qemu_src_configure "user" "${S}/user-build"
 	fi
 }
 
 src_compile() {
 	if [[ -n ${user_targets} ]]; then
-		cd ${S}/user-build
+		cd "${S}/user-build"
 		default
 	fi
 
 	if [[ -n ${softmmu_targets} ]]; then
-		cd ${S}/softmmu-build
+		cd "${S}/softmmu-build"
 		default
 	fi
 }
 
 src_install() {
 	if [[ -n ${user_targets} ]]; then
-		cd ${S}/user-build
+		cd "${S}/user-build"
 		emake DESTDIR="${ED}" install
 
 		# Install binfmt handler init script for user targets
@@ -380,7 +380,7 @@ src_install() {
 	fi
 
 	if [[ -n ${softmmu_targets} ]]; then
-		cd ${S}/softmmu-build
+		cd "${S}/softmmu-build"
 		emake DESTDIR="${ED}" install
 
 		if use kernel_linux; then
@@ -397,11 +397,11 @@ src_install() {
 			elog "of the /usr/bin/qemu-kvm symlink."
 		fi
 
-		use python && dobin ${S}/scripts/kvm/kvm_stat
-		use python && dobin ${S}/scripts/kvm/vmxcap
+		use python && dobin "${S}/scripts/kvm/kvm_stat"
+		use python && dobin "${S}/scripts/kvm/vmxcap"
 	fi
 
-	cd ${S}
+	cd "${S}"
 	dodoc Changelog MAINTAINERS TODO pci-ids.txt
 	newdoc pc-bios/README README.pc-bios