xen-tools: sync portage

Signed-off-by: Yixun Lan <dlan@gentoo.org>

19 files changed, 157 insertions, 2464 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 1fcbcdd..13d029f 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,65 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.233 2014/04/04 01:06:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.243 2014/05/22 06:14:50 dlan Exp $
+
+*xen-tools-4.2.4-r3 (22 May 2014)
+
+  22 May 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.4-r3.ebuild,
+  +files/xen-tools-4.2.4-udev-rules.patch:
+  fix missing udev rules, bug #510976, thanks Tomoatsu Shimada
+
+  17 May 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.3-r1.ebuild,
+  -xen-tools-4.2.4-r1.ebuild, -xen-tools-4.3.1-r5.ebuild,
+  -xen-tools-4.3.1-r6.ebuild, -xen-tools-4.3.2-r1.ebuild,
+  -files/xen-4-CVE-2012-6075-XSA-41.patch,
+  -files/xen-tools-4-CVE-2014-1950-XSA-88.patch,
+  -files/xen-4.2.0-anti-download.patch, -files/xen-4-CVE-XSA-86.patch,
+  -files/xen-4.3-anti-download.patch:
+  clean old ebuilds
+
+  17 May 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.4-r2.ebuild:
+  Stable for x86, wrt bug #509054
+
+  17 May 2014; Agostino Sarubbo <ago@gentoo.org> xen-tools-4.2.4-r2.ebuild,
+  xen-tools-4.3.2-r2.ebuild:
+  Stable for amd64, wrt bug #509054
+
+*xen-tools-4.4.0-r4 (16 May 2014)
+
+  16 May 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.4.0-r3.ebuild,
+  +xen-tools-4.4.0-r4.ebuild:
+  force depend on >=seabios-1.7.4, fix bug #510492, thanks Tomas Mozes
+
+*xen-tools-4.4.0-r3 (14 May 2014)
+
+  14 May 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.4.0-r2.ebuild,
+  +xen-tools-4.4.0-r3.ebuild:
+  upstream patches bump, fix security bug #510312
+
+  11 May 2014; Yixun Lan <dlan@gentoo.org> xen-tools-4.4.0-r2.ebuild:
+  silent QA warning, bug #510072, thanks iamnr3
+
+*xen-tools-4.4.0-r2 (09 May 2014)
+*xen-tools-4.3.2-r2 (09 May 2014)
+*xen-tools-4.2.4-r2 (09 May 2014)
+
+  09 May 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.4-r2.ebuild,
+  +xen-tools-4.3.2-r2.ebuild, +xen-tools-4.4.0-r2.ebuild,
+  +files/xen-tools-4-qemu-fix-po-collision.patch:
+  1) bump security patches, bug 508510, 508424, 509054, 509176 2) fix file
+  collision with app-emulation/qemu, bug 508302 3) drop old
+
+  12 Apr 2014; Ian Delaney <idella4@gentoo.org> xen-tools-4.3.1-r5.ebuild,
+  xen-tools-4.3.1-r6.ebuild, xen-tools-4.3.2.ebuild, xen-tools-4.4.0.ebuild:
+  minor correction to deps
+
+*xen-tools-4.4.0-r1 (12 Apr 2014)
+*xen-tools-4.3.2-r1 (12 Apr 2014)
+*xen-tools-4.2.4-r1 (12 Apr 2014)
+
+  12 Apr 2014; Yixun Lan <dlan@gentoo.org> +xen-tools-4.2.4-r1.ebuild,
+  +xen-tools-4.3.2-r1.ebuild, +xen-tools-4.4.0-r1.ebuild:
+  bump upstream patches, add IUSE=system-qemu to 4.4.x
 
   04 Apr 2014; Ian Delaney <idella4@gentoo.org> xen-tools-4.4.0.ebuild:
   Add revised configure option, fixes Bug #506072 by Sven
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index e57c305..5a3e0e6 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,24 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fix-gold-ld.patch 408 SHA256 9ed4a989562890a87c05f6a63c2c2a81528e79f9e2fe5b7ebaafbc4ba874007c SHA512 7456bd9055a84490c5ac156a39ae9cda02dbe38712db5beb7adf572870f619cd897c70d4c24491dbfa3334df7ca56fd0af7494ce070f99f7d6275b9f32e48563 WHIRLPOOL f78caad306e7305bd3bc04a8c6acfda9a7a77cc405bfa74f824138b3bca85e61e8a948e112546c217aa56fe12b2b7f8dff948060bd7e61b9ac28adeca72a2a85
 AUX ipxe-nopie.patch 964 SHA256 0b70407969735f36587fade77f524c1c2077f28585b9e0df4fe347ecc5e379bf SHA512 510f0d88cf08a9a963c0ccf32e795e98f89e749f746ea244b29d7af770608287d8218b215ee46d73ec4f727d6dfbdb316048c6b42df55a8e154aa952abb50c1d WHIRLPOOL 38ed76955d51e9c4603a487e34340df7392e3011e5b2ed550bd945727733cc3f02691c6e0a58ecbe0dd56377a5b6a955a1516647c49cb85dfc809c852ede9e38
 AUX qemu-bridge.patch 3808 SHA256 73155306c318b7a9304eb5b7798f1d2aaf009f45af4d4dcbbc3beeb7ced013b6 SHA512 be35481ea6f9e87a6b1b73bae4c10137379447d9fecf268073015ac10a3091b8f6b0088d494bff18fcb5df27e3417441a63c63bfa3b87dacd62e5a4d31f34cfd WHIRLPOOL e363cb8e666b83b1023e954fd40c4e6d980c6b391a9159cd60d1b4bf775f8376e198e53c3c59a25a820c2f0de9fa94b2245f31d7a77f224362754865a22fe2d2
 AUX stubs-32.h 537 SHA256 4c903162da80cefd394404cb8cd9963a6ef6e3ad6c7adcbaa450a002d929bfc5 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68 WHIRLPOOL 9c006e266bea6bb9d623e76011a4eac07c5fe4fdf76a041cc42a2289a7e9163988bad0fb2f458e300e45aabf9fb864ec764a496d7f89d58e57a506bac206a5f1
-AUX xen-4-CVE-2012-6075-XSA-41.patch 1393 SHA256 6aa21c02e94cb9b4f612c7a9d1a8f980967692b1f20346da9670abb1d7ec688c SHA512 547f63e7eaf0a6db1a9de267cc6f9aa0f28e2221f2c69ca463ada85edbc07ac84c276dcd3ee017ab8846d4e4129e182fb76be35b91ae9a0e0afecdc091e0c305 WHIRLPOOL 848359780edc15895a09bf76afeaa503f907ac98a856b52d64ef4dcb137e2319222a47cd7a2866e6f25731498f487cfca2a462fb6dfcda8404026d8acfff5bcc
-AUX xen-4-CVE-XSA-86.patch 6112 SHA256 0f715b7cecf3c5d786cd9ac8ac8e7b864aa7b332a478f4d94f6296f6b7ae0689 SHA512 79c3b2d77c5e3ca26f5c1368450575854b08f0928226b4313549fd9b67db733fcce09b522f23741199a83b8f20d89e7762b967cff5e2ddbdffe5e8f41d04e7ea WHIRLPOOL 6ae630b50f83dbd11bc717dd3ea02119108987e93d4ce331ad34b850903a8deff975ac16b1f25941dd280254cdfd147f7e5e2a6fa3e4cd15b9a91546aa228d85
 AUX xen-4-fix_dotconfig-gcc.patch 9551 SHA256 93c8726fc3e0bd3f54d4162a3fdace45e3c3ea24fecf5f54270c6dc55c3924ab SHA512 64bfc2dd60bf5a7db593250f9da62cdea4daa458aa8c474ec47b065f6e19509555f48d49ec8624c484d873fe947b6f9cab98cdcd2c24ca8795eb1b64b378a004 WHIRLPOOL 341506ced55ae2ad30af1696434df25ba77c665042aa82dda35d0722f0cccbe567c8cebf51c2e20e0df3084f74f7eb7a69808dea2801f911b2d3c46a293b6ba2
 AUX xen-4-ulong.patch 463 SHA256 160af74e6149a7c8066fa3f0b59c7dc36d0185adc98a3897de0ea26868778c1e SHA512 5188b1712009168c994ad72f9d0b0e9cd708a79244d2fbdd675b2fedb5f62b5b2f6c9f1bdd2101e2b66f1c08ab94f55230f4f269907671d82b00f510d059f2f2 WHIRLPOOL 86c98b5d698535893cd05f05481486a8a96f8ee96ce2add4e14de1d6a18701810d6a2c5925fa6cb367e95ef605c8bf9ebecb7dff7cf01763da4235a9c79c5b3f
 AUX xen-4.2-configsxp.patch 1216 SHA256 2ac6642cc1db65bb087e8179bb81f3a88230c81042ca951f487faf294def1f39 SHA512 50af6a970be4cbeb7f7c2e721a6f5bea13e73dabe3141131844970838ffc5e04bb65e3c7a98f602a3bbb8326dfb8e3f058adfcffe4e267a07cf081786f5bbc50 WHIRLPOOL ddb0c8ad6ee0653d9b30c86561eee9d6c66675023c0fe2fa7911f9639d5c7b21a1c0fc400978cc23ad075f38c28d97bdd64b3ed4e2ce56740415f8d30d7607ab
-AUX xen-4.2.0-anti-download.patch 1028 SHA256 95ff7390d25eddf56af1d98b1310d2ebf97eebcad5c298c8320eb6ce9afd596e SHA512 8d84c3386764e2dd38bd0e93163c016b38d9e634cc4c9078138e593a887f3a9d2cecf391008004ae934a49b24af2a18051aab22b2a83b48fdad60ea50fc6120d WHIRLPOOL d95955f7236c1a4d9e23e5e4be1a8f8e9148511fc16b4fe0bba3854c02e24789c808739654684140d9900f22172b635c9af5bb6910f594b115b1eca4a7c907bc
 AUX xen-4.2.0-jserver.patch 900 SHA256 a8f9c0517b7fa4d56f3125515d260e60c51ef2cfe3fc22223c54415a92ffa16e SHA512 7f9bb7189273ecc34b5c66aea8cc9567a15c3d7e0fbd44e0f49669b067d719c9d85d6758cc213145679cbb8c2224cb5704aabb3ed40925bb2529965a5238d411 WHIRLPOOL ed6bcf1135c7dcb58eb2219c02b002fb57b16f50bfb0161bc64319b78dd7f8b87bc6206952755af900245d13073408946e31a51f01e95517f7def072f4810e66
 AUX xen-4.2.0-nostrip.patch 1554 SHA256 3bab6078b59a086e214fa0786cb827eeeb009d6f7f9901f6a8f1a23b857259f9 SHA512 7fe44ac34a317fc2d1298cea5d26fdd778f8356f3ac9b4fc412c07ca471ea0b21e7fac29f456306681396dee835e4c18c35ce4b7ba47c47153989eeecfb96310 WHIRLPOOL 7701c5b521245ba0b66e9ff53c41ada8e216d36f7a92b2af45aaddc0bd210bbaf21cb9401036b995f2f8d2598edb9324ad50a91f71d08e427caca21b26f101bd
-AUX xen-4.3-anti-download.patch 1031 SHA256 c525684eba4c130193a4e31789e5b5ba6dab9ed6262ad913b0a1816b483679e5 SHA512 96ccf478b28f8286ef313bfba0c91d41e9ac13348cb85e277b39de5b998c80ba0a1df3efcfc026a487aba4474f1c90329a254834d07536916437636e383b9d17 WHIRLPOOL 755df637c5f8599b7ebbb9b0005aa6183d475a9b3049bb2721c5609b68140a7424c42a2682071de4a0c01405461b92f6e46e5929d6b018ae56899daf615463bc
 AUX xen-4.3-fix_dotconfig-gcc.patch 19143 SHA256 53464dbb766f4437826c084e74aa84ef0144964966335a8dfad12372d9e61378 SHA512 015c771ce8d9197c178ee02d756a120ae212c6bb036ad46158762b4728587c75ec96466fc71e3c34a2ffbb580c881feb3d0c367db718a463719ada6905f52fa8 WHIRLPOOL 49f146b8f978341e79d6a73ac38cb1be42ea5a403e1f07941e33ad200ace6bd82f86febe829cce878488562996dfa2610df016085e35610386ecb0fc91587fb7
 AUX xen-4.3-jserver.patch 1487 SHA256 3bbf6d06ad1960e30dc84a3e3b179d5d23331ecf60d347871b7008c58456a6ed SHA512 f92bced9f3e7fec84b1bfce6ce3366f134cec2b892ffc3afcdd3fd3f73daf158c17c312260fae39bc9e04c1dab1045d17f0da706dd0dba0279e66dea454aed8d WHIRLPOOL 10828eb65effad714a61a18bcd6c33c2b7fb7fd0007b1a68aed7a653cd7e67acc04cc5eb9574d7d50c92fc7ca8223dff0c73f1cfde994e4ee1d787f536588b99
 AUX xen-4.4-nostrip.patch 493 SHA256 5fde7414d3a4debc91229ce6fd91194590014ba0da875c0003950311d58f2d7f SHA512 fd473cc94375e9ea73003c9f904d8183a82521b7e35d0a90ce7561d532aacc0eb914b964ffafc9c6e29e4aa47d5da4715a0447da45b0906fc3884dcd50ae6dd6 WHIRLPOOL d8381a365d641ad7ca7702f570d9a48f520cae61c08b67970db42842c77509e7cf2bb133efa8acc95ad3d914f38da0c382871bcd35ce8e97e80b3f61bcc9bdbf
 AUX xen-4.4-qemu-bridge.patch 3557 SHA256 d6cdc6e947bfeeea98698952c9a85c0f0bb19239ebec7051873ed26e7ca5a2f5 SHA512 6f94f089a6a73f863b3e70f9a784cfdcc37a10901a596246aa5e324647484905a3c9c418f672d8895eca0fc36bd61c0df6bc3374baadcc4717c35dcb9a9a0a9d WHIRLPOOL ce78ac4bd098c87fb6794ab52e7a800f9d560e67628f6729ed2a15986e8b3bea72a22b0ce9ff3cfaeb07a39724498d8deba9fd26ae30b7dee6f1ab8c01a2734a
 AUX xen-consoles.logrotate 63 SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426 WHIRLPOOL be108bf298202851de434af513ac8c03a533e7621623c2a7e8f26d498074b3eec81b85b2ae29ad2ec67f4fe9937c88bd78c5f5e260793e7e69ec964d4adb989e
 AUX xen-tools-3.4.0-network-bridge-broadcast.patch 496 SHA256 d00a1954447fc29500ab2f1a8c7900310e0dee81942be5c922ad66b6b42dfb74 SHA512 496c61ec237506c77577e832828de923283f55ab07ad141718af1a719b1b5bcdb8152a8cffddc679ff4a3e389582e7b8de8aaf1b4c8b1124bf1563467bdf674f WHIRLPOOL f80a557ed62cc26a51f85bc8682a738ab29d4573e3261c440f6e66f50cd81263fa2c6898b1aa1b1c227a2d3923cc9fd718ffad2e123ee69c6d7929def7906433
-AUX xen-tools-4-CVE-2014-1950-XSA-88.patch 851 SHA256 7a73ca9db19a9ffe6e8cd259fa71dc1299738f26fa024303f4ab38931db75f14 SHA512 16cb312d5f8f3e83850900ed4c557d9f47e03670ffa8b148a4ac3ca792e309d86706f05119244c9e29b37e366a11d7dbcd4b5f1b47936c9a7b65094fabb4965b WHIRLPOOL a3c21b03a00c3d61bb9d1c843a371f14bb9d3b13aa18bdbc59020bdcf542aadbd027f4357b0b3298f32a4e3e0928ad5b6ccbd4e7462238a91ea8708eaad28fe3
 AUX xen-tools-4-docfix.patch 438 SHA256 016120c2333667aa84861ac9289c48a072c4842fb517936570882e1fc4060de6 SHA512 0a67d703749df823f5223b555c6dc896420e73ed7eeb5e77a8f8b950fc8bafaf9e20d66c35b29883b3cee6f8ca5054af3b55f804d20ae20d676feeeabf92b489 WHIRLPOOL fed73bd521b4cbea804ef4bc3b4b3a4007e7765cf0ab67e700e95afd328181ab5fce246b53a5e2a462baf6029664b25f82ffeabc1aaeb45fa99af344ecc957a5
+AUX xen-tools-4-qemu-fix-po-collision.patch 924 SHA256 d222f47362f60b284057709e6432a7e787c719b28e5378209a9e58e551183f0e SHA512 ac78d68cab8dc403b83c5ec30dd46efa283241c76febdb91ad1b706b2dd4a3f71d6d3edb33480014cd20140a99b12f15faaf35f1d84b9a74cc67bc652fd22a9d WHIRLPOOL c1667f14f4e35fafdcad91765f73675e3523a57e534ef82da67d7a4982b31314925990aabf7707c3646ccd537ef10ea019054c33e08d53140209053fa4826694
 AUX xen-tools-4-qemu-xen-doc.patch 820 SHA256 691b2d84f7312388d528c83f3e9e90521e6b2c97abae8ca8a83325655264c98a SHA512 bc07420be7629796e49e128c1cfbde8fa7d4dc3b66174462448e9033f78c0c982dfdbd4dde9b1c54a9862fd2f9602c6bac0be1dfc0df8280aaaf8de60acb708f WHIRLPOOL 4fc2907a42bc3f824160f92586392f7dba07c2229382585f5f7bf4c0f3ab2574a814e8e8fd076b68abb2580497492e1fc0e6181ffb8f1acb5c70e60caff81505
 AUX xen-tools-4-unbundle-ipxe.patch 1294 SHA256 8358f99924049bdd7e8f00a0f68250c33c46796d30457e885c6a36d8b23dd4ca SHA512 dfe1504bf5cbbf14060e16ef8f24c64c51d68420ede80c8fcd284ae302c50840cb305ff65f2279f3f8749cb62ad9c49fbbace6bdc3d71decca16398c40e4b2cc WHIRLPOOL 9801cf864928b8df55900164cab6d80c9b01a2e8e8685c003394ca2cc098ea969a0bf15fea6be7909a33011dd0fa45748446efe439d60900b1bd9daa3587bde8
 AUX xen-tools-4-unbundle-seabios.patch 805 SHA256 45e5d640fa071fe5a2e1f4168bb01851fb6e1d273b245b717f20229cf99e8d36 SHA512 96828ff555aa99347e9beda2adecbfe7fd27e9f9f0fc1491b470e25917aeb885d92d6ff1bbdf6282f400a76fc117c41b62cf71fffabbb9a1a5ddca20173abd6f WHIRLPOOL 29090b75288c23d8fd2e39cf7404c89e4c3fc209f7b29c87a5f7fdfc037e3b99ce7643bb2517e76bcc457fc5e8db49a4991c3a13b941db4d9e4c1ea861aa35f6
@@ -26,6 +25,7 @@ AUX xen-tools-4.1.1-bridge.patch 449 SHA256 71eea5408e3600c3c6f7ce4e8363ea2c19db
 AUX xen-tools-4.2-xen_disk_leak.patch 2324 SHA256 b5d07dded35d48196afe4e52e7e48ef459b527c4b34f1aad13710dae94cba6c8 SHA512 bb8a36a30e69f6d09c9293cd76f071741ce04bf0d0129d9417b3fc41841f6dcb0160506a80222e67d58c78a289072913578868d6a055eb23266d15d5fa59ebe2 WHIRLPOOL c0c69406f564b335a3215a7cea8a447ad7d2b27590f3cf92c74c74356c46ed26557fee3ff5fac5a8ae54f7d8dc1772500d75d9de1630a57ee48d8193a6fdd1e9
 AUX xen-tools-4.2.2-install.patch 994 SHA256 4e86e9aa4bb884fcdeec8824c1ec9c54d5e5106f9101b6ca6eb0f5fea6b953b9 SHA512 99b179082eda1326b093f04f9321b3133beef8f7689cc3b9ef626b8d08744629b7b5867a96cb31d3030a4db3f17d230d506828bdd87631989809139459e81937 WHIRLPOOL a5de9e0897552eab01741a8147c871909f48ec11238c9503f7902c94aad6df65baf0fe54b013145fade8091ec452c03906f624cbcd417e3cd2aac6f64b12ffd2
 AUX xen-tools-4.2.2-rt-link.patch 1371 SHA256 8bbcbf69900a041c368a219aa6a3eca13d802e54a29ccfa50db4f86691ba977a SHA512 cbfac7a485c811afa54740c638ef161036f36d09d11ee3df6ae79fa9d6fbae174933946f83b4dcaa7aa78124346fbb9b9bd3e969fa73c121afc64d8eda1ecdec WHIRLPOOL da90e1b6983541d52d26dcd1dd168ed3d05e6ab69624914c544af7a6102ef66de3594fc2b07f8fe6bb7f5233781c7c35bbbb9aa8a52dda0dc78eb57f05765b83
+AUX xen-tools-4.2.4-udev-rules.patch 705 SHA256 89b5eb99b4859f2f34ba55841118a21811e54c8d410ce4d14af4f21d25efb458 SHA512 90eaf7bb8e504ac035cc83d2a953af76bfd990296b539f8bf33439674ce172258171aef68617209a6c83788998bb968a3acb4c727b7f8965bef0eb9a5cd0e0bd WHIRLPOOL bf385acd06d335822d096e136ffa3ef1311be5de84b78058d788093cf87399b48801a4e020fbd0766ed3c0e60e8b211dfd8b2af4ca28ee7dd33aa8027238bef5
 AUX xen-tools-4.3-ar-cc.patch 4036 SHA256 1470887a8ced12d8df61ef74d6dfcb36f2822fa95da7031162ecb577f69ae49a SHA512 1171b5005a24fbbcd4ad9a68153c78ce816aa823f0452a707f3e26d5cee0a0faa05d917db3edcdc7f2924dcf9fd8aee5d7ac7a419723eebe3699be7a32765dd0 WHIRLPOOL e5c3a2adf7e55e7690c4123f442e8f43f66030015228473f9d4d69230eeeb82714c89f502942cd9a76e0637d70f6dc2ebed7eeb3202fbb6cca430c8af420b549
 AUX xen-tools-4.4-api-fix.patch 1586 SHA256 d4e2a090f38333996f14328c9b0ded2a76cb336637660446003cdfb1bc03ed49 SHA512 883c06d3d30d3b61815e0bbc69de49c11196e2bf8af7c32b4ed4dbd034596906c209e1714a5f7d9bdcdcdd289972b7b7163351c4b9e324640429e8aa598ec695 WHIRLPOOL 9a3b402487e626e4cf02664231ac263550c4f2e862f2e0d729157823217b94e7d07299e1363e8f0dc0afa0199b455f7a1c08601a4ba4b0b00b60b479f93b83c7
 AUX xencommons.confd 109 SHA256 e19b950b1bb4103f9006a0c2648a8d4bc890e2c67417de2700b82fb456802640 SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17 WHIRLPOOL a8b7df6f9a8515b9c3c845379a3aa4424490972d5f882e8779a30fd2d44b77cb66deaa5c1496125ea7bc82e06044a485e14e904ad5c9c79222c008fb6ccc4e74
@@ -41,25 +41,32 @@ AUX xenqemudev.confd 156 SHA256 61c5ff72464c5098d9cad50e5dc94a090dd107b4831bb60a
 AUX xenqemudev.initd 1847 SHA256 c1b002a54917f60adf6941fecf44453c0072a9048c9c3e318d2e695f7ea12c72 SHA512 3fb6a8c5d35b773e0fb7bc9b6c26aa18be48b97d95cbb21df8aefeebb814e3fd5819d579504a4015acb0e5fd6abe2f864f48ea83c095cedae2c69720b6e355ad WHIRLPOOL 2a286111d18eb1f8701f3d30e1fb0b006e2ab359db1ff32100e18fd0e4f46cf13407d765842542c38a31598f62cc71f246bb5c11d06410336850c0288c9e8d4a
 AUX xenstored.confd 42 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831 SHA512 0906cbcdc84935d07cf53bc4447a1f9a9dc4e4fb9fda9a7163f6982f1d8a3ada1f0650fcd254fb6f715a54f7971daf0a5e61c3de6db70dfd156156fd55b59fe4 WHIRLPOOL df46f3fde8b13c3427f445bcf08eb4c660f6000164a01e461cff85cf93ce1195009fc3b4457181788da8eef8dec9125b41ace233ec6f169919be64337a57ebb8
 AUX xenstored.initd 1056 SHA256 f16d6e4c319aebaa480e75cd32a754aee059223256bf786d7c983fb0c17e2a83 SHA512 a03312a736aed161ee78021493ab109182465053c6272a8281263f7ae32fd7ad3de83ab066441d827a78b24c5d65fcf95e55823a13f6e8767be1ced144fedbcb WHIRLPOOL aaf28f1cb86f8be5f7dd1922ec5918a74538b9fd81eb51be47b1e4a6235a399ea037e9e48a54b1d5929217c98b644ddd6a7dd4b6d796ec7eeb7bfd50450633d6
-DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c SHA512 c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4 WHIRLPOOL 58b7459aaf7323968e2f4d1cdcb563a04a0ee40d7d0e8fc600495baf6914127fbbbcddfb66199cd9f462eb59565b3d1ae90a05b3c771b8f13c2d2dcb6070eebc
-DIST seabios-dir-remote-20130720.tar.gz 3201017 SHA256 0cf06b54e8ae1cfc25f2942eea1490a9e7e01f478541577025f6eef76e0c76de SHA512 e9ebe3711e3f678d3632f8e8e645f8be4fb65608aff04aeeb0e1152521bf571bc4d879f136d23bb0aa8bd4c4ec20f294b472cf54dc70916e52d330328aadd357 WHIRLPOOL 6138271f72fd96fabe3cffc07a6efcb9c0e195ed96f4ad708d00e85e0a84a03900dc41389cd4f26d533a3aa42142a9e17708d7b87d722f1c9348f61a5db3e59d
-DIST xen-4.2.3-upstream-patches-0.tar.xz 84436 SHA256 7c2477b9b29c9d84bb26ed60bfc2700f2a614ed8040b93906e801831f3498b41 SHA512 a4e8b53a0efb9d64d4dc65ee3107422c8007537e03f9c8e6f1b2c838cf62e6819d447c1ed44aacb5c4e9979f0dad7ed313d2db61df6e6ad2d7708a81964a7e12 WHIRLPOOL cc3c2224bba3b2e5f057ec95f9e85e58b17bc0dce338da429c7970877967cddf69228258ff491be9c1d022169a90fcde34ef1bcb0c198c9123ca219707a5a99f
-DIST xen-4.2.3.tar.gz 15613235 SHA256 69b6a73701383d609ad094a38925004e8595755fb39a6fafd579ba754e8667db SHA512 01521c8724354f92a2555683a8b103e5e16aedeb2c6166cc3ce40a0cc6cd9e07a601aa24930bb7391e00eb97f04003e6523dead09382cf86eb56f5b886509b9a WHIRLPOOL e7f7848ad632e5e77db95b2eb37c82f31a73021af4b6bb44091cc14103faa193bc2d6deb089e2a196daab5a08dbc08f135a8937a25a4ff5d31fe37c789bae1e9
-DIST xen-4.2.4-upstream-patches-0.tar.xz 15480 SHA256 c01c2edf3f7f0f3e1c9408f2eddb2ee3d211a3fe44833852335488bb585072b1 SHA512 3eb85f982478b9c09db94978fee4e042c556ddcd4b89aaff1c4a3adf07b118404eeacb29b83e58e2e8a1d389d0027903458d14b2b900b31f4806f7c428a387b9 WHIRLPOOL d4c9b0550b0f38f5227ea305c0b983deafb97bdac4fa498bc791dce6796d564303813959a1a90d488b69d5540ef9a65fab70598329420691d30b4f4c48de37e9
+DIST xen-4.2.4-upstream-patches-1.tar.xz 27932 SHA256 8f246eaf65a7cfe72cd9af596993ec1326dd1c4411efd1b76294a7bffafed119 SHA512 4d0eca51d91588214b06c3a082fff62ffb69fa518f0d1afb28e7489ffc1539751a586b334db6cefc7ef99ffaaff296af26c85a6dc114db7d78663de7748922f3 WHIRLPOOL 28e82065d033bd2ef0b140a2eaf2aea546e3e7ec5fa1e6f44a0d4dd7c26324981805dbc9f41b13fd3b12dc8440dfa74a1da79b117f7294e222b7407ad7371f74
 DIST xen-4.2.4.tar.gz 15663999 SHA256 e23e6292affd7a6d82da99527e8bf3964e57eb7322144c67c2025692b1a21550 SHA512 3e5263511e7c40899f580f3384bd987f9c875b8e6816202fd1a5a64fe7e336803d09e58148af074938ef261f0ceeafad121ac541ddd2bf66b76c5aa4ad07c357 WHIRLPOOL 25d23f5d921139ba0f853fcd76ae998647d32292bccfd4e7c4f3b12f860a38fbb33ebda67c839657bf3a25d837c9c02b80d663362263d16d42284ffde09f0bc2
-DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca
-DIST xen-4.3.2-upstream-patches-0.tar.xz 13844 SHA256 c083f9b4490049cfcd83782574f52847df9b5738c8fe3220481526e73d01c380 SHA512 69c5b4fbfcf4ddc5964a7c0b60012eab244368d67c625cdb67d9c33f1e273c04234bed1e78de9e6a40ede1a30d279d5d588718bd5f210d37e016e53c03a4a0f9 WHIRLPOOL bb7b088fec542521fe6a0438607618c390f83da379f9a6de57472afdfb0f5d4a3aedcdaf43716df4353eb1cbf642a34e2da546da974bb8906a6780486d3844f6
+DIST xen-4.3.2-upstream-patches-1.tar.xz 28004 SHA256 451df6bc293102a8f5eff0bc5b2c9feba0d8c0df5bdfba5591fac405e4f0141f SHA512 c0fd9ed16773e62121290dfc85e082997b049756a5038b0e3d4d618566a86abcf8baf499d176a529d8c33e2b333bd2be11dc075d026ce21b0d42d20b141c9e4f WHIRLPOOL 9a01940b7247a448ee1795539682a79dd70b470a535f438f077d2da7633f06eeb01c26c62c504a0e7ad68d7156957f96d8e966762b9c782e1bce37416b40a648
 DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69 SHA512 ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302 WHIRLPOOL 72250369fb2c90ba608e1da018cb6417b3089642c8ba59af9f2825ec5ba7c4e6c5d6f86140b20825817e4625727c6d58c5d38b00863c994e31c8a04927997bd3
-DIST xen-4.4.0-upstream-patches-0.tar.xz 13124 SHA256 78d3e7dfd8c2f6243954fa320406d332c318e598e0602b4a7df7949260fb4f16 SHA512 c8bf9687742c352f20df85eee9f72e7d27a4250612396be7d61ed0e2251f1508f0be4ebecf39e5fbf001f7dbc5642f46a9d388dfb6f75231998f0e7221c9a6a1 WHIRLPOOL 2fe18ea84cacb4b2baef8c701e3383c14b9d354b3dfab6ffc14e455a764815c520a00ad485d7faf6281e60f4b09010fd2f71e497313ed4af7fd4b44cc9eb3716
+DIST xen-4.4.0-upstream-patches-2.tar.xz 51840 SHA256 b1828719a42a429d66c4943bde714ac98dbd368d9f337795b3a9da4e7d755e22 SHA512 dabaa350dcc07f91df7bb4712b69f8fb5c5cf624b5e6ddfde75be891c4d7b7a81e0d8824b707fdc85a4de98929609c9f276ee871a54afa15ff21d80cebf31f80 WHIRLPOOL 6326d13e69090957d8f7f6b2cb088d597103d03b54728f37a49b89b7fac71446b4aa11c535996b206c1c7373eff8ac693e0f48b7fc3e69a566362df6eb6ecab6
 DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406
-EBUILD xen-tools-4.2.3-r1.ebuild 11989 SHA256 a32aadc6a44ad5181288bf970147576a6a1e6229a577301eb8c127f91ee2c6a0 SHA512 e7f1e7f774a985acbb68cd5c9212d930d1ee8c6f64f115f15768c0af12b09590bfc32e796a9127dac0f7a7a879082a9cc3095e049beee897b095afa32e63ea8c WHIRLPOOL 15d09e5044937f542c29df861fc819751f0dbc0325cb195924bc057e86c9d6b0c7723315ca16e71794654a280cfef29609f7d48a037faa15bf18c33e73afa120
-EBUILD xen-tools-4.2.4-r1.ebuild 11988 SHA256 1b4a6d056d91e9097fb5d1729d4d890ffc7e191eb058b9107c206f68869f76eb SHA512 d1056bbe0e0c5ce1cbd8302a75e8fd78e0e0e4fdd0c6f495632d412ea5337f346b012e8f6b187e6ea54d6d270c59af89c62d16d9e23bbb5ddfe4788b660958af WHIRLPOOL 3fdec84498e9ce72289e32ff46de9b10f39eaa8df89e71ccd5a2bf14b6a53de5a843856ffd43a8e02aa9b075e7540405960d6a25ce636d63dbbc173e16c42f36
-EBUILD xen-tools-4.2.4.ebuild 11987 SHA256 ba8f8215a30ad9c8142afe162daa9ccf622a1ec6a1c886e2455c9d0711f30d7d SHA512 0529a8831529bab34a8c44b3e28f740a283fee758ff3fbf496c80cba47cf983a2bd5cac56502ad958a305f62680ecd31554d254b68e0e2b165f9372b45c91edb WHIRLPOOL 7ac8b6c68f851c8456b75a6d1780e33b632d330100c489e5a266fbd917f240590e57ba8bd92ed8dddb4710995032f313d92124e8ff4792e3a492633e83bddde0
-EBUILD xen-tools-4.3.1-r5.ebuild 13361 SHA256 a8ce8d82a364d052e4cff8e0488a3a4270195454f36c3147bad7eac85d1fd759 SHA512 5627f29c7ec9710db00c828d4cf3d919f75368f82ca21c8398c04d6ca98e92541b07b5a3491ee289f652b5d532249e98cd85820a4f56a7fcfa9c78b9eb42712e WHIRLPOOL 3850ebf7e61ff79b79eb0f00707b7d9da289188a4f09a69d45eff3b0b680a6d3474773fd7ff280ff6a70d54c8cf6d9ff38bb3b195d491bc068d2f5584515eb7a
-EBUILD xen-tools-4.3.1-r6.ebuild 13005 SHA256 7e958545d22e0bba03adc8a00a8330f35f27dcb426bb6e0494a62a4dfe1510a3 SHA512 2aa89d5b14842c7acb77a0e81899b5a19cc40ca2a223936fd04f584c3ee147b56efceb59759162f1ff8197d482e36ee8434cbe8cb508e8d16ab38e725a8f6ff7 WHIRLPOOL 95969a9eda5f3a1b9e731baa23470bf39ecfca37788d7e88b109e4b9763435a5f875ab206e79de646a281db5833c492aee1e89ce39905d17ce2b6fb04a66e4dd
-EBUILD xen-tools-4.3.2-r1.ebuild 13246 SHA256 946a64bee6fd8450161acc8fc94037926e4a7e94b8bd1848a990d60902a2b67d SHA512 e784457dc346cacc8ce853e4520eddc93a185d79babbd8af1efe6e9913d2dfae5935440d7f430d4da4108f2a8184e9c3eb772aaaf2df6606ca5f4ceee0932b90 WHIRLPOOL 31cf9992274c5dbfc02fabd932a1cc90ef672bc5e6386705d2f53958b937bb55a45029534d5319bff6c2db61d898e04f9030d6cb857e3ce4cfeebdb550c5d239
-EBUILD xen-tools-4.3.2.ebuild 13245 SHA256 34e4c318fe5d1a21020488f8f4c81c856451471d4ae86ca5d145c71e422ddff7 SHA512 fbe50cf92f137887c609dd201a3af0a0cb0b9e001b933bf54737e82962cdf971d6cf4964265d7ed3bd6d252b7e202a03e6596e00bfb393854b1ab0c15e1d1205 WHIRLPOOL 3d8d1facf4368adda3144277b07873eba9b79e0cf7eb11da1b990bb306a2bcdcb6ab4be038b59bdae1953dc1fd980e19fc0b389fab359f4fedce56fd25371394
-EBUILD xen-tools-4.4.0-r1.ebuild 12805 SHA256 8aaa670bd309b13b4f4cdb75f7ce23b2a9cca86719dada438d1f57a45ac6e261 SHA512 59ac932a5a3939a0bf284b6683e0f80c750708004b01ca9d3eabfe4d0668362ea32bade46b54773597384ef56fda4badd8bfabf50bdcf451f9796d34e7a318e8 WHIRLPOOL 3a9ec97da5da0dd7baf8f7bbb6d5eb7af1ff8507e4878df13eada0ad00a53aaed828c1827bdcfce035d856738f6645eedb89fb1ad1600f7499d1a2c840826c15
-EBUILD xen-tools-4.4.0.ebuild 12804 SHA256 1aa22d9901e644e939b64dea8ba7fe05b38ce310f2f5e5e0b452910779e17136 SHA512 d5008cca7db804ac2ef6f5acfa69884c5c95f1947f72d107c35d294bf2c529bdeb734b4ad3f6e7bc19a2b0ba93d5dbcdf1caa8faf65e7f461d8647e9ffa3d810 WHIRLPOOL 545ab44cc507c248338f95e4e97f3e367ed27f4c7f1285a85e904901ba3a4de0e09fea976e90812bd52532ae10ad90c5869c7457fe0f5e0a4effde7b3393584b
-MISC ChangeLog 55291 SHA256 df2cbd17bc5270984835955c8295d5168c059ab0252b8ea1d1b9ea2274d81703 SHA512 0b08aec6273a9e12687b43f6e3c67e3f80164106ee4a0f8759f8ce4877c970e87769c063527f6c0932379ade6bd1011e973f10e86253185b9d51be44f527b0a1 WHIRLPOOL 80b1e9781044af4486b3b783a32c854c5f506949fa4d54fbcf588c1536eda9b83e0ea16d91d643f77f5c45452c308d5f4301ca636ef4de178f3cd54eaf19b5ab
-MISC metadata.xml 810 SHA256 adf8036cf95a218b6ac09df641acc482e39557e3cfd16728e03af04810c92e36 SHA512 8fd59fc4b8110132df068d3658b8d48b9f10c36243b2ca340c5b178a58eea12bc7531c14b6a41478a0aa754a2b29ec1bf32827d5fca240ad1237c017e50f1de9 WHIRLPOOL 01e873b0cebe4a40f702e0977efc2b3f62984032e3ff81d3e45b3e291712e51c20510f41dd1402bd4d916a674204b02acc49fc6e6be53cbb0f4fc8430cbb53d8
+EBUILD xen-tools-4.2.4-r2.ebuild 11986 SHA256 ce01ef25bb3545e4a93ec97a371dbf657895bf21a7e947a6cf81e2586dc080ae SHA512 e7a248987b6516495c9189b27caaec174798d62c486d685ab10b05ffe5033bceec07182e265d5227c83fd00372a86111b50594558990ee018892f431714bee66 WHIRLPOOL 2b37bdcbe274a6848f12f7eaf5fc6b2aa983ac809a2c8d30900d10bf6894d43546eb0df63f9003c25953641a6f664faa69acd387d4bec34c7268f10165c7b931
+EBUILD xen-tools-4.2.4-r3.ebuild 12048 SHA256 9f3611f949a836ee5023fbaf3b516954f41e6e5ecec046bc07f818e0d73d45ec SHA512 5193f73cfe9387aa132c0d49c3ef176d1ab51645aa76f30f7b17260d272ca2280657a03be89674ce94bece9fab96b859709fda8997dc8a9f7f7eb4bc5a519ec5 WHIRLPOOL 561ab987e019f93d31ff0c14e08e121b64396e854b8f2666ce51deb6aef7591306b12a14f3dd94b08fde3aa3ec2c78f378c562e4011ceeca4b3db0046c792629
+EBUILD xen-tools-4.3.2-r2.ebuild 13245 SHA256 58f321dcf96d8d1b5998b9d44be9df8656aaaee2bd946f35a1b9a3c4dba6cabe SHA512 550e6a6332a1a486b88ce2b39fa52b524aefb1f095079ca1275cf776f46a2e740088b23270209127303d7bc536a311ace6bbc85c28114158e6ade1350f41768d WHIRLPOOL d74c89983b6622ab14f64e1fb37429d50d812180036932e046114c7bac367d52f61b33e8d4794299be56fed4c8e2c26741cdc2eb7e7d4960bceefeaeefcaafc7
+EBUILD xen-tools-4.4.0-r4.ebuild 13092 SHA256 45111f65638ba18dad929543c5c782c8711b215c351ce4aae7abea42a5d582b3 SHA512 5065511f1cb11472da837a5652b73c851fdceb3473b2ce82cf25c05f840e5a8aef53320c554437621d95ee8292692aee18a95fff312568e9fda5253657965bf7 WHIRLPOOL af442f2682dd8d4bfd99f78874e47a5e94ceae5673af29dd9ca13747bd3035ecc6a2caf6a9e928ce3f43f6fa039a5905c49fee88121a08fb973ddb5d4bc12171
+MISC ChangeLog 57563 SHA256 e09477e35cca7bc816673c8cb62b97333ca27b6a793d312ac1683f037807f28f SHA512 844e539d22a3b569ecdb2f1312c5345d51d572151abf4ff515c7e54c192142e1fa6f3fde53815dabb69e05f7422e75e8cd9f0fa9d84b6c738663686ad38316a8 WHIRLPOOL 9c7d9191f8b76668df8c700a07216a887610b3a1ab22fdf66e67ef4c413bf0aa596aae72feeae80e344453f00543b3864b1d77134cab676980a568b330662d50
+MISC metadata.xml 907 SHA256 3a4a48068d7123fc4942ebbf10b09f12add6e8dddb62adac4b6b76ddd591f8d4 SHA512 424f8bc1caaa5304df91b4c80af900e053c77f760b0d6c4b7c1ae05750f681457a862b7b9ac31017d4a8ab9fa25601090ba961a601a1b19e4eca19f442249a41 WHIRLPOOL a9b30ce1ce48a3acc64e4e49f4c1f516cd38bce19c2c25d513363c4e2cda90588e7c42498b026af0b103f6a6d2fc1d279bcdd6ac6077ffdf59bb28d15711fa69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJTfZOEAAoJEJIMDbyqvv1VGAoQAIehn1lrSDPZvITcgPG+ktUm
+MpTOtZB46BGNng/n9Dwo6fJ13z9ObofqrUcrqVqBkklmtBq3ntNnINifIjYeeHqw
+I1/TgYRdC3429uTnSdQapLud0A66WfVA3VnEfk/7cdEEciMODf7SE3h1fQZ4akqp
+nGhJ0cTSGmfE747SM7L9Sg1N/cOUhCEmnHNM2w1kTB03/yR8My5T0XkFexbtLxKk
+U8iFxtqmfFfO7oQuaiNIKyj0e99YLSnsysCTG4FEaLk/ezM5Vcfw2YpUeLCB0FkF
+z1paGzJcdpbJF6VfbDOfqVtsl7orHdC0sjy8UXSjIOW3ievi06c65sc9xczX3FKb
+0LkSOu7nleT5HJ5yE8IQukDoMYgk8f6nOPPEAe9ZZDhvX5eyrts+D2CaJeQxrN3s
+i20YJiRX6hcELOFCDyfVSIH8+ejFWXWdm7c2lTzUdDNuwgEEhuVUaaulqGDwf6P9
+IgiNOwVA+Zv9K/5BG2dvvNFqhx8G1FaJ7mtVkd7fAonGxkyJCAUl5+48wAFrLW3X
+4AcNm9hzIB5jOusx7HLyXVWFi+lX8w14KJOyOhiZ7DhiOPCaczF3BQC9Zb6vAS5J
+7JssBMPavAB+NXkJKwZUzousGRdOiCDS7qrPc2np6CmgR/8JuGNz/gCr9WNkIvLq
+vlsV+S3E+uEoe7hKVV1c
+=8bjJ
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xen-4-CVE-2012-6075-XSA-41.patch b/app-emulation/xen-tools/files/xen-4-CVE-2012-6075-XSA-41.patch
deleted file mode 100644
index 7513ac3..0000000
--- a/app-emulation/xen-tools/files/xen-4-CVE-2012-6075-XSA-41.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-authorMichael Contreras <michael@inetric.com>
- Mon, 3 Dec 2012 04:11:22 +0000 (20:11 -0800)
-committerAnthony Liguori <aliguori@us.ibm.com>
- Mon, 3 Dec 2012 14:14:10 +0000 (08:14 -0600)
-
-The e1000_receive function for the e1000 needs to discard packets longer than
-1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes
-this behavior and allocates memory based on this assumption.
-
-Signed-off-by: Michael Contreras <michael@inetric.com>
-Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-hw/e1000.c
-
---- tools/qemu-xen/hw/e1000.c
-+++ tools/qemu-xen/hw/e1000.c
-@@ -59,6 +59,9 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
- #define PNPMMIO_SIZE      0x20000
- #define MIN_BUF_SIZE      60 /* Min. octets in an ethernet frame sans FCS */
- 
-+/* this is the size past which hardware will drop packets when setting LPE=0 */
-+#define MAXIMUM_ETHERNET_VLAN_SIZE 1522
-+
- /*
-  * HW models:
-  *  E1000_DEV_ID_82540EM works with Windows and Linux
-@@ -805,6 +808,13 @@ e1000_receive(NetClientState *nc, const uint8_t *buf, size_t size)
-         size = sizeof(min_buf);
-     }
- 
-+    /* Discard oversized packets if !LPE and !SBP. */
-+    if (size > MAXIMUM_ETHERNET_VLAN_SIZE
-+        && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)
-+        && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) {
-+        return size;
-+    }
-+
-     if (!receive_filter(s, buf, size))
-         return size;
- 
diff --git a/app-emulation/xen-tools/files/xen-4-CVE-XSA-86.patch b/app-emulation/xen-tools/files/xen-4-CVE-XSA-86.patch
deleted file mode 100644
index ee56b9b..0000000
--- a/app-emulation/xen-tools/files/xen-4-CVE-XSA-86.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From: Xen.org security team <security () xen org>
-Date: Thu, 06 Feb 2014 12:39:17 +0000
-
-From b4c452646efd37b4cd0996256dd0ab7bf6ccb7f6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
- <marmarek@invisiblethingslab.com>
-Date: Mon, 20 Jan 2014 15:51:56 +0000
-Subject: [PATCH] libvchan: Fix handling of invalid ring buffer indices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The remote (hostile) process can set ring buffer indices to any value
-at any time. If that happens, it is possible to get "buffer space"
-(either for writing data, or ready for reading) negative or greater
-than buffer size.  This will end up with buffer overflow in the second
-memcpy inside of do_send/do_recv.
-
-Fix this by introducing new available bytes accessor functions
-raw_get_data_ready and raw_get_buffer_space which are robust against
-mad ring states, and only return sanitised values.
-
-Proof sketch of correctness:
-
-Now {rd,wr}_{cons,prod} are only ever used in the raw available bytes
-functions, and in do_send and do_recv.
-
-The raw available bytes functions do unsigned arithmetic on the
-returned values.  If the result is "negative" or too big it will be
->ring_size (since we used unsigned arithmetic).  Otherwise the result
-is a positive in-range value representing a reasonable ring state, in
-which case we can safely convert it to int (as the rest of the code
-expects).
-
-do_send and do_recv immediately mask the ring index value with the
-ring size.  The result is always going to be plausible.  If the ring
-state has become mad, the worst case is that our behaviour is
-inconsistent with the peer's ring pointer.  I.e. we read or write to
-arguably-incorrect parts of the ring - but always parts of the ring.
-And of course if a peer misoperates the ring they can achieve this
-effect anyway.
-
-So the security problem is fixed.
-
-This is XSA-86.
-
-(The patch is essentially Ian Jackson's work, although parts of the
-commit message are by Marek.)
-
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
-Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
-Cc: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
-Cc: Joanna Rutkowska <joanna@invisiblethingslab.com>
----
- tools/libvchan/io.c |   47 +++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 41 insertions(+), 6 deletions(-)
-
-diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c
-index 2383364..804c63c 100644
---- a/tools/libvchan/io.c
-+++ b/tools/libvchan/io.c
-@@ -111,12 +111,26 @@ static inline int send_notify(struct libxenvchan *ctrl, uint8_t bit)
- 		return 0;
- }
- 
-+/*
-+ * Get the amount of buffer space available, and do nothing about
-+ * notifications.
-+ */
-+static inline int raw_get_data_ready(struct libxenvchan *ctrl)
-+{
-+	uint32_t ready = rd_prod(ctrl) - rd_cons(ctrl);
-+	if (ready >= rd_ring_size(ctrl))
-+		/* We have no way to return errors.  Locking up the ring is
-+		 * better than the alternatives. */
-+		return 0;
-+	return ready;
-+}
-+
- /**
-  * Get the amount of buffer space available and enable notifications if needed.
-  */
- static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request)
- {
--	int ready = rd_prod(ctrl) - rd_cons(ctrl);
-+	int ready = raw_get_data_ready(ctrl);
- 	if (ready >= request)
- 		return ready;
- 	/* We plan to consume all data; please tell us if you send more */
-@@ -126,7 +140,7 @@ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request)
- 	 * will not get notified even though the actual amount of data ready is
- 	 * above request. Reread rd_prod to cover this case.
- 	 */
--	return rd_prod(ctrl) - rd_cons(ctrl);
-+	return raw_get_data_ready(ctrl);
- }
- 
- int libxenvchan_data_ready(struct libxenvchan *ctrl)
-@@ -135,7 +149,21 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl)
- 	 * when it changes
- 	 */
- 	request_notify(ctrl, VCHAN_NOTIFY_WRITE);
--	return rd_prod(ctrl) - rd_cons(ctrl);
-+	return raw_get_data_ready(ctrl);
-+}
-+
-+/**
-+ * Get the amount of buffer space available, and do nothing
-+ * about notifications
-+ */
-+static inline int raw_get_buffer_space(struct libxenvchan *ctrl)
-+{
-+	uint32_t ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl));
-+	if (ready > wr_ring_size(ctrl))
-+		/* We have no way to return errors.  Locking up the ring is
-+		 * better than the alternatives. */
-+		return 0;
-+	return ready;
- }
- 
- /**
-@@ -143,7 +171,7 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl)
-  */
- static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request)
- {
--	int ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl));
-+	int ready = raw_get_buffer_space(ctrl);
- 	if (ready >= request)
- 		return ready;
- 	/* We plan to fill the buffer; please tell us when you've read it */
-@@ -153,7 +181,7 @@ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request
- 	 * will not get notified even though the actual amount of buffer space
- 	 * is above request. Reread wr_cons to cover this case.
- 	 */
--	return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl));
-+	return raw_get_buffer_space(ctrl);
- }
- 
- int libxenvchan_buffer_space(struct libxenvchan *ctrl)
-@@ -162,7 +190,7 @@ int libxenvchan_buffer_space(struct libxenvchan *ctrl)
- 	 * when it changes
- 	 */
- 	request_notify(ctrl, VCHAN_NOTIFY_READ);
--	return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl));
-+	return raw_get_buffer_space(ctrl);
- }
- 
- int libxenvchan_wait(struct libxenvchan *ctrl)
-@@ -176,6 +204,8 @@ int libxenvchan_wait(struct libxenvchan *ctrl)
- 
- /**
-  * returns -1 on error, or size on success
-+ *
-+ * caller must have checked that enough space is available
-  */
- static int do_send(struct libxenvchan *ctrl, const void *data, size_t size)
- {
-@@ -248,6 +278,11 @@ int libxenvchan_write(struct libxenvchan *ctrl, const void *data, size_t size)
- 	}
- }
- 
-+/**
-+ * returns -1 on error, or size on success
-+ *
-+ * caller must have checked that enough data is available
-+ */
- static int do_recv(struct libxenvchan *ctrl, void *data, size_t size)
- {
- 	int real_idx = rd_cons(ctrl) & (rd_ring_size(ctrl) - 1);
--- 
-1.7.10.4
diff --git a/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch b/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch
deleted file mode 100644
index 95a1ce6..0000000
--- a/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile
---- tools/firmware/etherboot/Makefile	2012-09-17 18:21:18.000000000 +0800
-+++ tools/firmware/etherboot/Makefile	2012-11-21 14:12:54.389536642 +0800
-@@ -28,13 +28,6 @@
- 	$(MAKE) -C $D/src bin/$(*F).rom
- 
- $T:
--	if ! wget -O _$T $(IPXE_TARBALL_URL); then \
--		$(GIT) clone $(IPXE_GIT_URL) $D.git; \
--		(cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
--		$(IPXE_GIT_TAG) | gzip >../_$T); \
--		rm -rf $D.git; \
--	fi
--	mv _$T $T
- 
- $D/src/arch/i386/Makefile: $T Config
- 	rm -rf $D
-diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile
---- tools/firmware/Makefile	2012-09-17 18:21:18.000000000 +0800
-+++ tools/firmware/Makefile	2012-11-21 16:14:21.974868539 +0800
-@@ -18,7 +18,6 @@
- 	cp ovmf-makefile ovmf/Makefile;
- 
- seabios-dir:
--	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
-	cp seabios-config seabios-dir/.config;
- 
- .PHONY: all
diff --git a/app-emulation/xen-tools/files/xen-4.3-anti-download.patch b/app-emulation/xen-tools/files/xen-4.3-anti-download.patch
deleted file mode 100644
index 04a87bb..0000000
--- a/app-emulation/xen-tools/files/xen-4.3-anti-download.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile
---- tools/firmware/etherboot/Makefile	2012-09-17 18:21:18.000000000 +0800
-+++ tools/firmware/etherboot/Makefile	2012-11-21 14:12:54.389536642 +0800
-@@ -28,13 +28,6 @@
- 	$(MAKE) -C $D/src bin/$(*F).rom
- 
- $T:
--	if ! $(FETCHER) _$T $(IPXE_TARBALL_URL); then \
--		$(GIT) clone $(IPXE_GIT_URL) $D.git; \
--		(cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
--		$(IPXE_GIT_TAG) | gzip >../_$T); \
--		rm -rf $D.git; \
--	fi
--	mv _$T $T
- 
- $D/src/arch/i386/Makefile: $T Config
- 	rm -rf $D
-diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile
---- tools/firmware/Makefile	2012-09-17 18:21:18.000000000 +0800
-+++ tools/firmware/Makefile	2012-11-21 16:14:21.974868539 +0800
-@@ -18,7 +18,6 @@
- 	cp ovmf-makefile ovmf/Makefile;
- 
- seabios-dir:
--	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
-	cp seabios-config seabios-dir/.config;
- 
- .PHONY: all
diff --git a/app-emulation/xen-tools/files/xen-tools-4-CVE-2014-1950-XSA-88.patch b/app-emulation/xen-tools/files/xen-tools-4-CVE-2014-1950-XSA-88.patch
deleted file mode 100644
index a9fc806..0000000
--- a/app-emulation/xen-tools/files/xen-tools-4-CVE-2014-1950-XSA-88.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Date: Wed, 22 Jan 2014 17:47:21 +0000
-Subject: libxc: Fix out-of-memory error handling in xc_cpupool_getinfo()
-
-Avoid freeing info then returning it to the caller.
-
-This is XSA-88.
-
-Coverity-ID: 1056192
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- tools/libxc/xc_cpupool.c |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c
-index c8c2a33..6393cfb 100644
---- a/tools/libxc/xc_cpupool.c
-+++ b/tools/libxc/xc_cpupool.c
-@@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch,
-     info->cpumap = xc_cpumap_alloc(xch);
-     if (!info->cpumap) {
-         free(info);
-+        info = NULL;
-         goto out;
-     }
-     info->cpupool_id = sysctl.u.cpupool_op.cpupool_id;
diff --git a/app-emulation/xen-tools/files/xen-tools-4-qemu-fix-po-collision.patch b/app-emulation/xen-tools/files/xen-tools-4-qemu-fix-po-collision.patch
new file mode 100644
index 0000000..9304768
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4-qemu-fix-po-collision.patch
@@ -0,0 +1,26 @@
+diff --git a/tools/qemu-xen/po/Makefile b/tools/qemu-xen/po/Makefile
+index 705166e..2e7cdcb 100644
+--- a/tools/qemu-xen/po/Makefile
++++ b/tools/qemu-xen/po/Makefile
+@@ -30,7 +30,7 @@ install: $(OBJS)
+ 	for obj in $(OBJS); do \
+ 	    base=`basename $$obj .mo`; \
+ 	    $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES; \
+-	    $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \
++	    $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/xenqemu.mo; \
+ 	done
+ 
+ %.mo: %.po
+diff --git a/tools/qemu-xen/ui/gtk.c b/tools/qemu-xen/ui/gtk.c
+index c38146f..d3c331b 100644
+--- a/tools/qemu-xen/ui/gtk.c
++++ b/tools/qemu-xen/ui/gtk.c
+@@ -31,7 +31,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+  */
+ 
+-#define GETTEXT_PACKAGE "qemu"
++#define GETTEXT_PACKAGE "xenqemu"
+ #define LOCALEDIR "po"
+ 
+ #include "qemu-common.h"
diff --git a/app-emulation/xen-tools/files/xen-tools-4.2.4-udev-rules.patch b/app-emulation/xen-tools/files/xen-tools-4.2.4-udev-rules.patch
new file mode 100644
index 0000000..0e1d67a
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4.2.4-udev-rules.patch
@@ -0,0 +1,13 @@
+--- xen-4.2.4.org/tools/hotplug/Linux/Makefile	2014-05-22 05:39:57.090009337 +0000
++++ xen-4.2.4/tools/hotplug/Linux/Makefile	2014-05-22 05:41:03.816009464 +0000
+@@ -31,8 +31,8 @@
+ XEN_HOTPLUG_SCRIPTS = xen-backend.agent
+ 
+ UDEVVER = 0
+-ifeq ($(shell [ -x /sbin/udevadm ] && echo 1),1)
+-UDEVVER = $(shell /sbin/udevadm info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
++ifeq ($(shell [ -x $(shell which udevadm) ] && echo 1),1)
++UDEVVER = $(shell $(shell which udevadm) info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
+ endif
+ ifeq ($(shell [ -x /usr/bin/udevinfo ] && echo 1),1)
+ UDEVVER = $(shell /usr/bin/udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index bd4d8c1..2ee3ebb 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name='qemu'>Enable IOEMU support via the use of qemu-dm</flag>
 		<flag name='pygrub'>Install the pygrub boot loader</flag>
 		<flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag>
+		<flag name='system-qemu'>Using <pkg>app-emulation/qemu</pkg> instead of the bundled one</flag>
 		<flag name='xend'>Enable support the xend and xm to manage xen</flag>
 		<flag name='ocaml'>Enable support for the ocaml language</flag>
 		<flag name='pam'>Enable pam support</flag>
diff --git a/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4-r2.ebuild
index 9853f44..7b10d5f 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild,v 1.6 2014/03/01 23:06:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r2.ebuild,v 1.3 2014/05/17 13:34:06 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="mercurial"
 else
 	KEYWORDS="amd64 x86"
-	UPSTREAM_VER=0
+	UPSTREAM_VER=1
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen-tools/xen-tools-4.2.4-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4-r3.ebuild
index 90a44ae..c2e587a 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.4-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4.ebuild,v 1.4 2014/03/01 23:06:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r3.ebuild,v 1.1 2014/05/22 06:14:50 dlan Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="mercurial"
 else
 	KEYWORDS="~amd64 ~x86"
-	UPSTREAM_VER=0
+	UPSTREAM_VER=1
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
@@ -226,6 +226,9 @@ src_prepare() {
 	# Bug 379537
 	epatch "${FILESDIR}"/fix-gold-ld.patch
 
+	# Bug 510976
+	epatch "${FILESDIR}"/${P}-udev-rules.patch
+
 	# Bug 472438
 	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
 		-i Config.mk || die
diff --git a/app-emulation/xen-tools/xen-tools-4.2.4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4.ebuild
deleted file mode 100644
index b1715eb..0000000
--- a/app-emulation/xen-tools/xen-tools-4.2.4.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4.ebuild,v 1.4 2014/03/01 23:06:15 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE='xml,threads'
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	REPO="xen-unstable.hg"
-	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
-	S="${WORKDIR}/${REPO}"
-	live_eclass="mercurial"
-else
-	KEYWORDS="~amd64 ~x86"
-	UPSTREAM_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
-	${UPSTREAM_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-	S="${WORKDIR}/xen-${PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend"
-
-REQUIRED_USE="hvm? ( qemu )
-	${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libgcrypt:0
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pypam[${PYTHON_USEDEP}]
-	sys-libs/zlib
-	sys-power/iasl
-	sys-firmware/seabios
-	sys-firmware/ipxe
-	dev-ml/findlib
-	hvm? ( media-libs/libsdl )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	${PYTHON_DEPS}
-	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
-	sys-devel/bin86
-	sys-devel/dev86
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-doc/doxygen
-		dev-tex/latex2html[png,gif]
-		media-gfx/transfig
-		media-gfx/graphviz
-		dev-tex/xcolor
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? (  x11-proto/xproto
-		!net-libs/libiscsi )"
-RDEPEND="sys-apps/iproute2
-	net-misc/bridge-utils
-	ocaml? ( >=dev-lang/ocaml-4 )
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if use qemu; then
-		export "CONFIG_IOEMU=y"
-	else
-		export "CONFIG_IOEMU=n"
-	fi
-
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	use api     && export "LIBXENAPI_BINDINGS=y"
-	use flask   && export "FLASK_ENABLE=y"
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
-
-	# Drop .config, fixes to gcc-4.6
-	epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch
-
-	# Xend
-	if ! use xend; then
-		sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
-			-i tools/misc/Makefile || die "Disabling xend failed"
-		sed -e 's:^XEND_INITD:#XEND_INITD:' \
-			-i tools/examples/Makefile || die "Disabling xend failed"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
-	fi
-
-	# Disable hvm support on systems that don't support x86_32 binaries.
-	if ! use hvm; then
-		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	fi
-
-	# Don't bother with qemu, only needed for fully virtualised guests
-	if ! use qemu; then
-		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
-		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	epatch "${FILESDIR}"/${PN}-4-docfix.patch \
-		"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
-
-	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
-
-	# Bug 496708
-	epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
-	epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
-
-	# Fix bridge by idella4, bug #362575
-	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
-
-	# Don't build ipxe with pie on hardened, Bug #360805
-	if gcc-specs-pie; then
-		epatch "${FILESDIR}"/ipxe-nopie.patch
-	fi
-
-	# Prevent double stripping of files at install
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
-
-	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch
-
-	# add missing header, Bug #467200
-	epatch "${FILESDIR}"/xen-4-ulong.patch \
-		"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
-
-	# Set dom0-min-mem to kb; Bug #472982
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
-
-	# Bug 463840
-	epatch "${FILESDIR}"/${PN}-4.2.2-install.patch
-	epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch
-
-	# Bug 379537
-	epatch "${FILESDIR}"/fix-gold-ld.patch
-
-	# Bug 472438
-	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
-		-i Config.mk || die
-
-	# Bug 445986
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
-
-	# fix QA warning, create /var/run/, /var/lock dynamically
-	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
-		tools/libxl/Makefile || die
-
-	sed -i -e "/\/var\/run\//d" \
-		tools/xenstore/Makefile \
-		tools/pygrub/Makefile || die
-
-	sed -i -e "/\/var\/lock\/subsys/d" \
-		tools/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons || die
-
-	epatch_user
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	unset LDFLAGS
-	unset CFLAGS
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${ED}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=1:autoballoon=1:' \
-		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
-		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-		-i tools/examples/xl.conf  || die
-
-	# Reset bash completion dir; Bug 472438
-	mv "${D}"bash-completion "${D}"usr/share/ || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	if use xend; then
-		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
-	fi
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
-		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
-		mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# xend expects these to exist
-	keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Temp QA workaround
-	dodir "$(udev_get_udevdir)"
-	mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
-	rm -rf "${D}"/etc/udev
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem at boot."
-	elog "Add by use of rc-update on completion of the install"
-
-	if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
-		echo
-		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
-		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
-		ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
-	fi
-
-	# TODO: we need to have the current Python slot here.
-	if ! has_version "dev-lang/python[ncurses]"; then
-		echo
-		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
-		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
-	fi
-
-	if has_version "sys-apps/iproute2[minimal]"; then
-		echo
-		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-		ewarn "will not work until you rebuild iproute2 without USE=minimal."
-	fi
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
-	fi
-
-	if use xend; then
-		echo
-		elog "xend capability has been enabled and installed"
-	fi
-
-	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-		echo
-		elog "xensv is broken upstream (Gentoo bug #142011)."
-		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild
deleted file mode 100644
index 3641d09..0000000
--- a/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild,v 1.5 2014/03/01 23:06:15 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE='xml,threads'
-
-IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz"
-XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-20130720.tar.gz"
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	REPO="xen-unstable.hg"
-	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
-	S="${WORKDIR}/${REPO}"
-	live_eclass="mercurial"
-else
-	KEYWORDS="amd64 -x86"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
-	$IPXE_TARBALL_URL
-	$XEN_SEABIOS_URL"
-	S="${WORKDIR}/xen-${PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make 
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend"
-
-REQUIRED_USE="hvm? ( qemu )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )"
-
-DEPEND="dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libgcrypt:0
-	dev-python/lxml[${PYTHON_USEDEP}]
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	sys-libs/zlib
-	sys-power/iasl
-	hvm? ( media-libs/libsdl )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
-	sys-devel/bin86
-	sys-devel/dev86
-	dev-lang/perl
-	app-misc/pax-utils
-	dev-python/markdown
-	doc? (
-		app-doc/doxygen
-		dev-tex/latex2html[png,gif]
-		media-gfx/graphviz
-		dev-tex/xcolor
-		media-gfx/transfig
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? ( x11-proto/xproto
-		!net-libs/libiscsi )
-	qemu? ( x11-libs/pixman )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-RDEPEND="sys-apps/iproute2
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-
-RESTRICT="test"
-
-# Security patches
-XSA_PATCHES=(
-	"${FILESDIR}"/${PN/-tools/}-4-CVE-2012-6075-XSA-41.patch
-	"${FILESDIR}"/${PN/-tools/}-4-CVE-XSA-86.patch		#bug #500530
-	"${FILESDIR}"/${PN}-4-CVE-2014-1950-XSA-88.patch	#bug #501080
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if use qemu; then
-		export "CONFIG_IOEMU=y"
-	else
-		export "CONFIG_IOEMU=n"
-	fi
-
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Drop .config, fixes to gcc-4.6
-	epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch
-
-	# Xend
-	if ! use xend; then
-		sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
-			-i tools/misc/Makefile || die "Disabling xend failed"
-		sed -e 's:^XEND_INITD:#XEND_INITD:' \
-			-i tools/examples/Makefile || die "Disabling xend failed"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	# Disable hvm support on systems that don't support x86_32 binaries.
-	if ! use hvm; then
-		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	fi
-
-	# Don't bother with qemu, only needed for fully virtualised guests
-	if ! use qemu; then
-		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
-		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	epatch "${FILESDIR}"/${PN}-4-docfix.patch \
-		"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
-
-	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
-
-	# Prevent the downloading of ipxe, seabios
-	epatch "${FILESDIR}"/${PN/-tools/}-4.3-anti-download.patch
-	cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die
-	mv ../seabios-dir-remote tools/firmware/ || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Fix bridge by idella4, bug #362575
-	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
-
-	# Don't build ipxe with pie on hardened, Bug #360805
-	if gcc-specs-pie; then
-		epatch "${FILESDIR}"/ipxe-nopie.patch
-	fi
-
-	# Prevent double stripping of files at install
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
-
-	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch
-
-	# add missing header
-	epatch "${FILESDIR}"/xen-4-ulong.patch
-
-	# Set dom0-min-mem to kb; Bug #472982
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
-
-	[[ ${XSA_PATCHES[@]} ]] && epatch "${XSA_PATCHES[@]}"
-
-	# Bug 472438
-	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
-		-i Config.mk || die
-
-	# Bug 477676
-	epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch
-
-	# Prevent file collision with qemu package Bug 478064
-	if use qemu; then
-		epatch "${FILESDIR}"/qemu-bridge.patch
-		mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-	fi
-
-	use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Bug 379537
-	epatch "${FILESDIR}"/fix-gold-ld.patch
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons || die
-
-	# Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844
-	sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \
-		-i tools/libxl/libxl_bootloader.c || die
-
-	# fix QA warning, create /var/run/, /var/lock dynamically
-	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
-		tools/libxl/Makefile || die
-
-	sed -i -e "/\/var\/run\//d" \
-		tools/xenstore/Makefile \
-		tools/pygrub/Makefile || die
-
-	sed -i -e "/\/var\/lock\/subsys/d" \
-		tools/Makefile || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--prefix=/usr --disable-werror"
-
-	if use ocaml
-	then
-		myconf="${myconf} $(use_enable ocaml ocamltools)"
-	else
-		myconf="${myconf} --disable-ocamltools"
-	fi
-
-	if ! use pam
-	then
-		myconf="${myconf} --disable-pam"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	unset LDFLAGS
-	unset CFLAGS
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=1:autoballoon=1:' \
-		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
-		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-		-i tools/examples/xl.conf  || die
-
-	# Reset bash completion dir; Bug 472438
-	mv "${D}"bash-completion "${D}"usr/share/ || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	if use xend; then
-		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
-	fi
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# Move files built with use qemu, Bug #477884
-	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
-		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
-		mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# xend expects these to exist
-	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Temp QA workaround
-	dodir "$(udev_get_udevdir)"
-	mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
-	rm -rf "${D}"/etc/udev
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
-		echo
-		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
-		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
-		ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
-	fi
-
-	# TODO: we need to have the current Python slot here.
-	if ! has_version "dev-lang/python[ncurses]"; then
-		echo
-		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
-		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
-	fi
-
-	if has_version "sys-apps/iproute2[minimal]"; then
-		echo
-		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-		ewarn "will not work until you rebuild iproute2 without USE=minimal."
-	fi
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
-	fi
-
-	if use xend; then
-		elog"";elog "xend capability has been enabled and installed"
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
-	fi
-
-	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-		echo
-		elog "xensv is broken upstream (Gentoo bug #142011)."
-		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild
deleted file mode 100644
index 10f1466..0000000
--- a/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild
+++ /dev/null
@@ -1,428 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild,v 1.2 2014/03/01 23:06:15 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE='xml,threads'
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	REPO="xen-unstable.hg"
-	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
-	S="${WORKDIR}/${REPO}"
-	live_eclass="mercurial"
-else
-	KEYWORDS="~amd64 -x86"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
-	S="${WORKDIR}/xen-${PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make 
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend"
-
-REQUIRED_USE="hvm? ( qemu )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )"
-
-DEPEND="dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libgcrypt:0
-	dev-python/lxml[${PYTHON_USEDEP}]
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	sys-libs/zlib
-	sys-power/iasl
-	sys-firmware/seabios
-	sys-firmware/ipxe
-	hvm? ( media-libs/libsdl )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
-	sys-devel/bin86
-	sys-devel/dev86
-	dev-lang/perl
-	app-misc/pax-utils
-	dev-python/markdown
-	doc? (
-		app-doc/doxygen
-		dev-tex/latex2html[png,gif]
-		media-gfx/graphviz
-		dev-tex/xcolor
-		media-gfx/transfig
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? ( x11-proto/xproto
-		!net-libs/libiscsi )
-	qemu? ( x11-libs/pixman )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-RDEPEND="sys-apps/iproute2
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-
-RESTRICT="test"
-
-# Security patches
-XSA_PATCHES=(
-	"${FILESDIR}"/${PN/-tools/}-4-CVE-2012-6075-XSA-41.patch
-	"${FILESDIR}"/${PN/-tools/}-4-CVE-XSA-86.patch		#bug #500530
-	"${FILESDIR}"/${PN}-4-CVE-2014-1950-XSA-88.patch	#bug #501080
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if use qemu; then
-		export "CONFIG_IOEMU=y"
-	else
-		export "CONFIG_IOEMU=n"
-	fi
-
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Drop .config, fixes to gcc-4.6
-	epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch
-
-	# Xend
-	if ! use xend; then
-		sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
-			-i tools/misc/Makefile || die "Disabling xend failed"
-		sed -e 's:^XEND_INITD:#XEND_INITD:' \
-			-i tools/examples/Makefile || die "Disabling xend failed"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	# Disable hvm support on systems that don't support x86_32 binaries.
-	if ! use hvm; then
-		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	fi
-
-	# Don't bother with qemu, only needed for fully virtualised guests
-	if ! use qemu; then
-		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
-		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	epatch "${FILESDIR}"/${PN}-4-docfix.patch \
-		"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
-
-	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
-
-	# Bug 496708
-	epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
-	epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
-
-	# Fix bridge by idella4, bug #362575
-	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
-
-	# Don't build ipxe with pie on hardened, Bug #360805
-	if gcc-specs-pie; then
-		epatch "${FILESDIR}"/ipxe-nopie.patch
-	fi
-
-	# Prevent double stripping of files at install
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
-
-	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch
-
-	# add missing header
-	epatch "${FILESDIR}"/xen-4-ulong.patch
-
-	# Set dom0-min-mem to kb; Bug #472982
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
-
-	[[ ${XSA_PATCHES[@]} ]] && epatch "${XSA_PATCHES[@]}"
-
-	# Bug 472438
-	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
-		-i Config.mk || die
-
-	# Bug 477676
-	epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch
-
-	# Prevent file collision with qemu package Bug 478064
-	if use qemu; then
-		epatch "${FILESDIR}"/qemu-bridge.patch
-		mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-	fi
-
-	use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Bug 379537
-	epatch "${FILESDIR}"/fix-gold-ld.patch
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons || die
-
-	# Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844
-	sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \
-		-i tools/libxl/libxl_bootloader.c || die
-
-	# fix QA warning, create /var/run/, /var/lock dynamically
-	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
-		tools/libxl/Makefile || die
-
-	sed -i -e "/\/var\/run\//d" \
-		tools/xenstore/Makefile \
-		tools/pygrub/Makefile || die
-
-	sed -i -e "/\/var\/lock\/subsys/d" \
-		tools/Makefile || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--prefix=/usr --disable-werror"
-
-	if use ocaml
-	then
-		myconf="${myconf} $(use_enable ocaml ocamltools)"
-	else
-		myconf="${myconf} --disable-ocamltools"
-	fi
-
-	if ! use pam
-	then
-		myconf="${myconf} --disable-pam"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	unset LDFLAGS
-	unset CFLAGS
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=1:autoballoon=1:' \
-		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
-		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-		-i tools/examples/xl.conf  || die
-
-	# Reset bash completion dir; Bug 472438
-	mv "${D}"bash-completion "${D}"usr/share/ || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	if use xend; then
-		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
-	fi
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# Move files built with use qemu, Bug #477884
-	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
-		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
-		mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# xend expects these to exist
-	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Temp QA workaround
-	dodir "$(udev_get_udevdir)"
-	mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
-	rm -rf "${D}"/etc/udev
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
-		echo
-		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
-		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
-		ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
-	fi
-
-	# TODO: we need to have the current Python slot here.
-	if ! has_version "dev-lang/python[ncurses]"; then
-		echo
-		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
-		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
-	fi
-
-	if has_version "sys-apps/iproute2[minimal]"; then
-		echo
-		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-		ewarn "will not work until you rebuild iproute2 without USE=minimal."
-	fi
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
-	fi
-
-	if use xend; then
-		elog"";elog "xend capability has been enabled and installed"
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
-	fi
-
-	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-		echo
-		elog "xensv is broken upstream (Gentoo bug #142011)."
-		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.3.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.3.2-r1.ebuild
deleted file mode 100644
index 1d27a9a..0000000
--- a/app-emulation/xen-tools/xen-tools-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2.ebuild,v 1.4 2014/03/01 23:06:15 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE='xml,threads'
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	REPO="xen-unstable.hg"
-	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
-	S="${WORKDIR}/${REPO}"
-	live_eclass="mercurial"
-else
-	KEYWORDS="~amd64 -x86"
-	UPSTREAM_VER=0
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
-	${UPSTREAM_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-	S="${WORKDIR}/xen-${PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make 
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend"
-
-REQUIRED_USE="hvm? ( qemu )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )"
-
-DEPEND="dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libgcrypt:0
-	dev-python/lxml[${PYTHON_USEDEP}]
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	sys-libs/zlib
-	sys-power/iasl
-	sys-firmware/seabios
-	sys-firmware/ipxe
-	hvm? ( media-libs/libsdl )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
-	sys-devel/bin86
-	sys-devel/dev86
-	dev-lang/perl
-	app-misc/pax-utils
-	dev-python/markdown
-	doc? (
-		app-doc/doxygen
-		dev-tex/latex2html[png,gif]
-		media-gfx/graphviz
-		dev-tex/xcolor
-		media-gfx/transfig
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? ( x11-proto/xproto
-		!net-libs/libiscsi )
-	qemu? ( x11-libs/pixman )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-RDEPEND="sys-apps/iproute2
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if use qemu; then
-		export "CONFIG_IOEMU=y"
-	else
-		export "CONFIG_IOEMU=n"
-	fi
-
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
-
-	# Drop .config, fixes to gcc-4.6
-	epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	epatch "${FILESDIR}"/${PN}-4-docfix.patch \
-		"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
-
-	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
-
-	# Bug 496708
-	epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
-	epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
-
-	# Fix bridge by idella4, bug #362575
-	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
-
-	# Prevent double stripping of files at install
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
-
-	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch
-
-	# add missing header
-	epatch "${FILESDIR}"/xen-4-ulong.patch
-
-	# Set dom0-min-mem to kb; Bug #472982
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
-
-	# Bug 477676
-	epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch
-
-	# Bug 379537
-	epatch "${FILESDIR}"/fix-gold-ld.patch
-
-	# Prevent file collision with qemu package Bug 478064
-	epatch "${FILESDIR}"/qemu-bridge.patch
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Xend
-	if ! use xend; then
-		sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
-			-i tools/misc/Makefile || die "Disabling xend failed"
-		sed -e 's:^XEND_INITD:#XEND_INITD:' \
-			-i tools/examples/Makefile || die "Disabling xend failed"
-	fi
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	# Disable hvm support on systems that don't support x86_32 binaries.
-	if ! use hvm; then
-		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	fi
-
-	# Don't bother with qemu, only needed for fully virtualised guests
-	if ! use qemu; then
-		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
-		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Bug 472438
-	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
-		-i Config.mk || die
-
-	use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons || die
-
-	# Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844
-	sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \
-		-i tools/libxl/libxl_bootloader.c || die
-
-	# fix QA warning, create /var/run/, /var/lock dynamically
-	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
-		tools/libxl/Makefile || die
-
-	sed -i -e "/\/var\/run\//d" \
-		tools/xenstore/Makefile \
-		tools/pygrub/Makefile || die
-
-	sed -i -e "/\/var\/lock\/subsys/d" \
-		tools/Makefile || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--prefix=/usr --disable-werror"
-
-	if use ocaml
-	then
-		myconf="${myconf} $(use_enable ocaml ocamltools)"
-	else
-		myconf="${myconf} --disable-ocamltools"
-	fi
-
-	if ! use pam
-	then
-		myconf="${myconf} --disable-pam"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	unset LDFLAGS
-	unset CFLAGS
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=1:autoballoon=1:' \
-		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
-		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-		-i tools/examples/xl.conf  || die
-
-	# Reset bash completion dir; Bug 472438
-	mv "${D}"bash-completion "${D}"usr/share/ || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	if use xend; then
-		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
-	fi
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# Move files built with use qemu, Bug #477884
-	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
-		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
-		mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# xend expects these to exist
-	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Temp QA workaround
-	dodir "$(udev_get_udevdir)"
-	mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
-	rm -rf "${D}"/etc/udev
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
-		echo
-		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
-		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
-		ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
-	fi
-
-	# TODO: we need to have the current Python slot here.
-	if ! has_version "dev-lang/python[ncurses]"; then
-		echo
-		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
-		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
-	fi
-
-	if has_version "sys-apps/iproute2[minimal]"; then
-		echo
-		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-		ewarn "will not work until you rebuild iproute2 without USE=minimal."
-	fi
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
-	fi
-
-	if use xend; then
-		elog"";elog "xend capability has been enabled and installed"
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
-	fi
-
-	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-		echo
-		elog "xensv is broken upstream (Gentoo bug #142011)."
-		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.3.2.ebuild b/app-emulation/xen-tools/xen-tools-4.3.2-r2.ebuild
index e58d594..8a8fee2 100644
--- a/app-emulation/xen-tools/xen-tools-4.3.2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2.ebuild,v 1.4 2014/03/01 23:06:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r2.ebuild,v 1.2 2014/05/17 13:32:34 ago Exp $
 
 EAPI=5
 
@@ -14,8 +14,8 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 	live_eclass="mercurial"
 else
-	KEYWORDS="~amd64 -x86"
-	UPSTREAM_VER=
+	KEYWORDS="amd64 -x86"
+	UPSTREAM_VER=1
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen-tools/xen-tools-4.4.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0-r1.ebuild
deleted file mode 100644
index 9c4ea84..0000000
--- a/app-emulation/xen-tools/xen-tools-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,427 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0.ebuild,v 1.3 2014/04/04 01:06:31 idella4 Exp $
-
-EAPI=5
-
-MY_PV=${PV/_/-}
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	REPO="xen-unstable.hg"
-	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
-	S="${WORKDIR}/${REPO}"
-	live_eclass="mercurial"
-else
-	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
-	${UPSTRAM_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs"
-
-REQUIRED_USE="hvm? ( qemu )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )"
-
-COMMON_DEPEND="
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
-	hvm? ( media-libs/libsdl )
-	${PYTHON_DEPS}
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
-	arm? ( >=sys-apps/dtc-1.4.0 )
-	!arm? ( sys-devel/bin86
-		sys-firmware/ipxe
-		sys-firmware/seabios
-		sys-devel/dev86
-		sys-power/iasl )
-	dev-lang/perl
-	app-misc/pax-utils
-	dev-python/markdown
-	doc? (
-		app-doc/doxygen
-		dev-tex/latex2html[png,gif]
-		media-gfx/graphviz
-		dev-tex/xcolor
-		media-gfx/transfig
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		dev-tex/latexmk
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-latexrecommended
-	)
-	hvm? ( x11-proto/xproto
-		!net-libs/libiscsi )
-	qemu? ( x11-libs/pixman )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	if has_version dev-libs/libgcrypt:0; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	if use qemu; then
-		export "CONFIG_IOEMU=y"
-	else
-		export "CONFIG_IOEMU=n"
-	fi
-
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-	#bug 472438
-	export BASH_COMPLETION_DIR=/usr/share/bash-completion
-}
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
-	fi
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	epatch "${FILESDIR}"/${PN}-4-docfix.patch
-
-	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
-
-	# Bug 496708
-	epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
-
-	# Fix bridge by idella4, bug #362575
-	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
-
-	# Prevent double stripping of files at install
-	epatch "${FILESDIR}"/${PN/-tools/}-4.4-nostrip.patch
-
-	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch
-
-	# Set dom0-min-mem to kb; Bug #472982
-	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
-
-	# Bug 477676
-	epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch
-
-	# Bug 379537
-	epatch "${FILESDIR}"/fix-gold-ld.patch
-
-	# Prevent file collision with qemu package Bug 478064
-	epatch "${FILESDIR}"/xen-4.4-qemu-bridge.patch
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	epatch "${FILESDIR}"/${PN}-4.4-api-fix.patch
-
-	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		 -i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-
-		# try and remove all the default cflags
-		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-			-exec sed \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-				-i {} + || die "failed to re-set custom-cflags"
-	fi
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	# Disable hvm support on systems that don't support x86_32 binaries.
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	fi
-
-	# Don't bother with qemu, only needed for fully virtualised guests
-	if ! use qemu; then
-		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Bug 472438
-	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
-		-i Config.mk || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	# fix QA warning, create /var/run/, /var/lock dynamically
-	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
-		tools/libxl/Makefile || die
-
-	sed -i -e "/\/var\/run\//d" \
-		tools/xenstore/Makefile \
-		tools/pygrub/Makefile || die
-
-	sed -i -e "/\/var\/lock\/subsys/d" \
-		tools/Makefile || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--disable-werror \
-		--with-system-seabios=/usr/share/seabios/bios.bin \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		--with-system-qemu \
-		$(use_enable pam) \
-		$(use_enable api xenapi) \
-		$(use_enable ocaml ocamltools) \
-		"
-	econf ${myconf}
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	unset LDFLAGS
-	unset CFLAGS
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
-
-	use doc && emake -C docs txt html
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"tmp || die
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=1:autoballoon=1:' \
-		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
-		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-		-i tools/examples/xl.conf  || die
-
-	# Reset bash completion dir; Bug 472438
-	mv "${D}"bash-completion "${D}"usr/share/ || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${D}"/usr/share/doc/xen/
-	doman docs/man?/*
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# Move files built with use qemu, Bug #477884
-	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
-		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
-		mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# xend expects these to exist
-	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Temp QA workaround
-	dodir "$(udev_get_udevdir)"
-	mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
-	rm -rf "${D}"/etc/udev
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config sytem At boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
-		echo
-		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
-		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
-		ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
-	fi
-
-	# TODO: we need to have the current Python slot here.
-	if ! has_version "dev-lang/python[ncurses]"; then
-		echo
-		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
-		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
-	fi
-
-	if has_version "sys-apps/iproute2[minimal]"; then
-		echo
-		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-		ewarn "will not work until you rebuild iproute2 without USE=minimal."
-	fi
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
-	fi
-
-	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-		echo
-		elog "xensv is broken upstream (Gentoo bug #142011)."
-		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.4.0.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0-r4.ebuild
index ca370a2..82cbce1 100644
--- a/app-emulation/xen-tools/xen-tools-4.4.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.4.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0.ebuild,v 1.3 2014/04/04 01:06:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r4.ebuild,v 1.1 2014/05/16 21:39:26 dlan Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="mercurial"
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=2
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
@@ -42,11 +42,12 @@ SLOT="0"
 # Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
 # >=dev-lang/ocaml-4 stable
 # Masked in profiles/eapi-5-files instead
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-qemu"
 
-REQUIRED_USE="hvm? ( qemu )
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
 	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )"
+	pygrub? ( python )
+	qemu? ( !system-qemu )"
 
 COMMON_DEPEND="
 	dev-libs/lzo:2
@@ -68,7 +69,7 @@ DEPEND="${COMMON_DEPEND}
 	arm? ( >=sys-apps/dtc-1.4.0 )
 	!arm? ( sys-devel/bin86
 		sys-firmware/ipxe
-		sys-firmware/seabios
+		>=sys-firmware/seabios-1.7.4
 		sys-devel/dev86
 		sys-power/iasl )
 	dev-lang/perl
@@ -90,6 +91,7 @@ DEPEND="${COMMON_DEPEND}
 	hvm? ( x11-proto/xproto
 		!net-libs/libiscsi )
 	qemu? ( x11-libs/pixman )
+	system-qemu? ( app-emulation/qemu[xen] )
 	ocaml? ( dev-ml/findlib
 		>=dev-lang/ocaml-4 )"
 
@@ -104,7 +106,8 @@ RDEPEND="${COMMON_DEPEND}
 
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
 
 RESTRICT="test"
 
@@ -116,12 +119,6 @@ pkg_setup() {
 		export "CONFIG_GCRYPT=y"
 	fi
 
-	if use qemu; then
-		export "CONFIG_IOEMU=y"
-	else
-		export "CONFIG_IOEMU=n"
-	fi
-
 	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
 		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
 		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
@@ -194,6 +191,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-4.4-api-fix.patch
 
+	# Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302
+	epatch "${FILESDIR}"/${PN}-4-qemu-fix-po-collision.patch
+
 	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
 	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
 		 -i tools/firmware/Makefile || die
@@ -268,11 +268,13 @@ src_configure() {
 		--disable-xen \
 		--enable-tools \
 		--enable-docs \
-		--with-system-qemu \
+		--disable-qemu-traditional \
+		$(use_with system-qemu) \
 		$(use_enable pam) \
 		$(use_enable api xenapi) \
 		$(use_enable ocaml ocamltools) \
 		"
+	use qemu || myconf+=" --with-system-qemu"
 	econf ${myconf}
 }