From 98c732a7a6a29e5d46a8b812dcb49f1d519a9861 Mon Sep 17 00:00:00 2001
From: Alexey Shvetsov <alexxy@gentoo.org>
Date: Tue, 25 Oct 2011 18:40:28 +0000
Subject: [PATCH] [app-emulation/xen-tools] Version bump prepared by Ian
 Delaney aka idella4

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64
---
 app-emulation/xen-tools/ChangeLog             |   8 +-
 app-emulation/xen-tools/Manifest              |  32 +-
 .../xen-tools/xen-tools-3.4.2-r5.ebuild       |   6 +-
 .../xen-tools/xen-tools-4.1.2.ebuild          | 333 ++++++++++++++++++
 app-emulation/xen/Manifest                    |  32 +-
 5 files changed, 377 insertions(+), 34 deletions(-)
 create mode 100644 app-emulation/xen-tools/xen-tools-4.1.2.ebuild

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 6d794896b81c..69528142a71e 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.102 2011/10/24 12:02:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.103 2011/10/25 18:40:28 alexxy Exp $
+
+*xen-tools-4.1.2 (25 Oct 2011)
+
+  25 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-3.4.2-r5.ebuild,
+  +xen-tools-4.1.2.ebuild:
+  Version bump prepared by Ian Delaney aka idella4
 
   24 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.1-r6.ebuild,
   +files/xen-tools-4.1.1-bridge.patch, +files/xen-tools-4.1.1-curl.patch:
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 8344bdcebd73..1057fe3ea473 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -29,27 +29,29 @@ AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 983
 DIST ipxe-git-v1.0.0.tar.gz 1996881 RMD160 dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 SHA1 da052c8de5f3485fe0253c19cf52ed6d72528485 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
+DIST xen-4.1.2.tar.gz 10365786 RMD160 457797ec4be286afbbcad940a9ce04e44f3f40d6 SHA1 db584cb0a0cc614888d7df3b196d514fdb2edd6e SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d
 EBUILD xen-tools-3.4.2-r3.ebuild 7049 RMD160 05ffd0fdba6761df2d59f3bd7421599e1f20f4a1 SHA1 e36b7900c84de2ca1f861af081678ff3c7eb943a SHA256 d1513d443231dd27cb0267acac47c00c9bf95c25aa296e90ee6bb21a134e1e51
-EBUILD xen-tools-3.4.2-r5.ebuild 7398 RMD160 08e9b12c23c9d853f5b59ee2613a5e07a9623038 SHA1 0859af01b9dace9451e24f509c4b436a76b9da39 SHA256 92682159a7961a7ebebf523541f793e59e7b4807755e32e8787e70658bc3ff54
+EBUILD xen-tools-3.4.2-r5.ebuild 7383 RMD160 b31318f590f2d563c036a7acffe65cecc9bf677f SHA1 34312c51b92c28dc7d7ab718c1b5f67b1554be61 SHA256 0ae0c406503dbc8342d5a4abc72d896ec0205317c9e6ec8690f71a40bd7bb8c4
 EBUILD xen-tools-4.1.1-r5.ebuild 10316 RMD160 92450a0dba081cda3e23e94072953b858538d31e SHA1 f1af2fba3958c0813b37adc16c82d69d720f2458 SHA256 80485abdbcaf256d21289f0cf260de671d72bbcc023bf49df3bd99db99b23720
 EBUILD xen-tools-4.1.1-r6.ebuild 10650 RMD160 ca9ed4794403b2db2aecf0f424d90dc32a9b8112 SHA1 f6d9c393831de33167698ffb84a42db946e894c7 SHA256 d5abd406cc5d2a1c96e3ebcc9ec697c890ca24cc408e76b286bc8fd4f0c4d586
+EBUILD xen-tools-4.1.2.ebuild 10489 RMD160 36b921ccc4560fe926d613c94fcff733a4938417 SHA1 a039c9fcb532b15d109939670f9a148243b6538a SHA256 861ea71ccb872e2d335698fa9fa367f25f810de51ca08731efffea63e92fcdda
 EBUILD xen-tools-9999.ebuild 9517 RMD160 a1fa4abc0c2a8cf160d05fd699f3b2ded872f113 SHA1 ae51b976fe1f07152444e0f1b01e8e513e8ce215 SHA256 bd832962adbf6388ed7d44530587596f97543a6596bc59b5593bff7c972bc926
-MISC ChangeLog 25300 RMD160 588ff3957d8d1ba851f3864ff59f775855469200 SHA1 3b99469a56d2956f2f6340e6e6922ea1197c3976 SHA256 eb42d6c1416cf03827dd1ddca8caba8a0e94bc3ad6847cafb5ad8571e88ef0ba
+MISC ChangeLog 25489 RMD160 9ab172e992d3eb1968b472772d7e600a87ab4a14 SHA1 3355d361f8b44d60a8c07515dc2b7cd32b1c447e SHA256 40304026cf4cf8a38eb7401faeb66139adc3d40e1bbc3dd1e9bfad4c2d88e108
 MISC metadata.xml 947 RMD160 96890462f83ee4a47c9c77993ba76ef82a732af5 SHA1 7ff424eead47cb6ce81930c10d3b22b0d8f73d61 SHA256 74f0e5bea356989a42fd4086d87271ed7c25331306acb333707476f53cac4d60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOpVNlAAoJEOf+E+/4L5LmTSoP/1RFmmJtZYp53Wj6N26Clfvj
-/oQhzDkIC34Svpq5N0opgerA9fU1kK7ibKb3pQp1f1C1T/oR5UOa+pS8oq92wICt
-4e+DUafr3Q67Crf8mJ0GipCp8VZraV2n7WO/8y/hH7tk5O9A/p8GytYlYUjNKaHe
-kBSVqs4aGuQeTDl6hEg20vqx6jP/SsImgPX7xG9Yto/4S09xV8W+v6ovZtXDCuJU
-JgaB5TFvx4vsoTu0DXe9HKmXsWYKlv7OdbpNAiN6gLg6bJB8OJ5bI8hgKk7EtJBg
-LoHSfLj+74Xc4/uy1EzAkyeYWC0XkKlBstlRxQxTzcoZ3q+jFO+7zSovSF69Alfg
-hPk22gUIZGl5NhGeY0uePvHIW1miU09Osi9CKHVY6aprpRevA2McOuQJTYwrG3dX
-3CDdhKJWj3zkfwpbmGNLbGiYqX2+7XAxkMj8dtgvkjqwrJ1bTnQivbNNNVH3Bpvw
-5RQK7n7leSU7sQDvZX+z5Bu3QRPvNzW1cFsA5bDWIGKkhjjvHUE+Lj7VTPyW6GQL
-U33uAipAVGbM+djaNybVWSI+aRcKFZajIi6k/vPS/z9gLG0v+YajXwzg+6kEGvXO
-/x3ipJrZtxOXOj7uy3BOVS0EynA4jRLsJKet6dLIJEdNVUDc33LO/UFqkH+HMawb
-uwHMhE6lIvwag7PMNrc2
-=O5yi
+iQIcBAEBCAAGBQJOpwI8AAoJEOf+E+/4L5LmJDoP/Ax7P3rkCqAzs8N2zEmYHlwf
+7fl+xpMv3j33BVvyQLTEfxGgWnA/ngSCgonEA9JL5kUw0ivH2U8Odk/IBr3QmHnT
+0VnUiYuwnIaSGGcOcwWdKz1O2SuRbx47zSh/pLs8w9aHMohNMKZpnDGWDAZAu+p6
+tE5HxeSH5bx3XP7hMbXMFIIserhE3/ZHPn6QoLmd+VpbQnS/WggTD/O5157Hm4F2
+QoH+kL0zyV98gtFrk9+PvyAOqr7U29GzP2cXF1o3GYfwfKqqvVQ+nSkaUKZ27rzd
+SbHYsWmefWL8PvXrV3VgZ7Sb6tFYkUs/vEdm9UyB9wSNbe6WCU35XMXXJIJ4XrVR
+h2373H/c7X/h5PNEwmInFC+1aJPDTDIm5kbmSOlHZh9m/eoxcpRn799MO1vFENWn
+2q/KRe+aZt+VoWO8NM3Dm6q/KRMxVnxrIi3/IZa70K8dlvPAH1lWJE5sJvRmkgpk
+8RUrpszSfboj4IfWXK0gf1Jlp7XjAEdJ/77UMtQqQltrC1ke06a8iCJ8HU3L6VKb
+lNDst+ZoNbwQuk/84v0LRmF93aK0Y/baUH368qP/6mygWzWBgXdr24it0Y7iUseC
+lD+o6S+EP8IXIypT6Se/Oh7UPFbmBo39SFS1GjfekunQUH1Heyq7T55z0cXhYqUg
+zIzXMjtc/97ll+UTBC1Q
+=Djno
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild
index 6fd6ef19c5be..c31830b21501 100644
--- a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild,v 1.3 2011/10/05 18:59:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild,v 1.4 2011/10/25 18:40:28 alexxy Exp $
 
 EAPI="3"
 
@@ -45,8 +45,8 @@ DEPEND="${CDEPEND}
 		dev-tex/latexmk
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-pictures
-                dev-texlive/texlive-latexextra
- 		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-latexrecommended
 	)
 	hvm? (
 		x11-proto/xproto
diff --git a/app-emulation/xen-tools/xen-tools-4.1.2.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2.ebuild
new file mode 100644
index 000000000000..2455cf256fa9
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.1.2.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2.ebuild,v 1.1 2011/10/25 18:40:28 alexxy Exp $
+
+EAPI="3"
+
+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"
+	XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \
+	$XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz"
+	S="${WORKDIR}/xen-${PV}"
+fi
+
+inherit flag-o-matic eutils multilib python toolchain-funcs ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen xend"
+
+CDEPEND="dev-lang/python
+	<dev-libs/yajl-2
+	dev-python/lxml
+	sys-libs/zlib
+	hvm? ( media-libs/libsdl
+		sys-power/iasl )
+	api? ( dev-libs/libxml2 net-misc/curl )"
+
+DEPEND="${CDEPEND}
+	sys-devel/gcc
+	dev-lang/perl
+	app-misc/pax-utils
+	dev-ml/findlib
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html
+		media-gfx/transfig
+		media-gfx/graphviz
+		dev-tex/xcolor
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? (
+		x11-proto/xproto
+		sys-devel/dev86
+	)"
+
+RDEPEND="${CDEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	dev-python/pyxml
+	>=dev-lang/ocaml-3.12.0
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	|| ( sys-fs/udev sys-apps/hotplug )"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
+QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
+	usr/share/xen/qemu/openbios-sparc64"
+
+pkg_setup() {
+	export "CONFIG_LOMOUNT=y"
+
+	if use qemu; then
+		export "CONFIG_IOEMU=y"
+	else
+		export "CONFIG_IOEMU=n"
+	fi
+
+	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
+		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
+		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
+		eerror "to build xen-tools on your current profile."
+		die "USE=hvm is unsupported on this system."
+	fi
+
+	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 doc && ! has_version "dev-tex/latex2html[png,gif]"; then
+		# die early instead of later
+		eerror "USE=doc requires latex2html with image support. Please add"
+		eerror "'png' and/or 'gif' to your use flags and re-emerge latex2html"
+		die "latex2html missing both png and gif flags"
+	fi
+
+	if use pygrub && ! has_version "dev-lang/python[ncurses]"; then
+		eerror "USE=pygrub requires python to be built with ncurses support. Please add"
+		eerror "'ncurses' to your use flags and re-emerge python"
+		die "python is missing ncurses flags"
+	fi
+
+	if ! has_version "dev-lang/python[threads]"; then
+		eerror "Python is required to be built with threading support. Please add"
+		eerror "'threads' to your use flags and re-emerge python"
+		die "python is missing threads flags"
+	fi
+
+	use api     && export "LIBXENAPI_BINDINGS=y"
+	use flask   && export "FLASK_ENABLE=y"
+
+	if use hvm && ! use qemu; then
+		elog "With qemu disabled, it is not possible to use HVM machines " \
+			"or PVM machines with a framebuffer attached in the kernel config" \
+			"The addition of use flag qemu is required when use flag hvm ise selected"
+	fi
+}
+
+src_prepare() {
+	cp "$DISTDIR/ipxe-git-v1.0.0.tar.gz" tools/firmware/etherboot/ipxe.tar.gz
+	sed -e 's/-Wall//' -i Config.mk || die "Couldn't sanitize CFLAGS"
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+	# Xend
+	if ! use xend; then
+		sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
+			-i tools/misc/Makefile || die "Disabling xend failed"
+		sed -e 's:^XEND_INITD:#XEND_INITD:' \
+			-i tools/examples/Makefile || "Disabling xend failed"
+	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 {} \;
+	fi
+
+	# Disable hvm support on systems that don't support x86_32 binaries.
+	if ! use hvm; then
+		chmod 644 tools/check/check_x11_devel
+		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile
+	fi
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk
+		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" \
+			-i Makefile
+	fi
+
+	# Fix build for gcc-4.6
+	sed -e "s:-Werror::g" -i  tools/xenstat/xentop/Makefile
+	# Fix network broadcast on bridged networks
+	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
+
+	# Do not strip binaries
+	epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"
+
+	# Prevent the downloading of ipxe
+	sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \
+		-e 's:^\tfi:#\tfi:' -i \
+		-e 's:^\tmv _$T $T:#\tmv _$T $T:' \
+		-i tools/firmware/etherboot/Makefile || die
+
+	# Fix bridge by idella4, bug #362575
+	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
+
+	# Patch for curl-config from bug #386487
+	epatch "${FILESDIR}/${PN}-4.1.1-curl.patch" || die
+
+	# Don't build ipxe with pie on hardened, Bug #360805
+	if gcc-specs-pie ; then
+		epatch "${FILESDIR}/ipxe-nopie.patch" || die "Could not apply ipxe-nopie patch"
+	fi
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed"
+
+	if use doc; then
+		sh ./docs/check_pkgs || die "package check failed"
+		emake docs || die "compiling docs failed"
+		emake dev-docs || die "make dev-docs failed"
+	fi
+
+	emake -C docs man-pages || die "make man-pages failed"
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/etc/init.d
+	export CONFIG_LEAF_DIR=default
+
+	make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools  \
+		|| die "install failed"
+
+	# Remove RedHat-specific stuff
+	rm -r "${D}"/etc/init.d/xen* "${D}"/etc/default || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=1:autoballoon=1:' \
+		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+		-i tools/examples/xl.conf  || die
+
+	dodoc README docs/README.xen-bugtool docs/ChangeLog
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \
+			|| die "install docs failed"
+
+		dohtml -r docs/api/
+		docinto pdf
+		dodoc docs/api/tools/python/latex/refman.pdf
+
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+	rm -rf "${D}"/usr/share/doc/xen/
+
+	doman docs/man?/*
+
+	if use xend; then
+		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
+	fi
+	newconfd "${FILESDIR}"/xendomains.confd xendomains \
+		|| die "Couldn't install xendomains.confd"
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains \
+		|| die "Couldn't install xendomains.initd"
+	newinitd "${FILESDIR}"/xenstored.initd xenstored \
+		|| die "Couldn't install xenstored.initd"
+	newconfd "${FILESDIR}"/xenstored.confd xenstored \
+		|| die "Couldn't install xenstored.confd"
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled \
+		|| die "Couldn't install xenconsoled.initd"
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled \
+		|| die "Couldn't install xenconsoled.confd"
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
+		keepdir /var/log/xen-consoles
+	fi
+
+	# xend expects these to exist
+	keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+
+	# for xendomains
+	keepdir /etc/xen/auto
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+
+	if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
+		echo
+		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
+		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
+		ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug."
+	fi
+
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 multilib system is required to build HVM support."
+		echo
+		elog "The qemu use flag has been removed and replaced with hvm."
+	fi
+	if use xend; then
+		echo
+		elog "xend capability has been enabled and installed"
+	fi
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+
+	python_mod_optimize $(use pygrub && echo grub) xen
+}
+
+pkg_postrm() {
+	python_mod_cleanup $(use pygrub && echo grub) xen
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index ea0e05702488..e5d40d9c6fdf 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX xen-3.3.0-unexported-target-fix.patch 788 RMD160 4b30444c021479cbd3969493639533fc1e43e781 SHA1 9119f06b4a005c385ac27e085e2d96ccf9cd4dc9 SHA256 e46f5fbe4c579b84f895f0ac6e05589553a11305ca30e69405082d58abd9ee07
 AUX xen-3.4.2-CVE-2011-1583.patch 2893 RMD160 c6ae9661202dafc2abdcf3aaf939464d14ded9fd SHA1 b2140fe7d615b542a96dadaaf8ace382e528d2cb SHA256 809c1744aee7569db31e9959c1e2c433ef6f4067134b26f70a689e056a024df9
@@ -10,26 +10,28 @@ AUX xen-3.4.2-werror-idiocy.patch 16826 RMD160 14f4678c723fd9241c88786b5b07a8c25
 AUX xen-4.1.1-iommu_sec_fix.patch 2851 RMD160 4367178c10cdc1e752f3e9ffb70f42e6e7179242 SHA1 8487f85dbf81bf245deaccca5ff5b8f46e60d112 SHA256 3a0ab3cb5c18db91f4be457cbba36189a558da7b794e1a35795f4fed3d48a7c8
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
+DIST xen-4.1.2.tar.gz 10365786 RMD160 457797ec4be286afbbcad940a9ce04e44f3f40d6 SHA1 db584cb0a0cc614888d7df3b196d514fdb2edd6e SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d
 EBUILD xen-3.4.2-r3.ebuild 3068 RMD160 a7823f95b67e2f237a5395a0063525794bf21820 SHA1 b7ea3ce1c4df92ee1d87101fda58765cc580168f SHA256 df35d173a9fbcd041e8d33f7edc5478c9e3ed5f64a1f3b17caf746f5bd92252b
 EBUILD xen-3.4.2-r4.ebuild 3247 RMD160 73c91e87a06e83faee786268db656531a2dbe71f SHA1 94f6be18689fd09099ad062f829358bfa159d6ef SHA256 385ddd40121b1d415214e9adc619cb39825febcaec21b7cb70c2d2f2e4b60a04
 EBUILD xen-4.1.1-r2.ebuild 3247 RMD160 a427e6bf0195f711c00a2487065dc0ee15c53921 SHA1 b485f3227820be797917d425fefdbe0f9febff98 SHA256 8b7126c404e6b0d227606efccb3be2dde79a124138dc763545dd90f492676846
+EBUILD xen-4.1.2.ebuild 3171 RMD160 bda424efe916dfb3302804751874626b5c44b78c SHA1 bdcc8bc8c8204f5019139f9a660080519def6441 SHA256 af24eb135612a644a1f9066ed7d8afc1f03a31c409bb7220c3e22590fbb20b29
 EBUILD xen-9999.ebuild 2929 RMD160 34b61aa566948357bed2bde59d06e38fdc21249c SHA1 5dfa8cebff2f2b9a10e40b888e151baf8afb804c SHA256 62f131e504a87ab2e05b1109325167ae9f6d9747ae90d89536d49734c7445f0e
-MISC ChangeLog 14490 RMD160 5d2b248a62e8d7f62ff1665304a454e89b0784e9 SHA1 37f42e59eb52bbb6c54b7805fcfb10e33d1f853e SHA256 23c9c14c306d23c57b6399d3a87f6861ec7f79b08fa685ad725bc0bc4c5195bc
+MISC ChangeLog 14636 RMD160 61579593bec26eac9255275ea8a42ab2430fda46 SHA1 71e7599c8ccdd06b9c3d742852266fd94ff21b81 SHA256 64917d400d7354b023f977c216427748b29a33a783be03b7602c6d489394f50f
 MISC metadata.xml 581 RMD160 d22ffb491d9dad33425b97add683dd6b8b9139e1 SHA1 649f65e9fd2ab25e32394c555a24fc0f6b59c37f SHA256 1cf2cc4bb5b5278ac75e74910607518ddd2bd6454f18325319ce1ac102fab535
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOmeD4AAoJEPqDWhW0r/LCS4sP/1DFYLUK/VL+LbT+liem05cF
-Nrv3iD//rSF6XL9LPMK/1f/thS1YZW7o/UvOBszR4Y695vD14X1hT1QYJYzzyFGT
-1Ix8fQ4q0YswV5ql0mdSRN2kNOA6wRFA6vCltQtYMdpIiz7e2YDgV+FSGpCMxXi7
-G5bM1e/ka9JTmT/KKPR/Se3XnPH98reEhuORbpIBMP1bIm0Z1krTYBiVHUW4HOby
-8flmS82SebwQWjJJQ43ZdtB+1S+YY6EgRRZLXh13E9U2t1leCm6K2+x0ANWRRVdL
-orsJGqaNTcsKVf3eSvcDGFs62FGK/Pefaql1XTwu0DOAGl+lbAbiFRYFLoScFb7b
-zJlozwV5mgAI3sz+IxfUA9vRYdIr2ZTW/1Bl4uamkdaTXOn1nkHIQH46p84E2KHE
-MgbZ9PBQjNcdvVkA/63W9dt0GmJAoRKmpVz02jNFbL0/01Ln4ERARXM6uO7ELQaf
-mXq3HT7JcdF0JBnx6K4EFeuSEgOz4Rwpi5EzQDouKUzCo2SrMCaPUWLlHaKm1zrn
-jAl9srhHTQ+OQW9YZw1pb43f5RW+ep3o5d22rtgJa993y3Wu4Xzv0pF9AJUqIiHA
-qQBeuA6UNh+r0G9WhHEvNs4CVz/FegJz6UKlvILZrIH/AZ7E/Uwz/r2kM00UxCnz
-tG/KPCGJ5RMahVKp5S1o
-=hIKN
+iQIcBAEBCAAGBQJOpwMDAAoJEOf+E+/4L5Lmb7QP/3B3M9gXNg9VSfce5YH/Lmuc
+RPCvWjVJvX4+QaD+y7HdgTyCdpP6ZHYEG0WqKyztdD1vr4aghEp54/BASGQufzrV
+XKsn2OXtqqsJxADxciZrokfneBfVV2gs5Ec2zqXrfPYAOzJHFxPCIiUPxRPovt9t
+XrPKnrrMB6Lz9iVBvRfFo1Ue+zGyzx32TiMm0roncZ+jUaWehPg0WR9xx9e1xYsE
+PWerbP/eEMsObQYSDD522lR5Z0Yeqdc+QJmxxNitCRUbJ++C92uGUP2ebIpTSE5k
+JDNxjDeuOqlXvN6+4gZrG3EBm9PgoqXzdHAInoj5P5JU3Xwr3EcGcfKEucxEXoql
+qZARKZ25GJiyeL1swP0+I1W6Dr+a/YQMWPAHTp0bKmdh9kHkAy1oqG7FdniXvVxc
+4i3PP/WMqVfUERUa3iXcchaoPaxCZiSNj9aeYYxebOOnPiRxUsdqFBPr9+yzgcNu
+r8MCixpAdpErOVcCj/sUS6ZUf3m8IwxDv2JBkCpsaJLCbVdtAR1EMUJFeVVKMfbX
+sT84+cJ5l0VjPQRm1HGtgd0SEchMY9Q1A5K9fXB/ACNvEpFs9EqxtJlIi8Y+RJIw
+lXrdtj2dxj9bptr97kMa/WPqJsGiWCiZXK/1elx6wJaz8Nln3mY4KTADtAilFCvm
+gxHdAOAKLbfV3K3WXDSj
+=BG5U
 -----END PGP SIGNATURE-----
-- 
2.26.2