shrink patches, move to devspace; drop USE=xend for 4.2.5 4.3.3

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

7 files changed, 166 insertions, 655 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 6b5204021cbc..b3ea5c9cda17 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.256 2014/09/11 05:33:16 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.257 2014/09/12 02:21:28 dlan Exp $
+
+  12 Sep 2014; Yixun Lan <dlan@gentoo.org> xen-tools-4.2.5.ebuild,
+  xen-tools-4.3.3.ebuild, -xen-tools-4.4.0-r9.ebuild, xen-tools-4.4.1.ebuild,
+  +files/gentoo-patches.conf:
+  shrink patches, move to devspace; drop USE=xend for 4.2.5 4.3.3
 
 *xen-tools-4.4.1 (11 Sep 2014)
 *xen-tools-4.3.3 (11 Sep 2014)
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index f2b2919768fb..973d6091dcf2 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX fix-gold-ld.patch 408 SHA256 9ed4a989562890a87c05f6a63c2c2a81528e79f9e2fe5b7ebaafbc4ba874007c SHA512 7456bd9055a84490c5ac156a39ae9cda02dbe38712db5beb7adf572870f619cd897c70d4c24491dbfa3334df7ca56fd0af7494ce070f99f7d6275b9f32e48563 WHIRLPOOL f78caad306e7305bd3bc04a8c6acfda9a7a77cc405bfa74f824138b3bca85e61e8a948e112546c217aa56fe12b2b7f8dff948060bd7e61b9ac28adeca72a2a85
+AUX gentoo-patches.conf 2541 SHA256 8f60398bf6e7fdddf7a039928574e72f00f95428afa90fa69601e7673109f37a SHA512 224c6f4a4e7901261ecb2a10cbcc6b3d7d4c009c1ddbb91ac6d3600ee3c643747822c785246aea56220823b46c6c2b79cdbc91fc65aa6556df6d18add8b96617 WHIRLPOOL 78cbd30af355333f2fa30a401a124ded84d00463f27a0734bbfb3f6f5659097c1ab88c6a527983f1cfe90a3bed0d66bc1a1bb55caf11ac622af7ca0839bdad04
 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
@@ -56,33 +57,31 @@ DIST xen-4.3.2-upstream-patches-3.tar.xz 60208 SHA256 661ab148c9eeb2c8e44d0bd620
 DIST xen-4.3.2-upstream-patches-4.tar.xz 69268 SHA256 eb00972bc511b584278a178765af8fc5d6d78097a39e6d3fdf5133a73693d953 SHA512 f9455d375f26b37844b820ea238a06c24a4e1f76adbd217a78ac31c3e0e078f9eaf2744886e09d7fc3a1b3b9b03c85257bac236742d69c5c0a00cf0683760d1d WHIRLPOOL e55f126f004313efadf7d881b10e7747504824d83f477787fad09eede0a8f3aba268a37d933e641720b51ed91723f036c80c855907697293ea2b1b52e5a9efb5
 DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69 SHA512 ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302 WHIRLPOOL 72250369fb2c90ba608e1da018cb6417b3089642c8ba59af9f2825ec5ba7c4e6c5d6f86140b20825817e4625727c6d58c5d38b00863c994e31c8a04927997bd3
 DIST xen-4.3.3.tar.gz 16479922 SHA256 59eb0e1c4a1f66965fe56dcf27cdb5872bf7e0585b7f2e60bd7967ec7f744ebf SHA512 cd9b7199d2859a856c719b75ee50a059c480f7493bbc493bcc3701d20321bd6d83c6fe1dd58e7b37695639bccf15e6420fb52f7e699586e7750ea665e99f82fc WHIRLPOOL 17ee263cb2a4c7b37d399e8baa88dab5b01386959de9d481e8666340d486bc9f32d57d6e1cef1568009fe8dbb2437b9ad90c1bed832cdfedd4be3fe5bf0a7dec
-DIST xen-4.4.0-upstream-patches-5.tar.xz 112184 SHA256 39b3db8f684a570d7379ee7e75e3cfffa72f8fdf639cbb745f90b42f7a223f0f SHA512 e25893b8507fd7b1a3d2194e83da55b934914df73aa4a18a893e6a09df3ab0e1f992a6b26c2b5a2fccfbe41c4a56d10db37eb58dcf08832b9d85be1ff94ced7d WHIRLPOOL 2baf008c98b9685fcad8ea58a41c14271947295ad5e28c99a01876c87ad5274d8f59e5583e1bf41caa536238ed0baaf785f4a1271b68e51f18f2195cd894b5fe
-DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406
 DIST xen-4.4.1.tar.gz 18134427 SHA256 55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2718b6fd1c4f88a9bc7ea25 SHA512 bcd577014f4e8cb37b934f17a4dfb6f12e72e865a9e553cc435fdbe6665c733a4d20a812bf126727eca0946188a6abbd9419579757d7e03a38059f3656371c1c WHIRLPOOL f29eab626729f36de3f2e2c6c8446da4a05085818e18c28f07fe364065e05f0af67602eeb988091df3027a844ad0ccd52b6a0ee86592c7ff6008f961b9bd4bcf
+DIST xen-gentoo-patches-0.tar.xz 22240 SHA256 cfe809b2ca278a4ad6771a59ea5bf4848423e5eb5c72c2f3092163c772774e3c SHA512 05c3416859e24b6704e4cf3442fe20411e78a63689d20f97dfd228a15a7e5bb6cf0c4310278ef6cb15a37bc5e07933137ffa17ccb0a8b7096fc45f3a1c16ba90 WHIRLPOOL ea1c3a4679368bcc37f4638400e91f773126a43f6c180084cb8c8f737d9bdae476d67e310453ac3b10e3fe71a0e2c760906ad707234ee6933c0963d6f3c7f061
 EBUILD xen-tools-4.2.4-r6.ebuild 12426 SHA256 c5489ffd4bd4b453bd702ba6b5c827a1662c7bf836f0cf3752361d565cd0b339 SHA512 d5215f224a8f9c7f139b51515cc8d4932f54c86fa5a1206b3724a5479fde77f55573208e1c76c3f797d052a03f97713a401380969a02e96b9d6a7c45b09a29e7 WHIRLPOOL ff5a62df762bdcca6f661556886bea44c6f3e96576ab0b4db1eeffb762955dda100b01be49954c97684de3ecf44bb9a2e85d23c8160ece4af9630c4fac6c7378
 EBUILD xen-tools-4.2.4-r7.ebuild 12423 SHA256 9220dfdd1b37112fc112bb924b7eaa8ded52acceb0d23c3b76da14437e2847de SHA512 dc223b4f7397e9fa1d61bb486abb959b0d4ef788f84642e04985d4f7eaed870983e5b9cdb79987a9373015954dd01317da251bd22a4e4a8378a19495ab00b95e WHIRLPOOL bb57e425ea862a883f128ec4069ebaecc575b87ec9e6cdd6c8e70f999f7625d8abe8ab19173a82e3a307aaae56511c81ebf34c02e6f53f5e96fcc31302a84662
-EBUILD xen-tools-4.2.5.ebuild 12545 SHA256 bda39a7411dd1bf535867269b46c81b024b97eacda4c75d6833c7075f44a5c00 SHA512 83c895a9a58508f85736efed3f1e154441a6737bd34cbf4f0e1d9fa0e0da1a1ca9eca07ce2f22a840d4072f01457b05f499d9bc876fda30b2718368a7ec6fbd5 WHIRLPOOL 190fb3a75db35c83804d54c9abe7786298f016339b4d5f1de1bbc02c41fee8e0b674277c9dec72ca30624094fcccc23b21bb65e4f60594bbb0799fd2f1ca7f1a
+EBUILD xen-tools-4.2.5.ebuild 10637 SHA256 e110581809fefc17ba9d931cb105100be268a487a0be2593a5a55702edc47769 SHA512 d11d935eff379bd5becddad3aaf5ebdb69ee5223865a4bea65304817418a432e418ba5e5f4b1c53e9c028f6ff30e0d3d9153dd3d8d07820d4b0edecb25528831 WHIRLPOOL d6ff2bc9be57b0b9c3b63dc81da18c183e6f6b5877c13b1676221293b6c8c4200a09a38c0a02ccdb4cb874489c1c13c633fc61ccd174afd09b22643f6b6761da
 EBUILD xen-tools-4.3.2-r5.ebuild 13635 SHA256 99871c3b5398dbfccacb34b273436892dfe78311b0007b7aba23421277b4f70d SHA512 c134d361d6d4cd491f266b29a199b305fb7f3d263adc0204b1ce4f7c6e96f9ba3bb915014230357818ad5b2e8760c1ab0943b7401cd41e90ab2c1d6338ff0197 WHIRLPOOL a33b91b8c6ea021cf181c0f723fc60db961c1e215779092d437042e077082799f8513a508c02d4b1b3ed368df7399265a86a0e9f51afd944fb46fc975264020f
 EBUILD xen-tools-4.3.2-r6.ebuild 13631 SHA256 8753b9bf0e713f6ce53f68f52c8ed93af1fdf448e3e2aa305bd5f3874a58c011 SHA512 498a0e292b73bb20c5fb0db69cb2c808c49d10eefd25e7921baf10f418121ddf5491bf1d0dcfc76bf9da43f6f7b428d365519367388bbcaeae75179be901f2c5 WHIRLPOOL 61017db68ee3e6e341ba5f3d59a48e995d209bfe91c6c356cb566bef65a994f69cd19a3bddbb1407ec509a7865dd36d86d15d47bf6dcdbfb905614eab26ef10c
-EBUILD xen-tools-4.3.3.ebuild 13627 SHA256 3a3fc2e5af017fb7f3081d58a196842151e0f8558ecb0f005fbd967f8fb81d5f SHA512 155a82c9035a9924d829f6453dd9cd4fe2117fafd91c5bf86b65af81188b16e6f9751069e2eeafbca2eeee16393d8af4f25e61ef17861056464d9d971137e539 WHIRLPOOL d1eb6cdf5fa5bfcd4afddf9fe05a6607dd805d7a5a9822ce57da255704cb1beb84f1729611c4f3b0507a819484e2efd433a1106c0866003886f3b8ca0caaebfd
-EBUILD xen-tools-4.4.0-r9.ebuild 13521 SHA256 bd902ca88be1d165a4df7ad78629910cbf8e3d047e51dbbdf8e85a5a40ce570d SHA512 d70b6c3e82f7a5b6a4b567d38e923f1903b0a3a39fc2026005e0e2ba60223e226870995f5c39f3cd4cbb2f664bdf0b7bc841ef2d199de186c06ca202a34def53 WHIRLPOOL 5eef42f4c8aa971373189b0c16d672779414e80c9bd63a7fb632210f484257b0a75da1279d83b283b382d4fdc7ff21eda4ea07740df4dc9387c21389408c19e3
-EBUILD xen-tools-4.4.1.ebuild 13565 SHA256 51ad587543596ba4fd0785736166844e05aeadf420a87407ac2d11b6035e1341 SHA512 6267f58f13e3818bca12f584b93a423c5c3630f8e5db8496fede9c7311cc645622235b50a916976a576909320b4a464214b79df4ebde7ea49617cbdf0c592cf0 WHIRLPOOL a0862d0a053c02b02b874bc5e46469fb866d43af836ce66ef2ed0f97a078938cee3c9bad33e3481107f49f2490a7fc371410f08ff2cd1ad1a9783775b6cffa89
-MISC ChangeLog 60609 SHA256 c88a2cd1f8a4bd0209c8519c9f858aa21f602b565304b71c9f747f87443bd416 SHA512 39dc1b8977f8d659203c8c112f31dc18ae71a9b4ac0a87add2c79ea32aefabe1ad2c8745ebe789819940c098d4939dd4404d7a7a8f9a2f8c8b17d1fb2f87d3fa WHIRLPOOL 4717684ec5dd234afe720d8ac83ed0ca34441048d6e17d02c113bdcc7aead1d076535d1e1968338fc0974eda5eaf52ba723ff65071e4466b72279171a0f1b4a1
+EBUILD xen-tools-4.3.3.ebuild 12009 SHA256 29553672da19c497f35259071895badf0dd96f96e7db1c4e3d67ac7471bac8b7 SHA512 13f0c74d6e5041f61204494eef82a80b7ad4139598ce3b337d64293cda3392428066bc3295606d816b01f161698b360f64c8643ae8561e3b6bc3c45e7b9466ba WHIRLPOOL beb88c166cac9ed571e74d4fe6007dfdb79ab37689913589365509cbce5c779fd696900ddfe08ea0d2dda3dc1e36dfc949821f5c4a7ac34b6143555d1526a2d6
+EBUILD xen-tools-4.4.1.ebuild 12484 SHA256 4ef323418978176c6795f2b179b800d1597a58bc61df3927c8d72b8311acfaec SHA512 0953afb2c4128f40d985bffd2043bfd986c555d25d22beaaab57226916394fade71ec6293437e99a1cbd2b947b9cc3264ca13af626720bc83cf26c236f27a769 WHIRLPOOL 8874b2253e5fddf1e694e421ffde33b4534fb076c206c2fe13c08875cde1e6fac0e914706d93bed07bfe579b1c60355d9c3b224a306280194dd19f76da5c3efe
+MISC ChangeLog 60851 SHA256 c51459fd24b0a3b654349396a6f05045e30cd08a14c4236d2a5d354144e757df SHA512 d5673a5b295818cf0ac7983b6f182ed5c8be6d500c577c6aac0656e51815d57fcc0ba40418b810ca6c29f3b78e3ea6bcb93548e849addf38ed47fa09450b32bc WHIRLPOOL b988339cf50e832db92c33c0a3c4a853f52f514f1967f293c41f89c9cfe4f9ce937ad3c2d7571bfe7dcbe183b9645a63aacc6e247163d15d6cc40b0ca00be224
 MISC metadata.xml 1009 SHA256 9e8e2c5b191fffbbdf2dd0772213f5b2fe13b10e0413f9d12081f87e7ba6565b SHA512 bdd573cf6cb7664d4f0512f99f7ba5c81758d59986d764423328ce1fccc2149f0f7ca9eccefe3953ecec5f4d15bf829792f9ed07a60a5c447e1a3f5ed0d26c26 WHIRLPOOL 08f65daec784396532cc0700847d5e8545a73b49e840a491a6089945bbb9a8597ecc012bf65a6835ad5dff1623377d80360692ae9c41589130f9b4bedc909e76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUETQoAAoJEJIMDbyqvv1VudMQAM7/Wz30i/AcfeU/LlAhzTNM
-5rMojB8n7kK04eG2IOVO33iDl8Qj1i2k3+R8WNZzP3pT7AaFFRSeePkHxVPU0345
-yq/x1OpMdx1PNAHPShhjtQsJpSW1dlQcAn9vI5YU85/pulYn4Ty+tUwkd5ePdyqQ
-5pT8Sk0UsosMbXl3uNmVlbQY6l4QlN7mo8fqhPJ5rGOFX0scED1YOAc84HsDNx9N
-E7JLPOnnp77og5BkLEiw0mb/j7GrLeYO9FFF8LhTOd+tV5hCOJOLLwrUBVbIvorV
-ggD91S81dB+AAdj+EFkKnGsAQo6U5TOQNB2JelRv9VmGlEfk/SCqzga4h9XuMn/C
-FNX1eQZEo9Dvz2nfcxXtq31n9Hy+FNJYypehcJPCtLq56Yy0hJ6dJSgeVXqZuvsg
-kVlpUt289BVEVvqhWIjKqhlf372vbMsDQ6/8QgsEOFKYKAOucwZSFF8n5vJIYeAv
-SYskTZ/z1DhDeolr7nA4mWmczzg53/5oEiJQx2mmK7qnXWbQvPXOwd/5lA1LtNtO
-WavEEzT/GfRoG6XQQH647Ld17TCQSjb5PBviPGEkGYDaYDrDv2w1RK7iLzmLxlNq
-XzH5W24m14P0lof5VngJcWLOEy4Nx1aQyVfeIwvqiHN+sV7cAYT4lSqflc4GxgKg
-M6oTYZqjTq1YghK2WsQz
-=HGY0
+iQIcBAEBCAAGBQJUEli0AAoJEJIMDbyqvv1VW9EQAIxZkPpnqlkYYKWzskqYnY2h
+CqpGLUVBbHjGSnxkGsl5HxnjB4OlUvZ+uW57Q6sl6+6Hq6SnlHgp6YseEEth0KXZ
+e85xbpweXja3Z5euHFsSEMjvlY9Ivp/shRvJLhzJw8S0dOMufZgQBOvow5w9O4aN
+e1dO+LBln7T/HDvHFi86hUYBJZBcHF3KtqtAUuet9QVE/avEbQAcG3j1GJOE+KtR
+gfuFvDTZYpFg5bk+VotCJ0/pgzWSacdoiCCkURgMdO02ty+ujMIOVvB+y0C3lrJ+
+uYDiLmD1G3guVe/OFvIa7/2ju8eJJYtQfvsWbFc9dhjckmMNm0NgHc09oGmPCch0
+/l3I37mzx+8+DpMHjHkXp37Bblf9qCr64OfqHbOIbfoiqkvM/9yQEcd40uBkp5FR
+wEJ81iZJ0nwB3Fait42Mwa+FHIMc0BDHNhaZlbfBEXoi/l7l6Uvo9Xn1fx4WD6HM
+k5uWUML7UpVgxJAeLrxkawS0xclr3LMx8fX+WRFKYZVxvnNIVZzxJsrAelDa+PKV
+eZJS1qGyq2u6sbsKWVSPugjOBWnNdcnVS//09TjzVxJABWkxeXSwQiVmmRPpOfQO
+2ZW92FQvDctoWTlta8IGgM1l14ckq/LGTR/Vfs9Cj+0FaiOhCMcLYEOmXoTEbBy0
+V4ZP/ibgL6cfSP5Y8OaS
+=Cdy0
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
new file mode 100644
index 000000000000..a5ce0c33e8fe
--- /dev/null
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -0,0 +1,92 @@
+# Drop .config, fixes to gcc-4.6
+_gx001=" xen-4-fix_dotconfig-gcc.patch"
+_gx020=" xen-4.3-fix_dotconfig-gcc.patch"
+
+# Fix texi2html build error with new texi2html, qemu.doc.html
+_gx002=" xen-tools-4-docfix.patch"
+_gx003=" xen-tools-4-qemu-xen-doc.patch"
+
+_gx004=" xen-tools-4.2-pod-utf8-chars.patch"
+_gx005=" xen-tools-4.2-pod-docs.patch"
+_gx006=" xen-tools-4.2-pod-xl.patch"
+
+# Fix network broadcast on bridged networks
+_gx007=" xen-tools-3.4.0-network-bridge-broadcast.patch"
+
+# Bug 496708
+_gx008=" xen-tools-4-unbundle-ipxe.patch"
+#use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
+
+# Fix bridge by idella4, bug #362575
+_gx009=" xen-tools-4.1.1-bridge.patch"
+
+# Conditional patch, fix in ebuild
+# 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
+_gx010=" xen-4.2.0-nostrip.patch"
+_gx024+=" xen-4.4-nostrip.patch"
+
+# fix jobserver in Makefile
+_gx011=" xen-4.2.0-jserver.patch"
+_gx021=" xen-4.3-jserver.patch"
+
+# add missing header, Bug #467200
+_gx012=" xen-4-ulong.patch"
+_gx013=" xen-tools-4.2-xen_disk_leak.patch"
+
+# Set dom0-min-mem to kb; Bug #472982
+_gx014=" xen-4.2-configsxp.patch"
+
+# Bug 463840
+_gx015=" xen-tools-4.2.2-install.patch"
+_gx016=" xen-tools-4.2.2-rt-link.patch"
+
+# Bug 379537
+_gx017=" fix-gold-ld.patch"
+
+# Bug 510976
+_gx018=" xen-tools-4.2.4-udev-rules.patch"
+
+# bundled seabios
+_gx019=" xen-tools-4-anti-seabios-download.patch"
+
+# Bug 477676
+_gx022=" xen-tools-4.3-ar-cc.patch"
+
+# Prevent file collision with qemu package Bug 478064
+_gx023=" qemu-bridge.patch"
+_gx025=" xen-4.4-qemu-bridge.patch"
+#mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+_gx026=" xen-tools-4.4-api-fix.patch"
+
+# Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302
+_gx027=" xen-tools-4-qemu-fix-po-collision.patch"
+
+# xen-tools-4.2.5 patches set
+_gpv_xen_tools_425_0="
+${_gx001} ${_gx002} ${_gx003} ${_gx004} ${_gx005}
+${_gx006} ${_gx007} ${_gx008} ${_gx009} ${_gx010}
+${_gx011} ${_gx012} ${_gx013} ${_gx014} ${_gx015}
+${_gx016} ${_gx017} ${_gx018} ${_gx019}
+"
+
+# xen-tools-4.3.3 patches set
+_gpv_xen_tools_433_0="
+${_gx020} ${_gx002} ${_gx003}
+${_gx007} ${_gx008} ${_gx009} ${_gx010}
+${_gx021} ${_gx012} ${_gx014} ${_gx022}
+${_gx017} ${_gx023} ${_gx019}
+"
+
+# xen-tools-4.4.1 patches set
+_gpv_xen_tools_441_0="
+${_gx007} ${_gx008} ${_gx009}
+${_gx024} ${_gx021} ${_gx014}
+${_gx022} ${_gx017} ${_gx025}
+${_gx026} ${_gx027} ${_gx019}
+"
diff --git a/app-emulation/xen-tools/xen-tools-4.2.5.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5.ebuild
index afde82e7a92c..0b00e22ad8c3 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.5.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.5.ebuild,v 1.1 2014/09/11 05:33:16 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5.ebuild,v 1.2 2014/09/12 02:21:28 dlan Exp $
 
 EAPI=5
 
@@ -16,13 +16,16 @@ if [[ $PV == *9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 	UPSTREAM_VER=
-	GENTOO_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=0
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
 	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"
 	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-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
@@ -40,7 +43,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 system-seabios"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios"
 
 REQUIRED_USE="hvm? ( qemu )
 	${PYTHON_REQUIRED_USE}"
@@ -136,21 +139,20 @@ src_prepare() {
 	fi
 
 	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
 	fi
 
-	# Drop .config, fixes to gcc-4.6
-	epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch
+	use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.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"
+	if gcc-specs-pie; then
+		epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch
 	fi
 
 	# if the user *really* wants to use their own custom-cflags, let them
@@ -189,54 +191,6 @@ src_prepare() {
 		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
-
-	epatch "${FILESDIR}"/${PN}-4.2-pod-utf8-chars.patch \
-		"${FILESDIR}"/${PN}-4.2-pod-docs.patch \
-		"${FILESDIR}"/${PN}-4.2-pod-xl.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"
-
-	# 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 510976
-	epatch "${FILESDIR}"/${PN}-4.2.4-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
@@ -323,9 +277,6 @@ src_install() {
 	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
@@ -375,13 +326,6 @@ pkg_postinst() {
 	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
@@ -402,11 +346,6 @@ pkg_postinst() {
 		elog "An x86 or amd64 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)."
diff --git a/app-emulation/xen-tools/xen-tools-4.3.3.ebuild b/app-emulation/xen-tools/xen-tools-4.3.3.ebuild
index fbcd70a8feea..4fffa5004412 100644
--- a/app-emulation/xen-tools/xen-tools-4.3.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.3.3.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.3.ebuild,v 1.1 2014/09/11 05:33:16 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.3.ebuild,v 1.2 2014/09/12 02:21:28 dlan Exp $
 
 EAPI=5
 
@@ -16,13 +16,16 @@ if [[ $PV == *9999 ]]; then
 else
 	KEYWORDS="~amd64 -x86"
 	UPSTREAM_VER=
-	GENTOO_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=0
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
 	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"
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-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
@@ -43,7 +46,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 xend system-seabios"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-seabios"
 
 REQUIRED_USE="hvm? ( qemu )
 	${PYTHON_REQUIRED_USE}
@@ -138,66 +141,27 @@ src_prepare() {
 	fi
 
 	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
 	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
+	use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.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
+	# Bug 478064
 	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"
@@ -344,9 +308,6 @@ src_install() {
 	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
@@ -399,13 +360,6 @@ pkg_postinst() {
 	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
@@ -426,10 +380,6 @@ pkg_postinst() {
 		elog "An x86 or amd64 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"
diff --git a/app-emulation/xen-tools/xen-tools-4.4.0-r9.ebuild b/app-emulation/xen-tools/xen-tools-4.4.0-r9.ebuild
deleted file mode 100644
index 1e2755aedc1b..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.4.0-r9.ebuild
+++ /dev/null
@@ -1,441 +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-r9.ebuild,v 1.1 2014/08/19 14:16:01 dlan 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=5
-	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"
-	[[ -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
-	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}"
-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 system-qemu system-seabios"
-
-REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
-	${PYTHON_REQUIRED_USE}
-	pygrub? ( python )
-	qemu? ( !system-qemu )"
-
-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
-		system-seabios? ( sys-firmware/seabios )
-		sys-firmware/ipxe
-		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 )
-	system-qemu? ( app-emulation/qemu[xen] )
-	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
-	usr/share/qemu-xen/qemu/s390-ccw.img"
-
-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 [[ -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_OPTS="-p1" \
-			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
-
-	# 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
-
-	# 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
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	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
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# Bug 477884, 518136
-	if [[ "${ARCH}" == 'amd64' ]]; then
-		sed -i -e "/LIBEXEC =/s|/lib/xen/bin|/$(get_libdir)/xen/bin|" config/StdGNU.mk || die
-	fi
-
-	# 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 \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		--disable-qemu-traditional \
-		$(use_with system-qemu) \
-		$(use_enable pam) \
-		$(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}
-}
-
-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
-
-	# 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 "$(get_udevdir)"
-	mv "${D}"/etc/udev/* "${D}/$(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 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.1.ebuild b/app-emulation/xen-tools/xen-tools-4.4.1.ebuild
index af49185a7fa4..7dc3a14b262a 100644
--- a/app-emulation/xen-tools/xen-tools-4.4.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.4.1.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.1.ebuild,v 1.1 2014/09/11 05:33:16 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.1.ebuild,v 1.2 2014/09/12 02:21:28 dlan Exp $
 
 EAPI=5
 
@@ -18,13 +18,16 @@ if [[ $PV == *9999 ]]; then
 else
 	KEYWORDS="~amd64 ~arm -x86"
 	UPSTREAM_VER=
-	GENTOO_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=0
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
 	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"
 	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-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
@@ -149,47 +152,18 @@ src_prepare() {
 	fi
 
 	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-			epatch "${WORKDIR}"/patches-gentoo
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
 	fi
 
-	# 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
-
-	# 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
@@ -399,13 +373,6 @@ pkg_postinst() {
 	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