Drop older versions. Fix HOMEPAGE. bug #463364

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xD7DFA8D318FA9AEF!

11 files changed, 31 insertions, 1728 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 9e994d13c013..44d182fe6385 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,12 @@
 # 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.205 2013/05/07 15:49:49 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.206 2013/05/07 15:56:29 cardoe Exp $
+
+  07 May 2013; Doug Goldstein <cardoe@gentoo.org> -qemu-1.1.1-r1.ebuild,
+  -qemu-1.1.2-r2.ebuild, qemu-1.2.2-r3.ebuild, qemu-1.2.2-r4.ebuild,
+  -qemu-1.3.1.ebuild, -qemu-1.4.0.ebuild, qemu-1.4.0-r1.ebuild,
+  qemu-1.4.1.ebuild, qemu-9999.ebuild:
+  Drop older versions. Fix HOMEPAGE. bug #463364
 
 *qemu-1.4.1 (07 May 2013)
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 3d202355074d..35a9bae3447b 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,41 +9,31 @@ AUX qemu-binfmt.initd 7397 SHA256 78cd12a7c683bcf8894469978fccb6d7ff2d052fbd8778
 AUX qemu-binfmt.initd-r1 7023 SHA256 3572c110c6f217754e638796400a5901910a2e61b8818c8569f8258b103ebcc6 SHA512 773af64fef164c00945acf5881e64a10141aa8fdc85491e57bf8dcc7c800a4f81879527998a0896a42f921edcbf5f741beb31ac2a82e45cba506c7b8461733c8 WHIRLPOOL 30382fe347248683e989c2b7fbd804ce26173b313746d80467029b2ad3594f414628f7537120b168a0e700c424d3525528eb632b07e16544c2fd07f418f3187c
 AUX qemu-kvm 60 SHA256 ded08eb1c74a9581912a9ca7876de6f33d1c545ed2a7d275f9b1749539feb7ee SHA512 d973d70ffeb7f4cdc61b25a30bf7174ac05b8c136234478782367a16668ff617756e9862a9cd94acd4b6636fda36410762e069a2eccca99410aa6e3b4294e363 WHIRLPOOL 41937bf752a2f643085fbd04643fb7a5cb898fabe8625d80b730c9e930f48f8d63245d5acdffbe31ecede1e1eb83fd3a73aad925f020e5c016f1b6559e7426d3
 AUX qemu-kvm-1.4 68 SHA256 8b1adf198129f001e75a2311fc420c168094d1084d2163cdf6a32b3b23c96137 SHA512 706fab4d155c410acc292e67fb354ce7dcd17f7e33f2ca8c9c44035ea128f8d36f89e27cf87ebe22721f5676be9e7f2ae5484fd000183c8ffd7854e02eb3d120 WHIRLPOOL ef795330b592cef8e3d92f52a77eb77a671e6aa1a47d07531917b5c1c09e72e5df1a44aea939b086e0a3c5ef2a5cea9223556a46ceae73e55300475c42f07067
-DIST qemu-1.3.1.tar.bz2 10283677 SHA256 3772e7ef0c9b4178195edcf90e711f12ba123f465fcf09fb43b56bdacaca0eaf SHA512 f371012d0c1fd5c2504ba4235ed787d897ff7b4dcf5bffc4452dd71b33394db4ec46488771927be2fc410408f69ca2c38d1edf23fca1e6767295c416ce98c588 WHIRLPOOL fb440dffca62c48a2644592ecdcd352349852fa67e5aa1c8cec45c86e599ef74cccc3a0464977cefebf311fea98a65e9035b5f87fa0dcdf87034b8a71d675627
 DIST qemu-1.4.0-4114896d.tar.xz 25852 SHA256 9df38a4a7a595093e88b63a112bb06af4bb27ae18078076f39a0ed6eed02e741 SHA512 ed291bc2046ffc345941fc61a7c406e146582475f3b59a57c91eec3dd0aebba32911698a38d8cf68e939791e1dddf0f052e39fe0631c10a0810eb68bb22abc0e WHIRLPOOL 5a13293d039384ba356ca0a184ea10eb4692c88d7a6290886c589cab3a4271eabc33a090d9453169c723badea2c11fb003ae4414471e161c072235ea82b78ff1
-DIST qemu-1.4.0-ebc00c94.tar.xz 6752 SHA256 be9574d8df4e3876f40921857b43fdcd62813ab86d496d7af0591aa3978f43ac SHA512 ae47e7dedf314630810e714106cc924a0449b2cdc7a4c7f464f82264311dad916737282a4782abd1479063cd312fec4618ea0416bb959fe4e550435e0bdb56cd WHIRLPOOL 57e31b5e1b947d3ddc9c6f3bf8529ab67b0e80602ffd06bf122be0ce0a1f13f317beed1f1cc8e89192fd5bd4ac7392beab11f10cb0fb6837997a40cb7e216d99
 DIST qemu-1.4.0.tar.bz2 10419510 SHA256 066297ed77408fb7588889c271a85cf3c259ad55c939315988e6062d7708eda8 SHA512 8ad0f1409d94283303abdc80e319fcfaad7818cade7c77fcba1b1adde411726ad166c5cc62a561414afb22b3bff956c4ec0cc7d0fec36542dd86dc347506ce72 WHIRLPOOL b0ecc866dd042a8af25f49419be680d7fb313230f99036ca8f22b20663da5b669cce7be89957fb583dc75bdcf73e905d7bd31904351f05d21816137c03c5be25
 DIST qemu-1.4.1-a2231a9d.tar.xz 5192 SHA256 5c6dacc243f55d00817dcc4fa24555c48665719bb4a1ea9f3d3542bea7606c52 SHA512 102e751d1dc972324a835fd2f2c88431856189a98505a9f8c1993b3bc5da390fed1cda04f719040c1c62b5cf4a7715d8d9fb15d6ceb511af5cf7cccd0dab0c09 WHIRLPOOL 8c22d6300c01a4afc9000bb0ab1c5a7626b61decb356d08731c715c417808a2801c3ca8c0192851a2f5ccfe36e30fc94da193365aaf69fdfbc44956c63c61142
 DIST qemu-1.4.1.tar.bz2 10417738 SHA256 75063a9326221607de3599e89fb5af80f2d8080ddc55ca253fff113843432df1 SHA512 b655d2816b9393ca30bbba2bc8a30076e1c933d593653a1f61b4d5f3aaa9b8eb390fa3aa6f3486f1d066b1e078a3d9e1a280d0e8dac68745b128ddc01ca1b149 WHIRLPOOL d45d290eb2877038f945d3aee88d28b5c81feb43b1ca4c8941b87fc225e4cfb7b7a601af8b8e639e831b7f41823b4d1723ca9149c0c072eb168907aa67e017be
-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-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-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.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.2-r2.ebuild 13797 SHA256 fed8d1598f3f6087029a89b2d263c9c5cb43dc3a451087d4ab7aadc21514d263 SHA512 7d2bec002f0f470bb10d08d54ca133395a68f1d6eb2827211c27f84c05f5282c3a33712b2d657ed3f3bfbc5629dd39d00b6fb1b1dc62410984413919ca57b714 WHIRLPOOL b48726f91f9e92cbd648661c60be64208c260da05651591863292b7f3ee91f7fa0f791d46c3e3b19be2b533b92b795741cb358de8c2a694477c94d2f23f6aacf
-EBUILD qemu-1.2.2-r3.ebuild 15167 SHA256 ad0e4f9f13bf61f92ca545ccbeb89dcd3f51aae9de69154a28c2edad46b80a0e SHA512 824bb2abf45545f1af34172dd06dc3f5e6645c06b7ccf1fa0837defe79e917b7d1a9580fb4d2ff0278f5f27adc2669e405f3a05f9b312c9dc1d7acf9b4508e3e WHIRLPOOL 0ce5fe9098e73399840f13a5b3aa5056d56da5855a1539959e7be57d5412ede7b35b4405091903a54b6844505931307853a2932ce0848563d097e5b174e81394
-EBUILD qemu-1.2.2-r4.ebuild 15436 SHA256 369bc611d4d63e6bb4ebda6dc5e95b3e40a9d393afa35eaa901ec561dd7c84b9 SHA512 c02f1d208ef6b70c1d1434b6d20967d401f5db7bf0e38ba82354de5289a560e4e236f634f8b64f0a0a181a2f6e74fbb77713ea846b9d95271c9deaafe51510f3 WHIRLPOOL b81eb5f824d9447ddc041c6b511cec62ea38689bc25df689e1f01ce7f743fe2597d3a281ef88ec431d587c9ac542b89b3f6562ae340f24457e4525a1eb5dd194
-EBUILD qemu-1.3.1.ebuild 14978 SHA256 e2e24c04443a2358b8c3ca6c9b02ad1db034423a7c08017c21d533c0298dc3d1 SHA512 90d7827fa5dd4ab96edf6c878cef7276bc9931cdca6c02d96d038f338c8f029d77c2323e67bce13b5d428af840d5d79d18071cbc49c00a52af723c7debbc1cfa WHIRLPOOL a6cbfb4fa295aa27c952c3ac1888263ccd99a2328266cb5f5977e6236f71cb3ed65e4b38cfd15035f61c434cb9d88b269ba6124dadf31d11823fdb15a521b940
-EBUILD qemu-1.4.0-r1.ebuild 16255 SHA256 133e2d90dedffd594fe13a789ea4891ff99be15ebfba519a55d45f4bd9c743de SHA512 c0f0127f9a10cef12016a8835b60f1acaa4ce6065f70e15bd694d0a3f5f8cb9493a286b2a8c52a0ed601b32801965119f9bb8001ff1203f48cae9ce45a944b58 WHIRLPOOL cc24f0dd4b922c32f8daafb8c4664b17f57592d303daa8998279013f678607b8b007e6aafec3a5d9c1359a9494dfaf33cb0edf4f42d1014c9a636685781d79ea
-EBUILD qemu-1.4.0.ebuild 15727 SHA256 10af5f359bac62b108f15843212f9834f62ce5942e3e9010cf4fafd927a72a16 SHA512 3cd87c22c71318dd99fcb0479bf45f08ec639b55ea1b6d2a60faf4efd8204378036f8fa61c4bfd5075607b2c47736a6514a98138ff31cb7b232d81d7a9dd60f2 WHIRLPOOL 4eeb52af3e61f0e0071e43ca78a6bb40b0967817327c367bee2b207c91d5888bb57d074fd9233c22c88f0e2deb651debafed5123166eb1daf2a776b18c9713a9
-EBUILD qemu-1.4.1.ebuild 16256 SHA256 aabbf534450d9b1c77e082c21e48cd2f68c3fa7f6821c3e66eb04e6dd7aec7d1 SHA512 1d7dfa98f61b74f0fd2c7bebf38074651bddfdf0e654f0b49786f3b7905824e09cc7d256a5f805e0a49355ec821ada89893dc3b1292f53642f5f011a09fe551a WHIRLPOOL bd3cdfa128464df5302023f65b67f5b79c3a801fbf0803eb600a6808b05c944a6e937120c7841c1468e4108789a51a7582eba38aa7a074a8c08a4d77c96b2764
-EBUILD qemu-9999.ebuild 13646 SHA256 8612db3b3019e32d84423c7e2ffe0380a70e3a2efed4e60cee59ce0757035170 SHA512 28ba69af465d40ef4c06cdf4ed8df7e068820cbffec807ee5e39a05a0c49cd8480c95dcc6937a74d4920ae493163fce519014325211683a7211d85f2283e67e1 WHIRLPOOL eb79f4424bf86c7f828f32e45e8cca616b9636fa922d01bbc7a06e80706b6e14e10341c0358203770cccd70fc01a15241ca0a30f62316f6a2b4e7bcc46a685f6
-MISC ChangeLog 33661 SHA256 9db828f5b42c03e032124e9863eddb5af9a8945a2cfada9d71c4d4b99253934a SHA512 551ac578f028b8f42bb6fa2bdc5d4807c0ab4c69fb71f7504836723130947177920b622feb994bb7c2264b6807cf8372a023cd2a52dcf0ec477e6277f3d2d6bd WHIRLPOOL ab98f401f6b57039623fdccd98ce7ac9886503cd534e7ea723ec107ca8f4880c95bcb32ce5cbc2d775e36df352f559514d25c47ecb15ab275a3ac7b496c115f5
+EBUILD qemu-1.2.2-r3.ebuild 15190 SHA256 dee162a8d9aad7f7767ea403b4c4e1eae201e73c4fc5ec7a716b7381e19e3b4e SHA512 25c6f4d2ad941ff7c57e4fd2f0dfd13d79d5ca0a964e4b4a0151c480558768099f02d93ffd09fd87cd0ff9ff69e926a822f68ee1cbb27f8433c8ed24391dd97b WHIRLPOOL c4b9eb76e758c1da2ec7e32b37e946738d35bb5037640746d56c0aa81cc0193b84f24aa4c186e269616a787740c4243541f4fc57942572a4539f1c5cc5199259
+EBUILD qemu-1.2.2-r4.ebuild 15456 SHA256 f82c406d900409cfcb74620abb145f2bed057b3356d6cb0e9aa2266cc18bb1c7 SHA512 8f561608469a5a49b176d1e0793c76d899763c11e965bbf54b7905deb6e862cf07b592e77ed509edff936e89a280ad6c8fe5204896b173c12d4111492987ba4a WHIRLPOOL dff35d9cb0689af35a0f840c0bcf91cd0f67192a1631351a5255648dbc67e624ee55f36345079abb7c3401bf9a2a076a07df27231ff72ee7cc742692ee2e2bf8
+EBUILD qemu-1.4.0-r1.ebuild 16275 SHA256 f289c440e2863b2051e71fb14c1e23b2c1b8ebbdfe041d05d2856a0c61fac76a SHA512 12be39b65f6f3bc95aa644f5f4edeade6d4a8e641bd67e93de0ab3d2004c00a6617a7746be417afbdec2bfde3c55111c0013989c52baf86ee4b5726a5bb94cc1 WHIRLPOOL d6da3f24612f8d7c0e3eebfc74ec4661a96f5fbb60407dae2923ee60a6924239fbe185a9a0c5945ed2ac464ba884bcc458e4aa46fb2c40d378c46528e2a8be4c
+EBUILD qemu-1.4.1.ebuild 16276 SHA256 3308c9933342a48a72e83914eb0c9451cc6f3ed8f80d6e0edf75a415fde525b9 SHA512 216d37206fce39568d2be08967f3a84a50ac4ec1609352783046f4fe187a2e82be3622b89c280eacba51371d6840408eb4043b83bd0c8ffc1aa45f4ad99efbbb WHIRLPOOL 017d29e27f677e54a1dc7d29beea8fea5ff0e1ab1d13a55786d090c51d52efbfe162c20a6048b36f1be54a66444552dbd8304383d200fe23ab813038459f6637
+EBUILD qemu-9999.ebuild 13667 SHA256 32eeabc28c6c3b4c45d79d0c2e197bb87182dcb92b5e952aa5d9b2337708a0b1 SHA512 f8a0e9c53abc1a4d061146ad35b5f516dadb3f7c2057d581150fa0cb6587ccc06bbbb9cb579de08b5ea6ecf00cfcc0ee531c2d5734ea2279589f70765ab0f94a WHIRLPOOL 447e4b0d977b5a17854ff9db4ae682170059940984e6bd4fdfa5c5f9ea682dd3f06e866cbead01fead417610f78a1f799a7932751573fc2865ee38e0442f257c
+MISC ChangeLog 33956 SHA256 11c0d855292ec2b59166fb583eab20cfb4fad7c0f5945fa094971c0e1ac4b86c SHA512 dfe8b9d7fdcf9eda677ad7b78fe811b26c81f337ecce955ca32acd5adadce8abc53ae427c982544b449a24a0f2be7bd4b94d82d9f3afe423a00fad821bcc4084 WHIRLPOOL 6aa00c2118cf93dde3f1e7f41fb34e425385c0b4bed8068fb788643012244dacf9d5288338c1606bf91d749e023c6420840b6806ea0532aa5a1d333cd5930077
 MISC metadata.xml 3228 SHA256 46bcb93b5ec650271b1f2b6de24c5b98214de01b6ec90180011c453e881caaf6 SHA512 e3951867195bc3eaf95492b848040c1739898daf9e3015186d3c6f9ccf59251874f3d7ca90a8a8364935dad7deea90e0153ad108b6bccf8469026c654336ddb1 WHIRLPOOL 6cc8dee4ddeff9c0dc9ce6532b0aa2b92b3f80c101f366dbcb9cec6bd4e3639aab5867019e0b4efafa60b54f08294f807f90f2529bd374170fdae36071043679
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRiSKeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJRiSQwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvhO0H/2p+Ei9B8fEAuguZMM8EPS+W
-5seHgEI6L+8q53opEjESyt2JRZUqQGMVYtID0CoHgIoslSurfzpvPHKnmalyQCso
-yjASudwOQuG2QAD98nCjUKnw76Iu8BCkH0vaRoQ6aU4Xf/CWXM9ZVcz+/Mpn2dvo
-IgLC18QFeyD3fCfW0qszgrWy0J6IzLKzRE+T32048TW4o4HMK7wQoNmhZz/ZJxg8
-JuCAJGh+BrdtqKxDU/nCF15ftvzudY/GOC651lltN0dzuiG5M9yQagUgjxDY/Vrd
-zWnWR8FenJXNBVJCGDpHk0YbE7du2vKBnEOohgpsD0NlDYej9aSjaK6728miRQg=
-=0D41
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvXf0H/R/Cl3WyB6uSEzlPgkW1RpPI
+xNbsm0MhorJEkswRJi8Zhlyp0CHNZ2bzI3NqVJzRoqkySEOr7HuAuduRzSGnY8ha
+ar8SHAbfeEJ2A/R16riJILRU7xUyqkM0VfgSm1/lCXa6+9BZ4awv/eTi/c+KfFm8
++tFvJ+CFY3u31T0orQ6MlFCR7Vnk88SfbfLarn+sXZprc0uBrO8iBJflVHVCbQiI
+oA2GDeTSKY3mAU5ErxsXgZ+40/fSyza9pQYNkuduOPHILpRRF1i69OhwLIYWPt2x
+oSQ61Ag4KymiEZd+OY+NEB+aLuCTDyD5TqTx82Zh2bYTXFQkpgVC12TXM3UWLos=
+=eGco
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-1.1.1-r1.ebuild b/app-emulation/qemu/qemu-1.1.1-r1.ebuild
deleted file mode 100644
index 7da5ee548f68..000000000000
--- a/app-emulation/qemu/qemu-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# 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.1.1-r1.ebuild,v 1.11 2013/01/12 23:08:29 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 udev
-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 !bluetooth )
-	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
-	>=dev-libs/glib-2.0
-	media-libs/libpng
-	sys-apps/pciutils
-	~sys-firmware/seabios-1.7.0
-	~sys-firmware/vgabios-0.6c
-	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-0.3.4
-		<sys-apps/usbredir-0.5
-		)
-	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 && CONFIG_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
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			dobin "${FILESDIR}"/qemu-kvm
-			ewarn "The deprecated '/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-r2.ebuild b/app-emulation/qemu/qemu-1.1.2-r2.ebuild
deleted file mode 100644
index 3011b856ab84..000000000000
--- a/app-emulation/qemu/qemu-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# 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.1.2-r2.ebuild,v 1.13 2013/01/12 23:08:29 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 udev
-BACKPORTS=6cee76f0
-
-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}-${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 +jpeg kernel_linux \
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl sdl selinux \
-smartcard spice static systemtap tci +threads tls usbredir +uuid vde +vhost-net \
-virtfs +vnc 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.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	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}"
-done
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!app-emulation/kqemu
-	~sys-firmware/seabios-1.7.0
-	~sys-firmware/sgabios-0.1_pre8
-	~sys-firmware/vgabios-0.6c
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( =dev-lang/python-2*[ncurses] )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.8.1 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? (
-		>=sys-apps/usbredir-0.3.4
-		<sys-apps/usbredir-0.5
-		)
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? ( ${LIB_DEPEND} )"
-
-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 && CONFIG_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
-
-	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
-
-	einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	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
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# 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 sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
-
-	# --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 \
-		--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 jpeg vnc-jpeg) \
-		$(use_enable kernel_linux kvm) \
-		$(use_enable kernel_linux kvm-device-assignment) \
-		$(use_enable kernel_linux nptl) \
-		$(use_enable ncurses curses) \
-		$(use_enable opengl) \
-		$(use_enable png vnc-png) \
-		$(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 threads vnc-thread) \
-		$(use_enable tls vnc-tls) \
-		$(use_enable usbredir usb-redir) \
-		$(use_enable uuid) \
-		$(use_enable vde) \
-		$(use_enable vhost-net) \
-		$(use_enable virtfs) \
-		$(use_enable vnc) \
-		$(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"
-
-		# 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
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			dobin "${FILESDIR}"/qemu-kvm
-			ewarn "The deprecated '/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
-
-	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() {
-	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.2.2-r3.ebuild b/app-emulation/qemu/qemu-1.2.2-r3.ebuild
index 27ef6469c9c5..669b51d1ce4f 100644
--- a/app-emulation/qemu/qemu-1.2.2-r3.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-r3.ebuild,v 1.5 2013/02/25 11:40:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r3.ebuild,v 1.6 2013/05/07 15:56:29 cardoe Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ else
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
diff --git a/app-emulation/qemu/qemu-1.2.2-r4.ebuild b/app-emulation/qemu/qemu-1.2.2-r4.ebuild
index f53a0662a189..ac63fe2a8041 100644
--- a/app-emulation/qemu/qemu-1.2.2-r4.ebuild
+++ b/app-emulation/qemu/qemu-1.2.2-r4.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-r4.ebuild,v 1.3 2013/02/26 16:16:18 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild,v 1.4 2013/05/07 15:56:29 cardoe Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ else
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
diff --git a/app-emulation/qemu/qemu-1.3.1.ebuild b/app-emulation/qemu/qemu-1.3.1.ebuild
deleted file mode 100644
index 536a6e7516ec..000000000000
--- a/app-emulation/qemu/qemu-1.3.1.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# 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.3.1.ebuild,v 1.1 2013/02/16 21:37:48 cardoe Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="2:2.4"
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
-#BACKPORTS=7c9a3a87
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download//${P}.tar.bz2
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-${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 +jpeg kernel_linux \
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \
-sdl selinux smartcard spice static static-softmmu static-user systemtap tci \
-+threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
-mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	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}"
-done
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	static? ( static-softmmu static-user )
-	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!app-emulation/kqemu
-	qemu_softmmu_targets_i386? (
-		sys-firmware/ipxe
-		~sys-firmware/seabios-1.7.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		sys-firmware/ipxe
-		~sys-firmware/seabios-1.7.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( =dev-lang/python-2*[ncurses] )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.12.2 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( >=sys-apps/usbredir-0.5.3 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-softmmu? ( ${LIB_DEPEND} )"
-
-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="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-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	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
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-qemu_support_kvm() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		return 0
-	fi
-
-	return 1
-}
-
-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 && CONFIG_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
-}
-
-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
-
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/vmxcap"
-
-	epatch "${FILESDIR}"/qemu-1.2.0-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local buildtype=$1
-	local builddir=$2
-	local conf_opts audio_opts
-	local static_flag="static-${buildtype}"
-
-	conf_opts="--prefix=/usr"
-	conf_opts+=" --sysconfdir=/etc"
-	conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
-	conf_opts+=" --disable-bsd-user"
-	conf_opts+=" --disable-guest-agent"
-	conf_opts+=" --disable-libiscsi"
-	conf_opts+=" --disable-strip"
-	conf_opts+=" --disable-werror"
-	conf_opts+=" --python=python2"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-
-	if [[ ${buildtype} == "user" ]]; then
-		conf_opts+=" --enable-linux-user"
-		conf_opts+=" --disable-system"
-		conf_opts+=" --target-list=${user_targets}"
-		conf_opts+=" --disable-bluez"
-		conf_opts+=" --disable-sdl"
-	fi
-
-	if [[ ${buildtype} == "softmmu" ]]; then
-		conf_opts+=" --disable-linux-user"
-		conf_opts+=" --enable-system"
-		conf_opts+=" --target-list=${softmmu_targets}"
-		conf_opts+=" $(use_enable bluetooth bluez)"
-		conf_opts+=" $(use_enable sdl)"
-		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable brltty brlapi)"
-		conf_opts+=" $(use_enable caps cap-ng)"
-		conf_opts+=" $(use_enable curl)"
-		conf_opts+=" $(use_enable fdt)"
-		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
-		conf_opts+=" $(use_enable kernel_linux kvm)"
-		conf_opts+=" $(use_enable kernel_linux nptl)"
-		conf_opts+=" $(use_enable ncurses curses)"
-		conf_opts+=" $(use_enable opengl)"
-		conf_opts+=" $(use_enable png vnc-png)"
-		conf_opts+=" $(use_enable rbd)"
-		conf_opts+=" $(use_enable sasl vnc-sasl)"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" $(use_enable smartcard smartcard)"
-		conf_opts+=" $(use_enable smartcard smartcard-nss)"
-		conf_opts+=" $(use_enable spice)"
-		conf_opts+=" $(use_enable tls vnc-tls)"
-		conf_opts+=" $(use_enable usbredir usb-redir)"
-		conf_opts+=" $(use_enable uuid)"
-		conf_opts+=" $(use_enable vde)"
-		conf_opts+=" $(use_enable vhost-net)"
-		conf_opts+=" $(use_enable virtfs)"
-		conf_opts+=" $(use_enable vnc)"
-		conf_opts+=" $(use_enable xattr attr)"
-		conf_opts+=" $(use_enable xen)"
-		conf_opts+=" $(use_enable xen xen-pci-passthrough)"
-		conf_opts+=" $(use_enable xfs xfsctl)"
-		use mixemu && conf_opts+=" --enable-mixemu"
-		conf_opts+=" --audio-drv-list=${audio_opts}"
-	fi
-
-	conf_opts+=" $(use_enable debug debug-info)"
-	conf_opts+=" $(use_enable debug debug-tcg)"
-	conf_opts+=" $(use_enable doc docs)"
-	conf_opts+=" $(use_enable tci tcg-interpreter)"
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Add support for static builds
-	use ${static_flag} && 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_flag} && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	einfo "./configure ${conf_opts}"
-	cd ${builddir}
-	../configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| 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_configure() {
-	softmmu_targets=
-	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
-
-	[[ -n ${softmmu_targets} ]] && \
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	[[ -n ${user_targets} ]] && \
-		einfo "Building the following user targets: ${user_targets}"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		mkdir "${S}/softmmu-build"
-		qemu_src_configure "softmmu" "${S}/softmmu-build"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		mkdir "${S}/user-build"
-		qemu_src_configure "user" "${S}/user-build"
-	fi
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets
-		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			dosym /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm
-			ewarn "The deprecated '/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}"
-		elif use x86 || use amd64; then
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables 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"
-	fi
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Avoid collision with app-emulation/libcacard
-	use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-	fi
-
-	# 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"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		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
-	fi
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-	fi
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-	fi
-}
-
-pkg_postinst() {
-	if qemu_support_kvm; 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
-	fi
-
-	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."
-}
diff --git a/app-emulation/qemu/qemu-1.4.0-r1.ebuild b/app-emulation/qemu/qemu-1.4.0-r1.ebuild
index 2a36f9a7d09a..43a6ac455d7f 100644
--- a/app-emulation/qemu/qemu-1.4.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-1.4.0-r1.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.4.0-r1.ebuild,v 1.2 2013/03/19 17:34:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0-r1.ebuild,v 1.3 2013/05/07 15:56:29 cardoe Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ else
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
diff --git a/app-emulation/qemu/qemu-1.4.0.ebuild b/app-emulation/qemu/qemu-1.4.0.ebuild
deleted file mode 100644
index 3879a8be83e5..000000000000
--- a/app-emulation/qemu/qemu-1.4.0.ebuild
+++ /dev/null
@@ -1,487 +0,0 @@
-# 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.4.0.ebuild,v 1.10 2013/03/12 20:08:09 cardoe Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="2:2.4"
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python \
-	user udev fcaps
-BACKPORTS=ebc00c94
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download//${P}.tar.bz2
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-${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 +jpeg kernel_linux \
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \
-sdl selinux smartcard spice static static-softmmu static-user systemtap tci \
-+threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
-mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	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}"
-done
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	static? ( static-softmmu static-user )
-	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!app-emulation/kqemu
-	qemu_softmmu_targets_i386? (
-		sys-firmware/ipxe
-		~sys-firmware/seabios-1.7.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		sys-firmware/ipxe
-		~sys-firmware/seabios-1.7.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( =dev-lang/python-2*[ncurses] )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss !app-emulation/libcacard )
-	spice? ( >=app-emulation/spice-protocol-0.12.3 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( >=sys-apps/usbredir-0.6 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-softmmu? ( ${LIB_DEPEND} )"
-
-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="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-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	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
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-qemu_support_kvm() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		return 0
-	fi
-
-	return 1
-}
-
-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 && CONFIG_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
-}
-
-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
-
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/vmxcap"
-
-	epatch "${FILESDIR}"/qemu-9999-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local buildtype=$1
-	local builddir=$2
-	local conf_opts audio_opts
-	local static_flag="static-${buildtype}"
-
-	conf_opts="--prefix=/usr"
-	conf_opts+=" --sysconfdir=/etc"
-	conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
-	conf_opts+=" --disable-bsd-user"
-	conf_opts+=" --disable-guest-agent"
-	conf_opts+=" --disable-libiscsi"
-	conf_opts+=" --disable-strip"
-	conf_opts+=" --disable-werror"
-	conf_opts+=" --python=python2"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-
-	if [[ ${buildtype} == "user" ]]; then
-		conf_opts+=" --enable-linux-user"
-		conf_opts+=" --disable-system"
-		conf_opts+=" --target-list=${user_targets}"
-		conf_opts+=" --disable-bluez"
-		conf_opts+=" --disable-sdl"
-		conf_opts+=" --disable-tools"
-	fi
-
-	if [[ ${buildtype} == "softmmu" ]]; then
-		conf_opts+=" --disable-linux-user"
-		conf_opts+=" --enable-system"
-		conf_opts+=" --with-system-pixman"
-		conf_opts+=" --target-list=${softmmu_targets}"
-		conf_opts+=" $(use_enable bluetooth bluez)"
-		conf_opts+=" $(use_enable sdl)"
-		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable brltty brlapi)"
-		conf_opts+=" $(use_enable caps cap-ng)"
-		conf_opts+=" $(use_enable curl)"
-		conf_opts+=" $(use_enable fdt)"
-		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
-		conf_opts+=" $(use_enable kernel_linux kvm)"
-		conf_opts+=" $(use_enable kernel_linux nptl)"
-		conf_opts+=" $(use_enable ncurses curses)"
-		conf_opts+=" $(use_enable opengl)"
-		conf_opts+=" $(use_enable png vnc-png)"
-		conf_opts+=" $(use_enable rbd)"
-		conf_opts+=" $(use_enable sasl vnc-sasl)"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" $(use_enable smartcard smartcard-nss)"
-		conf_opts+=" $(use_enable spice)"
-		conf_opts+=" $(use_enable tls vnc-tls)"
-		conf_opts+=" $(use_enable tls vnc-ws)"
-		conf_opts+=" $(use_enable usbredir usb-redir)"
-		conf_opts+=" $(use_enable uuid)"
-		conf_opts+=" $(use_enable vde)"
-		conf_opts+=" $(use_enable vhost-net)"
-		conf_opts+=" $(use_enable virtfs)"
-		conf_opts+=" $(use_enable vnc)"
-		conf_opts+=" $(use_enable xattr attr)"
-		conf_opts+=" $(use_enable xen)"
-		conf_opts+=" $(use_enable xen xen-pci-passthrough)"
-		conf_opts+=" $(use_enable xfs xfsctl)"
-		use mixemu && conf_opts+=" --enable-mixemu"
-		conf_opts+=" --audio-drv-list=${audio_opts}"
-		conf_opts+=" --enable-migration-from-qemu-kvm"
-	fi
-
-	conf_opts+=" $(use_enable debug debug-info)"
-	conf_opts+=" $(use_enable debug debug-tcg)"
-	conf_opts+=" $(use_enable doc docs)"
-	conf_opts+=" $(use_enable tci tcg-interpreter)"
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Add support for static builds
-	use ${static_flag} && 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_flag} && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	einfo "./configure ${conf_opts}"
-	cd ${builddir}
-	../configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| 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_configure() {
-	softmmu_targets=
-	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
-
-	[[ -n ${softmmu_targets} ]] && \
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	[[ -n ${user_targets} ]] && \
-		einfo "Building the following user targets: ${user_targets}"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		mkdir "${S}/softmmu-build"
-		qemu_src_configure "softmmu" "${S}/softmmu-build"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		mkdir "${S}/user-build"
-		qemu_src_configure "user" "${S}/user-build"
-	fi
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets
-		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
-			ewarn "The deprecated '/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}"
-		elif use x86 || use amd64; then
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm script."
-		fi
-
-		use python && dobin "${S}/scripts/kvm/kvm_stat"
-		use python && dobin "${S}/scripts/kvm/vmxcap"
-	fi
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS TODO docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-	fi
-
-	# 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"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		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
-	fi
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-	fi
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-	fi
-}
-
-pkg_postinst() {
-	local virtfs_caps=
-
-	if qemu_support_kvm; 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
-	fi
-
-	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
-	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-
-	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."
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version sys-firmware/seabios[binary]; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/vgabios)"
-}
diff --git a/app-emulation/qemu/qemu-1.4.1.ebuild b/app-emulation/qemu/qemu-1.4.1.ebuild
index ba6f8e2a3fb2..fc254755707b 100644
--- a/app-emulation/qemu/qemu-1.4.1.ebuild
+++ b/app-emulation/qemu/qemu-1.4.1.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.4.1.ebuild,v 1.1 2013/05/07 15:49:49 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.1.ebuild,v 1.2 2013/05/07 15:56:29 cardoe Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ else
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 49e767cab298..52468af38147 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.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-9999.ebuild,v 1.48 2013/03/28 02:06:23 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.49 2013/05/07 15:56:29 cardoe Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ else
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"