re-introduce bundled seabios with USE=system-seabios flag, bug #510052, #510492, #510680

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

7 files changed, 521 insertions, 26 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 13d029faab96..f6d2bdbe8b9b 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,17 @@
 # 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.243 2014/05/22 06:14:50 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.244 2014/05/23 11:00:30 dlan Exp $
+
+*xen-tools-4.4.0-r5 (23 May 2014)
+*xen-tools-4.3.2-r3 (23 May 2014)
+*xen-tools-4.2.4-r4 (23 May 2014)
+
+  23 May 2014; Yixun Lan <dlan@gentoo.org> -xen-tools-4.2.4-r3.ebuild,
+  +xen-tools-4.2.4-r4.ebuild, +xen-tools-4.3.2-r3.ebuild,
+  -xen-tools-4.4.0-r4.ebuild, +xen-tools-4.4.0-r5.ebuild,
+  +files/xen-tools-4-anti-seabios-download.patch:
+  re-introduce bundled seabios with USE=system-seabios flag, bug #510052,
+  #510492, #510680
 
 *xen-tools-4.2.4-r3 (22 May 2014)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 5a3e0e63734b..37f2737e0157 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -16,6 +16,7 @@ AUX xen-4.4-nostrip.patch 493 SHA256 5fde7414d3a4debc91229ce6fd91194590014ba0da8
 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-anti-seabios-download.patch 400 SHA256 ca40e82b7624e23a5e9e3f5ceac8755e48358e75012c33a01869b916a1cfc080 SHA512 f0156cc9d5bc41b2b1ddc021146f0eebf7f5bbcf68fbc9fcbefd7c1a0a7e82adfc27f6a30887a966e1aa0bf65e7e6f08913c4b3f2b94ac726c7dec3f3a7e3e9d WHIRLPOOL e50c91861b0df4527ce9235667234c2a35d12dd5da6375565820dc7e6cda500de9e9c40cce194e1ac7456bd17b54b9c86947aec019d774249e1c799adde6f47b
 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
@@ -41,6 +42,9 @@ 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 seabios-1.6.3.2.tar.gz 422376 SHA256 888aafe37ef3d1f502a73518a5e4dd0e9373ce4cd41681c354771314f1e41dd7 SHA512 c54431d8e81d25b74427696da689e90d3ab68c7c1be1dec05c81658d28b650f53daa34dcee2da826c1cf5d5d39396b12b0b16ea20ed6fd89de8f732163c8cca5 WHIRLPOOL 826c0e034ca46291661faa363189ee6cf56098cabc39f8fc84d2c442cc2da2174c2fa027cc11e11a7c3fed619f2e524f2aee804d9836d256448cdad28631d69a
+DIST seabios-1.7.1-stable-xen.tar.gz 437679 SHA256 f45a2815fb3cce1e0d0acadcf06c6eaecf1f104bb18138a566cb5eaf414f88e5 SHA512 60b686a4dfc56b390bee3592c999d5485ad3fef8adb6115a999eb4c2d850b33ac22e67d8c58513a2d3aba3997c1402b86a01bfb7e8f19834a23623e32010f73b WHIRLPOOL 3bff0ff214d83ea1521a2689f56c6f261d59c760eb1fb5789492e4be6a638073de393d11b93a3e0a71d6f43f5fd597dc2deac326f64bb55af4346579821a28c8
+DIST seabios-1.7.3.1.tar.gz 463801 SHA256 e1f5845c3fa01a9280421d587dcd866273d5d6c0002b9fe70a6736e56ef5c36f SHA512 6b2c376f6c2644e1ecad687079fc8ec63eb064b82ec3ac2d24f4ec7b56432c7ed69d41539e7b212aa134368272198bdaf50fed23637a29fcf1e653db008b2009 WHIRLPOOL 8e37ef66722580b9db67c5b98282e23074847eadbdd2db5ed8b999d25c1ce7cbe9ab54fbbb15d2985f403e18e6b2fa2ea36d87ce46ec30b0e5bbbc0f69623007
 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.2-upstream-patches-1.tar.xz 28004 SHA256 451df6bc293102a8f5eff0bc5b2c9feba0d8c0df5bdfba5591fac405e4f0141f SHA512 c0fd9ed16773e62121290dfc85e082997b049756a5038b0e3d4d618566a86abcf8baf499d176a529d8c33e2b333bd2be11dc075d026ce21b0d42d20b141c9e4f WHIRLPOOL 9a01940b7247a448ee1795539682a79dd70b470a535f438f077d2da7633f06eeb01c26c62c504a0e7ad68d7156957f96d8e966762b9c782e1bce37416b40a648
@@ -48,25 +52,26 @@ DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8f
 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.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.2.4-r4.ebuild 12522 SHA256 9faa56db4c9f53a3a85dd00fdd0d0289abf158573eadd4861653f2723a45b1cf SHA512 3e92f6a209ed89fc16b9d9a3d629f2b3b0453d64f20b69d3588a8d8382dbe81ec8a57a35ed171ddf67a827ed87faaca611aaf1d810fdd62b6d86b5c06519792f WHIRLPOOL b4814cdfb6669d9cc6f32db51629b60b480e4d528eab9fdc839e34fc67e31639c87ea52d9f8d8dfc6cfd410324b95365f97b4acea0ce4f47e74575df89ed5e68
 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
+EBUILD xen-tools-4.3.2-r3.ebuild 13730 SHA256 c267bca6a907c34548fa07248c238773f27e9e3bb9c716504e86a15dbd7dcd4b SHA512 63013ee7568b58a1327621e1ee9bc351a3dc422ea4db787507fde128d67840c304465e8fba646069d300fde02147c6c03537f039156cd0ed3a353182615a1a73 WHIRLPOOL 10c82f618d261989f7114872d7ec9c1b9a89293f816517356c4e46043ab6f9e2677187033abbd90d47044ecce3dd480b144589078401acb1c317dfc07939ebdb
+EBUILD xen-tools-4.4.0-r5.ebuild 13566 SHA256 0c543a7cd5148c6b607b2518b6dec14634fdb762746eecb95cbf96aca5f5f36e SHA512 dadc75321bff9ea27fe942ce54e0045e0d2f942ba84bffba62ccd364040a0043733b788dcd4ed7184726bf0c19eedb726a64b7e1b5bf09c37cd00fe58a75bcfa WHIRLPOOL fdd3d5dc88764d54a9ccc6d92ecff604b6dec9acd61274a648a36ed5778ea7c4bd497997ad112adc2b5239c8cb1f9bf567222f2b72ff623831f0bc8fbdb03b8c
+MISC ChangeLog 57997 SHA256 0f643cbdcc1162522fea92bf4f875ffade8d6009e3d0eb3ba09e4cb02a62df76 SHA512 5a627fd280cd865721f4ffca0511347574ea1fa87f534ea7b76fcac2172ba1169daab585667e4ce24d30a4ba9656313ea879910471fe1215c33903f220542553 WHIRLPOOL 673ac6d37b797a6fcd3f979ce402781b5567e02e7be0e7e14d9b679ea2edc58e1573cd19267ef57ab05ba6c4c31048b1c173a12204c1eb45a854d0bc49a9423b
+MISC metadata.xml 1009 SHA256 9e8e2c5b191fffbbdf2dd0772213f5b2fe13b10e0413f9d12081f87e7ba6565b SHA512 bdd573cf6cb7664d4f0512f99f7ba5c81758d59986d764423328ce1fccc2149f0f7ca9eccefe3953ecec5f4d15bf829792f9ed07a60a5c447e1a3f5ed0d26c26 WHIRLPOOL 08f65daec784396532cc0700847d5e8545a73b49e840a491a6089945bbb9a8597ecc012bf65a6835ad5dff1623377d80360692ae9c41589130f9b4bedc909e76
 -----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
+iQIcBAEBCAAGBQJTfyf/AAoJEJIMDbyqvv1VCukP/0CJ30oSzLabvDB8FIRbU/km
+4a/5VKec/yRzJErgTLEc6Ml+Oc7Wrs5A9Po8ylMe0L88yLk8Hh5NdFwn2xrYbnc6
+b9XgdF+YjqhccAQ2xk73DYnlR8BYqv9L43HvAJT87uCPemY9hebbzy6BKVWotizd
+RnbMetUwu0Vqa1l6UCSxwn70+H8vErt4qGC7jCRSxWR1XdY/eJJE50E3cJ+IRiI8
+G3BGeqsv7MqzRf6YWNPWoQ0eJ1xtEyJXQpUUk7WIkXenFYaO+9kTrUg5hN7d0euB
+FnGX4GO7FTkGijZ2qMWvlMSIIh8YCk3RRJYQyQko1us05Yo2Td8EUEnrd9NDOdTg
+SySVLeTmck1KbUjfDTiV/zPfLDmh2bZeWAyLC2XDUScUOf0DEpIh2KREz9UaATIv
+GEqosxzKDwh+fS3e4wC27YlXpRcK2ClCPeuhZh/ePpv03+XFUVFa7bMO0FzWJA+p
+vEKS7u+1ArUJyQZKXOJeYywGsyWfzqUyGGFKDrOoDvgCTRxCM10He/YIN2e2q2qj
+gCWB2fVDzywQLMTVXjgRrXsPdlaZM3nfLCCGeXTsQYa7ZoDgKVynKZS47wNdwGVy
+ebVJTwKWe3nic3D6zPXwenyidmQ83YLL5XA77foRZdXPf6SPiUurawX0SSrq4V9H
+H6ixxSNcZ1ibdAXMGiqc
+=efWt
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xen-tools-4-anti-seabios-download.patch b/app-emulation/xen-tools/files/xen-tools-4-anti-seabios-download.patch
new file mode 100644
index 000000000000..81f00e5c4238
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4-anti-seabios-download.patch
@@ -0,0 +1,12 @@
+diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
+index cb13212..d83c51a 100644
+--- a/tools/firmware/Makefile
++++ b/tools/firmware/Makefile
+@@ -22,7 +22,6 @@ ovmf-dir:
+ 	cp ovmf-makefile ovmf-dir/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/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 2ee3ebb17288..0d5491e1302f 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -10,6 +10,7 @@
 		<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='system-seabios'>Using <pkg>sys-firmware/seabios</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.4-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild
index c2e587a0a6aa..eff4ebe1d91b 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.4-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.4-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.2.4-r3.ebuild,v 1.1 2014/05/22 06:14:50 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r4.ebuild,v 1.1 2014/05/23 11:00:30 dlan Exp $
 
 EAPI=5
 
@@ -17,6 +17,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 	UPSTREAM_VER=1
 	GENTOO_VER=
+	SEABIOS_VER=1.6.3.2
 
 	[[ -n ${UPSTREAM_VER} ]] && \
 		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
@@ -24,6 +25,8 @@ else
 		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
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
 	${UPSTREAM_PATCHSET_URI}
 	${GENTOO_PATCHSET_URI}"
 	S="${WORKDIR}/xen-${PV}"
@@ -37,7 +40,7 @@ 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"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend system-seabios"
 
 REQUIRED_USE="hvm? ( qemu )
 	${PYTHON_REQUIRED_USE}"
@@ -50,7 +53,7 @@ DEPEND="dev-libs/lzo:2
 	dev-python/pypam[${PYTHON_USEDEP}]
 	sys-libs/zlib
 	sys-power/iasl
-	sys-firmware/seabios
+	system-seabios? ( sys-firmware/seabios )
 	sys-firmware/ipxe
 	dev-ml/findlib
 	hvm? ( media-libs/libsdl )
@@ -196,7 +199,7 @@ src_prepare() {
 
 	# Bug 496708
 	epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
-	epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
+	use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
 
 	# Fix bridge by idella4, bug #362575
 	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
@@ -229,6 +232,13 @@ src_prepare() {
 	# Bug 510976
 	epatch "${FILESDIR}"/${P}-udev-rules.patch
 
+	# bundled seabios
+	epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
 	# 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.3.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild
new file mode 100644
index 000000000000..baef68593fff
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.3.2-r3.ebuild
@@ -0,0 +1,446 @@
+# 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-r3.ebuild,v 1.1 2014/05/23 11:00:30 dlan 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=1
+	GENTOO_VER=
+	SEABIOS_VER=1.7.1-stable-xen
+
+	[[ -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
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.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 system-seabios"
+
+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
+	system-seabios? ( 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
+	use system-seabios && 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
+
+	# bundled seabios
+	epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# 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.4.0-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild
index 82cbce1836d3..3706196d00f4 100644
--- a/app-emulation/xen-tools/xen-tools-4.4.0-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.4.0-r5.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-r4.ebuild,v 1.1 2014/05/16 21:39:26 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.0-r5.ebuild,v 1.1 2014/05/23 11:00:30 dlan Exp $
 
 EAPI=5
 
@@ -19,6 +19,7 @@ else
 	KEYWORDS="~amd64 ~arm -x86"
 	UPSTREAM_VER=2
 	GENTOO_VER=
+	SEABIOS_VER=1.7.3.1
 
 	[[ -n ${UPSTREAM_VER} ]] && \
 		UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
@@ -26,6 +27,8 @@ else
 		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
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
 	${UPSTRAM_PATCHSET_URI}
 	${GENTOO_PATCHSET_URI}"
 	S="${WORKDIR}/xen-${MY_PV}"
@@ -42,7 +45,7 @@ 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 system-qemu"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-qemu system-seabios"
 
 REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
 	${PYTHON_REQUIRED_USE}
@@ -68,8 +71,8 @@ DEPEND="${COMMON_DEPEND}
 	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
 	arm? ( >=sys-apps/dtc-1.4.0 )
 	!arm? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
 		sys-firmware/ipxe
-		>=sys-firmware/seabios-1.7.4
 		sys-devel/dev86
 		sys-power/iasl )
 	dev-lang/perl
@@ -194,6 +197,13 @@ src_prepare() {
 	# Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302
 	epatch "${FILESDIR}"/${PN}-4-qemu-fix-po-collision.patch
 
+	# bundled seabios
+	epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
 	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
@@ -264,7 +274,6 @@ 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 \
@@ -274,6 +283,7 @@ src_configure() {
 		$(use_enable api xenapi) \
 		$(use_enable ocaml ocamltools) \
 		"
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
 	use qemu || myconf+=" --with-system-qemu"
 	econf ${myconf}
 }