4.2.0-r2, correct DEPS, thanks OP of Bug #447716, 4.2.1, rm white space, drop old

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

6 files changed, 18 insertions, 686 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index f0a0dfff6088..7e74214401a8 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.127 2013/01/24 08:28:47 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.128 2013/01/24 08:53:49 idella4 Exp $
+
+  24 Jan 2013; Ian Delaney <idella4@gentoo.org> -xen-tools-4.1.2-r2.ebuild,
+  -xen-tools-4.2.0-r1.ebuild, xen-tools-4.2.0-r2.ebuild, xen-tools-4.2.1.ebuild:
+  4.2.0-r2, correct DEPS, thanks OP of Bug #447716, 4.2.1, rm white space, drop
+  old
 
 *xen-tools-4.2.1 (24 Jan 2013)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 1ddf0f70388f..e691dd12a6fb 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -32,17 +32,15 @@ DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95c
 DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37
 DIST xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch 26848 SHA256 8654c4b587b350baaaea12cde3ef1737dc80088fba281556bf4c714fa4d8111f SHA512 1b2678f1cc0b4a9bf24b6b096ed40132a757594c1c5c877468d4cb0c2fba2193cc6bf5fb55d9a0f6cc81f1bf95913758c67898d8c4398210609a6e4412583df9 WHIRLPOOL 24d544c1c1d435879be8879a69eb096c451299a0d4e07c1407d6eaaa8910c2088f2ca0c618f8c6f02fbffbf745f06c9dd4faa5cc666a069e205a28024ddf77b4
 EBUILD xen-tools-4.1.1-r6.ebuild 10908 SHA256 c50a93bf7ae974fbee64429d6d9ec5636081c8cb1a4f5308bb9c45028871201d SHA512 5f13385bb439ea3806849d21f2cdb58303f54d38da6460e5e3baa64e1f2308b8acf23d9ad288b961b7b1cb65a1394d2a696c45e12b95e1baf20468b623e0eba0 WHIRLPOOL 839f1a00ff912b949ab0c857a6cb9c806c5153fd15c94802e789497fe1ce396358831edd1b5e4d212ff71cc1e54ee61b7f5d2aa192a68882b993f69a9baa78fe
-EBUILD xen-tools-4.1.2-r2.ebuild 9826 SHA256 b300e42de3af86855917751962a9a295398a499654ed1cbfbde41427abf0dbdf SHA512 769f640ef25f1f56135c928e1e7136ae0004a34781c1b3789f3c4ac974a11ab3c500097b6ab1f26a7f85da3199877c0c9e4d7dacf52493f50a4995ab25fdd18e WHIRLPOOL a60d467adb89fa56d982af3a3189372767bff3688732e26ccbd70fe3fc5fec4f9e0c86cbb3343ad8cc34d9190378161720f1b370e10e78eafd3e57fc534c89c8
 EBUILD xen-tools-4.1.2-r3.ebuild 9871 SHA256 ed822340a3a807899d1d493d52b166a10c956cc032e24468d40a0d54fb17220a SHA512 df957044e736b254ffae9b5b45b51db80d8d0afc7ad70324fd62b76076588614bc70171917a66f42d3c3ba73acb230938e728e68073943d18324999463d4d3b0 WHIRLPOOL 47f433f9807e91ba220de47e44e0256a3f9222344cf944bf0fa2a85c97112973f324a96bebb073e989c091e8f6bded5fac1cee4e58bdc4b6f000fc227d1d2c79
-EBUILD xen-tools-4.2.0-r1.ebuild 10184 SHA256 36e11a418b4ad36dc14b22847c6eee52ee8684c5cf4f1b32a6b20f21b479e1cb SHA512 9321e3b399136024cba5e8094f244e63b2c44c1557eff4ca26315a6fb97414e7df5c406cf9aa26bbe1d4601dfbaf40b0f4fbf7d48a8ba9a8cde7757c9bf3e86f WHIRLPOOL 82cff2fb0e6d7c4b5f7ba94deee3dd955a23d568ca973d887e193b79c34459764f8a9b309286e5596a0edc8ef5e95ac1a7fbbdab79b16258d99822dc27efa0ef
-EBUILD xen-tools-4.2.0-r2.ebuild 10254 SHA256 c8440539edfceab62364f555e20ae5497f79bfac8b805f742c448b4776e8e257 SHA512 b5e299d4409baee107c25b5ea2d7da7e971ea0aad226f06f6048856679e92ab18f87c176443687e9c6347510d619413b3f767b699a61e22c8416be8b6613707d WHIRLPOOL 578f6c95bd7f2d32bd6cf9684739c32ffab73a72d9558efe157605eadab18e8243db2246e200e19ed0ffa62787f8992622abdeec909ea84bd2afb979226373de
-EBUILD xen-tools-4.2.1.ebuild 10293 SHA256 22ac62211c0babce18e7ce23f3bb4d7a3172ed1c2d1dff35939dc5003433975b SHA512 92be235178f13b17fd4a85934bc1252949411dfc0eb08da5728ab766feee3fb724fad40ae662238ff8a07a98755d0e55ee149aa0b77020d8e13d97cfcdc1cfe5 WHIRLPOOL 398f70529e1af1ab8a6cc3259a4010eb3a4f3ccbbd8a2ae9cc39850eacc48690b01f8c15b259fad63bcdb8c875f85e81032096bf6becadefcb0204efde33288a
-MISC ChangeLog 30719 SHA256 01a53d798c179ff4737920a7257d565c40f3707bc026ca0da1694cb916fae83c SHA512 ba404f4797795474023b8ea9dfe11d77f352f63642ec25dd371d3d66001e8bbf1bb50dbb9c6c2595d7335f9c72a99b0c30725e3c04e98fc4032627633f85a945 WHIRLPOOL 211d8edf4a24e7ed35e86f9fc2ff58365d942e112b987027ce7f5e80ecc1eb93bc71fa459d3d908fc7a3138d6f296fa1ca42b6410a2d5b730c9b8f83fb8eeb6b
+EBUILD xen-tools-4.2.0-r2.ebuild 10237 SHA256 2374a5117cac17c0ff5c2b307efe2ecf1f27c1038b4e147a28f1cc5cf4755ace SHA512 6b8587b5b4ed9ef9a347e1ccc6c78d8ffcd163b5d0ed11629d188d5e22ff3812dd81f41f25502eb2f3869a2769ece2d9bfc5f82f25c3ee0ed4eb26c4c9b3031a WHIRLPOOL 7a79e169253d9e6be9a457c6f17356aa6827699a9891fde02e285f5f30c53d58946c601b4eaa1ce1a82bb17da1055d94bda4cab1783d73b68a3bdec1d76795a8
+EBUILD xen-tools-4.2.1.ebuild 10279 SHA256 763ee5f7cce3cc7e55b7e3bab4d271c03115000053c809793ec30a14ad6681a4 SHA512 c91f648bce05a476780267cf2839431e200944bb4d9379f8cd9370b91ec241df2c29d119e4b4160f4802949a03bc2b93f2c837187325d9b72f0a573d3a951e03 WHIRLPOOL 88aa1ec2beb59fa5b62f88cd711a3823dbeebfca22395d12445e587c87e1de11333c07f9e0535b0e61ccb5403d75ea562f4e4759fc7f1a81489634061e22f852
+MISC ChangeLog 30963 SHA256 6a192d84f745796939c7d7a0f0bca12162ee48b29d754da8e618fcaa675a2dc8 SHA512 417699b5f382d5c3971b5536568eb2cdbe72b60535071d7b3673923cd0131a8fc512f2e37a4dd6b2a9431924e2b6fa22f9b9db4190912934228f0de891f7e9e1 WHIRLPOOL 7a71c9ae24d3e9e37da8ffb8331632498cbc4221d6b3f18831c47319ffbdfa66198da5fc330b113079ce07ac39a3ffb11518e755d8ba94733743aa8f0796d18c
 MISC metadata.xml 881 SHA256 52d19c65a78ed979b0d6df2f83fc281e8622296e2686c199dbc58cb76a70a57b SHA512 3e2400037f840272c38b0a7b9d46f9975d512bea13e6dc21bf8458fb68b1c741f4458a9eaf18aa53c3183ef4f83e70e8ae50e28132e563fc4a1d6463c77a586d WHIRLPOOL 3b030061503f4c2beec7f51d3bf790f358a4837d78d7a0faf0eee5214832fe888445a53c0b09b94bf8dd811e44523e0bb05535d58583499df97b32280f722312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEA8NYACgkQso7CE7gHKw2lXQCeMlh4/fOoI9/gpY0MEuMzx5QP
-Xf8AoMpivUYHkW/1HbJowMDXnDBfZV0N
-=ZcEp
+iEYEAREIAAYFAlEA9q0ACgkQso7CE7gHKw2CqwCdFduvzCCxeON3Tc6TrkH7uSZo
+shAAn0KPnNKxzAPGjwv3NJLcAp3IV556
+=i0NB
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
deleted file mode 100644
index 0180c2976ab5..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2013 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-r2.ebuild,v 1.6 2013/01/21 22:18:07 ssuominen Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml threads"
-
-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/"
-DOCS=( README docs/README.xen-bugtool docs/ChangeLog )
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen xend"
-
-REQUIRED_USE="hvm? ( qemu )"
-
-QA_PRESTRIPPED="/usr/share/xen/qemu/openbios-ppc \
-	/usr/share/xen/qemu/openbios-sparc64 \
-	/usr/share/xen/qemu/openbios-sparc32"
-QA_WX_LOAD=${QA_PRESTRIPPED}
-
-CDEPEND="<dev-libs/yajl-2
-	dev-python/lxml
-	dev-python/pypam
-	dev-python/pyxml
-	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[png,gif]
-		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
-	)	pygrub? ( dev-lang/python[ncurses] )
-	"
-
-RDEPEND="${CDEPEND}
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	>=dev-lang/ocaml-3.12.0
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# 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"
-RESTRICT="test"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_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
-
-	use api     && export "LIBXENAPI_BINDINGS=y"
-	use flask   && export "FLASK_ENABLE=y"
-}
-
-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" || die
-		sed -e 's:^XEND_INITD:#XEND_INITD:' \
-			-i tools/examples/Makefile || "Disabling xend failed" || die
-	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
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
-	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 || die
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	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 || die
-		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Fix build for gcc-4.6
-	sed -e "s:-Werror::g" -i  tools/xenstat/xentop/Makefile || die
-
-	# 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"
-
-	# Remove check_curl, new fix to Bug #386487
-	epatch "${FILESDIR}/${PN}-4.1.1-curl.patch"
-	sed -i -e 's|has_or_fail curl-config|has_or_fail curl-config\nset -ux|' \
-		tools/check/check_curl || die
-
-	# Don't build ipxe with pie on hardened, Bug #360805
-	if gcc-specs-pie; then
-		epatch "${FILESDIR}/ipxe-nopie.patch"
-	fi
-
-	# Fix create.py for pyxml Bug 367735
-	epatch "${FILESDIR}/xen-tools-4.1.2-pyxml.patch"
-
-	sed -e '/texi2html/ s/-number/&-sections/' \
-		-i tools/ioemu-qemu-xen/Makefile || die #409333
-}
-
-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}
-
-	if use doc; then
-		sh ./docs/check_pkgs || die "package check failed"
-		emake docs
-		emake dev-docs
-	fi
-
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/etc/init.d
-	export CONFIG_LEAF_DIR=default
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools
-	python_convert_shebangs -r 2 "${ED}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${ED}"/etc/init.d/xen* "${ED}"/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="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/api/
-		docinto pdf
-		dodoc ${DOCS[@]}
-	#docs/api/tools/python/latex/refman.pdf
-		[ -d "${ED}"/usr/share/doc/xen ] && mv "${ED}"/usr/share/doc/xen/* "${ED}"/usr/share/doc/${PF}/html
-	fi
-	rm -rf "${ED}"/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
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	python_convert_shebangs -r 2 "${ED}"
-	# 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-tools/xen-tools-4.2.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild
deleted file mode 100644
index 6192ef6f067a..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2013 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.2.0-r1.ebuild,v 1.4 2013/01/21 22:18:07 ssuominen Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml threads"
-
-IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz"
-XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2"
-
-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
-	$IPXE_TARBALL_URL
-	$XEN_SEABIOS_URL"
-	S="${WORKDIR}/xen-${PV}"
-fi
-inherit flag-o-matic eutils multilib python toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen static-libs xend"
-
-REQUIRED_USE="hvm? ( qemu )"
-
-CDEPEND="<dev-libs/yajl-2
-	dev-python/lxml
-	dev-python/pypam
-	dev-python/pyxml
-	sys-libs/zlib
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	dev-ml/findlib
-	hvm? ( media-libs/libsdl )
-	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[png,gif]
-		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
-	)	pygrub? ( dev-lang/python[ncurses] )
-	"
-
-RDEPEND="${CDEPEND}
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	>=dev-lang/ocaml-3.12.0
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	export "CONFIG_LOMOUNT=y"
-
-	if has_version dev-libs/libgcrypt; then
-		export "CONFIG_GCRYPT=y"
-	fi
-
-	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
-
-	use api     && export "LIBXENAPI_BINDINGS=y"
-	use flask   && export "FLASK_ENABLE=y"
-}
-
-src_prepare() {
-	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" || die
-		sed -e 's:^XEND_INITD:#XEND_INITD:' \
-			-i tools/examples/Makefile || "Disabling xend failed" || die
-	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
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
-	fi
-
-	# Disable hvm support on systems that don't support x86_32 binaries.
-	if ! use hvm; then
-		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	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 || die
-		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
-	fi
-
-	# Fix build for gcc-4.6
-	find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) -exec sed \
-		-e "s:-Werror::g" \
-		-i {} \; || die "Failed to remove -Werror"
-
-	# Fix texi2html build error with new texi2html
-	sed -r -e "s:(texi2html.*) -number:\1:" -i tools/qemu-xen-traditional/Makefile
-
-	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
-
-	# Prevent the downloading of ipxe, seabios
-	epatch "${FILESDIR}"/${P/-tools/}-anti-download.patch
-	cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die
-	mv ../seabios-dir-remote tools/firmware/ || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Fix bridge by idella4, bug #362575
-	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
-
-	# Don't build ipxe with pie on hardened, Bug #360805
-	if gcc-specs-pie; then
-		epatch "${FILESDIR}/ipxe-nopie.patch"
-	fi
-
-	# Prevent double stripping of files at install
-	epatch "${FILESDIR}"/${P/-tools/}-nostrip.patch
-
-	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${P/-tools/}-jserver.patch
-}
-
-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
-	unset CFLAGS
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools ${myopt}
-
-	if use doc; then
-		sh ./docs/check_pkgs || die "package check failed"
-		emake docs
-		emake dev-docs
-	fi
-
-	emake -C docs man-pages
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/etc/init.d
-	export CONFIG_LEAF_DIR=default
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Remove RedHat-specific stuff
-	rm -rf "${ED}"/etc/init.d/xen* "${ED}"/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
-
-	if use doc; then
-		emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
-		dohtml -r docs/api/
-		docinto pdf
-		dodoc ${DOCS[@]}
-		[ -d "${ED}"/usr/share/doc/xen ] && mv "${ED}"/usr/share/doc/xen/* "${ED}"/usr/share/doc/${PF}/html
-	fi
-
-	rm -rf "${ED}"/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
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${ED}"usr/$(get_libdir)/*.a "${ED}"usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	#python_convert_shebangs -r 2 "${ED}"
-	# 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
-
-	# Temp QA workaround
-	dodir "$(udev_get_udevdir)"
-	mv "${ED}"/etc/udev/* "${ED}/$(udev_get_udevdir)"
-	rm -rf "${ED}"/etc/udev
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	rm -f $(find "${ED}" -name openbios-sparc32) \
-                $(find "${ED}" -name openbios-sparc64) \
-                $(find "${ED}" -name openbios-ppc) \
-                $(find "${ED}" -name palcode-clipper) || die
-}
-
-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-tools/xen-tools-4.2.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild
index 3549172f3001..386048da461d 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.0-r2.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-tools/xen-tools-4.2.0-r2.ebuild,v 1.5 2013/01/21 22:18:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild,v 1.6 2013/01/24 08:53:49 idella4 Exp $
 
 EAPI=5
 
@@ -40,8 +40,6 @@ CDEPEND="<dev-libs/yajl-2
 	dev-python/pypam[${PYTHON_USEDEP}]
 	dev-python/pyxml[${PYTHON_USEDEP}]
 	sys-libs/zlib
-	sys-devel/bin86
-	sys-devel/dev86
 	sys-power/iasl
 	dev-ml/findlib
 	hvm? ( media-libs/libsdl )
@@ -50,7 +48,8 @@ CDEPEND="<dev-libs/yajl-2
 	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )"
 
 DEPEND="${CDEPEND}
-	sys-devel/gcc
+	sys-devel/bin86
+	sys-devel/dev86
 	dev-lang/perl
 	app-misc/pax-utils
 	dev-ml/findlib
diff --git a/app-emulation/xen-tools/xen-tools-4.2.1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.1.ebuild
index ac15f882154a..b61b1d2641ec 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.1.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-tools/xen-tools-4.2.1.ebuild,v 1.1 2013/01/24 08:28:47 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1.ebuild,v 1.2 2013/01/24 08:53:49 idella4 Exp $
 
 EAPI=5
 
@@ -49,8 +49,8 @@ CDEPEND="<dev-libs/yajl-2
 	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )"
 
 DEPEND="${CDEPEND}
-        sys-devel/bin86
-        sys-devel/dev86
+	sys-devel/bin86
+	sys-devel/dev86
 	dev-lang/perl
 	app-misc/pax-utils
 	dev-ml/findlib