bump security patches, fix bug 519800, 519802 519804

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

5 files changed, 338 insertions, 20 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 6caf2877ed59..0a07ccdca673 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,14 @@
 # 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.169 2014/07/12 14:10:52 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.170 2014/08/19 14:11:54 dlan Exp $
+
+*xen-4.4.0-r6 (19 Aug 2014)
+*xen-4.3.2-r5 (19 Aug 2014)
+*xen-4.2.4-r5 (19 Aug 2014)
+
+  19 Aug 2014; Yixun Lan <dlan@gentoo.org> +xen-4.2.4-r5.ebuild,
+  +xen-4.3.2-r5.ebuild, -xen-4.4.0-r5.ebuild, +xen-4.4.0-r6.ebuild:
+  bump security patches, fix bug 519800, 519802 519804
 
   12 Jul 2014; Yixun Lan <dlan@gentoo.org> -xen-4.2.4-r2.ebuild,
   -xen-4.2.4-r3.ebuild, -xen-4.3.2-r2.ebuild, -xen-4.3.2-r3.ebuild:
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index b2f28e67ab9a..8ab3ccd4bb04 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -6,30 +6,34 @@ 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.4-upstream-patches-3.tar.xz 57456 SHA256 e223b6fb10ca26415d0677e465480f77378f7a196bb3a2cc654a2d53e867fa66 SHA512 4b1091cba3afb149f8734630f32a3c44b1abade4a524f5bbfcc88df5700dbcb38dfd7b4dd0059e323a5b89a9156109505891a54dae9d698fe9d89ab2294e3151 WHIRLPOOL 1448b20e6930dcc7a0d57819732341e24257159c97fc5e270be9c47935b750cf7fa08b02ac1d0f49792b453476330b19c773e79d1c6b02ea9ed7baca83750163
+DIST xen-4.2.4-upstream-patches-4.tar.xz 69344 SHA256 23ef320500452dcf8a824d5c8062c6399e1c3f39a51ce6594b232b4bfbd9d9c4 SHA512 43141b8ba4790860632eb83814e9b5e469ba3431da00820fd131ae6a79e1a05ea4db4b801627f52360ebac06160dd86217a79b196d2b6d379c86cf9449b75371 WHIRLPOOL 30344a3780122fed2d3895adf60bc4d7efc6879b0ad46160ccbcaa98c69aa4f419cd233690f69a250dc413fb410c3affad805bfa8570c9d78290c3a9b224264c
 DIST xen-4.2.4.tar.gz 15663999 SHA256 e23e6292affd7a6d82da99527e8bf3964e57eb7322144c67c2025692b1a21550 SHA512 3e5263511e7c40899f580f3384bd987f9c875b8e6816202fd1a5a64fe7e336803d09e58148af074938ef261f0ceeafad121ac541ddd2bf66b76c5aa4ad07c357 WHIRLPOOL 25d23f5d921139ba0f853fcd76ae998647d32292bccfd4e7c4f3b12f860a38fbb33ebda67c839657bf3a25d837c9c02b80d663362263d16d42284ffde09f0bc2
 DIST xen-4.3.2-upstream-patches-3.tar.xz 60208 SHA256 661ab148c9eeb2c8e44d0bd620496607a567d4f6c1fa0a6f89b21086ee8f607d SHA512 1248c937c604716f756083d44ef14150c8601f810fd8c0b73df314bd34287a53b4db3e8697f03acab3cf56252cbac8578a5bbedb40c342fa7c2b3f7f9c6575e0 WHIRLPOOL df3525d76607232720d3f3351548add60c89a139d380cf6147bec122cb11c52570e99dd14f800e88e411248b950aeed32ae03cce93fc8358011b3125114bb3c6
+DIST xen-4.3.2-upstream-patches-4.tar.xz 69268 SHA256 eb00972bc511b584278a178765af8fc5d6d78097a39e6d3fdf5133a73693d953 SHA512 f9455d375f26b37844b820ea238a06c24a4e1f76adbd217a78ac31c3e0e078f9eaf2744886e09d7fc3a1b3b9b03c85257bac236742d69c5c0a00cf0683760d1d WHIRLPOOL e55f126f004313efadf7d881b10e7747504824d83f477787fad09eede0a8f3aba268a37d933e641720b51ed91723f036c80c855907697293ea2b1b52e5a9efb5
 DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69 SHA512 ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302 WHIRLPOOL 72250369fb2c90ba608e1da018cb6417b3089642c8ba59af9f2825ec5ba7c4e6c5d6f86140b20825817e4625727c6d58c5d38b00863c994e31c8a04927997bd3
-DIST xen-4.4.0-upstream-patches-4.tar.xz 98388 SHA256 84dd81b8d1126edebcff72f1ceac4384b524d05ba7f6c7289df1485c493707eb SHA512 fdcbbda88237bd8106151c293e0fefbb87880f9a12ac430da16709360de62032083daf5d57e5a929c792d9c27ac046f98871510a72bb4ae03fba35b1cfcf725e WHIRLPOOL 8422e345717b4fc482d2517c415f97a321a784a314a30fb6519bf1a02412534278151b187cf527f5d644bc5a852a53e5cef9a08e5a8ee4e5e840a9a8079c5723
+DIST xen-4.4.0-upstream-patches-5.tar.xz 112184 SHA256 39b3db8f684a570d7379ee7e75e3cfffa72f8fdf639cbb745f90b42f7a223f0f SHA512 e25893b8507fd7b1a3d2194e83da55b934914df73aa4a18a893e6a09df3ab0e1f992a6b26c2b5a2fccfbe41c4a56d10db37eb58dcf08832b9d85be1ff94ced7d WHIRLPOOL 2baf008c98b9685fcad8ea58a41c14271947295ad5e28c99a01876c87ad5274d8f59e5583e1bf41caa536238ed0baaf785f4a1271b68e51f18f2195cd894b5fe
 DIST xen-4.4.0.tar.gz 18116578 SHA256 6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021 SHA512 84bc293415b8ce9686240b0145a92be190cdd7032c66b5b07906baacbfeb33ad1e6148336e951fd4506b7f4e0b250937c702226c0207d7088a50e643bedabd17 WHIRLPOOL 87886cc83bf1eaaf5dd5b67d7cc82823d98dd9b4b47c0a178ea70ee2367c1a4a142aa66df13f58603840d0e310fb5c09dc0d5b87f6361c934e1c83c95d09d406
 EBUILD xen-4.2.4-r4.ebuild 4233 SHA256 b739069c9a618fe96a773f8dfe49ba0d95d41779a17ac451e3e95b6ddaccf070 SHA512 4d2694654a3cd1078183e393e3e0d173847e7b49e43d9d3f4035c535b5940121704b6a14ee661c5120dc0e1ac3cdd109f68d6155dba2d40e32e7be818a8fa120 WHIRLPOOL daec6e83d65b7eb99e8a41280cce177934015b305026e5613487171af0d7d859e31c3567c00a6081abe39949d379c41c950d71b14aa6817b5b34f3d639b5941e
+EBUILD xen-4.2.4-r5.ebuild 4236 SHA256 1a7f884d39446e2ecae69c0681e19c097847b3e3498efa8bf8c1997469ef1946 SHA512 1990f1505ea2ad5fc2471d3d849aae08ac3d0e3a54747ec89ba3a3f58206f2cdf01af5bc9a6b45362dc29557674fe6b49e6b9c475affb078608b34442cca60ba WHIRLPOOL 227b4793e6596493529ad72c4968657a59665df8feb79d0d45c430a3cb9a7081127a0320a74d12a9a22d0b9e29e4ad717b26e1630d74b09d92aa20c0cd125e8f
 EBUILD xen-4.3.2-r4.ebuild 4128 SHA256 052a0c975c437ca6b7e2df5310bec50e0dabfceb1a199a70970f26a80b122222 SHA512 b6401e348ce4465fd1eb303695782520f0fcfc191d277f0904c3e62baa82a003c7d920aff5423bd873e4020c221121ea1078ef91286aef2195a7dd5bf956688c WHIRLPOOL ff3d566629729877f1f1d38f62c443258dd8f59bcf31d74905bf519f6638bdbfeffe204223e54f7c62a38548078374038dda949aced414aa7456daa3a14d0453
-EBUILD xen-4.4.0-r5.ebuild 4359 SHA256 60a84e4509531b29950b3187b7ca570d2ecc8de407878b4f3a99b51bc7145901 SHA512 46fb8a857632bcb7b88095229529b6e42e3b1b8f27bf2131834fee647677e77decef2635ab54b5efdfbcb84926d0e1a4d27bc18deca071fa3722e20d4d47f171 WHIRLPOOL 84918330f50cf60eeeb22dabe94b53fd6bdf04daa2e8e7afb21789ef04c647a4e9e8d35fd25e1f4d0b55bcc6db64892be7abff38a92bb0b8b55e667c8b12936e
-MISC ChangeLog 31248 SHA256 461a038b66347912f4832b36e84cd54393a4792b6503ec64ac9955095c5204e4 SHA512 ed9e6004b712c4781fd5b584d3c4b0d83584bd8b542484e04837eaab6c6a9aa5c62a1c0c2e6dac2a2075b2830ecfc9495648344a74a5165d3b2c05584c2ba1a4 WHIRLPOOL 653ef96c4b5658426916e6b5fac73266792c4520b286adbf02b930dfd08234a0e087193f877c594b585d2e8f757f5661eadd6b24bf35d15643e4e910999f2d8c
+EBUILD xen-4.3.2-r5.ebuild 4130 SHA256 c41b014b87c70fd2102c6b7c2828572200aca2add5277ddddba429c73e28f9e5 SHA512 7f69a426fb5df176da3e16b711e242b5ab0310fd026018cc82d97186c10b97dc5ffa9fa2e7db5db4f2d11046b3b22ca469b75a2e3a80dbc936f3df7da5439f52 WHIRLPOOL edceef8424f838d2fc5b5766237702aedbc083bed3b8dde921f33aaf857c03efc100ea5dd9f87d499c2f8b0aa5f2a6ac964ce595c4b69396fa53d34827db4c54
+EBUILD xen-4.4.0-r6.ebuild 4359 SHA256 e7aa59b9ce2f22627ef757b6d2daed083dc93c6e766763b1242016d6d179debc SHA512 386a978d50e850932b0467c9a12ab3cfa20196ff62ddf40cdcadcee2096590bc5c42f26315a5c39f35307e3f75948887b3c010fdcf0f0b0f95e1844eaeeb464a WHIRLPOOL 55cfe1fe0f4544a506f4d01dfada34f6481c0a60d79871e11324e73203133d7d3e314299cae6b9c151ad256ac5f91aaa0382f2866953f1ed908b8abf71302332
+MISC ChangeLog 31522 SHA256 23de31c348a62e6cdb7008a79a40925db741e09cbf8affc714e467392cf1e95c SHA512 5ee1560a645648f3b96390b47404728ff65ebc3588256e492080db669e0477766aa1053294ca34bf4df326d4dd2c07122bcefe2d0224ec7ee93ee5e95c182ba2 WHIRLPOOL 31b5b63ef7656bb41bd35f12d25469085fe8e27cecc6855086c0f5b33d09bf04bc154fb59a79276487ea9ccf52dfba09a7ff8fe7980e7e333cc50f64201a4306
 MISC metadata.xml 480 SHA256 c6d867148db1480748552aea9692bdee95fb98a94fcfadab0d128cbf1102b0d5 SHA512 888aa860cbb74d79c76f096107d8b22975470373ab11249da2c4ae9c4e172bc52fee73fdfaf07c19e977cabbbdf35ea5b3c6508d4a6f555b771ab6729806fe5c WHIRLPOOL c4d10589ca2c8b4e8bbd877dfc8f4f3b66ce8ae7bece71617e9571f07a39270f54c41f5fbbb2b29020ffc6473e2341064bd708813af3e20a31d5b9bd0510ebe2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTwUIIAAoJEJIMDbyqvv1VgisQAJ3kFWYhecAC9gim03AZNoJY
-3en1fxjqD2ivWogGhg4lA4h0cxfbXC+6MEg5AISCxlgy10/Na++f2anQJWZZrnJl
-mJIDZuACtnZhQa+ZLYgKJF4/+OMdE+jcB60pTTxn/5WDfsr4rsTOAhSNOvNKUdKN
-3eIfFCB+uAk76//ifKNPnKSQtidZUEVgoz/A+490Hxe0Fa8BA00u85Mh1ja60RdA
-A15RuA+83Abm9uCN7mUIJ8g0Q8iNRnsRDnAqYnJH/5uV9Kmc6WQmP7yFQakp1Efd
-qKbMIQVLK3URlueNLT2mIv5+DxWhY/l7xBZZwxYs+SNHnZV+Q8B9RiagppUNX0lP
-2rIT19rwgZIa46CfBM6B7wqXJ3VXopm940kjWolcmZ3YaAe877S6omxsE/xcc8Ka
-kU8cPjZvygGpSkCT/xFrBWNuu4yzE0oRoGPlJFVKh7F2lJBszjCX/yq4M50MlA01
-MhHdg1UPmXksS7h06ytA92UCcZxDPi33cet29ZteQ5AW5ZddyEQTKBiM1kqq6bCM
-bq4MKX1ISNBEAv8aMl1kuzEgVeCN/7Zpb5MNA9JmjLG0t5ZhP1qEw0dZQNQqdQ7X
-2T/ggPU38cA4fh1yYgQcxYIM1luRQlISeLbne6TG2A9WLLXsfrAw758prr+BMx8T
-sB2uvfnhy7rTwLCsLdim
-=nYhR
+iQIcBAEBCAAGBQJT81puAAoJEJIMDbyqvv1VAOAP/RlrzSD3b/6vM4AJVxM9J9wP
+Pf+PY48Y8ztpaY881UsETkfZYgsBal+fUceBwqZD20/q0NI0yjLwg7K5ToMFwZsz
+DmzSSKenJubd7WIjyQ4mH1ouz3/CaGyjZYkeNSbqk4o+nijkcveFYVQZgJOf1gEr
+Ta7byUZZNwXoppvCvS+f7fnqMP439SVL6HjIBUT+/l1fGyEqk9KXr+rqZA66FUVy
+mmSzq3KJWtuNpHjzOWHEkZioScteEpfy1/m8dtvkPijIk6xmqlrC2WW+/aQMfLIk
+lijqlQzJAl/3raFo7krynLW2QeJHfU7BgolIa+azmA1yL3g4s4jgdkdS4/iwNKmm
+2X8LZiqMEWtsdajrpYsQ8UdHd5fBFk9QQiwij0k+CsBImDg/0hhEzLO5stElvt22
+J1CgD7sPP3IbnYEdkmCf1A6t3B+qQSJI5S4atNR9TxJnxD6h532d8SFyqAq6dQdH
+DOF5gL/YTnwnB6GLdkICfa8g7K8C24NZpxJ37y+7s37865I3ulF66tOD7HLDnZ4A
+AGEGAx6ENHywvV0q1WGZOhHuF8V3GGxi+Ulp50OC5fWcbhSbU87D7SmfmAzNX1ih
+k0PgdmcSiEmIO9uHl9VpOxi9TuBw7mXsV1ZgqAfWPRbWYuSuUYJ91al1YADCvz8w
+/XDKPFzOjRqtWq+rqa+r
+=I7y4
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-4.2.4-r5.ebuild b/app-emulation/xen/xen-4.2.4-r5.ebuild
new file mode 100644
index 000000000000..a4f8b132a949
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.4-r5.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-r5.ebuild,v 1.1 2014/08/19 14:11:54 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=4
+	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.2-r5.ebuild b/app-emulation/xen/xen-4.3.2-r5.ebuild
new file mode 100644
index 000000000000..88f63d0c127a
--- /dev/null
+++ b/app-emulation/xen/xen-4.3.2-r5.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.2-r5.ebuild,v 1.1 2014/08/19 14:11:54 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=4
+	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.4.0-r5.ebuild b/app-emulation/xen/xen-4.4.0-r6.ebuild
index 920a63160ee8..ff32bc2289a9 100644
--- a/app-emulation/xen/xen-4.4.0-r5.ebuild
+++ b/app-emulation/xen/xen-4.4.0-r6.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-r5.ebuild,v 1.1 2014/07/09 06:31:29 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.0-r6.ebuild,v 1.1 2014/08/19 14:11:54 dlan Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 	live_eclass="git-2"
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=4
+	UPSTREAM_VER=5
 	GENTOO_VER=
 
 	[[ -n ${UPSTREAM_VER} ]] && \