After further review, reverted both -r1 ebuilds, revbumped both to -r2, fixed deps and install, reduced efi.patch accordingly and re-named to xen-4.2-efi.patch, all wrt Bug #458160

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

8 files changed, 306 insertions, 58 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index c3ab43c93b58..685c6f90f560 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.109 2013/02/23 16:34:06 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.110 2013/02/24 08:23:59 idella4 Exp $
+
+*xen-4.2.1-r2 (24 Feb 2013)
+*xen-4.2.0-r2 (24 Feb 2013)
+
+  24 Feb 2013; Ian Delaney <idella4@gentoo.org> +files/xen-4.2-efi.patch,
+  +xen-4.2.0-r2.ebuild, +xen-4.2.1-r2.ebuild, -files/xen-4-efi.patch,
+  xen-4.2.0-r1.ebuild, xen-4.2.1-r1.ebuild:
+  After further review, reverted both -r1 ebuilds, revbumped both to -r2, fixed
+  deps and install, reduced efi.patch accordingly and re-named to
+  xen-4.2-efi.patch, all wrt Bug #458160
 
   23 Feb 2013; Ian Delaney <idella4@gentoo.org> +files/xen-4-efi.patch,
   metadata.xml, xen-4.2.0-r1.ebuild, xen-4.2.1-r1.ebuild:
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 1f9871938c37..ea839123ff8b 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -14,19 +14,21 @@ AUX xen-4-CVE-2012-5634-XSA-33.patch 860 SHA256 47ef99cad90bfc8befb569ea430a25af
 AUX xen-4-CVE-2013-0151-XSA-27_34_35.patch 6927 SHA256 ae3432b7498ab7af6632bfac7334bb3112d78dba6604c1280577f0247d71a75c SHA512 6f100e12716fe712da111ac9df041d5455afaa4840e2772fa9b940f52a8a028e450adf5b07c3e413d6ce2a1209eda9a7a858e8747fe41ad8314e1d80af40d6db WHIRLPOOL 18ada6b2631a6f50d42ade57f8b0fd2e2f780df433b1d5997d70279474f3505d340818158bc2f6c050279d256073cee79765682c4c8f3aaf4f16ef4746462797
 AUX xen-4-CVE-2013-0151-XSA-34_35.patch 2216 SHA256 1e8303a295cdd6096345261af81b74506f4fcff15755f48b7b702e12284276c7 SHA512 65ba47e75a55b78a63505a779b21be5628867b8a586c0ebf7ceb9a874828a0fc5eb4d0ed327762eb5ecfdcc97c947c5bc42435a1a794ffeb515d6674b103903d WHIRLPOOL 495ddd4fb7fe0480418ff5e37ed419b665eb207166b065eabdd9a352b6ba31cd05564dd5682336360e29dd2b24fdf14a7505bcd457c85c079fa814ab7b48df9b
 AUX xen-4-CVE-2013-0154-XSA-37.patch 686 SHA256 64f1eff89242ecb5c7c3cc50b40662210bf33563282125838d8c822af0c04e6b SHA512 eae9999ef99b9b4911b957d802e79f4102641c0e6f3b13feaf81d11d97df8a799a27640b69ff8f205667eb9714f4f14f2fbed2af5b338e5120b523724e996963 WHIRLPOOL dd508ab13199c579a84e54c44a3f4bd48d7cbeed5a89dd93477b51a705479348a3866defb24ab13aa6cd0f68b8eaaefb7cb516bef0971652958841cc7bb7ea46
-AUX xen-4-efi.patch 1624 SHA256 467b1c35fca24da2c75e84c00c617dc7c7b4a1057dc49a44aa0eb1fb77500256 SHA512 9fdcd667c0c1509fe352308df79284510cdf833d2ce716bd96df8b5ea32ba74f77cb6294eb659144fe3a0b6e852f881f893063b822bcbc05a9c45358bdcdbd81 WHIRLPOOL 9f0c3685d4555a08075bbe36c70be4ec3a0f6d583e1d3d709594e8264cec930445e448711385aaeba1c0e6d8146bb2e41253fdc4067b29bb2b8125778f107d47
 AUX xen-4-fix_dotconfig-gcc.patch 1525 SHA256 943119cde08d16d05a927a85fb54ee4cee323cb4870dd0d90a552051fedc9907 SHA512 aa507594d96159c4e01ccfc4781f9afe7b6fe125c9df5925128c002f28fdf04999954b523cc53c6d7eaa49cb6e05120605f4e7d6f8bab6d5718d73a60b5accea WHIRLPOOL 6f4395203199b8037363ed56256e12f426f0c26f449c5e4a001c5454370a0e412f18cd03099866c30592ee0413556b85b3c374efb7172212db37ff3891c004af
 AUX xen-4.1.1-iommu_sec_fix.patch 2851 SHA256 3a0ab3cb5c18db91f4be457cbba36189a558da7b794e1a35795f4fed3d48a7c8 SHA512 832ecee2dedeb13c3cc61298fa9dacd131623c84c06fa9d4ecbcc6be97d660c3fa025ae61654e0f31396b50d917de3c2ca77262ed18e006ec281a707a6cf662d WHIRLPOOL f787685f52f4bd27fa11e80f8025c4ea90cf831610d9ae69d34bb0eaee7a34017d7aa7868935e1936bc868503892ae923d8fdfc8eafea5fab8f33765452ea371
+AUX xen-4.2-efi.patch 617 SHA256 27ad79e890a273deb5351e095db61e4159669e3fe10e3748fc6098135d336510 SHA512 ec850f32e3e83abf5aacc2d5c6a51b73e71622328281f1504855aa568434ca54dd0a64f3b84cdd3a57f7b614b4252c1d656ad1ce3369cff96edc0f5e865bfa00 WHIRLPOOL d5473ad9a5bf242543e084636eaed87535f78a54652cd5ec805a79ebf392bdb896a66df0cad470efaf0ce715c08e322811796a227af3bfe80dae20dce8107654
 DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
 DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37
-EBUILD xen-4.2.0-r1.ebuild 4006 SHA256 ec4c45aaa4efd821c3e474942999fceeec9d79034395a7397971cec27d615350 SHA512 4fe1284a261662ee7fa319f59da879207b66de166a0b10df519abc8fe4a7819375d8f7629048e13f9bdb5a1f14c406aadd5e5ac534a27cd83a935f7fdcf6d545 WHIRLPOOL f949537961db4f2d57de602d210eb3212cef8f050dca695ebff891437b258b23b2dd6a70656e8e47323789c7d8513ef945c6550d6dfe52db0070a49f9a9e7efd
-EBUILD xen-4.2.1-r1.ebuild 3551 SHA256 3124750b6cecb3fe2b9edda1f89ee7f219d89f0e9505e99eaeecf38c88fc2bbc SHA512 f1ee3405c725aa551445e429aa5f9344a0d5c9b216f8623eabd1fcd6eb2d05f3b344caa707a124c0dac068260762f9039ec598163324002d99c7360b1ad327e8 WHIRLPOOL f79015fd91d7810edfcdc134717d5d10f3c4a6bc0ef44b950e07403c2aae05d69735d1bab3148385e8dd68f534c074fffe4a6da066b98efd53e160540b83ed8a
-MISC ChangeLog 18770 SHA256 0a97e7caf0b2bc2c88acfbfdd324f1f7fe9050e40f1f2b7406f9637a055a11a8 SHA512 78d94122a9a9ed410fa712b460b52dd9fe480e44eb13bb860a954bce5df6735cb10f9a76f411d3b3a4bf9d91f93dbd842c7ab65c8956647d055c5e8bff2e6b75 WHIRLPOOL c501fef375ab2334d6cbb188be2fd19dc5ea43008d41efa51eb35808d382b472aa01ec6a169f2801a0de870fdae7b7b86bf039bc838a6718090b7fa55b004650
+EBUILD xen-4.2.0-r1.ebuild 3759 SHA256 653466405aa3b25fdcb8c6fed8c7022caacef8a837b2d58c379db8ddb76e58f6 SHA512 fec682dbc7e353cbf5c6063592b806815c2f86dbd30e36e09cfc650ed684687fd3cb67ecc54973d341aaf12c1776614ddf596571d5312278bad95a363a236e5e WHIRLPOOL 297608eed32ebd51c60667f78c571d3502344836e5814146ea644dce27b6fd9ccbf6b877b206d8828f531e2147aeb2a2355ba7bad03e7081b9f8c397c0ebaeb0
+EBUILD xen-4.2.0-r2.ebuild 4083 SHA256 d291dad226d96a70c13be613a6ab3cd0349bb098e2848104a892b087ab180ea3 SHA512 49d0eb849e2a3c273c6903fb59b9c4ad7fe09f1925884bd7c20c33ea70c37ce2d913d98394835ba1569ff989be8e2087454a972cfe06a8616c03788f5c3ce3b3 WHIRLPOOL ea1eee12b92029099b5e76fe090409accd7c166dcb34f7b3d600e0c554a4be4b5c82adb1e50bd92bbd0d6f0ccadc624aafac625a25d21d477d06899e3323c995
+EBUILD xen-4.2.1-r1.ebuild 3305 SHA256 9086561438e45f57aa191812aeaa1e6e2bc83ad2cbc2427be277f1bb619416d8 SHA512 ff50c7e57000706d5eb1d27c9dc982263f574fd70223f697cdaed73aac5e4ac69a0d686cf726d329a1ce666e873b50ccc9b1e54f9e236d9640a2d89f8708cff2 WHIRLPOOL edcf3161dee1dea5c512d57bdd628ee58417836b5c8263f854faee7022f35d5b1ad5482151576ba8e09f678b868713564c5fffc291c8b88fdada07edec07d83b
+EBUILD xen-4.2.1-r2.ebuild 3674 SHA256 7403e474365ffe49019921a90c75cf008bac81ba1af86089f1a43b8d66443dad SHA512 6fd0c4aa10557cd0b7aca44d0d2f17b1fcad07ed70ef05e17ccb11d653c4dbb0aae39598f8236e5c2f56ea42df9cc3df431213327114b4b00efe0e7333418913 WHIRLPOOL f165c5e5cf8167d14a8cbf90b508456e9dd6e600991eff408bea1b02170f2126f393d57391dae7a4f29f244cf72f6281925e6bea6318ed762afe392be3daac93
+MISC ChangeLog 19203 SHA256 388306510b82512c7c7cfecda6282f1e750b3290220e15c3ba5d09a68b93c9db SHA512 986759c8611130fe14943bc2d325663da347fda43bee322ef2403b91e63137d803a8f76e32cbd66c8033e758cf051bfb07d6436cee9cb7c0eebaa3716ee3f992 WHIRLPOOL aea3c6fe754039c88dc96c19f47a258da481502fbe02b75c13ef11b89fb657fd84e445e5e9d9ea5dc112463c87712365d206b49fa5f4fc534aa6916a95c844f8
 MISC metadata.xml 572 SHA256 0f510aa5a7261b30e5eff6961fa9dd95b19db63e0eea93cfad1d47460318ba07 SHA512 8bbca8d353aa3b556783bddd4822b97c0372b169edb89ff2907a00895e014ff9dba9e8efccf04f45de8a69ce63849505455e9735c224700d1ebf93aa3f097ac5 WHIRLPOOL 1f5517720776198868cf5a0165b9daf2ee48187bde4ad4d86533c65898da608bde779289df7ef83eaf076e0ce284607fc21f61fc3ca0baaf86873ca400491d0e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEo740ACgkQso7CE7gHKw2aJgCfYz3ZmDGr7U435efoIkmPYeej
-4D0AnAyzLHTxNucLryDbM0OWvTgrNpo8
-=1HAq
+iEYEAREIAAYFAlEpzjAACgkQso7CE7gHKw20NQCeK0Qwwd/xcc3aYZz5soGzusuv
+sAwAoJQ8WjLI2MJSuC9mRRUNEElXg6Wp
+=6PJ3
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/files/xen-4-efi.patch b/app-emulation/xen/files/xen-4-efi.patch
deleted file mode 100644
index ccffab2cd8e0..000000000000
--- a/app-emulation/xen/files/xen-4-efi.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur xen-4.2.0.orig/xen/arch/x86/Makefile xen-4.2.0/xen/arch/x86/Makefile
---- xen/arch/x86/Makefile	2012-09-17 18:21:19.000000000 +0800
-+++ xen/arch/x86/Makefile	2013-02-23 20:37:30.679918815 +0800
-@@ -112,7 +112,7 @@
- 	    $(@D)/.$(@F).1.o -o $@
- 	rm -f $(@D)/.$(@F).[0-9]*
- 
--EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
-+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
- EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
- EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
- EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
-diff -ur xen-4.2.0.orig/xen/Makefile xen-4.2.0/xen/Makefile
---- xen/Makefile	2012-09-17 18:21:19.000000000 +0800
-+++ xen/Makefile	2013-02-23 21:26:41.396771995 +0800
-@@ -12,7 +12,7 @@
- export BASEDIR := $(CURDIR)
- export XEN_ROOT := $(BASEDIR)/..
- 
--EFI_MOUNTPOINT ?= /boot/efi
-+export EFI_MOUNTPOINT = /boot/efi
- 
- .PHONY: default
- default: build
-@@ -43,6 +43,8 @@
- 		ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \
- 		if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
- 			$(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \
-+		elif [ -n '$(EFI_MOUNTPOINT)' ]; then \
-+                       $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \
- 		elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(DESTDIR))" ]; then \
- 			echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \
- 		fi; \
-
diff --git a/app-emulation/xen/files/xen-4.2-efi.patch b/app-emulation/xen/files/xen-4.2-efi.patch
new file mode 100644
index 000000000000..2d0b7d7d143a
--- /dev/null
+++ b/app-emulation/xen/files/xen-4.2-efi.patch
@@ -0,0 +1,13 @@
+diff -ur xen-4.2.0.orig/xen/arch/x86/Makefile xen-4.2.0/xen/arch/x86/Makefile
+--- xen/arch/x86/Makefile	2012-09-17 18:21:19.000000000 +0800
++++ xen/arch/x86/Makefile	2013-02-23 20:37:30.679918815 +0800
+@@ -112,7 +112,7 @@
+ 	    $(@D)/.$(@F).1.o -o $@
+ 	rm -f $(@D)/.$(@F).[0-9]*
+ 
+-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
+ EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
+ EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
+ EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
+
diff --git a/app-emulation/xen/xen-4.2.0-r1.ebuild b/app-emulation/xen/xen-4.2.0-r1.ebuild
index 06f9bc5775c6..b6e3ff0a2602 100644
--- a/app-emulation/xen/xen-4.2.0-r1.ebuild
+++ b/app-emulation/xen/xen-4.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0-r1.ebuild,v 1.7 2013/02/23 16:34:06 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0-r1.ebuild,v 1.8 2013/02/24 08:23:59 idella4 Exp $
 
 EAPI=5
 
@@ -24,10 +24,9 @@ HOMEPAGE="http://xen.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="custom-cflags debug efi flask pae xsm"
+IUSE="custom-cflags debug flask pae xsm"
 
-RDEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] )
-		 >=sys-devel/binutils-2.22[-multitarget]"
+RDEPEND=""
 PDEPEND="~app-emulation/xen-tools-${PV}[${PYTHON_USEDEP}]"
 
 RESTRICT="test"
@@ -65,8 +64,6 @@ src_prepare() {
 	# Drop .config, fix gcc-4.6
 	epatch "${FILESDIR}"/${PN}-4-fix_dotconfig-gcc.patch
 
-	use efi && epatch "${FILESDIR}"/${PN}-4-efi.patch
-
 	# 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"
@@ -119,7 +116,6 @@ src_install() {
 	local myopt
 	use debug && myopt="${myopt} debug=y"
 	use pae && myopt="${myopt} pae=y"
-	use efi && mkdir -p "${D}"/boot/efi
 
 	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
 }
@@ -130,5 +126,4 @@ pkg_postinst() {
 	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"
 }
diff --git a/app-emulation/xen/xen-4.2.0-r2.ebuild b/app-emulation/xen/xen-4.2.0-r2.ebuild
new file mode 100644
index 000000000000..f40d08b2fb05
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.0-r2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0-r2.ebuild,v 1.1 2013/02/24 08:23:59 idella4 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"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+fi
+
+inherit mount-boot flag-o-matic python-single-r1 toolchain-funcs ${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"
+
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="
+	flask? ( xsm )"
+
+pkg_setup() {
+	python-single-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() {
+	# Drop .config, fix gcc-4.6
+	epatch "${FILESDIR}"/${PN}-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"
+
+	#Security patches
+	epatch "${FILESDIR}"/${PN}-4-CVE-2012-4535-XSA-20.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2012-4537-XSA-22.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2012-4538-XSA-23.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2012-4539-XSA-24.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2012-5510-XSA-26.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2012-5513-XSA-29.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2012-5514-XSA-30.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2012-5515-XSA-31.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2012-5525-XSA-32.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2012-5634-XSA-33.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2013-0151-XSA-27_34_35.patch \
+		"${FILESDIR}"/${PN}-4-CVE-2013-0154-XSA-37.patch
+}
+
+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
+	use efi && mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+
+	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.2.1-r1.ebuild b/app-emulation/xen/xen-4.2.1-r1.ebuild
index a66263b8e6c2..e492bc681466 100644
--- a/app-emulation/xen/xen-4.2.1-r1.ebuild
+++ b/app-emulation/xen/xen-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r1.ebuild,v 1.3 2013/02/23 16:34:06 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r1.ebuild,v 1.4 2013/02/24 08:23:59 idella4 Exp $
 
 EAPI=5
 
@@ -24,10 +24,9 @@ HOMEPAGE="http://xen.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="custom-cflags debug efi flask pae xsm"
+IUSE="custom-cflags debug flask pae xsm"
 
-RDEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] )
-		>=sys-devel/binutils-2.22[-multitarget]"
+RDEPEND=""
 PDEPEND="~app-emulation/xen-tools-${PV}"
 
 RESTRICT="test"
@@ -65,8 +64,6 @@ src_prepare() {
 	# Drop .config and fix gcc-4.6
 	epatch  "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
 
-	use efi && epatch "${FILESDIR}"/${PN}-4-efi.patch
-
 	# 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"
@@ -110,7 +107,6 @@ src_install() {
 	local myopt
 	use debug && myopt="${myopt} debug=y"
 	use pae && myopt="${myopt} pae=y"
-	use efi && mkdir -p "${D}"/boot/efi
 
 	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
 }
@@ -121,5 +117,4 @@ pkg_postinst() {
 	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"
 }
diff --git a/app-emulation/xen/xen-4.2.1-r2.ebuild b/app-emulation/xen/xen-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..cd38c21d105c
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.1-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r2.ebuild,v 1.1 2013/02/24 08:23:59 idella4 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"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+fi
+
+inherit mount-boot flag-o-matic python-single-r1 toolchain-funcs ${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"
+
+RDEPEND="efi? ( >=sys-devel/binutils-2.22[multitarget] )"
+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-single-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() {
+	# 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"
+
+	#Security patches
+	epatch "${FILESDIR}"/${PN}-4-CVE-2012-5634-XSA-33.patch \
+                "${FILESDIR}"/${PN}-4-CVE-2013-0151-XSA-34_35.patch \
+                "${FILESDIR}"/${PN}-4-CVE-2013-0154-XSA-37.patch
+}
+
+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
+	use efi && mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+
+	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"
+}