fix XSA-132, bug 547202

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

5 files changed, 550 insertions, 18 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index b29009938eb3..e17aa8aa2314 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.200 2015/04/08 07:30:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.201 2015/05/14 05:16:20 dlan Exp $
+
+*xen-4.5.0-r6 (14 May 2015)
+*xen-4.4.2-r2 (14 May 2015)
+*xen-4.2.5-r9 (14 May 2015)
+
+  14 May 2015; Yixun Lan <dlan@gentoo.org> +xen-4.2.5-r9.ebuild,
+  +xen-4.4.2-r2.ebuild, +xen-4.5.0-r6.ebuild:
+  fix XSA-132, bug 547202
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> xen-4.2.5-r8.ebuild:
   Remove old Python implementations
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 8dfc43ea859a..497c69e8b0c2 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -7,32 +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
 AUX xen-4.5-efi.patch 1940 SHA256 f977cd11b28f3d8a8cd808c8910c661c6abd92864414ca1412409fe66f1773ae SHA512 7a5bf988c5c9b4fc231d3013f5be6994ef8a2c7e38c37871d54aeaf4f2cd4922c55f3551f4a7d8296b79078fa9192a3835b42197eb314e6cbeb89dd93e10961f WHIRLPOOL 5c7a01f292e39cb9b04acf40b2e1bba1766acf91f082923416c0e086461d5e8ac8f6885934ae1326128b061ec69a2f56a0c526e7d3e1d00da4cc7a6cdfda27d9
 DIST xen-4.2.5-upstream-patches-6.tar.xz 19908 SHA256 29e0eb892f18fba8de51a7cfae9d7781e376f45adda7b57ab295b619832cbb95 SHA512 0f1a00b1a339e0d9fc0f0dbb440cc68b80bc8acc030898e7ad5de5b9c064ac0459b1a9228a4b7ef06fc46572fd921bd70121f407d8481ace9a5495607d94e7bd WHIRLPOOL 06e4eabbe9be3a2f94fa65e7658d3019155f802f7fff90c0b8250e5fd21435b08cde9ce4ddb9322f52a5c6e45a5f04dc2a2f7082402af736d34dbb37844f0f28
+DIST xen-4.2.5-upstream-patches-7.tar.xz 22492 SHA256 d672bd1be49f9312eef7229d6ab199b21423df6d99ee99732d0386d8c5239dba SHA512 c7c917b8333073646680f66a5e5395a65f40d28bd1ceefaa327a391f4bf8b3569f763754db14beff1c0c975076f9393cb61869ff9d9bfa9d7942406d411b01d1 WHIRLPOOL 8ffd11a7fe4c6113a76fc06434a778da8375b741b9ffe4371c4ceb3ea50b07fe3e545752db5f4340f243432a6fd250590b08895975111d80f791e5daa76b590d
 DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
+DIST xen-4.4.2-upstream-patches-0.tar.xz 16468 SHA256 1a05c1555f9e868e0e9358cb94ed23afbde170c346977fe8f515dc090107fec9 SHA512 8ff91288d6852219061ca6961fd6e156b313af4e0ce8903eb08b1f4dc7312ac549843cccb5f8b6cba7172f55163de407a98925ed6254a52a29f7c275c180bec5 WHIRLPOOL 9b83edb137edcfd5b530a115afcf28e8b0a2a460291728646cb83ebca79c7280ffd4de45ac1523771b703dab0024dcc35044b40cb7249f13ef954d018b512216
 DIST xen-4.4.2.tar.gz 18137195 SHA256 cd53592e86669e5e8c4d4a731b0199e8af17d8eadbb8f26dbb69f1b751259204 SHA512 7dae2a1d601d5c65c350ea9fe9870551ec53dff47b6ebe56e99285fd1112aa1cba3a2594e294b871defcf43fb7fccace9f18910e69f02dfce162d7bf453eb07b WHIRLPOOL 2dfe3de5fd800d2172ad2c95117e0646c6b2045cfcb9fa5eccc46b695f1c58aa861bf2a591f78db5baf5a89894b3fa26dc1ba63cb0d57f87be4df5c445c82a94
 DIST xen-4.5.0-upstream-patches-3.tar.xz 27560 SHA256 25bd1414f56b2279efc0ba6a915fd86cf5d3c2fdee26da5876a8a4e875aa0132 SHA512 73bfba732b344bc45bf484b586b004852207fed08d69263ba1354ad14a2941df131526c2669a93b8bc55f231ddfc13f1d30a3f4aefdbb7e609616ab555396f76 WHIRLPOOL 454f8d1b5e4b433bca7691323220867ab50467aca998ccdfeb4dc51a44e4315ac32d830560cdf29ea31f39fc3c41d03945aee2ec0bb4e8cb8c8912654ac34ff6
+DIST xen-4.5.0-upstream-patches-4.tar.xz 48856 SHA256 91957fdc53a69e09deba5b307c9c9aa400793267eab2a7ad45d7fe8f69310f47 SHA512 15ae3df9cdaf76c8029a7c39fbc6a2614bf6ef5398518ee9624055a56b4b4293dcfc746f9fdbde11fdb57f5fa3a51d2d51ef30c14e0c5c37134ae9254a244c41 WHIRLPOOL 35a9a0919a466b4129d089ad6742ccf2ced91f249146c127c847a04cda413f8f7c94c89ad27f983d2d7c93a225185fd28054a422ac7879144ebbbe26b6e6103b
 DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b SHA512 31621fbaf621ad350125d03366ecff4dec5d810b0c1242ca0e28788f7556ac1443d7ee9247e1f76dec07e148e0b4ae16d08a7c10101bb78d6529375f3e40998e WHIRLPOOL 4a77588a4aa4846cfbf9493ab20bd2f293c55a941a5639fdd166a43f284cc0cc7218969def755a1acd89e640181bdd862fff0b566cfb8e628d73deeb6369c924
 DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412a25e2ff8c4ce0d332204e37b94d7e96 SHA512 de812e66563e608548b220aa00c8fd71973af748a00cea79959f46a5b6893a38248d2ea455026af43f47e3f5e566d08b5a6f3d18f22e940d75d2a2ca76cec3d3 WHIRLPOOL 3e18d32798bdfe584ee8d102963090b569ec3660fd5723d8c608091e5c7d935c1edced5e258d92bf51fe06975455a3ae33dfedd01702c6076aedf97ea61f2d1b
+DIST xen-security-patches-1.tar.xz 4228 SHA256 0a8bbc3eae72b908801b3445a4513d2fc976ec181c7f02d1a70f76026490dcfe SHA512 7a2271b4d0bd7dcdf2ebaf692157ed69c4c49b7251f7917100d5a22db780a9c7eb66e67dc52261d1d1438d290366f2a6d1cd72f56637cd5b130c22580f47b4d0 WHIRLPOOL 390c649e3ab9335518bbc492335e820f70c0d69bf75963485925b7671c936db5040a01e28f02dd67630ebd49735b2a228670f1db5817d83c578e7611e37c86f9
 EBUILD xen-4.2.5-r8.ebuild 4583 SHA256 c1ba3d12ab08ea2ee50017c970dab0bfeb8352c4f3e66e2186fd78ad4e04330f SHA512 ad76fcabefdbbd98c1b04e8d3c0aace8dd2b9119621b9a115cf8e544ddd8136f33fa6ff26c67e7f978b0e8cae5b1d7e67cbc07839404e85ce11eb319b291aad7 WHIRLPOOL bd685791bcad84b51d0755b4b85a6ed811e0937fd1fea1145307e3beae56c11350d712aea0129f3f00169a663085f9668f3881c51911f9e439aca152437467a6
+EBUILD xen-4.2.5-r9.ebuild 4583 SHA256 37c0a5bcf70c2c061f940de7edcd2d33ae539981b5536e184ccf2d0bd19947ef SHA512 ff42595264dfe16bb585cb55bf16ab5765271567fd73fa5776a35305ff17365574451b54e12cee64325a246629fff34f966138b200567a27ffe4f1cb8f4ac98d WHIRLPOOL 112f97adc64045a31c133091e5a05fce766069defbfa57e47d478bb4b2577616b38dde4f1ecd9810da62cbf3f263b57507c76046574109198ce86ed191a07695
 EBUILD xen-4.4.2-r1.ebuild 4709 SHA256 8cf5ed4b63c177cedfcf389995bdf2454b0576a689fa45bbf3347e48a0f3be48 SHA512 7fe1399d4a880d9eb1854369577bca7b5432d8523a4037f8ee5a6e1eb2e1009617554eb51e1f7b88207639cba4e2fbf4e1a6084b9d33e511ed0e97b0c1efbbc7 WHIRLPOOL 1a64c18dec743960d60671c38814a435c6458d75908bad03eed6d5d9cfa9d6f103ef7970357964e8a7b07b217da114728a0a2d711096c3dc5c7e178df725d7cf
+EBUILD xen-4.4.2-r2.ebuild 4712 SHA256 ae12aa2edc351d1ad4335984ba738456729f3e88ad41f95cf6f3b6146beaa554 SHA512 7b4c0378796234d1eb3fee0484892dba4e60e9b7bb26e415d4bb6777b8a838b2d6fea61d1faeda45a38b1e13dd7c5e7a58f29c619cb20e9d37aff0c70145a347 WHIRLPOOL 68e168a041a4fe645135f6aad03cf520887b7dc307fbe3aceefa76a2099cc90d304685536edbaf0b96ea74a3a0a3b126f4a58312c36821c321c7566b998de0b7
 EBUILD xen-4.5.0-r5.ebuild 4771 SHA256 800a8a01aa8ce16b3a33646065b06bbeec2cc10e25f6d32f905af6c1b7de9e10 SHA512 01d1038df8d9147ba7cb0d9023e52f257de0892e7d7e425e71435c4d186079a008b694fad66516e7ad958e1cd0047ab4bbe67da055e4156eb56ed88676c656c9 WHIRLPOOL d339132220706f2918dc6db366781b8553a471de013ff4d7ecb895239e941680a9487bf06dc93fa1a9af5597935efa402edeb82d176f76360b004c2f6bb29974
-MISC ChangeLog 37386 SHA256 2ea0f647637393a70a54153b174cacfd586a715c6db46e3de2839aeb432a14ee SHA512 415528d5487b0e151b11860c42e5586ef7018dc4c1809ec7c756c279cc0168585c50e475fab01d600d2bd3fd4df6c57e69ada7ef47b1d4720d7b66d310356eaa WHIRLPOOL 0adc6773f0d308c04e6c7c93a3eef8e9b95baf16fa2c9ae393ac7029dfc4c20f5131c09532e607dbddde7dc5d384c7bd36e90fcd0b42eef6364dcd95354f60b5
+EBUILD xen-4.5.0-r6.ebuild 4771 SHA256 88c159cb2213ad529236925052e574899ba680612733b769aa08a0e511bd3fce SHA512 34f942af6940585c8795ebf743a74d9efc3c9684e1e1386f832c9f51c0d3ed2693b736aba474fdf59ca47614753aa149cab4cbac51ebec114b15ffd78df5d72c WHIRLPOOL dd6fdfa4f596ceaa6fd30edaf758a962e5595567158cf3b1d499a43405800bb9288c83463515d2bfef13ad15673a368f6c4d17ba7454c5a9be6938f9269e589c
+MISC ChangeLog 37607 SHA256 01a8c598e9cada9269444650ac2180517841a1895696c770648edfabf44277e7 SHA512 d59460cd185f23569ad96208b31cabab976770d4a71be3ada50ae64047496ae11a3345406325e3641ee1856c9710c8e92646e3209cf7f7a7960dccbe2d9766eb WHIRLPOOL 27958ade0700d93fbb622bb67d4cc0a481c4e17088e2871f80f5e931b8467f95807ca5496c0e4289223c3aa341d1efaa9ff338151d4d94a1dbf57ebbbc82a6c4
 MISC metadata.xml 480 SHA256 c6d867148db1480748552aea9692bdee95fb98a94fcfadab0d128cbf1102b0d5 SHA512 888aa860cbb74d79c76f096107d8b22975470373ab11249da2c4ae9c4e172bc52fee73fdfaf07c19e977cabbbdf35ea5b3c6508d4a6f555b771ab6729806fe5c WHIRLPOOL c4d10589ca2c8b4e8bbd877dfc8f4f3b66ce8ae7bece71617e9571f07a39270f54c41f5fbbb2b29020ffc6473e2341064bd708813af3e20a31d5b9bd0510ebe2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVJNl5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOr8gP/RAsmaCY8hE0QDmp0l6GqlGe
-Akl2fgtn/diTB8RbaQWrpGhL0IULFg1NUmo00FgTripvqZmSvnu2EQQrwrfxFXyV
-lqMJinVtWm/yHwD3FHROmu58xM7XvPQRvMe+cSf5CvgWkya/5dAS0ZOf6yekRJXH
-KTpGIvyCNgJ32YVsrzR3ojMi+jdo003/b6Bz7XeB9nLinqKUb71AowAuE4qxQsWG
-pd0B+X9KoONCSwAc3sbnCmthl1/dhgkeZSNOfNydg7vldyCOO4oF06DSqm/mftDd
-TSNlUhpUjrul0xfU31p6u1/B3EeDO+7Nag8BHaais200K9/U08JND1MWfPIZj/Qq
-6WyC9xd7e8dNXs0OL3Hm42IS1T0a+1Fi0Zj/NmqSEVc+NzdCHh+WHS1CQj2lZFYO
-cUGzCdMQlxFIHl7hBnZvin5zopk2TcXJLYOzxPUQzsAvzf5E/8+1h73dL5vGzUv2
-lXbJKoNyP/LZGoB8neeL5HtTSTNv8TYPKSnTmhfqqWxhVugd0ThSY77VGdBuEVvg
-zgMJKTz7C1WXR/msxEfqRM2LMr+1hyz8ma3IfunBZtkxHlT+0g1+LsLoPXW+w3WU
-HcCiVeJL9XWZpHuIpyTXaOGfcb3/j2TeM+6l31MZLrViXqU15PHK9pwb8leVpz2Z
-Gf2U/Eng1hFS4k8U6qX3
-=MQB6
+iQJ8BAEBCABmBQJVVKBXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtZB0P/iy0/MKgNe6lwrJe+PolmIO7
+EHVJ3GlPrC0cE488ZRnQc2O6ZjfuPcyZIKOGvgBttZXKK2W7lstxD/4mh3NXYyF3
+qVZ/jgBiTsJAVGU3K9ST7UlY/eE2gviv1y6M9WPLKISXNKzNLeUHjaoL82bOOU+z
+6Iaj4nBY+56e9WYm5FZeOn5RO3gt0YO0nhzNPSsyEwL9riKUp+XFs8PvZCPJHPlS
+90pK+qlkUUzrzrtrI7KVAFYunOcdFlU1R5YeyDvWi26p1DlcTD3xOQjNBa8gUahm
+9VGNOsk91RCwEW8hzAfGJV0S/vNF3g+4JOhIjU9lxfwNmQqwncwRfVHd3hmpWZYr
+130xnHSNmy4t6pzjZKgHqJehYH18sGTQn5EDhWqy9fCaQZIyNSTeCYL/YrAh/i2z
+RtpCKjZcFugcEwEczq8cqjFSiX02QTNF08Ux99MKqWV8pEswB6ajx9VOjdSqCmGD
+G3O11WCOjiq4z4M+c04WIwvLvqQP217NLnhj288ZuqwnbcBApr4FjbH2AjaKAVj4
+xis7ySL7qK7Q3/n3K93iKUiNOt8VbApB5xpz9ECe/nEmzZeBIOOfY1ptgQVMQc7n
+ZTJisu3B9jagT2ipZ3tWoWA79hIv0dgGc3kZRXtgPQu0AIgJ0v2o0XUAAQsckJZr
+UWrCdiBZwIIk5bOU6qBG
+=tmvd
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-4.2.5-r9.ebuild b/app-emulation/xen/xen-4.2.5-r9.ebuild
new file mode 100644
index 000000000000..e0a97d476798
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.5-r9.ebuild
@@ -0,0 +1,167 @@
+# 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-r9.ebuild,v 1.1 2015/05/14 05:16:20 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
+	KEYWORDS="~amd64 ~x86"
+	UPSTREAM_VER=7
+	SECURITY_VER=1
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_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
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	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 " https://wiki.gentoo.org/wiki/Xen"
+	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.4.2-r2.ebuild b/app-emulation/xen/xen-4.4.2-r2.ebuild
new file mode 100644
index 000000000000..5f2572288232
--- /dev/null
+++ b/app-emulation/xen/xen-4.4.2-r2.ebuild
@@ -0,0 +1,174 @@
+# 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.4.2-r2.ebuild,v 1.1 2015/05/14 05:16:20 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=0
+	SECURITY_VER=1
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_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
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	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 " https://wiki.gentoo.org/wiki/Xen"
+	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-r6.ebuild b/app-emulation/xen/xen-4.5.0-r6.ebuild
new file mode 100644
index 000000000000..84f337ea3913
--- /dev/null
+++ b/app-emulation/xen/xen-4.5.0-r6.ebuild
@@ -0,0 +1,176 @@
+# 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-r6.ebuild,v 1.1 2015/05/14 05:16:20 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=4
+	SECURITY_VER=1
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_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
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}/patches-security/${PV}"
+	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.5-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 " https://wiki.gentoo.org/wiki/Xen"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}