bump stable/security patches, fix bug 515106, 513824

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

5 files changed, 201 insertions, 44 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index db0b85984da0..32ca929cedeb 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.164 2014/06/14 07:14:16 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.165 2014/07/09 06:31:29 dlan Exp $
+
+*xen-4.4.0-r5 (09 Jul 2014)
+*xen-4.3.2-r4 (09 Jul 2014)
+*xen-4.2.4-r4 (09 Jul 2014)
+
+  09 Jul 2014; Yixun Lan <dlan@gentoo.org> +xen-4.2.4-r4.ebuild,
+  +xen-4.3.2-r4.ebuild, -xen-4.4.0-r3.ebuild, -xen-4.4.0-r4.ebuild,
+  +xen-4.4.0-r5.ebuild:
+  bump stable/security patches, fix bug 515106, 513824
 
 *xen-4.4.0-r4 (14 Jun 2014)
 *xen-4.3.2-r3 (14 Jun 2014)
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index f0da249f1a9b..e6af5110b2c1 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -7,35 +7,37 @@ 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.4-upstream-patches-1.tar.xz 27932 SHA256 8f246eaf65a7cfe72cd9af596993ec1326dd1c4411efd1b76294a7bffafed119 SHA512 4d0eca51d91588214b06c3a082fff62ffb69fa518f0d1afb28e7489ffc1539751a586b334db6cefc7ef99ffaaff296af26c85a6dc114db7d78663de7748922f3 WHIRLPOOL 28e82065d033bd2ef0b140a2eaf2aea546e3e7ec5fa1e6f44a0d4dd7c26324981805dbc9f41b13fd3b12dc8440dfa74a1da79b117f7294e222b7407ad7371f74
 DIST xen-4.2.4-upstream-patches-2.tar.xz 43984 SHA256 5c75f8942bd51ff2c9552e3afa548907551a7c53bb191827c56ebea5f222db2c SHA512 06732a9c8f3c6a2d85dd0aa57a0277f401e299e9df204c2c9209bf0c139adebf31eaba6a64f31d0fc13f3c1c7958598f83cdcef81f76ea560bba479e9cfdf803 WHIRLPOOL b3eeb22a415030409ee380a8b11b6501b81975318167898073dcffde310b26bc413f05668604f3c0cfb298a43182295eacee99971d2476c6c4130ce2ec0295e4
+DIST xen-4.2.4-upstream-patches-3.tar.xz 57456 SHA256 e223b6fb10ca26415d0677e465480f77378f7a196bb3a2cc654a2d53e867fa66 SHA512 4b1091cba3afb149f8734630f32a3c44b1abade4a524f5bbfcc88df5700dbcb38dfd7b4dd0059e323a5b89a9156109505891a54dae9d698fe9d89ab2294e3151 WHIRLPOOL 1448b20e6930dcc7a0d57819732341e24257159c97fc5e270be9c47935b750cf7fa08b02ac1d0f49792b453476330b19c773e79d1c6b02ea9ed7baca83750163
 DIST xen-4.2.4.tar.gz 15663999 SHA256 e23e6292affd7a6d82da99527e8bf3964e57eb7322144c67c2025692b1a21550 SHA512 3e5263511e7c40899f580f3384bd987f9c875b8e6816202fd1a5a64fe7e336803d09e58148af074938ef261f0ceeafad121ac541ddd2bf66b76c5aa4ad07c357 WHIRLPOOL 25d23f5d921139ba0f853fcd76ae998647d32292bccfd4e7c4f3b12f860a38fbb33ebda67c839657bf3a25d837c9c02b80d663362263d16d42284ffde09f0bc2
 DIST xen-4.3.2-upstream-patches-1.tar.xz 28004 SHA256 451df6bc293102a8f5eff0bc5b2c9feba0d8c0df5bdfba5591fac405e4f0141f SHA512 c0fd9ed16773e62121290dfc85e082997b049756a5038b0e3d4d618566a86abcf8baf499d176a529d8c33e2b333bd2be11dc075d026ce21b0d42d20b141c9e4f WHIRLPOOL 9a01940b7247a448ee1795539682a79dd70b470a535f438f077d2da7633f06eeb01c26c62c504a0e7ad68d7156957f96d8e966762b9c782e1bce37416b40a648
 DIST xen-4.3.2-upstream-patches-2.tar.xz 46684 SHA256 be4544c14d09a17ec71c5fd9958b8d3807c5a8c062985e9beab77dce4a1172a8 SHA512 7791b3b465e0222f817b49939f52838151639fe5e4b56da5864fae4b40135d5cbd469e914ca2be5626cc4597c25b8b88fa537d45d448bae2f4dff54b75aa741f WHIRLPOOL df9854482657085d6dfc6453fd366aefa0f16b093ac253cb08e239948a3acdcaa92073dc4122c15cd2cf7f8d9d834d166bb6776bec0416c595cefa2d14f9ba8f
+DIST xen-4.3.2-upstream-patches-3.tar.xz 60208 SHA256 661ab148c9eeb2c8e44d0bd620496607a567d4f6c1fa0a6f89b21086ee8f607d SHA512 1248c937c604716f756083d44ef14150c8601f810fd8c0b73df314bd34287a53b4db3e8697f03acab3cf56252cbac8578a5bbedb40c342fa7c2b3f7f9c6575e0 WHIRLPOOL df3525d76607232720d3f3351548add60c89a139d380cf6147bec122cb11c52570e99dd14f800e88e411248b950aeed32ae03cce93fc8358011b3125114bb3c6
 DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69 SHA512 ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302 WHIRLPOOL 72250369fb2c90ba608e1da018cb6417b3089642c8ba59af9f2825ec5ba7c4e6c5d6f86140b20825817e4625727c6d58c5d38b00863c994e31c8a04927997bd3
-DIST xen-4.4.0-upstream-patches-2.tar.xz 51840 SHA256 b1828719a42a429d66c4943bde714ac98dbd368d9f337795b3a9da4e7d755e22 SHA512 dabaa350dcc07f91df7bb4712b69f8fb5c5cf624b5e6ddfde75be891c4d7b7a81e0d8824b707fdc85a4de98929609c9f276ee871a54afa15ff21d80cebf31f80 WHIRLPOOL 6326d13e69090957d8f7f6b2cb088d597103d03b54728f37a49b89b7fac71446b4aa11c535996b206c1c7373eff8ac693e0f48b7fc3e69a566362df6eb6ecab6
-DIST xen-4.4.0-upstream-patches-3.tar.xz 79232 SHA256 4deebb23eeccac080490d897bd9abb4eb5c18aa491c39c99d4a9d8d488ef7d0c SHA512 df9a403daf511383c9d51ad63953994b7b49e72f72cb983cf0acc1f29f3e1617f1c3838ea0547b6155f0326399999181d5b1b0d622ceef39ca4cc79e9eeee2bf WHIRLPOOL 7bb224b9cab270acf9549db366f69ee89f06722e3a2087e4130825e994612cfdcbffb9fac8ecfb7b9df7d50773466ab6c70c276b410d58567d3dbd3cc353d21d
+DIST xen-4.4.0-upstream-patches-4.tar.xz 98388 SHA256 84dd81b8d1126edebcff72f1ceac4384b524d05ba7f6c7289df1485c493707eb SHA512 fdcbbda88237bd8106151c293e0fefbb87880f9a12ac430da16709360de62032083daf5d57e5a929c792d9c27ac046f98871510a72bb4ae03fba35b1cfcf725e WHIRLPOOL 8422e345717b4fc482d2517c415f97a321a784a314a30fb6519bf1a02412534278151b187cf527f5d644bc5a852a53e5cef9a08e5a8ee4e5e840a9a8079c5723
 DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406
 EBUILD xen-4.2.4-r2.ebuild 4211 SHA256 aebf00f9d5872e6a7f7ee36de3e6b637568a0e48d3241c379aa44d31e84d99c5 SHA512 e01e53e9b35d3d2d2ea4785145e97c6cf12084a2a989e30570555801283fbfc1d6a78d30da150bc5da35fffae5b85415d0a0347dac20d94479ae640993b278e6 WHIRLPOOL 01c4e89d8be6571f1c5ebdf8b5022bb2b2fa6d02340db18559f12598fd47318511fcc7aa674b2dc955b208716364cb237c6b23da5da3585f86ef487b0322f717
 EBUILD xen-4.2.4-r3.ebuild 4214 SHA256 617f21bc707b37047924ae8673e051672bea37f83fdf72a0430783065bb865ed SHA512 8ed670a0b98d747fae9da5be8a39f5ff7aafe6ee98e648d5e911fbdb5995cc868c5b8d0b8d62000e51447ee3c634cfb8251c664b4b4befe10f57f2616ad22daa WHIRLPOOL 15063b9d7462955150a712b3df724a5aa04edabb79c87a7e0e2bc926dcba2f3741934ac99863e1902263ef11bb09ba9c1ce786e4b8c6df6f0f59d362345648bb
+EBUILD xen-4.2.4-r4.ebuild 4236 SHA256 eaf0a27d73bd64b4ea0415588f31d85acabd2e7b39ee7366e3ae9f007db5e2fc SHA512 e9e6ea5cc0165a8eea8a401e0225e497c732d532a693d913ce108af80815024759bb5d84c2e7f5ffd51fa5ddfc1d35d25fddc5d15471073e7a8e5bc5c84b449a WHIRLPOOL 662abe04c32fca704ac9db3c8cccf71f228b3422d75677db2dae7ee36adb6582fd9ce86b8959cd1e2f84f68d8d5e79b0a6153428f76b54666d8baa55249956ce
 EBUILD xen-4.3.2-r2.ebuild 4106 SHA256 cb21092b3d977d83eb1aaba467d52803a05ebc659aab39855e8b51a3ece2d542 SHA512 3143729cccb9dadba8ab28a7893be4d1512e93e4eca29c7370f32bdb2c5cadf08ac8e45ad90b1052c37fdc5d2da9517e429d42a3fdccadea5b794e5dce00bf81 WHIRLPOOL f6e6e1b015b3a201bb8335e4aef0d6846ef8b607e3b786f2878198bf943029dce4d4944448d3245649e8ee04a26d8b02b1b9f6db1fb7e0d70dc5e32b9049573f
 EBUILD xen-4.3.2-r3.ebuild 4108 SHA256 dc57c7479431f374b23170fe312a3c521f8c17c66e04f6338a24c90ed151cf3e SHA512 55eceaef3b93c66ffbe9ddebc776b32d7b0626bb7cc1a9f864aae885c74966ab8c38577e5ad70a5c6a4d1d2e3619a15579b3c5224817efccafdec5f93b79a739 WHIRLPOOL 71b7022cd53577782d6369b908fff1b593df71c6b98a54a1b0975ecded2433b1a842265adf077e10f09c51d7ff0827690f1e862c6235158787856d3c708b0dd5
-EBUILD xen-4.4.0-r3.ebuild 4337 SHA256 e1f9729188b68dc4cf7f52c8ef32a7805c7656bbc9f355346b275e3bfde90efa SHA512 279a70ed5e46e522d40d044147d58e03a9d3b164ba94c40fe6a6e015498f6165d18dc09aa18fd507b2700465393d1f0b414092b847f7d90771ff778e98d44c5c WHIRLPOOL 469de6e728d2fffe2e7581de58027f2b0f8aa9b93b8f3a31022f55961235e1946b9497bd525c1b27996aa9fb540695ed8545d61df4075d90dc2f0be13229fd8b
-EBUILD xen-4.4.0-r4.ebuild 4337 SHA256 929edd382df2d2fc73c4dbe510117217d18dbfff043b7ca415d686dffb7341d8 SHA512 b9e87eb41464c9606ea95c203dd78fab6994168f38f099076cde7b57e6f2172caeecb98242ff9777fbf5c25dfac60743356abe03087efa58c6062a11969508af WHIRLPOOL 0e584fc7acf1066943e355287ffd19010bd679364f1be5e5abd35db9f2d841de65a96fde22552b3ed26bea1f556f36b3afcddf21b0fe268d5f3dccd09f3044f9
-MISC ChangeLog 30467 SHA256 0ec9720880615ac0ca9527bcb493f35765576c95f6379f540eae8862b3f99c52 SHA512 afea01343303b68b5f7f7fd3aab187bf63f95e73eeba26a7bc2739b903a53841ecd2917a0f2133c1fd6ca26f0435e1154bb7195a3918c7627610b6768e1b8564 WHIRLPOOL 6a2cd8848faf14e9c0dbcfbb9151998383cb83bfbeba359c115202cd927fcefa85cd0e8b3d4e014093964c1d39ccaf27397dd876c1256c3655a911f387cb8f86
+EBUILD xen-4.3.2-r4.ebuild 4130 SHA256 962d420b1d59f864c3f26686d6505c1fbd3d82d9886e824aea6c0063daff3dbd SHA512 69a4f624e237055fee9df03c65d9cbdd3548ef8e0744c83d1914278148ca369b30f7bd77a6ce66adaaeb4ffd64d116869e45e70a4cd0c1e27985bb898df81ef8 WHIRLPOOL 8ffa53dcad19bb02ef2f06a85a76b464123d541ad65f60961164e88db59e173101fb3525d1de90be6eb16182bec728b6ac8d6bad8c5c747961d9312444a2be0d
+EBUILD xen-4.4.0-r5.ebuild 4359 SHA256 60a84e4509531b29950b3187b7ca570d2ecc8de407878b4f3a99b51bc7145901 SHA512 46fb8a857632bcb7b88095229529b6e42e3b1b8f27bf2131834fee647677e77decef2635ab54b5efdfbcb84926d0e1a4d27bc18deca071fa3722e20d4d47f171 WHIRLPOOL 84918330f50cf60eeeb22dabe94b53fd6bdf04daa2e8e7afb21789ef04c647a4e9e8d35fd25e1f4d0b55bcc6db64892be7abff38a92bb0b8b55e667c8b12936e
+MISC ChangeLog 30765 SHA256 8b986607508e4f1891c0075bbe333a2646b2dbb436d68955885611866c2026e2 SHA512 dfb5cbbaec0ee9b8ac1af8e3f7be50c9ebb4f2938a0aef7f04af343c1c48f13d562f90e09e40bc59acf0ed38c5aff7c7a25a2e6de1e11c705ac8c951e61de3ab WHIRLPOOL d1c12b69da062c1f8f4ef53440882604252ab0924ea379e4ef2fe627b3686f045453173c6b615258e0b6c5de551b70984b932994eaa26e53f3afb4c4880b329b
 MISC metadata.xml 480 SHA256 c6d867148db1480748552aea9692bdee95fb98a94fcfadab0d128cbf1102b0d5 SHA512 888aa860cbb74d79c76f096107d8b22975470373ab11249da2c4ae9c4e172bc52fee73fdfaf07c19e977cabbbdf35ea5b3c6508d4a6f555b771ab6729806fe5c WHIRLPOOL c4d10589ca2c8b4e8bbd877dfc8f4f3b66ce8ae7bece71617e9571f07a39270f54c41f5fbbb2b29020ffc6473e2341064bd708813af3e20a31d5b9bd0510ebe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTm/ZhAAoJEJIMDbyqvv1Vd0gQAMOa7iAAjJHimuhpMS8BreV1
-D8fLbvyWxNwg8iMmM2tzTXSY5Qvk/zOJQtW501Y+nQ8OJwY105yMSqfNNv88ZN5H
-CFvGRtlOfZMo/dYq4+0Mpg+jXqVHGWNHK5Ps84PTjSfbVJC5+9+aZqnDBxvsjFJM
-2Pf8jbFhlGLTQ0UDCDiD456ywTVfqck3cvrkWRxkWJzPS4pUhxbgkhzfcBWTf9xx
-qNdznTzji3schKZEA2Vgi469DwF1VPOEOFQjJZ8j9DxBTgVT42DOk7YHir6xadks
-HEI/Hkl/8HAnnShmIWUBoOBU1jTKVmCzdEzmjHcim0r8sCtOJbKgez3105/A7L0w
-D3+sLDXlmwpLDzAqF8Hm4EkVZmz/PJWCRtQP8UsqO4MIcBfleYvwOmmby92N/tGP
-iP67Sd5NMMdI7DVod4H9xYn8f1lwqYYQ1aB9WvGW9JbNJBaK0QIECqIw15GCMGoB
-Uf17SsMzGsMXEIm3Mc2Bnus0DkexiE6Nbs1ko7OEN4bDVlVm0YVmZgBF2CDpa9xN
-/89QetWs0LKxwC/VUOKr6u0fjPkKV84VDgIPhR6ifYoYgrZmMz93ZnSASk23sSYv
-AM8YwAmhY3J51EKS/md7skoybB5W/GJgr5lJzgASpLffddLnvXQfrZB2lwHL6z4W
-ND+RcddICPejIE6wyIQ4
-=vbrw
+iQIcBAEBCAAGBQJTvOFxAAoJEJIMDbyqvv1VdqIP/3HTiCxFsd4zA5tjqNk6vBmV
+pz+pyFbOtwYDhz4ubcRd9Nu0E9qsdPCQ3mhO/gddY5NEZLGbTVoya/5gUMds+wRt
+FJQVI3iUeUIxErpl2gXPngy9/MuUd+47wPdeplVrhQbo9KLc1wW14k65anxS21sD
+SdEhCJHfTbI0zbOmo0VTpAnNKsqL1fZ+A8k1sLt0IP8qeqPoKk3rh+ptGpukj9fH
+64wc2/j8cHuuWhoKD4sXZflXQ1PIOiJkX8leeaAVHPkF5BUbQeKhobwP+NP62dnP
+tXFCQTyiy8r3L88UzYeR+yiCxrjCs/7TMHCSiBL3UnHBJc9OkteLxMbqmMS9rAQn
+dbWRaB1MrQnHvDU8Y68Z+ImEGKlf6H13/rSpfIFA9qYgn/kdVidIOMK3dqgeE50f
+7Kio0OJQcs1WS2VA4j1Gr8fIj5Wtt5hut2VVvqSoEZjkTFFTQSfkbbGTRwUOAae+
+kponDM4MFFCD4ym7sq8LZxq2Blpvw260OkqejZsbKeedHErEhqFpcupwNpsBEnS7
+gOa8oQxj5WzNUKQuFCQ13i3cwJIe8iQPGptOjC3i3RLYCTsjGKVBbCcrkuVVh6jc
+JbmJz2WGmWBzR5PL03NS2mh8yfEuj4ZgRla9E7iuSzYZ5TTlZU0TCDx1nHmGQhGl
+JhRh95SbCGrChgn/KCSj
+=5KU6
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-4.2.4-r4.ebuild b/app-emulation/xen/xen-4.2.4-r4.ebuild
new file mode 100644
index 000000000000..cd60378dbb9c
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.4-r4.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.4-r4.ebuild,v 1.1 2014/07/09 06:31:29 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.4.0-r4.ebuild b/app-emulation/xen/xen-4.3.2-r4.ebuild
index abaec31a0955..20e73fa8f743 100644
--- a/app-emulation/xen/xen-4.4.0-r4.ebuild
+++ b/app-emulation/xen/xen-4.3.2-r4.ebuild
@@ -1,20 +1,20 @@
 # 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-r4.ebuild,v 1.1 2014/06/14 07:14:16 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.2-r4.ebuild,v 1.1 2014/07/09 06:31:29 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"
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	# Set to match entry in stable 4.3.1-r1, Bug 493944
+	KEYWORDS="~amd64 -x86"
 	UPSTREAM_VER=3
 	GENTOO_VER=
 
@@ -22,10 +22,9 @@ else
 		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
+	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}
@@ -47,10 +46,7 @@ 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}"
+REQUIRED_USE="flask? ( xsm )"
 
 pkg_setup() {
 	python-any-r1_pkg_setup
@@ -61,8 +57,6 @@ pkg_setup() {
 			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
@@ -81,6 +75,7 @@ src_prepare() {
 	if [[ -n ${UPSTREAM_VER} ]]; then
 		EPATCH_SUFFIX="patch" \
 		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
 			epatch "${WORKDIR}"/patches-upstream
 	fi
 
@@ -91,11 +86,11 @@ src_prepare() {
 			epatch "${WORKDIR}"/patches-gentoo
 	fi
 
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+	# 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.4-efi.patch
+		epatch "${FILESDIR}"/${PN}-4.2-efi.patch
 		export EFI_VENDOR="gentoo"
 		export EFI_MOUNTPOINT="boot"
 	fi
@@ -113,9 +108,6 @@ src_prepare() {
 			-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"
 
@@ -123,8 +115,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
 	use debug && myopt="${myopt} debug=y"
 
 	if use custom-cflags; then
diff --git a/app-emulation/xen/xen-4.4.0-r3.ebuild b/app-emulation/xen/xen-4.4.0-r5.ebuild
index 3bd4939cdbc5..920a63160ee8 100644
--- a/app-emulation/xen/xen-4.4.0-r3.ebuild
+++ b/app-emulation/xen/xen-4.4.0-r5.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-r3.ebuild,v 1.1 2014/05/14 15:07:27 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.0-r5.ebuild,v 1.1 2014/07/09 06:31:29 dlan Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="git-2"
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=2
+	UPSTREAM_VER=4
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \
@@ -81,6 +81,7 @@ src_prepare() {
 	if [[ -n ${UPSTREAM_VER} ]]; then
 		EPATCH_SUFFIX="patch" \
 		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
 			epatch "${WORKDIR}"/patches-upstream
 	fi