bump security patches, bug 508510, 508424, 509054, 509176

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

6 files changed, 36 insertions, 187 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index e3fb341e8ec6..6975bc988163 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.158 2014/04/09 21:35:41 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.159 2014/05/10 00:06:23 dlan Exp $
+
+*xen-4.4.0-r2 (09 May 2014)
+*xen-4.3.2-r2 (09 May 2014)
+*xen-4.2.4-r2 (09 May 2014)
+
+  09 May 2014; Yixun Lan <dlan@gentoo.org> -xen-4.2.4.ebuild,
+  +xen-4.2.4-r2.ebuild, -xen-4.3.2.ebuild, +xen-4.3.2-r2.ebuild,
+  -xen-4.4.0.ebuild, -xen-4.4.0-r1.ebuild, +xen-4.4.0-r2.ebuild:
+  bump security patches, bug 508510, 508424, 509054, 509176
 
 *xen-4.4.0-r1 (09 Apr 2014)
 *xen-4.3.2-r1 (09 Apr 2014)
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 715e5f9c0b18..28fb1a4cb463 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -19,36 +19,37 @@ AUX xen-CVE-2013-6885-XSA-82.patch 1447 SHA256 db47b9dcb2124995754e7b43d7eedb5aa
 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-1.tar.xz 45136 SHA256 717a67c01c8442559987b717a03e2e36e1173b6603054e5125c0890ef36f2001 SHA512 42715369162c30ea646dda6a215ef4b7464f5e3510779fd243bcaa07a7eb8b07166b3026a482b0cc71ecac2a957fa2ed11ede4e00fc0a4fbbabfb9c0fd687ec9 WHIRLPOOL 44ea7c65357ad6d5ebbcd27bd3aeb054ba0e8dbe6224bcc6941b8cc37e5128c8965a980d430e925293c66957f9285b73f2c661afa99457b88994efe78c6406f2
 DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406
 EBUILD xen-4.2.3.ebuild 4212 SHA256 f09e7ea233bef41c17089ca7a046c6944f214e81907fb09ee0940e3735bed992 SHA512 d9d42dabf5114fb259c22eb6cd2b1a956cabbaf18131dcb562c23dcd55698607ae5049667c954f4454bb6adb0cfc46054bb23215cf5bf29ec16aeb13b85d46f2 WHIRLPOOL 935e22e705fc0364c41bb18b4780a435de2e8c48bb1fb8f6ebfa501f486f03f03c064bfc77d045afb961d4bfc2db1e12b276bbbbfece359cd54885df822016be
 EBUILD xen-4.2.4-r1.ebuild 4214 SHA256 fb0bd32cf4eb686fefd03deb82a29e21716f9f2d0f598cd2f51acd56668842a5 SHA512 00ca3b2a0f5117af7462e1befd365a0ed0d605ad94007a17efba686daca5f00e73a9a0927793347d9077b51d164b5fa3210fd621c904f6be8f8e8d20c562df6f WHIRLPOOL b83ef51ec1dfe1c04a9773191b842405f8ca84177dd7d7bcdf78a10d1fbea5dc509a2679bef1dfaf61c80284828e4fc2a3fc74ddbbd36b44e75b7e567aa1a46f
-EBUILD xen-4.2.4.ebuild 4213 SHA256 99be813c840774024cff83f02b0d2bb7d9e479882d60d48aa114ea302e576379 SHA512 e5ed5103ac91a0fd1acb1209db063c2b145e45f5e171f235499acad5faaf571e4b06c80113fa0f4e7d891df31c331159403b28a8c470122d27f1246bf2920f9b WHIRLPOOL 43b307924681ffaf7f31647b490091e6ec25909fe73548e3b215b2457706a407050bdf1684ce13f825a58272e37a977b6dc202083567329c80b487941e691dd5
+EBUILD xen-4.2.4-r2.ebuild 4214 SHA256 2457a4835800a3421b911a35381641333c241490ae58ca250a293ba913855299 SHA512 6618560a899fbc950758a0004cce41749dd48f765f45d8cc8b48b4248bcada21fab4c17f28f2c8b37e23f01d4601c524755a5cb5acabe5f49f0c86d480b42f44 WHIRLPOOL bc6e4f3f68761a96e2af96474968be0a155d33ee998bd9b7a798195f291545fb18bffed3ef8d9c0690ae31435ff5a0d735f75ea7d2b48fd254bf2f1590bba477
 EBUILD xen-4.3.1-r5.ebuild 4118 SHA256 acac2edea0a26f1025254f754e864e386e70488d9d0d7d9a5743552c61022b9b SHA512 c75f3cee4665776b2f350101f7cde6efa916c45976ee1f690a4d0ed07cffd051d0bfdc0cc006b7f0a463e747a5cc7b41900ecbaa1ab32505f0fefd68811c610f WHIRLPOOL e6a4eda3889fbb94430ddc50be50cb71a3a292595dd19399d14d1bcdd06f19ea40bdc3c0a926cd8791c3af9cb883bb3564a35acd1ca647aed2b4cd179261871a
 EBUILD xen-4.3.2-r1.ebuild 4108 SHA256 18de3d799cc197167780901eb9a16e4174b7c122eb5642a4d18297c90ed42175 SHA512 df8478bde9928cb47d146009c3b38e110545624b51a553ccdafee5bf865395eff3fba5ce5833f6c21fb1dfe730108f05d194b531b8232892433da7595a7bd450 WHIRLPOOL f94d271e122a018c307315ff5ed907915f7c0599a43202d4cce96cd5851cdd9eb667c8594d5239a330e473ee29f334175ffc1e69615817a1b7553f767d58468e
-EBUILD xen-4.3.2.ebuild 4107 SHA256 ffd84a6285e31ab05435e2143522c00ddd71683e9199a82189db406be8b0703f SHA512 2ece621e74731ae5a41b4de59b0a68be449941a12e0464cca4c5664e14f9f75cce3f109829c4d3c0adb3558c5b39a5f73b6b924c2e32e348b885258def75aa1f WHIRLPOOL bc4da56fdd53440a1a85ce1a872d39a30ec460e0ce0b8726cfc54c6aea42854b8e2691d53d49abc3140526d9a1884d113fa7e0ca40022f04c63c756a4face81a
-EBUILD xen-4.4.0-r1.ebuild 4337 SHA256 45887ca24342421542ed1a5d40dccca7393ca449d73e5bf347d1b7e0119f1511 SHA512 b3e2f7ac1828c549f540366955201e6f061d24005f78998ed018093de50698d16a2cf08005f5fb586a55c5de15ebcae759ae502a3512426dfe27c18d1f6016ad WHIRLPOOL 345c380358b111e462767de849f279b7a412bd6c37d21e43724e27bf50769c1c62ca9f0b7707552e7b244ab591d55331be678aca42e037920fd51dda5c9cb98b
-EBUILD xen-4.4.0.ebuild 4333 SHA256 ad596681105e4fabab3c36202012601ff4fb7f16191ecbeaedb4029ec2709738 SHA512 3e733984a5aec2f9abd21f09940ff6fba346a0b3d4ed98c40ac84044f558dccc7584fcffe2cfa1360b6623b0c082034df4f8c84e8a0a8f695b8166cea5750157 WHIRLPOOL 49ec43a6e4d7b48a5e379dd3281fa658e3649c7371bd43d85ee9961b7dcac8efede876bc09d90c526c2443505d78a11b98c881f3ac83daa8dfc3a2f53ba54683
-MISC ChangeLog 28909 SHA256 8b570a9601b43f1c0384cbf74eea85861c830f2465e4423139977fd1a46e855a SHA512 e0e8e26249152fd40af3e9312f0a3d753dda394a2cdaacdf353a4673c6fc87f4f5d5b3104ee697868ca3d7869e6ca59ca99d3ed3b1fb090814cf5504cff29d39 WHIRLPOOL 4ba8c628e0644445f87d160625fca3f070682564c05a3381aaff3d1224e6f4e0bd4caa46294504d7458a71942971301f5786874e723b8ec766ac9eb6feca006b
+EBUILD xen-4.3.2-r2.ebuild 4108 SHA256 6d3f1f204b7bb23dc9e1c6d2df6f33d2535bef62f35cd8d23caa12eff98f843e SHA512 97bfccb009fa3bee444d4f050c4e183be0a46f054bf904f997129dcbebc5d8f76f5002f74ac1f53871cc5893fd9bd1f52a3453f6458b894d57b058a086d530d0 WHIRLPOOL 5b88919c50d6c7cbcd7d9e23156251d72bf6c5e81aaef9bff6cb9c2537a8f7970a2de622896d9a146074ef3b12e58ed5bbbb14e9b1d558ef1cf6bf112b30aed0
+EBUILD xen-4.4.0-r2.ebuild 4337 SHA256 88ce098a72b0ac268c0919a1bcbac2d0bd107829a0a1bdd804c9ae660a42a5ca SHA512 065e723c566770bf6ba6f856bc5c0b77f7979fdd88cae58719f1c835a1dade8f0c7fcac10a88dfb9cb05a11e0011edaa932498bc9897132f7fbb981b87fa0fb5 WHIRLPOOL 2c6872b850f8ba33504443d06fd9653a9518c76222145300228240c412661a73198bbee5d716695bfcd1b0a19e6a8569af422f4922ad87af4c3a4b346db60ffd
+MISC ChangeLog 29247 SHA256 0dad843ae38b71ce59d054eddebfa939ff3f7c93d70877b2ef787313224ec1f7 SHA512 cea0877c8f99c3538b5cfd58d43bde36ab0afa02a4b975ab743eb4d75a6939ab7871f83937ee483ec518be6319537cc160587fd81b1f41b0aded5c247fc8d503 WHIRLPOOL 94c6c3a7ecf61a848cfecae923930d253d67e55bd8a69c386e3d3fbb7e38ebcfbcf765385ef4b5959c33cb592bf0b5ba91eb4cdffad9313d0383dd2eb48bc8cb
 MISC metadata.xml 480 SHA256 c6d867148db1480748552aea9692bdee95fb98a94fcfadab0d128cbf1102b0d5 SHA512 888aa860cbb74d79c76f096107d8b22975470373ab11249da2c4ae9c4e172bc52fee73fdfaf07c19e977cabbbdf35ea5b3c6508d4a6f555b771ab6729806fe5c WHIRLPOOL c4d10589ca2c8b4e8bbd877dfc8f4f3b66ce8ae7bece71617e9571f07a39270f54c41f5fbbb2b29020ffc6473e2341064bd708813af3e20a31d5b9bd0510ebe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTRb1LAAoJEJIMDbyqvv1Vk1oP/jWcqxBXFrmfl/AUiGQD1NYJ
-/oh4rE74UVEzvZf0QOIkXWx4v96f171IEWlvPZ/DzdfD7HJH3NvCtvDD1gkMNoKf
-gVtgJ4TZ+QxM2Q89yay7r+cfBHi+GU5ImlfwDFc1gAz4QdxDR/3vLNMmUM9tHWfI
-K2lgmCj5d87zTkP2i8g3ryWwLmvnCc0jp05xuy63gyZRCvT2oBX1jWRk4RmDfi0+
-RdIXOGWGWUu3UV2wwx24RhrJxRUx+KWNJ0Z/3LpGmvAbue19XEAN//e5WiK6tF95
-DrFiUCoSkzg5fPUHR0EXqtSE3S/3o8fn/pEsy5mQrUO1uDBEMiq+9WxdIDlOawB5
-e3D3mMmp5fOmlD2vyU8PmaTeMNIbySbo86oHb8COIyNUFoEPpa1+eWQshAgtkTnR
-yNyJjZSPI5N/KAzpHdGCBEU0MPUvrz24gUi4c6IthhGwg1edPFiTywfLhBPaJ+lR
-6yyOgHxpPL0/AdcMBHUBaNuOnRVolArbs3I96eqw4Ha+cU/ThE4YZYXMG3Is4Qco
-s5bAzOVjC9wJgnq979Xrf7/319jPfXZmj0ed6F9F19XwR5lCv9tE5ZyqAnBqoGdF
-Rls8WxNomK0GzxjT8JJRGX8PK1rkdNMgRZ7ar6apfn+xW0oZHRqyx9/ZPa24harj
-lmJrnCoRlEAP4XUIoiI9
-=5k4q
+iQIcBAEBCAAGBQJTbW2PAAoJEJIMDbyqvv1VyKcP/iJLUtcHA1ywBRHMfSBvuA06
+nEWpFi42vlYGH/k4K/whfHSqs9hrUYs5Mm40PEDp1pKSSkRnnS6WGyQx00g9mVvB
+jFq+UNoTQjI7lD26ztdsilw7v/2GKiWz25Nehg7xRqmD9YX4LIqhjpu3P7T9Fftq
+TC51NA+/rXzgogPDSOr8Z6pHwHKyy38PagovEOeZ35VfMa+LeEEV/O0imbC54eOb
+yBRx92kRR2xJCp8UZHfbc7IPv7VswctxMW8czJttfMChZgD/FIfRPam2oS8zxU/H
+YP0Zo/eBL9qcS27O64WJddoevIS4qXzq4r0R31srtO2mygXUpMZI6PvOVC0rrIxx
+sVd1Bq1TgJVZPL91b0dHPg816B6N4Mo+v9jSeSdP+bQXp4dkOMFxe7KU07GN74X8
+fyWf+fgT9TLDZHiZJg8aOyGi33c1J9BUA6fEkyk0e6f3ytUOmtdXQ1RUr4n1d4FG
+qOKybuSbBlNuvEhXLlbhTRQ2Q3Qf5yJelPLk4ZUJRU6E1Au7RrK+jEPiiYXF015j
+t+FUygLuiGDtjM86QztskSW7d7AXkGn/dJbudUo7O7YJy8ztux5igSeNy9UnJM8a
+fWzICfRcL+wrblg0jvEXmRgz/MqG7FYi397pEhl2j1WNOEft+YujD4Cjj0kZP4C7
+/k4K547gdoIEtamDJb8L
+=eu/F
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-4.2.4.ebuild b/app-emulation/xen/xen-4.2.4-r2.ebuild
index cfb93a7b3285..03e1297f0430 100644
--- a/app-emulation/xen/xen-4.2.4.ebuild
+++ b/app-emulation/xen/xen-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/xen-4.2.4.ebuild,v 1.2 2014/02/21 04:53:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.4-r2.ebuild,v 1.1 2014/05/10 00:06:23 dlan Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="mercurial"
 else
 	KEYWORDS="~amd64 ~x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=1
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen/xen-4.3.2.ebuild b/app-emulation/xen/xen-4.3.2-r2.ebuild
index ebb83b808715..663bdcc6ed1f 100644
--- a/app-emulation/xen/xen-4.3.2.ebuild
+++ b/app-emulation/xen/xen-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/xen-4.3.2.ebuild,v 1.2 2014/02/21 04:53:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.2-r2.ebuild,v 1.1 2014/05/10 00:06:23 dlan Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 else
 	# Set to match entry in stable 4.3.1-r1, Bug 493944
 	KEYWORDS="~amd64 -x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=1
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen/xen-4.4.0-r1.ebuild b/app-emulation/xen/xen-4.4.0-r2.ebuild
index 11bffd4721b7..484e6a2e7ffe 100644
--- a/app-emulation/xen/xen-4.4.0-r1.ebuild
+++ b/app-emulation/xen/xen-4.4.0-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/xen-4.4.0-r1.ebuild,v 1.1 2014/04/09 21:35:41 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.0-r2.ebuild,v 1.1 2014/05/10 00:06:23 dlan Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="git-2"
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
+	UPSTREAM_VER=1
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen/xen-4.4.0.ebuild b/app-emulation/xen/xen-4.4.0.ebuild
deleted file mode 100644
index 21f8fedb1f72..000000000000
--- a/app-emulation/xen/xen-4.4.0.ebuild
+++ /dev/null
@@ -1,161 +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/xen-4.4.0.ebuild,v 1.1 2014/03/23 02:15:34 dlan Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
-	live_eclass="git-2"
-else
-	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-
-fi
-
-inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask xsm"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="flask? ( xsm )
-	arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	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
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	elif use xsm ; then
-		export "XSM_ENABLE=y"
-	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
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		epatch "${FILESDIR}"/${PN}-4.4-efi.patch
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="boot"
-	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 custom-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
-
-	# remove -Werror for gcc-4.6's sake
-	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
-		xargs sed -i 's/ *-Werror */ /'
-	# not strictly necessary to fix this
-	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
-
-	epatch_user
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-	fi
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the unoffical wiki page:"
-	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
-	elog " http://en.gentoo-wiki.com/wiki/Xen/"
-
-	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-}