Bring over the qemu-kvm ebuilds since we're merging the two packages together to better follow how other distros ship qemu/qemu-kvm. Eventually we'll just use qemu instead of qemu-kvm but not yet.

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

10 files changed, 669 insertions, 959 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 3a8b8a5fdd28..8f41bfa3ea03 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.117 2012/09/22 22:01:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.118 2012/10/09 20:18:30 cardoe Exp $
+
+*qemu-1.1.1-r1 (09 Oct 2012)
+
+  09 Oct 2012; Doug Goldstein <cardoe@gentoo.org> +files/65-kvm.rules,
+  -qemu-1.0-r2.ebuild, -qemu-1.0-r3.ebuild, -qemu-1.0.1.ebuild,
+  +qemu-1.1.1-r1.ebuild, qemu-1.1.2.ebuild, +files/qemu-kvm:
+  Bring over the qemu-kvm ebuilds since we're merging the two packages together
+  to better follow how other distros ship qemu/qemu-kvm. Eventually we'll just
+  use qemu instead of qemu-kvm but not yet.
 
 *qemu-1.2.0 (22 Sep 2012)
 *qemu-1.1.2 (22 Sep 2012)
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 7fc6039f793d..cf5ff315fccc 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920
 AUX qemu-0.11.0-mips64-user-fix.patch 313 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f SHA512 ca7f92b7d094ed62c15e539ac760aab50255699edfd6faf2bc017e13fb73da66f455c07999c6ee6a1f2196b7c0a2e2caa6c7a584be22d04717d1abea08781dbf WHIRLPOOL 2eb95b7dd79e30ecd4b50a4901553866180c0022760cb1e425bb23f14411ef84356db00eca593230d8fc204f5f5b724567d051fad299a8d6bdb81a346bfa7436
 AUX qemu-0.11.1-CVE-2012-0029-backport.patch 1448 SHA256 fb739ca478977f17b73489823b92d8964da1bb308db997596e1160900f2c9236 SHA512 d143a497af349aa58a4542754c757a73bc9ab89ed54498c6d22a18452634f81a8d009aaa3aa4a9a06888af4461987390b8ccae7b2e4c9f5095b38bcb108c608a WHIRLPOOL ae30b58043818d0643d04b689105fb19ded7220152b838305d1db30ad6d47a0230acbeaae788a833246d5c0b975a2106421ba561332c2c5aa7c9e4bf05e9dea0
 AUX qemu-0.11.1-cfg-pulse.patch 622 SHA256 22ee9c11fad4f1360dff7dfddf0776db72efee19cb5409fbefc995277cd2d134 SHA512 8228ab3fb5c8d111498588ec75f9b9376580a4953f627f19b9b1412129db7fc6f83a821ad122d3b59636a97edb11ada4393a2fbcdae8f7d9c337711db9e2a2ba WHIRLPOOL 86e5a9fbe311dde602785ffb2c2e0d8c13fc199f9d7eeea4051daa1b18c0571590b8098842205c55b68d32d32f7835aba6b6b91481be3a92a436fc463ff742f2
@@ -10,39 +8,20 @@ AUX qemu-1.0.1-siginfo.patch 2268 SHA256 b5d8ddf3469b72ac3c82847c7b35df5f84ab2b0
 AUX qemu-1.2.0-cflags.patch 359 SHA256 8917142633d32497d63dd2f2934e17d86a2e2ab11be2c8551e7218c9251b66a1 SHA512 f60ecc9a0e6969436a77444193cdba4f3028db683de0963870cbac5bf3a1b47da815926236f127a5f56333efc21efc52eb732cfce6393b764bfa1b9f569df645 WHIRLPOOL e0b3b8e1e68a3b42ce7727f7fa2029dd382fe9c8f7260c29e52368a1cd3b29efcfc134cf9908b3590ed6fe57c785bd05bf676e61736dc321a7a4899dd8b0a861
 AUX qemu-ifdown 478 SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d SHA512 6aeffcd1cd38ce0468fb280d52de402429d8d88b97b215e6e3727bc7f58f63e60a84ed351becc854436fdcd33d00c0e4ee7b1f5f31b225a009e8af6decab0e4d WHIRLPOOL de2be76d26c28bf5dca213106be824836b682e47f9cfbefe51d515fb4ae5a090624bb7050f13a0340a1305925473043ac5316172b33a197359cd7d89d414174c
 AUX qemu-ifup 554 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d SHA512 dd1fab3db7fa6e8b8ce3ef27e09996629c0eea9e3d4f6489523af71f25eb0f801d30614a5e0f191b6977b34d13b588e64a5cec8fcc731e6ff7dbfdebc759f028 WHIRLPOOL fb665f63982a47fe47c5186036524981c848ad22902886bc10425e2ea7d06dafdd9b4fe86027e4d9ae3847d81b0fc9c2d6fe7dcf63e55cd943cd0a63503b7450
+AUX qemu-kvm 60 SHA256 ded08eb1c74a9581912a9ca7876de6f33d1c545ed2a7d275f9b1749539feb7ee SHA512 d973d70ffeb7f4cdc61b25a30bf7174ac05b8c136234478782367a16668ff617756e9862a9cd94acd4b6636fda36410762e069a2eccca99410aa6e3b4294e363 WHIRLPOOL 41937bf752a2f643085fbd04643fb7a5cb898fabe8625d80b730c9e930f48f8d63245d5acdffbe31ecede1e1eb83fd3a73aad925f020e5c016f1b6559e7426d3
 AUX qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch 1412 SHA256 9a06665c47b76b2501f148713c46f8ce0b14ed03da5e6cb03c0d141f5d91900a SHA512 ce0cb894819ff4a97de54a0f8935a8311f563c3ef4f7b71f15d83f333481febce947697430db92bf3fe95fbbc921312cb163bc6f214d1cf7c4275d4c4d331587 WHIRLPOOL a526113ef51e6d65ba01db9a8310a161f857b80672a588b52d468540d4ee715b378164ca6c1b7eac68b359895a7b938df67f2a68fc7f2d44ac9d804f7e0afa1d
 DIST qemu-0.11.1.tar.gz 3830070 SHA256 2ecd2fc0af2ce5d96067ae82cc98a08275c596de53fc929484bedee1d6e7893a SHA512 3e9ad01223010abbdbe36a2ca87c8360cc8dfaed60d6eabc23317c19b487a5a018efed54b3150046538ddb6148294784d77a3bfd4310bb282c4308f1b6bfad69 WHIRLPOOL c4d148460e84f19795602c4c09200748809ca82f8c7b1d6505976efe0967ad89f60888997e9f117d5390a380fa73a037174900d865c353c95cc2764dbfe5df33
-DIST qemu-1.0-patches.tar.xz 43540 SHA256 32a8b98cd5fd661268328d71efbfafd65972102b10da363193f3da98bd9b2d72 SHA512 074d52d716e79abd42dba12723ba4f80148bd6849d627321d65bc29d77b399219adcc9a240f27cd603739295a517a96ae8827d2020934a23e8a1c1be3d504d4f WHIRLPOOL 6b2dbfd4319c6a68e39da95bac0ca5342ab865931d7c2d534c92192daf80fae19b5bb4cf8863faa32008b3721655755d426672897ae02b96807a53b13137c89f
-DIST qemu-1.0.1.tar.gz 10853005 SHA256 198902e10782517f607c9ed9e629b5e7708ea39eb373ed3ec3f1c8a169d98378 SHA512 c3c311288bd9e843c3e9dae9ad36e370ffa6a379878fae1067e656e9a1f38e002314e59f0fc46c84df98bdd4d6b7acc6b99907b3cf04a2b100a752b837da0178 WHIRLPOOL d05e7d97855f67347d7f3e252b7f72f16b112ae2c0b9a9b56e60ab11f78712789d99c35adf09e44c1a4d853a7f24c1dd65ebd7199c5ce66fea00442ff6be6fd0
-DIST qemu-1.0.tar.gz 10848714 SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737 SHA512 a49ed9c30f018d361d1cdd71d7149e2373e9243653aee119ece0f2e23d45c61e1fe72412c4a58b6b9906a3003ab70b9a9ba43f090b7edabef3785e04ead5cc70 WHIRLPOOL 850ce298be0c51bfdce3dd987844bda4bd4784016b45f73aab953b56ccde143f67e8a498e3ad1a49b658dcba268b8487ffd0974128342a358ac079055099a0b2
 DIST qemu-1.1.1-1.tar.bz2 9635574 SHA256 6fbaff1fa75aae1a06947cf7cb101c35273712c561b87ef8eaec92aa39734ac8 SHA512 4501b024b1d188349ab767f5c4de4a9bd491b7f7cd62ffbcdf49c1983b96ae1c39d9fba170522014b03d15e7fbdcf8c5276e7790818bbeb741f4f9d38e04a4fb WHIRLPOOL 6d8d6758455f3589bb15c4b10e113ef254cff41a1b7eb2e0f8f17da5d39f0b0ac0bc061f36394888fbe7ee44503df03210103e3016e3aa919cc63c5c77b9089b
-DIST qemu-1.1.2.tar.bz2 9644554 SHA256 d1e2bcd13c9ac4602aa2a2804b7a141d02f7c8480a7618355400a2cd3659a4e8 SHA512 1e68f21f5e5a1fbb4fc8cdfbdf32709631583269e0cb56f6d48377bc33c3ebc1be0be9407e8a5c75f69a29250b0b74388cd19f12c6f5ba9c7c3fe3a3c2b7422e WHIRLPOOL 99a1d29ddc312e93ec3a799a0954ce9310e1fc1797eca139dbd4baed596b5374ac2cd04c42d3b82e546d94dbd4943c16db11e522bfa5db6a3c6a2582d25fa761
 DIST qemu-1.2.0.tar.bz2 9865186 SHA256 c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 SHA512 b590ea4ff484abc1abf2d3ec3fb294d4ece24d2dfa0a179d9c5f60baca0ea474d47a560f5d95b010a53a5563793414f3257240c5e9917a8d0f556a2066ccd60e WHIRLPOOL 5e5a5f09b828b0aff6139d7efad4dd0d1ed8d86badc2657f7ea53352aa1dbb6e6e227501f7ab63f7e95ee248007942ae94431b7f99092a4ed7005c345b10ca4e
+DIST qemu-kvm-1.1.1-bp-1.tar.xz 2908 SHA256 16b7cd2e10b3a05d20006898bcfdb26eb596f7c7d3c0e18fb216cb2b2026af40 SHA512 781eae1fdc1cb7482d3d6fd1cf81e0d565588e3987fc4cab92abc06741b1b57d999b0de1fffce7270f50033b53c5707e4ef477ca3b7ddfca3dc1a432c1e15cc7 WHIRLPOOL 3f80b4cc9902021686bea823a41af136d21dd5a6b8aa59913aeb8697c3a38acc02d92ee59b9d052b6d161830a72d709fe684beb95f756a92216fe79cce4c5d9a
+DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105
+DIST qemu-kvm-1.1.2.tar.gz 6605075 SHA256 2be9cb9986c0b67ef97a2d21a51a945e91c4032b8c4229297461d8ed91f95178 SHA512 c1fc6a91276347ec2188c9fa8750b51ed14116ea0a7afc74e0ddf305e9f175a6c16d3dc6ef1ee52926c4d8b9bd0fd5465041f32ec24ce315059062a078e2df82 WHIRLPOOL f21af6107de2343c6a45cbd6aa97cbc58e36a37c37db42110397658a2c303d63e5af96b84b778b5f08e958a5e65a84088c596e1b83cbdcd4009efff64dab4d09
 EBUILD qemu-0.11.1-r1.ebuild 4894 SHA256 25ef257efc5ee950d5f93ad3dc059c24cc8104e094b62840477ec719c66bd5f5 SHA512 0afcc745a78a23a8fba3cdd518595894f4ed12b4048b128c55be3f53c96f97d7701dd5bebbfcbb06cf37da617a78f3813f847792542e27e85e932ba9395eb542 WHIRLPOOL 3b606df1b67a37b61f858a0e76133867b2c281d0cde1024c510cf4bcdb433e25db117bd817e6e91eadf0d42246c55873e69078bb5f4c212122fc89a36cd7c5c4
 EBUILD qemu-0.11.1.ebuild 4826 SHA256 7aaf359e5b09721faeb9b97ff0fd8ac4c91ba8906d8f9439ac21550af786fcda SHA512 5a9631fe38c86b1fd56519544f381ab4fdb064004a1b229adda361916724ef88451dd72713c61b092a056111a7a66143d9dd0e4b5638a69f9c782f21b63d2289 WHIRLPOOL 2c50d082e32176108d661a199dd9633c4d5bdd94288921d443148c62657cf9f8f24db268f0babf4fdc707d24e3f317e0a019670104849b6b00b272cb505a2006
-EBUILD qemu-1.0-r2.ebuild 6835 SHA256 900cd224d6f05bdbba8c25d0d99e31e9bfbc8c4f4066b7448aff190ba5cc276f SHA512 4ab035da1f3669a0eb39fbc9416a96ac3852d864a708b493cab6486cdea7a5a7da4f3c18ede5c28a6c0bbdfbb0a829f547bbd39d95dafbbd6aaa591b03a8fb77 WHIRLPOOL e5cd010cf00098302647e72210709debbe41c8186f6881895afa47e9c8aa139843dd3daadb0905a56aa13bbe764a99dc1bfe2c0800769ea8e3886e5b03cc6153
-EBUILD qemu-1.0-r3.ebuild 7143 SHA256 b6beb84a33c86ea97eaa1af095da8bbd67bb2104bfe0813f7f1bda81fd2cf7e2 SHA512 8548e165c3ae12e4d56f73fababedf7c904ff191ee39521ebc245c8266089af00b0770599117beba79814a3c22a6e70223139641774e16e507e9e43fe993e2c2 WHIRLPOOL 56e8ac04b29a571ea1d02aa796f5e2b45f3e190ff0d212efcefbc912b829fa5c6157cbeb0f7b9d5a58b76d537168f93287a55e651b95d3e5d7152b05b824e3aa
-EBUILD qemu-1.0.1.ebuild 7151 SHA256 f3c5abf8b37a18e2bf1179b986c9356727eab187ba306bbc08178fc7fb63549b SHA512 33503415ca8a63a24847cd8fddb9a8641b8ac317c74d668654c917ca329e893e142dacf2871396fc1e67870a54b81b0c2b154e4f6f029fce41fc2e6302060715 WHIRLPOOL 9d1d62ff2db37e4cef269c944293712069026565ec5014d2ddcbfef05de9bdfd73ff2a4b5a93c3081518717343a29fd3d036d81d862e59b539e750a6f21eaafa
+EBUILD qemu-1.1.1-r1.ebuild 12075 SHA256 7328ae9ee1017b3325c9c529f03d1d6fe81da81de4b29f5b560bc6a978fb0e00 SHA512 b2d47a30b1c0dcb2071d52dad087d70f91877426f9a4a9d2f67c3a73ce1a94b3d92683076f6d9d05c3269b63527dee60709df464bb6599cbaa64dba6e2a9faff WHIRLPOOL ac9a2f4fdbafaf8659e0102715964801fc05cef47acf1ebeeb8b12985c52c01bc2e18a3547ff0202755c257f86f62afc16afac62bc343fedf2005d89105b0613
 EBUILD qemu-1.1.1.ebuild 6827 SHA256 4b1f548473a0ab8b341bee0e9c1b4171ae10d194f1f366a89fea734664f89ef0 SHA512 daa413e28d7703368bc0fde1fe0a7c8d948ab668bfe32a46baee4decdb679857caf7b108cf75cfa80f0beb37d9fbac8f3cb2f34d5dcb1cef622f3d35576ac43c WHIRLPOOL dd4834559b45b9efe3866aec425962e0db5d24498d0b98189e03d76ec4e756b3c2f583d11427e429ed2773e70f4ed0754d1b5fe61302d643cb9a02a495fe5941
-EBUILD qemu-1.1.2.ebuild 6825 SHA256 8bf47b61eeaa66fc68dd58c7e9d01048d318b75c760218916f88dc436b4e73f1 SHA512 fb2821a43e4a4efa45ae8416426e9432a6dcbcea265ef8b993ea2aea12f107f62b676ad873ced7a35ccdf933aadfec3cd1604a3290aad1ac18814ec5629a4124 WHIRLPOOL 02ce0ab6c235872fcb25d4859f50d480b50f92e12cc68e0fba19baa45c36a9c5cf8f38088cda262461ec945e102267b8cd847fbcb54d49349609907573c9c913
+EBUILD qemu-1.1.2.ebuild 11901 SHA256 925770c70b62a68f4908e1ae5ad3f2e6058249de1772144df2d2076d4e8fb2c9 SHA512 c1baf475391a4492d50e3b346a0a1914c23499a4864df30c3a4608d4d7254f66d54e24de4877b3682a2fc0f30b07ba9659e7a2d2087c407702719e1334049d60 WHIRLPOOL 0b3c5dcb1dbd8ff0431ecfc31b7b02238226f02f0e64ec6ed16cc1aa6a5f843222fd3bd9920ced63ab223808a0def4e2f45bda99e0f64133432bef653f4fa4f8
 EBUILD qemu-1.2.0.ebuild 6781 SHA256 c3315377ba5fe331fa028bc2e1dc4231b09c9180856732943e5fb3b5534c9445 SHA512 68d1422c70f52461294ac703cb8bb6c6daca0efa41fa994f034d5dfc5a47674774b9e60cc03eefe9f635b750a6b089a3333b95ef3be0792d1648437a14a13017 WHIRLPOOL c6ed1c57c820d77c804f6ff5127aa0e16b3597462c3c0005cb1d8a364ac7f84ff00b641d1e95a1d914e48b8e2a1421b326d3095af56163179afe51548d15d4f2
 EBUILD qemu-9999.ebuild 6760 SHA256 dac7d315ed7779ce77173a608f4c6965129b63797a828310df1a5ab319f1294a SHA512 cfcef588346bc3228bd045d21f461a12e8cb46e88218c1edb15d40788eca9b07eb3a0eb2d0f3a8a6462e88a961225619f1bde49974e48fc6a651b1f4359fa750 WHIRLPOOL caba9f0ff0020a0f6a32f2f8c11ce7295537261a96a4de4b1084804d6390f46d535b14b553c26796bd43c2fdeb17a52a025674308ea705a4770d108171d09bc3
-MISC ChangeLog 17774 SHA256 62b9c8f192caa28767baab0ad0611543f7ff5cb907ee8804198d2775d7dcb766 SHA512 10d5a7ad08371f2a7280b6368b970f4301a07f884611bcb311a767bb6aaca6dce08e6acaa8e515c0a6371d3389f799f434fda82bc15d88b69a79dca1ff57dbb7 WHIRLPOOL 3465302fcd3624df809f85a5c5abd69107a4255e025ac9045790609708db564a484a0b12666918055ecfc1c85499f963623e042fba062db03b903547fbf021b3
-MISC metadata.xml 2506 SHA256 039849ef9550e3ef56d5821e4bd7ef0b8cfad1da24f9bf4476ac6871d0f32357 SHA512 8c9aa246aaaadbc295b5f16e62f33a66ebc88c44551de3b2819d0be088c5912fee45655e1994767c8d1f061887a2a769bae896f6e3eb51f3e31603c9bd3a1eca WHIRLPOOL 7f61ba9dc0c645397795de5547ff219ea430f4a37c5a7c1cedd830eba0e839b70d8a1afca1dec7b381bbafeb8ba786f472a2e0adb0b10300e220cdaf889d0724
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQXjU/AAoJELEHsLL7fEFWl80P/AkV2wtHRrgBudts1DS6LLyB
-n7zOLcjCiXzv+CCMYv+VqmVPxIYqBMqdeBZd+JcVwmIoI3BNmdxKafQrKzHMdXh5
-QQl9z/ZaQkv+MFbZSaks2WetuCwmejhNqruy7fUuTRxdKpYa64b5R3nY6ODS9A0s
-zUxVbMkHdVpcb5wp/aNSKKfBnH/xO9NK2gNAy+2/ZZK0Qh/S4cdfYWM7qdZBrtmu
-UR/ucpopAbOKUqn9WhxCj6lm92qR+hm7ks+LQdzBzW3bVM8+lsoUVYXUQ3snN0UD
-O7vTHCMKrjGuzgZ+umvjT9OHRo5vo5jQM5UyLuu9eLjJXO02DKez4EzLw22LU9s6
-rxuGoeUssRffe+ZnFwCjqm86VVFx6wxnHlDMxcrWlX4SgeMqg03tFEvSjTKWIEvg
-XTqhNXtaO95Vn03Rzib2CKIS9fh3mIAMtA8//7z3d8Ie2yEU76rUkIRUue+YL5fX
-FY/kiHu9XD1uTjPvgmS10cdss/nfvBoT8xLo6+8YaRG6E1nXt/dtSViT8SkL4Hak
-8oH9y3/VsRj79Z8Dx5cXtBQvW1tau4df3mHl/J8tqMX/ouqHGkt3th3/kiPeITD9
-CdRCIAeUijwOg8OFSDvi8cRh5yWtwc52gfjy1gjeGP5cfV9OpX8j+P6absWPJ0wu
-vcWM7Jvlv4CeOboXHndd
-=dyW5
------END PGP SIGNATURE-----
+MISC ChangeLog 18204 SHA256 02e8b4041a0c46663c6f96d9199855f789edfa561ddf71a685eb0b4e64955d46 SHA512 1023f0b2387e42a9362158325f35068ce899c09f58a1f4888c1106f8145257b4bbd0bc5cfc7a1d4fcc928b2aafd1d86e19e895151ef20bf5b19656d3c5b72687 WHIRLPOOL fbbba520c04f698eed3eed7c33e2595f0d6729f4951d258c12beb00f6b6eea02556fe4d0161253cfc7173a838c9850bac5faef16307d6108baed5030696d3b66
+MISC metadata.xml 2524 SHA256 5f66c67a656d1ed6033ed49a9fc58b80545ddce2b3a71585aa985c76728d73ac SHA512 5f5c6382987e6fddd2ba32a0bf9cf8076cfeb5da1251627dfdd8f3b6dcb46396d07e2766fc137fdd4df9e02a579c4f2e5685ee027043c6a09aede3543cf33a70 WHIRLPOOL 37face0e6cd74701403a70d1e6145b0705b11c906a06850373356bbeea82783be3f6e1a0b479102f46450839a4af3e7cdf70b1ee0a4c846bdaf267feff52fec2
diff --git a/app-emulation/qemu/files/65-kvm.rules b/app-emulation/qemu/files/65-kvm.rules
new file mode 100644
index 000000000000..c2f7317aacca
--- /dev/null
+++ b/app-emulation/qemu/files/65-kvm.rules
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/app-emulation/qemu/files/qemu-kvm b/app-emulation/qemu/files/qemu-kvm
new file mode 100644
index 000000000000..8273d11c7d46
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-kvm
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/qemu-system-x86_64 -enable-kvm "$@"
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 3bc369197b43..a6c0342ab39f 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -2,43 +2,38 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>qemu</herd>
-  <maintainer>
-    <email>lu_zero@gentoo.org</email>
-  </maintainer>
-  <maintainer>
-    <email>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
-  </maintainer>
   <use>
     <flag name='aio'>Enables support for Linux's Async IO</flag>
+    <flag name='alsa'>Enable alsa output for sound emulation</flag>
     <flag name='brltty'>Adds support for braille displays using brltty</flag>
-    <flag name='curl'>Adds support for read-only block device emulation based on files
-        located on http and ftp servers</flag>
+	<flag name='curl'>Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag>
     <flag name='fdt'>Enables firmware device tree support</flag>
-    <flag name='gnutls'>Enable TLS support for the VNC console server</flag>
-    <flag name='kqemu'>Enables the kernel acceleration module on a x86/x86-64 cpu</flag>
-    <flag name='kvm'>Use the KVM (Kernel Virtual Machine) infrastructure on compatible hardware</flag>
+	<flag name='mixemu'>Enable audio mixer emulation. On Fedora, known to cause performance problems when using SDL output and ALSA. For OSS, locks the sound device from other applications.</flag>
     <flag name='ncurses'>Enable the ncurses-based console</flag>
-    <flag name='nss'>Build support for Smartcard devices emulation using <pkg>dev-libs/nss</pkg></flag>
-    <flag name='nss'>Enable opengl/x11 output for lm32 target.</flag>
     <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
-    <flag name='qemu-ifup'>Provides the qemu-ifup script for use with
-        QEMU's built in bridging</flag>
+    <flag name='qemu-ifup'>Provides the qemu-ifup script for use with QEMU's
+		built in bridging</flag>
     <flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
     <flag name='sdl'>Enable the SDL-based console</flag>
-    <flag name='static'>Enable static build, useful to chroot in user-mode
-        emulation</flag>
     <flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
-    <flag name='ssl'>Enable TLS support for the VNC console server</flag>
+	<flag name='systemtap'>Enable SystemTAP/DTrace tracing</flag>
+	<flag name='tci'>Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
+    <flag name='tls'>Enable TLS support for the VNC console server</flag>
     <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
         devices to another machine over TCP</flag>
-    <flag name='vde'>Enable Virtual Distributed Ethernet (VDE) based networking</flag>
+    <flag name='vde'>Enable VDE-based networking</flag>
     <flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
+	<flag name='virtfs'>Enable VirtFS support. See http://wiki.qemu.org/Documentation/9psetup</flag>
     <flag name='xattr'>
       Add support for getting and setting POSIX extended attributes, through
       <pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.
     </flag>
-    <flag name='xfs'>Support specific optimizations when files are stored on XFS filesystem.</flag>
     <flag name='xen'>Enables support for Xen backends</flag>
+	<flag name='xfs'>Support xfsctl() notification and syncing for XFS backed
+		virtual disks.</flag>
+    <!-- flags going away -->
+	<flag name='kvm'>Enable Linux KVM support</flag>
+	<flag name='nss'>Enable smartcard support</flag>
+	<flag name='kqemu'>Enable old kqemu acceleration</flag>
   </use>
 </pkgmetadata>
diff --git a/app-emulation/qemu/qemu-1.0-r2.ebuild b/app-emulation/qemu/qemu-1.0-r2.ebuild
deleted file mode 100644
index fe433a238fb2..000000000000
--- a/app-emulation/qemu/qemu-1.0-r2.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0-r2.ebuild,v 1.3 2012/05/03 18:49:05 jdhore Exp $
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git
-		http://git.qemu.org/git/qemu.git"
-	GIT_ECLASS="git-2"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
-+vhost-net xattr xen"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/qemu-kvm
-	!app-emulation/qemu-user
-	>=dev-libs/glib-2.0
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	curl? ( net-misc/curl )
-	fdt? ( >=sys-apps/dtc-1.2.0 )
-	jpeg? ( virtual/jpeg )
-	ncurses? ( sys-libs/ncurses )
-	nss? ( dev-libs/nss )
-	opengl? (
-		virtual/opengl
-		x11-libs/libX11
-	)
-	png? ( media-libs/libpng )
-	pulseaudio? ( media-sound/pulseaudio )
-	qemu-ifup? (
-		sys-apps/iproute2
-		net-misc/bridge-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? (
-		>=app-emulation/spice-0.9.0
-		>=app-emulation/spice-protocol-0.8.1
-	)
-	ssl? ( net-libs/gnutls )
-	usbredir? ( sys-apps/usbredir )
-	vde? ( net-misc/vde )
-	xattr? ( sys-apps/attr )
-	xen? ( app-emulation/xen-tools )
-"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	virtual/pkgconfig
-	>=sys-kernel/linux-headers-2.6.35
-"
-
-# alpha ELF binary. don't let portage mess with it
-STRIP_MASK="usr/share/qemu/palcode-clipper"
-
-QA_PRESTRIPPED="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-"
-# keep sorted
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-armeb
-	usr/bin/qemu-cris
-	usr/bin/qemu-i386
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-	usr/bin/qemu-x86_64
-"
-
-pkg_setup() {
-	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-}
-
-src_prepare() {
-	# bug #400595 / CVE-2012-0029
-	epatch "${FILESDIR}"/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
-
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-	# append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
-	# Fix underlinking.
-	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
-	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
-}
-
-src_configure() {
-	local conf_opts audio_opts user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [[ -z ${softmmu_targets} ]]; then
-		conf_opts="${conf_opts} --disable-system"
-	else
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
-
-	#config options
-	conf_opts="${conf_opts}
-		$(use_enable aio linux-aio)
-		$(use_enable bluetooth bluez)
-		$(use_enable brltty brlapi)
-		$(use_enable curl)
-		$(use_enable fdt)
-		$(use_enable hardened pie)
-		$(use_enable jpeg vnc-jpeg)
-		$(use_enable ncurses curses)
-		$(use_enable nss smartcard-nss)
-		$(use_enable opengl)
-		$(use_enable png vnc-png)
-		$(use_enable rbd)
-		$(use_enable sasl vnc-sasl)
-		$(use_enable sdl)
-		$(use_enable spice)
-		$(use_enable ssl vnc-tls)
-		$(use_enable threads vnc-thread)
-		$(use_enable vde)
-		$(use_enable vhost-net)
-		$(use_enable xen)
-		$(use_enable xattr attr)
-		--disable-darwin-user --disable-bsd-user
-	"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa ${audio_opts}"
-	use pulseaudio && audio_opts="pa ${audio_opts}"
-	use sdl && audio_opts="sdl ${audio_opts}"
-
-	set -- --prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-strip \
-		--disable-werror \
-		--disable-kvm \
-		--disable-libiscsi \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)"
-
-	echo ./configure "$@" # show actual options
-	./configure "$@" || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use qemu-ifup; then
-			exeinto /etc/qemu
-			doexe "${FILESDIR}"/qemu-if{up,down}
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-}
-
-pkg_postinst() {
-	use qemu-ifup || return
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "qemu-ifup script from /etc/qemu."
-	echo
-}
diff --git a/app-emulation/qemu/qemu-1.0-r3.ebuild b/app-emulation/qemu/qemu-1.0-r3.ebuild
deleted file mode 100644
index 670253327b87..000000000000
--- a/app-emulation/qemu/qemu-1.0-r3.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0-r3.ebuild,v 1.5 2012/05/03 18:49:05 jdhore Exp $
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git
-		http://git.qemu.org/git/qemu.git"
-	GIT_ECLASS="git-2"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz
-			 http://dev.gentoo.org/~lu_zero/distfiles/${P}-patches.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
-+vhost-net xattr xen"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-	RDEPEND="${RDEPEND}
-			 !app-emulation/qemu-user[qemu_user_targets_${target}?]"
-done
-
-RESTRICT="test"
-
-RDEPEND="${RDEPEND}
-	!app-emulation/qemu-kvm
-	>=dev-libs/glib-2.0
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	curl? ( net-misc/curl )
-	fdt? ( >=sys-apps/dtc-1.2.0 )
-	jpeg? ( virtual/jpeg )
-	ncurses? ( sys-libs/ncurses )
-	nss? ( dev-libs/nss )
-	opengl? (
-		virtual/opengl
-		x11-libs/libX11
-	)
-	png? ( media-libs/libpng )
-	pulseaudio? ( media-sound/pulseaudio )
-	qemu-ifup? (
-		sys-apps/iproute2
-		net-misc/bridge-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? (
-		>=app-emulation/spice-0.9.0
-		>=app-emulation/spice-protocol-0.8.1
-	)
-	ssl? ( net-libs/gnutls )
-	static? ( sys-libs/zlib[static-libs] )
-	!static? ( sys-libs/zlib )
-	usbredir? ( sys-apps/usbredir )
-	vde? ( net-misc/vde )
-	xattr? ( sys-apps/attr )
-	xen? ( app-emulation/xen-tools )
-"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	virtual/pkgconfig
-	>=sys-kernel/linux-headers-2.6.35
-"
-
-# alpha ELF binary. don't let portage mess with it
-STRIP_MASK="usr/share/qemu/palcode-clipper"
-
-QA_PRESTRIPPED="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-"
-# keep sorted
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-armeb
-	usr/bin/qemu-cris
-	usr/bin/qemu-i386
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-	usr/bin/qemu-x86_64
-"
-
-pkg_setup() {
-	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# bug #400595 / CVE-2012-0029
-	epatch "${FILESDIR}"/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
-
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" epatch
-
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-	# append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
-	# Fix underlinking.
-	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
-	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
-}
-
-src_configure() {
-	local conf_opts audio_opts user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [[ -z ${softmmu_targets} ]]; then
-		conf_opts="${conf_opts} --disable-system"
-	else
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
-
-	#config options
-	conf_opts="${conf_opts}
-		$(use_enable aio linux-aio)
-		$(use_enable bluetooth bluez)
-		$(use_enable brltty brlapi)
-		$(use_enable curl)
-		$(use_enable fdt)
-		$(use_enable hardened pie)
-		$(use_enable jpeg vnc-jpeg)
-		$(use_enable ncurses curses)
-		$(use_enable nss smartcard-nss)
-		$(use_enable opengl)
-		$(use_enable png vnc-png)
-		$(use_enable rbd)
-		$(use_enable sasl vnc-sasl)
-		$(use_enable sdl)
-		$(use_enable spice)
-		$(use_enable ssl vnc-tls)
-		$(use_enable threads vnc-thread)
-		$(use_enable vde)
-		$(use_enable vhost-net)
-		$(use_enable xen)
-		$(use_enable xattr attr)
-		--disable-darwin-user --disable-bsd-user
-	"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa ${audio_opts}"
-	use pulseaudio && audio_opts="pa ${audio_opts}"
-	use sdl && audio_opts="sdl ${audio_opts}"
-
-	set -- --prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-strip \
-		--disable-werror \
-		--disable-kvm \
-		--disable-libiscsi \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)"
-
-	echo ./configure "$@" # show actual options
-	./configure "$@" || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use qemu-ifup; then
-			exeinto /etc/qemu
-			doexe "${FILESDIR}"/qemu-if{up,down}
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-}
-
-pkg_postinst() {
-	use qemu-ifup || return
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "qemu-ifup script from /etc/qemu."
-	echo
-}
diff --git a/app-emulation/qemu/qemu-1.0.1.ebuild b/app-emulation/qemu/qemu-1.0.1.ebuild
deleted file mode 100644
index 7c4170d73afc..000000000000
--- a/app-emulation/qemu/qemu-1.0.1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0.1.ebuild,v 1.6 2012/08/18 17:24:16 vapier Exp $
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git
-		http://git.qemu.org/git/qemu.git"
-	GIT_ECLASS="git-2"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz
-			 http://dev.gentoo.org/~lu_zero/distfiles/${PN}-1.0-patches.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg kvm ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
-+vhost-net xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/qemu-kvm
-	!app-emulation/qemu-user
-	>=dev-libs/glib-2.0
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	curl? ( net-misc/curl )
-	fdt? ( >=sys-apps/dtc-1.2.0 )
-	jpeg? ( virtual/jpeg )
-	ncurses? ( sys-libs/ncurses )
-	nss? ( dev-libs/nss )
-	opengl? (
-		virtual/opengl
-		x11-libs/libX11
-	)
-	png? ( media-libs/libpng )
-	pulseaudio? ( media-sound/pulseaudio )
-	qemu-ifup? (
-		sys-apps/iproute2
-		net-misc/bridge-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? (
-		>=app-emulation/spice-0.9.0
-		>=app-emulation/spice-protocol-0.8.1
-	)
-	ssl? ( net-libs/gnutls )
-	usbredir? ( sys-apps/usbredir )
-	vde? ( net-misc/vde )
-	xattr? ( sys-apps/attr )
-	xen? ( app-emulation/xen-tools )
-	xfs? ( sys-fs/xfsprogs )
-"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	virtual/pkgconfig
-	>=sys-kernel/linux-headers-2.6.35
-"
-
-# alpha ELF binary. don't let portage mess with it
-STRIP_MASK="usr/share/qemu/palcode-clipper"
-
-QA_PRESTRIPPED="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-"
-# keep sorted
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-armeb
-	usr/bin/qemu-cris
-	usr/bin/qemu-i386
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-	usr/bin/qemu-x86_64
-"
-
-pkg_setup() {
-	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-
-	use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-	EPATCH_EXCLUDE="0033-PPC-Fix-linker-scripts-on-ppc-hosts.patch" \
-	EPATCH_FORCE="yes" epatch
-
-	epatch "${FILESDIR}"/${PN}-1.0-unmagic-debug.patch
-	epatch "${FILESDIR}"/${PN}-1.0-unmagic-xfsctl.patch
-	epatch "${FILESDIR}"/${P}-siginfo.patch
-
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-
-	# Fix underlinking.
-	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
-	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
-}
-
-src_configure() {
-	local conf_opts audio_opts user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [[ -z ${softmmu_targets} ]]; then
-		conf_opts="${conf_opts} --disable-system"
-	else
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# drop '-g' by default as it tends to eat
-	# A LOT (~2GB) of ram for each job #355861
-	conf_opts="${conf_opts} --disable-debug-info"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
-
-	#config options
-	conf_opts="${conf_opts}
-		$(use_enable aio linux-aio)
-		$(use_enable bluetooth bluez)
-		$(use_enable brltty brlapi)
-		$(use_enable curl)
-		$(use_enable fdt)
-		$(use_enable hardened pie)
-		$(use_enable jpeg vnc-jpeg)
-		$(use_enable ncurses curses)
-		$(use_enable nss smartcard-nss)
-		$(use_enable opengl)
-		$(use_enable png vnc-png)
-		$(use_enable rbd)
-		$(use_enable sasl vnc-sasl)
-		$(use_enable sdl)
-		$(use_enable spice)
-		$(use_enable ssl vnc-tls)
-		$(use_enable threads vnc-thread)
-		$(use_enable vde)
-		$(use_enable vhost-net)
-		$(use_enable xen)
-		$(use_enable xattr attr)
-		$(use_enable xfs xfsctl)
-		--disable-darwin-user --disable-bsd-user
-	"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa ${audio_opts}"
-	use pulseaudio && audio_opts="pa ${audio_opts}"
-	use sdl && audio_opts="sdl ${audio_opts}"
-
-	set -- --prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-strip \
-		--disable-werror \
-		$(use_enable kvm) \
-		--disable-libiscsi \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)"
-
-	echo ./configure "$@" # show actual options
-	./configure "$@" || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use qemu-ifup; then
-			exeinto /etc/qemu
-			doexe "${FILESDIR}"/qemu-if{up,down}
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-	dohtml qemu-doc.html qemu-tech.html
-}
-
-pkg_postinst() {
-	use qemu-ifup || return
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "qemu-ifup script from /etc/qemu."
-	echo
-}
diff --git a/app-emulation/qemu/qemu-1.1.1-r1.ebuild b/app-emulation/qemu/qemu-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..565e2301c1ed
--- /dev/null
+++ b/app-emulation/qemu/qemu-1.1.1-r1.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.1-r1.ebuild,v 1.1 2012/10/09 20:18:30 cardoe Exp $
+
+EAPI="4"
+
+MY_PN="qemu-kvm"
+MY_P=${MY_PN}-${PV}
+
+PYTHON_DEPEND="2"
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
+BACKPORTS=1
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
+	${BACKPORTS:+
+		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
+kernel_FreeBSD ncurses opengl pulseaudio python rbd sasl sdl \
+smartcard spice static tci tls usbredir vde +vhost-net virtfs xattr xen xfs"
+
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+
+# Setup the default SoftMMU targets, while using the loops
+# below to setup the other targets. x86_64 should be the only
+# defaults on for qemu-kvm
+IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+	if [ "x${target}" = "xx86_64" ]; then
+		continue
+	fi
+	IUSE="${IUSE} qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+	IUSE="${IUSE} qemu_user_targets_${target}"
+done
+
+REQUIRED_USE="static? ( !alsa !pulseaudio )
+	amd64? ( qemu_softmmu_targets_x86_64 )
+	x86? ( qemu_softmmu_targets_x86_64 )
+	virtfs? ( xattr )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+RDEPEND="
+	!app-emulation/kqemu
+	!app-emulation/qemu
+	!<app-emulation/qemu-1.0
+	>=dev-libs/glib-2.0
+	media-libs/libpng
+	sys-apps/pciutils
+	>=sys-firmware/seabios-1.7.0
+	sys-firmware/vgabios
+	virtual/jpeg
+	aio? ( dev-libs/libaio )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
+	caps? ( sys-libs/libcap-ng )
+	curl? ( >=net-misc/curl-7.15.4 )
+	fdt? ( >=sys-apps/dtc-1.2.0 )
+	kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
+	ncurses? ( sys-libs/ncurses )
+	opengl? ( virtual/opengl )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( =dev-lang/python-2*[ncurses] )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
+		!static? ( >=media-libs/libsdl-1.2.11[X] ) )
+	static? ( sys-libs/zlib[static-libs(+)] )
+	!static? ( sys-libs/zlib )
+	smartcard? ( dev-libs/nss )
+	spice? ( >=app-emulation/spice-protocol-0.8.1
+			static? ( >=app-emulation/spice-0.9.0[static-libs] )
+			!static? ( >=app-emulation/spice-0.9.0 )
+	)
+	tls? ( net-libs/gnutls )
+	usbredir? ( sys-apps/usbredir )
+	vde? ( net-misc/vde )
+	virtfs? ( sys-libs/libcap )
+	xattr? ( sys-apps/attr )
+	xen? ( app-emulation/xen-tools )
+	xfs? ( sys-fs/xfsprogs )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/texi2html )
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )"
+
+S="${WORKDIR}/${MY_P}"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper"
+
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CHECK_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if use static; then
+		ewarn "USE=static is very much a moving target because of the packages"
+		ewarn "we depend on will have their static libs ripped out or wrapped"
+		ewarn "with USE=static-libs or USE=static due to continued dicsussion"
+		ewarn "on the mailing list about USE=static's place in Gentoo. As a"
+		ewarn "result what worked today may not work tomorrow."
+	fi
+}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup kvm 78
+}
+
+src_prepare() {
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	# remove part to make udev happy
+	#sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
+
+	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
+
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	epatch_user
+}
+
+src_configure() {
+	local conf_opts audio_opts user_targets
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${target}" && \
+		softmmu_targets="${softmmu_targets} ${target}-softmmu"
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		use "qemu_user_targets_${target}" && \
+		user_targets="${user_targets} ${target}-linux-user"
+	done
+
+	if [[ -z ${softmmu_targets} ]]; then
+		eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
+		die "At least 1 SoftMMU target must be enabled"
+	else
+		einfo "Building the following softmmu targets: ${softmmu_targets}"
+	fi
+
+	if [[ -n ${user_targets} ]]; then
+		einfo "Building the following user targets: ${user_targets}"
+		conf_opts="${conf_opts} --enable-linux-user"
+	else
+		conf_opts="${conf_opts} --disable-linux-user"
+	fi
+
+	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+
+	# Add support for static builds
+	use static && conf_opts="${conf_opts} --static --disable-pie"
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if ! use static && gcc-specs-pie; then
+		conf_opts="${conf_opts} --enable-pie"
+	fi
+
+	# audio options
+	audio_opts="oss"
+	use alsa && audio_opts="alsa ${audio_opts}"
+	use pulseaudio && audio_opts="pa ${audio_opts}"
+	use sdl && audio_opts="sdl ${audio_opts}"
+
+	# conditionally making UUID work on Linux only is wrong
+	# but the Gentoo/FreeBSD guys need to figure out what
+	# provides libuuid on their platform
+	# --enable-vnc-thread will go away in 1.2
+	# $(use_enable xen xen-pci-passthrough) for 1.2
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-bsd-user \
+		--disable-libiscsi \
+		--disable-strip \
+		--disable-werror \
+		--enable-guest-agent \
+		--enable-vnc-jpeg \
+		--enable-vnc-png \
+		--enable-vnc-thread \
+		--python=python2 \
+		$(use_enable aio linux-aio) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable brltty brlapi) \
+		$(use_enable caps cap-ng) \
+		$(use_enable curl) \
+		$(use_enable debug debug-info) \
+		$(use_enable debug debug-mon) \
+		$(use_enable debug debug-tcg) \
+		$(use_enable doc docs) \
+		$(use_enable fdt) \
+		$(use_enable kernel_linux kvm) \
+		$(use_enable kernel_linux kvm-device-assignment) \
+		$(use_enable kernel_linux nptl) \
+		$(use_enable kernel_linux uuid) \
+		$(use_enable ncurses curses) \
+		$(use_enable opengl) \
+		$(use_enable rbd) \
+		$(use_enable sasl vnc-sasl) \
+		$(use_enable sdl) \
+		$(use_enable smartcard smartcard) \
+		$(use_enable smartcard smartcard-nss) \
+		$(use_enable spice) \
+		$(use_enable tci tcg-interpreter) \
+		$(use_enable tls vnc-tls) \
+		$(use_enable usbredir usb-redir) \
+		$(use_enable vde) \
+		$(use_enable vhost-net) \
+		$(use_enable virtfs) \
+		$(use_enable xattr attr) \
+		$(use_enable xen) \
+		$(use_enable xfs xfsctl) \
+		--audio-drv-list="${audio_opts}" \
+		--target-list="${softmmu_targets} ${user_targets}" \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		${conf_opts} \
+		|| die "configure failed"
+
+		# this is for qemu upstream's threaded support which is
+		# in development and broken
+		# the kvm project has its own support for threaded IO
+		# which is always on and works
+		# --enable-io-thread \
+
+		# FreeBSD's kernel does not support QEMU assigning/grabbing
+		# host USB devices yet
+		use kernel_FreeBSD && \
+			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	if [[ -n ${softmmu_targets} ]]; then
+		if use kernel_linux; then
+			insinto /lib/udev/rules.d/
+			doins "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use qemu_softmmu_targets_x86_64 ; then
+			dobin "${FILESDIR}"/qemu-kvm
+			ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
+			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
+			ewarn "your libvirt configs or other wrappers for ${PN}"
+		else
+			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+			elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
+		fi
+	fi
+
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	if use doc; then
+		dohtml qemu-doc.html qemu-tech.html || die
+	fi
+
+	use python & dobin scripts/kvm/kvm_stat
+
+	# Remove SeaBIOS since we're using the SeaBIOS packaged one
+	rm "${ED}/usr/share/qemu/bios.bin"
+	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+
+	# Remove vgabios since we're using the vgabios packaged one
+	rm "${ED}/usr/share/qemu/vgabios.bin"
+	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]]; then
+		elog "If you don't have kvm compiled into the kernel, make sure you have"
+		elog "the kernel module loaded before running kvm. The easiest way to"
+		elog "ensure that the kernel module is loaded is to load it on boot."
+		elog "For AMD CPUs the module is called 'kvm-amd'"
+		elog "For Intel CPUs the module is called 'kvm-intel'"
+		elog "Please review /etc/conf.d/modules for how to load these"
+		elog
+		elog "Make sure your user is in the 'kvm' group"
+		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+		elog
+		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
+	fi
+}
diff --git a/app-emulation/qemu/qemu-1.1.2.ebuild b/app-emulation/qemu/qemu-1.1.2.ebuild
index 5abe252fadea..3f6d8a609e4a 100644
--- a/app-emulation/qemu/qemu-1.1.2.ebuild
+++ b/app-emulation/qemu/qemu-1.1.2.ebuild
@@ -1,112 +1,128 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.1 2012/09/22 22:01:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.2 2012/10/09 20:18:30 cardoe Exp $
 
-EAPI=4
+EAPI="4"
 
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git
-		http://git.qemu.org/git/qemu.git"
-	GIT_ECLASS="git-2"
-fi
+MY_PN="qemu-kvm"
+MY_P=${MY_PN}-${PV}
 
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
+PYTHON_DEPEND="2"
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
+#BACKPORTS=2
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2"
-	# Pending review
-	#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
+	${BACKPORTS:+
+		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 fi
 
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.linux-kvm.org"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg kvm ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
-+vhost-net xattr xen xfs"
+IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
+kernel_FreeBSD mixemu ncurses opengl pulseaudio python rbd sasl sdl \
+smartcard spice static systemtap tci tls usbredir vde +vhost-net \
+virtfs xattr xen xfs"
 
 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
 IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
 
+# Setup the default SoftMMU targets, while using the loops
+# below to setup the other targets.
+IUSE="${IUSE}"
+REQUIRED_USE="|| ("
+
 for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+	IUSE="${IUSE} qemu_softmmu_targets_${target}"
+	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
 done
+REQUIRED_USE="${REQUIRED_USE} )"
 
 for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
+	IUSE="${IUSE} qemu_user_targets_${target}"
 done
 
-RESTRICT="test"
+REQUIRED_USE="${REQUIRED_USE}
+	static? ( !alsa !pulseaudio )
+	virtfs? ( xattr )"
 
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
 RDEPEND="
-	!app-emulation/qemu-kvm
-	!app-emulation/qemu-user
+	!app-emulation/kqemu
+	!app-emulation/qemu
+	!<app-emulation/qemu-1.0
 	>=dev-libs/glib-2.0
+	media-libs/libpng
 	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
+	>=sys-firmware/seabios-1.7.0
+	sys-firmware/sgabios
+	sys-firmware/vgabios
+	virtual/jpeg
 	aio? ( dev-libs/libaio )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
-	curl? ( net-misc/curl )
+	caps? ( sys-libs/libcap-ng )
+	curl? ( >=net-misc/curl-7.15.4 )
 	fdt? ( >=sys-apps/dtc-1.2.0 )
-	jpeg? ( virtual/jpeg )
+	kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
 	ncurses? ( sys-libs/ncurses )
-	nss? ( dev-libs/nss )
-	opengl? (
-		virtual/opengl
-		x11-libs/libX11
-	)
-	png? ( media-libs/libpng )
+	opengl? ( virtual/opengl )
 	pulseaudio? ( media-sound/pulseaudio )
-	qemu-ifup? (
-		sys-apps/iproute2
-		net-misc/bridge-utils
-	)
+	python? ( =dev-lang/python-2*[ncurses] )
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? (
-		>=app-emulation/spice-0.9.0
-		>=app-emulation/spice-protocol-0.8.1
+	sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
+		!static? ( >=media-libs/libsdl-1.2.11[X] ) )
+	static? ( sys-libs/zlib[static-libs(+)] )
+	!static? ( sys-libs/zlib )
+	smartcard? ( dev-libs/nss )
+	spice? ( >=app-emulation/spice-protocol-0.8.1
+			static? ( >=app-emulation/spice-0.9.0[static-libs] )
+			!static? ( >=app-emulation/spice-0.9.0 )
 	)
-	ssl? ( net-libs/gnutls )
+	systemtap? ( dev-util/systemtap )
+	tls? ( net-libs/gnutls )
 	usbredir? ( sys-apps/usbredir )
 	vde? ( net-misc/vde )
+	virtfs? ( sys-libs/libcap )
 	xattr? ( sys-apps/attr )
 	xen? ( app-emulation/xen-tools )
-	xfs? ( sys-fs/xfsprogs )
-"
+	xfs? ( sys-fs/xfsprogs )"
 
 DEPEND="${RDEPEND}
-	app-text/texi2html
 	virtual/pkgconfig
-	>=sys-kernel/linux-headers-2.6.35
-"
+	doc? ( app-text/texi2html )
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )"
 
-# alpha ELF binary. don't let portage mess with it
-STRIP_MASK="usr/share/qemu/palcode-clipper"
+S="${WORKDIR}/${MY_P}"
 
-QA_PRESTRIPPED="
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
 	usr/share/qemu/openbios-ppc
 	usr/share/qemu/openbios-sparc64
 	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-"
-# keep sorted
+	usr/share/qemu/palcode-clipper"
+
 QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
 	usr/bin/qemu-alpha
 	usr/bin/qemu-arm
-	usr/bin/qemu-armeb
 	usr/bin/qemu-cris
-	usr/bin/qemu-i386
 	usr/bin/qemu-m68k
 	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
 	usr/bin/qemu-mips
 	usr/bin/qemu-mipsel
 	usr/bin/qemu-ppc
@@ -115,30 +131,72 @@ QA_WX_LOAD="${QA_PRESTRIPPED}
 	usr/bin/qemu-sh4
 	usr/bin/qemu-sh4eb
 	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc32plus
 	usr/bin/qemu-sparc64
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-	usr/bin/qemu-x86_64
-"
-
-pkg_setup() {
-	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CHECK_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
 
-	use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
+	if use static; then
+		ewarn "USE=static is very much a moving target because of the packages"
+		ewarn "we depend on will have their static libs ripped out or wrapped"
+		ewarn "with USE=static-libs or USE=static due to continued dicsussion"
+		ewarn "on the mailing list about USE=static's place in Gentoo. As a"
+		ewarn "result what worked today may not work tomorrow."
+	fi
+}
 
+pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup kvm 78
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.1-siginfo.patch
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
 
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
 
-	# Fix underlinking.
-	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
-	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
+	epatch_user
 }
 
 src_configure() {
@@ -154,11 +212,7 @@ src_configure() {
 		user_targets="${user_targets} ${target}-linux-user"
 	done
 
-	if [[ -z ${softmmu_targets} ]]; then
-		conf_opts="${conf_opts} --disable-system"
-	else
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
+	einfo "Building the following softmmu targets: ${softmmu_targets}"
 
 	if [[ -n ${user_targets} ]]; then
 		einfo "Building the following user targets: ${user_targets}"
@@ -167,89 +221,152 @@ src_configure() {
 		conf_opts="${conf_opts} --disable-linux-user"
 	fi
 
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+	# Add support for SystemTAP
+	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
 
-	# drop '-g' by default as it tends to eat
-	# A LOT (~2GB) of ram for each job #355861
-	conf_opts="${conf_opts} --disable-debug-info"
+	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
 
 	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
-
-	#config options
-	conf_opts="${conf_opts}
-		$(use_enable aio linux-aio)
-		$(use_enable bluetooth bluez)
-		$(use_enable brltty brlapi)
-		$(use_enable curl)
-		$(use_enable fdt)
-		$(use_enable hardened pie)
-		$(use_enable jpeg vnc-jpeg)
-		$(use_enable ncurses curses)
-		$(use_enable nss smartcard-nss)
-		$(use_enable opengl)
-		$(use_enable png vnc-png)
-		$(use_enable rbd)
-		$(use_enable sasl vnc-sasl)
-		$(use_enable sdl)
-		$(use_enable spice)
-		$(use_enable ssl vnc-tls)
-		$(use_enable threads vnc-thread)
-		$(use_enable vde)
-		$(use_enable vhost-net)
-		$(use_enable xen)
-		$(use_enable xattr attr)
-		$(use_enable xfs xfsctl)
-		--disable-bsd-user
-	"
+	use static && conf_opts="${conf_opts} --static --disable-pie"
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if ! use static && gcc-specs-pie; then
+		conf_opts="${conf_opts} --enable-pie"
+	fi
 
 	# audio options
 	audio_opts="oss"
-	use alsa && audio_opts="alsa ${audio_opts}"
-	use pulseaudio && audio_opts="pa ${audio_opts}"
-	use sdl && audio_opts="sdl ${audio_opts}"
-
-	set -- --prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
+	use alsa && audio_opts="alsa,${audio_opts}"
+	use sdl && audio_opts="sdl,${audio_opts}"
+	use pulseaudio && audio_opts="pa,${audio_opts}"
+	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
+
+	# conditionally making UUID work on Linux only is wrong
+	# but the Gentoo/FreeBSD guys need to figure out what
+	# provides libuuid on their platform
+	# --enable-vnc-thread will go away in 1.2
+	# $(use_enable xen xen-pci-passthrough) for 1.2
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-bsd-user \
+		--disable-guest-agent \
+		--disable-libiscsi \
 		--disable-strip \
 		--disable-werror \
-		$(use_enable kvm) \
-		--disable-libiscsi \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
-		--audio-drv-list="${audio_opts}" \
+		--enable-vnc-jpeg \
+		--enable-vnc-png \
+		--enable-vnc-thread \
+		--python=python2 \
+		$(use_enable aio linux-aio) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable brltty brlapi) \
+		$(use_enable caps cap-ng) \
+		$(use_enable curl) \
+		$(use_enable debug debug-info) \
+		$(use_enable debug debug-mon) \
+		$(use_enable debug debug-tcg) \
+		$(use_enable doc docs) \
+		$(use_enable fdt) \
+		$(use_enable kernel_linux kvm) \
+		$(use_enable kernel_linux kvm-device-assignment) \
+		$(use_enable kernel_linux nptl) \
+		$(use_enable kernel_linux uuid) \
+		$(use_enable ncurses curses) \
+		$(use_enable opengl) \
+		$(use_enable rbd) \
+		$(use_enable sasl vnc-sasl) \
+		$(use_enable sdl) \
+		$(use_enable smartcard smartcard) \
+		$(use_enable smartcard smartcard-nss) \
+		$(use_enable spice) \
+		$(use_enable tci tcg-interpreter) \
+		$(use_enable tls vnc-tls) \
+		$(use_enable usbredir usb-redir) \
+		$(use_enable vde) \
+		$(use_enable vhost-net) \
+		$(use_enable virtfs) \
+		$(use_enable xattr attr) \
+		$(use_enable xen) \
+		$(use_enable xfs xfsctl) \
+		--audio-drv-list=${audio_opts} \
 		--target-list="${softmmu_targets} ${user_targets}" \
 		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)"
+		--host-cc="$(tc-getBUILD_CC)" \
+		${conf_opts} \
+		|| die "configure failed"
 
-	echo ./configure "$@" # show actual options
-	./configure "$@" || die "configure failed"
+		# FreeBSD's kernel does not support QEMU assigning/grabbing
+		# host USB devices yet
+		use kernel_FreeBSD && \
+			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${ED}" install
 
 	if [[ -n ${softmmu_targets} ]]; then
-		if use qemu-ifup; then
-			exeinto /etc/qemu
-			doexe "${FILESDIR}"/qemu-if{up,down}
+		if use kernel_linux; then
+			insinto /lib/udev/rules.d/
+			doins "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use qemu_softmmu_targets_x86_64 ; then
+			dobin "${FILESDIR}"/qemu-kvm
+			ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
+			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
+			ewarn "your libvirt configs or other wrappers for ${PN}"
+		else
+			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+			elog "of /usr/bin/qemu-kvm"
 		fi
 	fi
 
 	dodoc Changelog MAINTAINERS TODO pci-ids.txt
 	newdoc pc-bios/README README.pc-bios
-	dohtml qemu-doc.html qemu-tech.html
+
+	if use doc; then
+		dohtml qemu-doc.html qemu-tech.html || die
+	fi
+
+	use python & dobin scripts/kvm/kvm_stat
+
+	# Remove SeaBIOS since we're using the SeaBIOS packaged one
+	rm "${ED}/usr/share/qemu/bios.bin"
+	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+
+	# Remove vgabios since we're using the vgabios packaged one
+	rm "${ED}/usr/share/qemu/vgabios.bin"
+	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+
+	# Remove sgabios since we're using the sgabios packaged one
+	rm "${ED}/usr/share/qemu/sgabios.bin"
+	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
 }
 
 pkg_postinst() {
-	use qemu-ifup || return
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "qemu-ifup script from /etc/qemu."
-	echo
+	if [[ -n ${softmmu_targets} ]]; then
+		elog "If you don't have kvm compiled into the kernel, make sure you have"
+		elog "the kernel module loaded before running kvm. The easiest way to"
+		elog "ensure that the kernel module is loaded is to load it on boot."
+		elog "For AMD CPUs the module is called 'kvm-amd'"
+		elog "For Intel CPUs the module is called 'kvm-intel'"
+		elog "Please review /etc/conf.d/modules for how to load these"
+		elog
+		elog "Make sure your user is in the 'kvm' group"
+		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+		elog
+		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
+	fi
 }