6 files changed, 508 insertions, 22 deletions
diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index d444e2bdbd24..02c9ddac46e1 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,16 @@
 # 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.185 2014/12/21 14:38:45 dlan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.186 2015/01/21 02:46:30 dlan Exp $
+
+*xen-4.5.0 (21 Jan 2015)
+*xen-4.4.1-r5 (21 Jan 2015)
+*xen-4.3.3-r4 (21 Jan 2015)
+*xen-4.2.5-r4 (21 Jan 2015)
+
+  21 Jan 2015; Yixun Lan <dlan@gentoo.org> +xen-4.2.5-r4.ebuild,
+  +xen-4.3.3-r4.ebuild, +xen-4.4.1-r5.ebuild, -xen-4.5.0_rc4.ebuild,
+  +xen-4.5.0.ebuild:
+  version bump, fix security bug 536220
 
   21 Dec 2014; Yixun Lan <dlan@gentoo.org> -xen-4.2.5-r1.ebuild,
   -xen-4.2.5-r2.ebuild, -xen-4.3.3-r2.ebuild, -xen-4.4.1-r3.ebuild:
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 91729c7913ea..335f37c089cf 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -6,32 +6,38 @@ AUX xen-4.2-efi.patch 2216 SHA256 0886961e2656fe7e140dd0ac0e6620d4c14ef0796b8f88
 AUX xen-4.3-fix_dotconfig-gcc.patch 8854 SHA256 4e0d22acdb4ecc4a1d418ec91bc6ddb9ef1c283ee3ca1f67bac85d3116d76ccc SHA512 b4c969b0cf166862ea5c5cb0912d7dae8c5bf7befd6dd6bdf4e56df8a4daf85c0a36c94247053f74edc0f24b1c15a18e7ddae9d24ad28d54b726a1fbbab442be WHIRLPOOL de7b614ae486fd2cc591b405b475745b003c638c9be4c8153b61a368802af36d2a2974d1e022eb14fb58ad9260f9f82c438c84cb65c3499076c579f7e1c3e6ad
 AUX xen-4.4-efi.patch 1873 SHA256 096ae932f6f9387b8d5a837279c436173310f121e06ba356b7dded67d682ac7a SHA512 a448b72f679fa2e9d544d73bfb68d2deef646706917114a458c9c44a0338d46390ebffe8b671a30f057be9f15b8fb4246c574916e674b5bd314b6908e5e06c82 WHIRLPOOL 02ba29e135f85727a655ed674624a97c3bad40ddd00a0e194b64f5179b9e65c9f6831c902c754001551dc4fbc0a08ee52c075208551d72a65b2f93f7aef29698
 DIST xen-4.2.5-upstream-patches-2.tar.xz 16768 SHA256 5d63f9f4c0619465c4421ad4f9087e82f833b4b1683f0aa2a38c191aee36c71a SHA512 14bd3ed218d4c4711c084789e89914c1550c4154fa7e228f663eb5a635dfd8e0031e0d762d5502e0673a2991a8790ce3208fca5649093378066794f3ed32a1d5 WHIRLPOOL 54fcc148f70ddfde0b7bfb160850c473c1d8336ca4417bb27681ffd75127123c44d67ca04886dfc709fcbe45040abb9ffa49d392f1a82a9da525e7d93aadaba2
+DIST xen-4.2.5-upstream-patches-3.tar.xz 17260 SHA256 bf024b119135f1ead6eb2ec9873a04629caccdfafe9cdf55e50d9b9e15db276b SHA512 7c54df4a7d8688fcd50ee85da2cb871a3a0d66d95ed44a812eb70f604d8e7e2def21401cfc05227b3cceabaa6d6a4cc9d59ceae9a8f7cbdc93c014b5a925068a WHIRLPOOL 1faf73d545f54bf46925cea2ffb62bce7ee9c538e5459486593106b6b135d1784913f2cd27a0cdec3e6cc7ef4531a06e41512db07d79be58bc242acb1d49c5c7
 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
 DIST xen-4.3.3-upstream-patches-2.tar.xz 36832 SHA256 f4abfddb5fda721c899702798a1d4e067b15079e7c3146d4ebf574253ad3f000 SHA512 dde846e13bffb65b80487ab6072486183b67ea1aa30fad2dfffdf242bf35f52839b2c8f055473a85a565e263b484ceba538efef680c7166d5a59d5f2c23ee81e WHIRLPOOL 76e01f62580b27ed7ab0c5816f2015e0ddae8bee8abcd3b48746427a759d55accb29caa3b8ac77ceb0161b9ae02966a41c7e3f31559d111d43ecdb18a1085a1d
+DIST xen-4.3.3-upstream-patches-3.tar.xz 39856 SHA256 905288c57ca18c3bf3244a53b8a279d4ff5b93204d440ba78d06e603acbfbb7b SHA512 e4bd72f9481c40aeb7fdf6d31c7aa43b4109a2b623b3d51e9f6fce28ac87256645c466ff74648826599402bf38d03f3d8d7c5c782c1f058d9ccef7cee07d69b9 WHIRLPOOL 579da2c348950de616bb089c2ee23b2076822b2b8555a219f7e37c66f44c64f8a4cb5562567dede2d5508a2f46a235d109934e38424a9b4bdf41f832c6e7bb00
 DIST xen-4.3.3.tar.gz 16479922 SHA256 59eb0e1c4a1f66965fe56dcf27cdb5872bf7e0585b7f2e60bd7967ec7f744ebf SHA512 cd9b7199d2859a856c719b75ee50a059c480f7493bbc493bcc3701d20321bd6d83c6fe1dd58e7b37695639bccf15e6420fb52f7e699586e7750ea665e99f82fc WHIRLPOOL 17ee263cb2a4c7b37d399e8baa88dab5b01386959de9d481e8666340d486bc9f32d57d6e1cef1568009fe8dbb2437b9ad90c1bed832cdfedd4be3fe5bf0a7dec
 DIST xen-4.4.1-upstream-patches-3.tar.xz 44528 SHA256 efc404e553b30a7cb274fc412b59825e16772359d1cc230c231b2de8d3925fb7 SHA512 3d0ebef40d4575cf1cc4e1ce6bda429f201cbc02ea390f0072041636b8538a30cbf1858bd90e132b473a8de9da5ddeac4d67bd1d86f684d61cd99283bce3f1bf WHIRLPOOL a891b2405019455bb895c44b64f5c2f702adbebbdd3c9966e5eff449166dc510113eb2cfec65441c0e4ab0860300ff81ae6cda73121853721b5116b9478711f8
+DIST xen-4.4.1-upstream-patches-4.tar.xz 47284 SHA256 7145a260022a2f91023df03bf096e6f48934340a9edc20105ec6fb570b136ed2 SHA512 378e2eae2e69dcba93f5937ddc41ae50dcc5168b3f8a743d7b7990f4a11907c8902b7c14bd25a1d08c1a60ddfe93da432cd419e0e53935ff3f1345b05aa88488 WHIRLPOOL 20b99de6575a92ffdff2e64c7bfa827866328e499641e754429221e773eb45507095095ed19e78fde842507d6718101dfeee194d8187e93af095a940f9de3dc8
 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
+DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b SHA512 31621fbaf621ad350125d03366ecff4dec5d810b0c1242ca0e28788f7556ac1443d7ee9247e1f76dec07e148e0b4ae16d08a7c10101bb78d6529375f3e40998e WHIRLPOOL 4a77588a4aa4846cfbf9493ab20bd2f293c55a941a5639fdd166a43f284cc0cc7218969def755a1acd89e640181bdd862fff0b566cfb8e628d73deeb6369c924
 EBUILD xen-4.2.5-r3.ebuild 4233 SHA256 3bf971cc08d306aa718fdf2c2518906bd1aad2570845fd74a40c70922fefdea7 SHA512 d1693270b7a7ed8358f0e7ee2f0e58e61ad6e9ba446b9760ea6769ffeec1c9694050d3f8c0c52e3a142524dd35e2abf6a5649fe6f3fe1b49f79ce0d1b9a2ad30 WHIRLPOOL 11ba38eb5feb4a74d37332db0e5c0ab99970355ab58cae72fb674e73268d8f343ea0675961eb4e42ea4cceda12b6b364e99065433e23ffe9d4e6d0db0be15945
+EBUILD xen-4.2.5-r4.ebuild 4236 SHA256 e33930fd481b8112e2c50e2e8f740b8bfb6defece2734c0b8ca9218991f4d4a1 SHA512 0504c422722626266792c5a3e753843b2624b9c98572e42944220d94486c18ea8cb6758e7f8938fa63b2242a1cbd4a1da6313412f6146792c18c1e270296eac7 WHIRLPOOL 407d89fc4483f2a39b6d6db7f6f8610a1ea31a3e0270d2aeea5cd00ee77215fb003fd6874c0a170e39b4da8b41b2f463ecc476188526a79f675c022fd365be08
 EBUILD xen-4.3.3-r3.ebuild 4128 SHA256 ddb3860bc9b7e74b0883e36fe1d1856d1a4902b2bc8db5c325d9d6ce02d696cb SHA512 a2876ec3070cd8bfa3ff67a3fda4d373ccc19b300d5c6f8e78396de1373c873328e1de8594a346fb9b1e08ac7cf588462a63063255670c86609cf487a1ac36fc WHIRLPOOL d72a1ab68e8ad98aecba77a16915e98d136df79b9d5259bdd0b8d44704e447e9f13207ffcf5fe1ea688dbd9e32e6841ce51cdecf23d3ec3200c8e8df49c6d6c2
+EBUILD xen-4.3.3-r4.ebuild 4130 SHA256 6b9c9a2862a039ab62b2110580fefd387f46e38342cb8928e7a0587305a3f8bf SHA512 7bcd4f65426496ab3503b5f84c71f68b70feda12b6aadc085e604c940b4169103569c424f7dbe740385877cf657ad39ab2be859ba94395fd6c89d7c9b8cde832 WHIRLPOOL d4ff81795d4627a626e8bd89afb0a782dec0acb635a06f63492a1cd31c855452d87e7aaf63430fe440de7fc983214733ae388df3a40fa11f854d0b65129c9b99
 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 34047 SHA256 ce5fd1ffd40cb6ccea066819ec623c37cbe6fd8d071bd6f7569d73ddf58d3fc2 SHA512 58de12082b10160a5e8ad97f3bebd6ef4793664e6e1789e541a060e4b9926b4d95fae5882f1e5fd05aee7e9cde9b1b756e7157356a83335409b154ed9c28d1c6 WHIRLPOOL 292c5a1c6caac370aec72819229fbbc928276ad06b911e9b6c6c11582e4f6f87eb7b7207d5d3211cfcfc934123d5f5c2a9ffdea4cfc8d8340d24bb37def015c2
+EBUILD xen-4.4.1-r5.ebuild 4359 SHA256 dc7d0f3657e4ad4cb3eecfe14b4626c4c3a736f80aa5bf73bbdf83420f16230c SHA512 f9e8ee94a933b01fc14945eb86c237dab21f6cb2df187feffbaafca773a11a537ba1dcf086a9344e1b48434079d39550f450811a1671d2b57fd3c5d8cf9cda7e WHIRLPOOL c66822e31da8b971ac318610419ff2ea313b1413b998da3d2d4227db4e9311a120889add7ddd11000f11fbd004dd1a97e94f874cf8c84a9786e505baa53f1b9a
+EBUILD xen-4.5.0.ebuild 4414 SHA256 44083dd1f311937ed1f911ae282b9c24711b35cb907451269a26e335df860c1c SHA512 5f6d83e784ae1d5d553d4065161275d2f0a289476832a90bb184fcdb3f29ad2c82f0c5122dd8bf6d52f642a611b9d5d28b869b2d11e9173611c9c7c30c57033a WHIRLPOOL 360ad74221273f1e0b4fa18b226fbc63a3f0ad462b89f4f93e508c2e8ed0227f38e87c88be6e55fbafc8aa812bfab5534f9bd8a273668cad9cd7b95797d6a667
+MISC ChangeLog 34353 SHA256 42556138b0dcbeb6c3091bd7a4b9dc272157f8e4a525f42d234b2013e64df5d7 SHA512 b32d90f784c6aef20cf3e220ec86e5359c6bf191fe78a8e4f180de5bb8e878ea5d0ffebe5a575d81e7492e1fc9b00c5fd21fe8856360e9a62c465dfcfb7edfed WHIRLPOOL aa957409c079c62ff47ee4df96efaff9712b8673866d8b8b59441f44baf443bc88cc7bce859f2908f651570fca56eab756642f2d83d862f4c4e443ece75252b8
 MISC metadata.xml 480 SHA256 c6d867148db1480748552aea9692bdee95fb98a94fcfadab0d128cbf1102b0d5 SHA512 888aa860cbb74d79c76f096107d8b22975470373ab11249da2c4ae9c4e172bc52fee73fdfaf07c19e977cabbbdf35ea5b3c6508d4a6f555b771ab6729806fe5c WHIRLPOOL c4d10589ca2c8b4e8bbd877dfc8f4f3b66ce8ae7bece71617e9571f07a39270f54c41f5fbbb2b29020ffc6473e2341064bd708813af3e20a31d5b9bd0510ebe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUltuAAAoJEJIMDbyqvv1VqGkP/RJdk+PBn0QypqFbdAfY5Pta
-Tr1AXxFufDcEK1LZ69raC+EHMssoh0fv4ad50c55mLKV39TbaQ+qTppE3O36U33N
-4jnGhlxwDj2oPJTAkgN8W+dp5qzp/wSCrQE13tNuusbn5nF6vTxEBDtjgIqcnpQ8
-NvAhkPUMjrG+J90nrchO63kP1/XVVFWbSgMIhkaCvlk2KdNvn/xMqSa4I/Ac97ms
-q+P7Os8UP3svrxYk0zABOVg6cTE6v90HWP1Xl5ujJX2I3UnfJTAB3M6FPXRUMSrA
-a02F9k8e1+fsiW7ZJccDp6ryL6p10DNh4wLjwm5KO8WEgOHnKp2QUbZnUa2SPHs5
-N9C8ot47nfbfvz9QMzCcU8wqUs/WmWP6ATbJT51DBMXZ/ODu01DsbtBs+K0tZOrh
-wTawZv1oT1vb506ZJq2sNSHl5AeWCE6nuF+TrzDdaEbQyDSYGX6vWgfZ46vZdk72
-P5nU6k3KFoRDWO1dVnGGKp1N2ym9Pk5z3Lu6oip3L1bhlQcNK+/Qu90op+5FGKfu
-qZcPXtIh6f4lpQjnnbYWrp/rfOSGdT5gtnxKmaG7m8FD1ATg3SSyVMrjn+OSCLbt
-a1WDPC1B2r2HrACMoAhDFqWKh8AWPCbb/paq95K/IzI5gLb4A6bThdkb83XCbYMu
-AnHnWMdhx9v8N057DZlg
-=7xfw
+iQIcBAEBCAAGBQJUvxMPAAoJEJIMDbyqvv1VipUQAIaQYH5qFyXeSADoQD2Cryco
+ZapuAoYFybRMdHPkEGlDOrNKuPRs6xKNpS9h1qgopsoI6sDsfpU7hpzdAGkSv0N0
+166+IEC0LQAJ6CI/lKcBBBNdbvqin1OnstdZz9qUk/4yB3fvo3jl6UyjFNUP4n9N
+HrzbCOnOXSWqFO3Wv+itY/vttMf2/PukvkE7+FpAp2NaU/hQIonHPaTfhFR5XL/8
+wMTzmpWVDx2nFO1zrPwYvf397W4t94xybVSZ89qQE6kKSG0U+KUqZ7H3X8o3PAP3
+Xr2h6YSJqa2ucqfwwROaDAWMpiGFsYU8uSqTTQU+DNYCG1cxGHpBOaiiibxwuQRK
+JeIAgnyxnaMREgTlQgyfw+p2Q0Mv2YJsqN50RKHCC58FQVdwmoHlHRfU8eMGdnq5
+e8Hen6cPSH945eTcBtIMjrmr9rs+jMHdw/AYragD8B6PzM6CPL+k07lpzwnyMjgo
+0DMQd6sNgBRzLKirEcw3cpd2kURHnPzM+EK/1xW348CRJ6C+OtxQgAv4WTRX4xZ9
+9peAeJqaPGeaJlHDuRf2cr4+JWrppWDqmdB0GyOlRn+dP6VGrKnqIklfBklQroV/
+iycjYnXGc5jKzEU3Tqzfo26pihJpmPuqZHI+R8BDkMIpkMqifDyw+kZaB/USY9z9
+p6BCeTuRh1eebS4KcMkW
+=10iN
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-4.2.5-r4.ebuild b/app-emulation/xen/xen-4.2.5-r4.ebuild
new file mode 100644
index 000000000000..9d83c9850e0f
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.5-r4.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 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-r4.ebuild,v 1.1 2015/01/21 02:46:30 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=3
+	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-r4.ebuild b/app-emulation/xen/xen-4.3.3-r4.ebuild
new file mode 100644
index 000000000000..f38bdeb1c709
--- /dev/null
+++ b/app-emulation/xen/xen-4.3.3-r4.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 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-r4.ebuild,v 1.1 2015/01/21 02:46:30 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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
+	# Set to match entry in stable 4.3.1-r1, Bug 493944
+	KEYWORDS="~amd64 -x86"
+	UPSTREAM_VER=3
+	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 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.3-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"
+
+	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"
+}
diff --git a/app-emulation/xen/xen-4.5.0_rc4.ebuild b/app-emulation/xen/xen-4.4.1-r5.ebuild
index 312f1b2e88ec..0a59c6fcf9d8 100644
--- a/app-emulation/xen/xen-4.5.0_rc4.ebuild
+++ b/app-emulation/xen/xen-4.4.1-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.1-r5.ebuild,v 1.1 2015/01/21 02:46:30 dlan Exp $
 
 EAPI=5
 
@@ -14,8 +14,8 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
 	live_eclass="git-2"
 else
-	KEYWORDS=""
-	UPSTREAM_VER=
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=4
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
diff --git a/app-emulation/xen/xen-4.5.0.ebuild b/app-emulation/xen/xen-4.5.0.ebuild
new file mode 100644
index 000000000000..d597890d84af
--- /dev/null
+++ b/app-emulation/xen/xen-4.5.0.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 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.ebuild,v 1.1 2015/01/21 02:46:30 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="~arm ~arm64 ~amd64"
+	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"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		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"
+}