security bump, bug 532030; add 4.5.0_rc4 for testing, with keywords dropped to alter user

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

6 files changed, 356 insertions, 24 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index b73c580a79a9..c545f2bb98ad 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,17 @@
 # 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.181 2014/11/26 13:53:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.182 2014/12/19 06:44:44 dlan Exp $
+
+*xen-4.5.0_rc4 (19 Dec 2014)
+*xen-4.4.1-r4 (19 Dec 2014)
+*xen-4.3.3-r3 (19 Dec 2014)
+*xen-4.2.5-r3 (19 Dec 2014)
+
+  19 Dec 2014; Yixun Lan <dlan@gentoo.org> +xen-4.2.5-r3.ebuild,
+  -xen-4.3.3-r1.ebuild, +xen-4.3.3-r3.ebuild, -xen-4.4.1-r2.ebuild,
+  +xen-4.4.1-r4.ebuild, +xen-4.5.0_rc4.ebuild:
+  security bump, bug 532030; add 4.5.0_rc4 for testing, with keywords dropped
+  to alter user
 
   26 Nov 2014; Agostino Sarubbo <ago@gentoo.org> xen-4.2.5-r2.ebuild,
   xen-4.3.3-r2.ebuild:
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 9a48b5bb4716..8f98a5c564e5 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -7,35 +7,39 @@ AUX xen-4.3-fix_dotconfig-gcc.patch 8854 SHA256 4e0d22acdb4ecc4a1d418ec91bc6ddb9
 AUX xen-4.4-efi.patch 1873 SHA256 096ae932f6f9387b8d5a837279c436173310f121e06ba356b7dded67d682ac7a SHA512 a448b72f679fa2e9d544d73bfb68d2deef646706917114a458c9c44a0338d46390ebffe8b671a30f057be9f15b8fb4246c574916e674b5bd314b6908e5e06c82 WHIRLPOOL 02ba29e135f85727a655ed674624a97c3bad40ddd00a0e194b64f5179b9e65c9f6831c902c754001551dc4fbc0a08ee52c075208551d72a65b2f93f7aef29698
 DIST xen-4.2.5-upstream-patches-0.tar.xz 5380 SHA256 e1f2afeb801eb2f4905597cc819c05c7cfcfddb3f6a3c27599bbfbacca204117 SHA512 52f370d0606d3da6d058dee70016699ef25fe5ea0910a6681cf9ecd0f34396462361faffa1e16d0456bf1a08e4cfbde847535b45e5592c4f47e872868be89b60 WHIRLPOOL 4630bb386c70eb4317e1c3bc3db4e8c9b9b03fd6bed5f53f325d6c78110b06d13cad39371d5ddea16a2b8da0ec17a08bcb497999d5a31e5e6877c1c8800fe9fd
 DIST xen-4.2.5-upstream-patches-1.tar.xz 12260 SHA256 82c3640b6c3f64767810a2db26fc7b96751e350989846679ab60a034a17202e1 SHA512 71998510a0a80069f7d0ab4e74e6ecc1e4a224df9a6c83af50fa7cf322e4d45f80366006fc004238e05def1084dc80e70221ae082833f29781f33a0b621bd303 WHIRLPOOL 034ac220e17025c41a969a1474bb0170eb5ec72b9c0dc8ef48208da01f380fbd2d969a7ae323b41e73156a90f06c0f90f16722581a79c232f7d0b9bd1509b0c0
+DIST xen-4.2.5-upstream-patches-2.tar.xz 16768 SHA256 5d63f9f4c0619465c4421ad4f9087e82f833b4b1683f0aa2a38c191aee36c71a SHA512 14bd3ed218d4c4711c084789e89914c1550c4154fa7e228f663eb5a635dfd8e0031e0d762d5502e0673a2991a8790ce3208fca5649093378066794f3ed32a1d5 WHIRLPOOL 54fcc148f70ddfde0b7bfb160850c473c1d8336ca4417bb27681ffd75127123c44d67ca04886dfc709fcbe45040abb9ffa49d392f1a82a9da525e7d93aadaba2
 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
-DIST xen-4.3.3-upstream-patches-0.tar.xz 7536 SHA256 b62613ef4aaf4978e25ffba11493cd01eb7515e4cfb13326bec7c52726e4acb4 SHA512 c7a1a421439455098bdf7c3561b3b932251a950534f40dcca0cbbf51854e379b997a6d0efdfc42389cddb8c8d0fd8e9215dc5c1d273a87bd903d0ce8d02cd609 WHIRLPOOL 6377a962c3ce07a8f23d58b89f0b0746cfd10db244162da6eb3a049b9098bacf621d9070f0358fae91f072cc72b2f6661c7b24b70de67527910f351b4278b0b0
 DIST xen-4.3.3-upstream-patches-1.tar.xz 27356 SHA256 f1654f9955ef7e2b2ca7cfe03f452aa19453dc592f976fbc2c6b3e993606045c SHA512 c46a2ca7082223d9345ac49bf4ef5e5f02f338c0e4c406083e81c707210b505965cf1cd5a84b0fbb2abcf7e9973acdb85c05068c0c0310965a177d63bbed2076 WHIRLPOOL e937b24761d536e7d71982c872cbb346459ba627cabf3f792c728985655a6f3c0e65305807833f2c9a2ca5eef7f819dc214c336131e9dff046ef5152d405a491
+DIST xen-4.3.3-upstream-patches-2.tar.xz 36832 SHA256 f4abfddb5fda721c899702798a1d4e067b15079e7c3146d4ebf574253ad3f000 SHA512 dde846e13bffb65b80487ab6072486183b67ea1aa30fad2dfffdf242bf35f52839b2c8f055473a85a565e263b484ceba538efef680c7166d5a59d5f2c23ee81e WHIRLPOOL 76e01f62580b27ed7ab0c5816f2015e0ddae8bee8abcd3b48746427a759d55accb29caa3b8ac77ceb0161b9ae02966a41c7e3f31559d111d43ecdb18a1085a1d
 DIST xen-4.3.3.tar.gz 16479922 SHA256 59eb0e1c4a1f66965fe56dcf27cdb5872bf7e0585b7f2e60bd7967ec7f744ebf SHA512 cd9b7199d2859a856c719b75ee50a059c480f7493bbc493bcc3701d20321bd6d83c6fe1dd58e7b37695639bccf15e6420fb52f7e699586e7750ea665e99f82fc WHIRLPOOL 17ee263cb2a4c7b37d399e8baa88dab5b01386959de9d481e8666340d486bc9f32d57d6e1cef1568009fe8dbb2437b9ad90c1bed832cdfedd4be3fe5bf0a7dec
-DIST xen-4.4.1-upstream-patches-1.tar.xz 12472 SHA256 96bdb8696bca1de9b7b7963dbfe6d60cfb9db2751a5aa89a1abd57c48faa811d SHA512 a8c3a8c013571eebd12b8a633c3a4988d32579af693951883c8d81030d9bde0368cd8b8420c11f76c46f004c8651e94c2554959675632bf7db50b75bdbfc4fb6 WHIRLPOOL 7b3839c09481511e5482042510b5440496fb3096d965ed1c74aaf2288ad16d805fc0327933de3e56918e9e92f251d180ea4913b4a59be270530f4ec54acb5f02
 DIST xen-4.4.1-upstream-patches-2.tar.xz 32688 SHA256 da8e3e2556a81a60b3eaf9047766c5161b719881eee747e32e927887949d6792 SHA512 03c986bc111410106ac67a35dc25b8dcb59ba39d8983e4a2496b1bc810afe10ffa67bc55043d931f9589155ce999724a17460a33ec426238cea400e71839b0a2 WHIRLPOOL ef63771910ff8c3f7d12430627a6292ae9998f38ca6470032a5d4ca4044e82f74bb07af568f05310d357a53ddd4e6027ab69eb4d43f65a0a98390b79e955c148
+DIST xen-4.4.1-upstream-patches-3.tar.xz 44528 SHA256 efc404e553b30a7cb274fc412b59825e16772359d1cc230c231b2de8d3925fb7 SHA512 3d0ebef40d4575cf1cc4e1ce6bda429f201cbc02ea390f0072041636b8538a30cbf1858bd90e132b473a8de9da5ddeac4d67bd1d86f684d61cd99283bce3f1bf WHIRLPOOL a891b2405019455bb895c44b64f5c2f702adbebbdd3c9966e5eff449166dc510113eb2cfec65441c0e4ab0860300ff81ae6cda73121853721b5116b9478711f8
 DIST xen-4.4.1.tar.gz 18134427 SHA256 55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2718b6fd1c4f88a9bc7ea25 SHA512 bcd577014f4e8cb37b934f17a4dfb6f12e72e865a9e553cc435fdbe6665c733a4d20a812bf126727eca0946188a6abbd9419579757d7e03a38059f3656371c1c WHIRLPOOL f29eab626729f36de3f2e2c6c8446da4a05085818e18c28f07fe364065e05f0af67602eeb988091df3027a844ad0ccd52b6a0ee86592c7ff6008f961b9bd4bcf
+DIST xen-4.5.0-rc4.tar.gz 18406537 SHA256 af7014721ccb153d4f5c6a7751bd09ab441829628667619f7613d3a1a553bf4e SHA512 c4604b10eb9e291bbeaeedb5a99eb36fafc85db247a7c1c19b090ed0606ed262af2a9e5232266253b535bde56389d7c40176954f73e7dc1486ef6000a17184ff WHIRLPOOL b25ae254ca42c1aa54153471598e70371c674c71a308d813537ed267c9ba3fcd5fdec8bb44d3d1a2cac0ba84c01052b4637a520f81ef49541492ddf061d03b51
 EBUILD xen-4.2.5-r1.ebuild 4233 SHA256 b83c320ba293245068c8f761032d8d16c8dc4e280b0f07845ef53b6aa80dbfbd SHA512 3e6480af9ef5d7065d695f2f32fcba16e8c6f2a6e21d954233d421777e7f2868c218ad90580df1d70c4dbc12cf122dce9361d960cbdbfd8824b36d7cb36bca32 WHIRLPOOL d056e6b7d271c5a0ae57372043655296a704db4845a9f64d80ade6fadbe41e09aef5f720d11739343995a542bba8811591f66ca5822b81eb8c3f3d6f449d229b
 EBUILD xen-4.2.5-r2.ebuild 4234 SHA256 6177d083e74bed26ae5835aafb2c04fc6b21b44dd53658b1c7f2446f6d194c27 SHA512 bc3d195ba8151a17d93bb004ee1886789336e041e5c8b47a41a1f8f718cf8794c8a18cec2bc0b759a3d680aacbaa92e25b4b5a7334a2f20932cd3e603ea27fcb WHIRLPOOL 8bdc2af0a09647e2a16b9689023c1d4dc725af4eb5872133597f7ab7b02c8925f811b701abb172d19847e35374504480878d8eff9b8c751359913b061c6fa9af
-EBUILD xen-4.3.3-r1.ebuild 4128 SHA256 2823aeeade1f2c0c1206c6e0d1e747a4fec3151b654b5f3af23f79ca9dd536e7 SHA512 3ce390b86314efb14932ffd01b5e8ee29ad5bb9747569de9639c19bc257bca0ffe0055e4f0f8dca7e59d9c954bc461f5e69af4949c57e8f7e7292a325a4b0a27 WHIRLPOOL 2f398e01c60cfcd5d3ba40ce82905992c62b1a95805a4f25962cf40cf67b39011759f0ec5376467081d500aa19557f549aee4890a7c4edc7c02baecd7271a539
+EBUILD xen-4.2.5-r3.ebuild 4236 SHA256 d558c44af581f2be50fa2ae045dd882cf6989293de79016b1a8ccd077385c6ff SHA512 94eee8c84e8bc79d794ba173e37f6ab8c9e2cae722fb35648f53480bcf73af4f34a971d594712d7d6efac9c3167eaa8d737679c84437546b4f215f459ebf8991 WHIRLPOOL 991eecfaa8c89c3ff0174ef49906e2ee9b225fdcfd970acc9782448a4b95bda7ddfa08b7ca7cf99d1ca6d11172b749adf061b4574e64dfb31af173ae8e25f611
 EBUILD xen-4.3.3-r2.ebuild 4128 SHA256 753a5b846bb63c58abfbe1c3fc72d5f09bf7e38503c0c53a8ac8d5613305afc3 SHA512 e38110f594865da4ee8ab10a9fba6f2e0ea951c1b54612536f43c6696d08d232c19bd7288e20b22b9e51d56577b2df01400561f238946e31422bc9f7c8f3c184 WHIRLPOOL 7f416c29c21274644a8b6a34588e42bb736f390eed7053069d244ce6aa5f5c9aea74de2b63424c810b4ba5ccaf9ebf44d65dc7b2755f0af69786d8098f31a5e7
-EBUILD xen-4.4.1-r2.ebuild 4359 SHA256 d43ad43308ea88c3f3c96894cb1bfb9ca7a41a93feae6f4d346ff5aa2264ec53 SHA512 0173382ae88fa49218a10faf11915e2f8b8f5a65b39a444d31e273f3f08bf5ca241e3603d404ad6f8af53288a35da8414b7b724b08b7210fa6b1ac0adf312083 WHIRLPOOL bf401dc49c524f4845de4f9be4f3b1bdda546a5d71522fadc0bbcef91878d03b987d086c4cd901e11c711570f47688786ec88cf23e158cec1240bfad75754b43
+EBUILD xen-4.3.3-r3.ebuild 4130 SHA256 1e37c88939db9bd99b77552038db481f859f766cb6474b18f173dcc837f186f3 SHA512 0baaa9c4bbbd008f1dcecdf75a62579180b21e1f9d5c2e82e934b56cf88df48214badab9d1b4453471b2cd8a30a8a68e203f8f0f98777479272ac5220fd1ddc6 WHIRLPOOL 170b2764bc2a9c028dc3817721e8be79141c17dc454c9fada49261c58dacfadac3338c1a21b9dbd552d354c2fab261b79111ca8d0e1024f4cfbd14c9c52af582
 EBUILD xen-4.4.1-r3.ebuild 4359 SHA256 b8332ce4ca470284f63e1bcba7f1bf83c234c0f3798aca84b8e009a4068d5d11 SHA512 46bbbcbdfd1c969a215b0cb2ce69b23c4068876586e4b3c89fefb1e8790eee763c3c954bfa809d8e4ec328a541a2a7b019af99d432c5eae646504902614135c9 WHIRLPOOL f6dac1669dc222cf1ef7714bc0f497705f4a15f4b62cbe7eb92bd5c85636571c2736a57195807d5b77e33e757755fccd205548aaa434247fa955cf3396d43fb0
-MISC ChangeLog 33264 SHA256 0e94f3e24ccc20c5dda5e089e8041e6a316052f4abc29b5378030b66f250b2a8 SHA512 d0297561ba87529ef201ec345b4cadac663452bb76aa4becf595d1049294492236fa48d2f4a74383c85c3cc55465aae93b2fd06944569082a9b6357b68b3685c WHIRLPOOL f88c153eff0626ba994a25dc7af0299332bd07806d307266db26f9415240cc0582f762b43431647b8a3cc388e597157bb8104b9498a1cfff5111a40a401e1e3b
+EBUILD xen-4.4.1-r4.ebuild 4359 SHA256 65d6f92f94194676be6506ebb7aced0198dcad57669934001f3d04fcc81cc72c SHA512 60511e65eccaec6cef94328f93df193630c8f1e88698d69ea19c76bc0b9ca445cf0648c0c70edebffdb8e3365983394b13f6bf8a0973b647e05cec90547ade0a WHIRLPOOL 8c4072c364801ed43aca4f1a0870339fba7c644b9c7b2b02b4d9ca9b80b46fcd2e3bcf658806705dfe627fbf345643647b404fd00b2ac1047f78961b9f7eac4c
+EBUILD xen-4.5.0_rc4.ebuild 4343 SHA256 64093cab5ed6eeacf818bc7273328bf519287335068a5b9c90740f9dacb860a5 SHA512 c65152d28032cbdf8e526b1e07f363cb444e61cc1353ea154f986247a27c6e5a784b53aef655304d6a03340c5791cc173d699f0d1b7f4d16018a3370dacb3a21 WHIRLPOOL 38d8c30fd94100d2fa172550fd53f4ecd1ae0364ca4862757ef750660a005530365f97ddbf173b3a36f09383a2a9189ee738b2ba29677962e066505779da2886
+MISC ChangeLog 33654 SHA256 69791b5ec3d290cca0403b587aa11144eba7aeafed3fc5636f1336f6c6d3f42f SHA512 920cb5c8b5e70358518672b9ff32596603573c36429351a7e16921eb92ec3385dd74b2eb3f447276309cead45a7ae894ce645a4c997cfbf63a113ba8dd06cd18 WHIRLPOOL d84f31e09bd7fc4dcac1ba32f1fa260dfafccbd79b5ea10616daf7533e0bdf858d2e2cfe8f12541d940b7cacdce8fcc0001c33c2d05101bf06e39fdeb2fb106b
 MISC metadata.xml 480 SHA256 c6d867148db1480748552aea9692bdee95fb98a94fcfadab0d128cbf1102b0d5 SHA512 888aa860cbb74d79c76f096107d8b22975470373ab11249da2c4ae9c4e172bc52fee73fdfaf07c19e977cabbbdf35ea5b3c6508d4a6f555b771ab6729806fe5c WHIRLPOOL c4d10589ca2c8b4e8bbd877dfc8f4f3b66ce8ae7bece71617e9571f07a39270f54c41f5fbbb2b29020ffc6473e2341064bd708813af3e20a31d5b9bd0510ebe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUddtJAAoJELp701BxlEWf9/UP/3yxUYKr1DeHmjcB4E+sDsYP
-YS/sqa03Rf8oOtW2OcO/IFhNu9vY5iC0424bewtKiQKgRpLJ3L18P/5OBxyhmW48
-IGN55x9RER4lPlKLFre8gu16dQVLgi/im4eIx/4zQJz4W8oWNjXIML5iByZT4OS6
-kmzn91N2PthlIybh7HM4QodIPRX8wnRi6YV+DeYaxok6EHxYJzdzhCoEwgHwTp0K
-86SO6vNTiq6gqvN8nJ7G/S8aFvGQWPvqHLJtRLL8sYp6//2HUU+5H/bY8ku3E+VY
-dUXb1yGQCK1yzU5uI/qJjzC9mRBzA2H1sIlJkI3jrdm7HTcYOLcYJ9QPxJuhnl7B
-hf1ivEHHGGkfQW+tnUdkU7ME1TyVjZoIyHVtWOJg1E/002KcfP89mMHWxidSmDaj
-MzEFqv8rF2qO2yOT5tRj1JN9KiwErSqNg59QB+274IVuz4po9teXH5P67OmRStal
-bWbTZOOGC0KjCdeDicRPFjUWneolCXKmN7zDP5jzcPRAdeJENs8o9y0Dk8ctMNY/
-UcKqkzHPyWcL1TpfoCQc3Kv/QpcYGaO4Yb5psPFR+kjL2BDqpM9NiVz2iupk+OZR
-I6vmJmEQL6s3rLYaQ8icHl79Nsx304wZ2N5268SoK6+Z8Eq3uGvcYoRN0pT8cx/A
-EsmW2Eh1dzGbBt/EQxSm
-=XdLg
+iQIcBAEBCAAGBQJUk8lmAAoJEJIMDbyqvv1VsAoP/RGyyqknjgJN6plcDUcqXbOX
+hMN4mn3iMcThWBdfFd9bmoWDl077Ac1W6WudRMrucXmKJkwURFedVljd4jzx2oHf
+DyOis3Y7rWccZcRGxCLczoMV2FQk5TILQr9es3G3Uz6L3AzAd/vm+gjjXk5QvdIb
+q/zWiEcGMlEIJe/viIbcRG71XMTFi83HJm3tFtqcYboR0DqREMNBLsHgMd0aPmEn
+VtMi+dvZbX4AevGEnXpHjHpBLFl9VeZchbqXVYFebzd/e6K9O15eJnzylh8xz6iR
+pPkySnfNSXVAeqvd2LOPeADNM+RxqOu9q4ZYGOISiaGp4RER772QLCiJQPRXMgQI
+0wvNIPt/lZYQpMK/bG9EBfCZLKRINphkEsyoLJ04EX6sYY8S3mw535leqLhckS6k
+wYx67JlMqzfZJcfuaTnYRMVwg0q7cqj70F2YlOLk7+IicFNSN1xWxpocZghw1VhH
+/fpYhW1YgtiX6V44W18zhk7fJ9Zofze+YniUPrIvYtJozoL9jF9MdJ9vHkdZzwMh
+ZJ8XiSa2SljLfohvdH35JwAnT1+w7H/9vXdURUO71bs2AsDdx5fQ/wb3u7V545AE
+KOSHH0/sjfvBxdv7CbHJqviakahLE/PEBimfipn9afX0Y5dgyrkA4dzayxpMGChc
+VB5jedvw4GKdx15ADEhY
+=K1aV
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-4.2.5-r3.ebuild b/app-emulation/xen/xen-4.2.5-r3.ebuild
new file mode 100644
index 000000000000..5344c9fc17aa
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.5-r3.ebuild
@@ -0,0 +1,155 @@
+# 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.5-r3.ebuild,v 1.1 2014/12/19 06:44:44 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+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=2
+	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/${PV}/xen-${PV}.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 pae 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 )
+	"
+
+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"
+		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_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
+
+	# Drop .config and fix gcc-4.6
+	epatch  "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.2-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
+
+	# 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 debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=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 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=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 pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.3.3-r1.ebuild b/app-emulation/xen/xen-4.3.3-r3.ebuild
index 89e8c25bfc88..8beeb6cc7f40 100644
--- a/app-emulation/xen/xen-4.3.3-r1.ebuild
+++ b/app-emulation/xen/xen-4.3.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.3-r1.ebuild,v 1.2 2014/10/14 13:14:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.3-r3.ebuild,v 1.1 2014/12/19 06:44:44 dlan Exp $
 
 EAPI=5
 
@@ -14,8 +14,8 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="mercurial"
 else
 	# Set to match entry in stable 4.3.1-r1, Bug 493944
-	KEYWORDS="amd64 -x86"
-	UPSTREAM_VER=0
+	KEYWORDS="~amd64 -x86"
+	UPSTREAM_VER=2
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen/xen-4.4.1-r2.ebuild b/app-emulation/xen/xen-4.4.1-r4.ebuild
index 7a50b3424020..a841020b4063 100644
--- a/app-emulation/xen/xen-4.4.1-r2.ebuild
+++ b/app-emulation/xen/xen-4.4.1-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/xen-4.4.1-r2.ebuild,v 1.1 2014/10/10 03:15:33 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.1-r4.ebuild,v 1.1 2014/12/19 06:44:44 dlan Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="git-2"
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
+	UPSTREAM_VER=3
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen/xen-4.5.0_rc4.ebuild b/app-emulation/xen/xen-4.5.0_rc4.ebuild
new file mode 100644
index 000000000000..312f1b2e88ec
--- /dev/null
+++ b/app-emulation/xen/xen-4.5.0_rc4.ebuild
@@ -0,0 +1,162 @@
+# 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.5.0_rc4.ebuild,v 1.1 2014/12/19 06:44:44 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=""
+	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_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
+
+	# 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"
+}