From: Alexey Shvetsov <alexxy@gentoo.org>
Date: Mon, 28 Nov 2011 18:29:19 +0000 (+0000)
Subject: Move -9999 to virtualization overlay and revbump xen-tools to EAPI4
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=01a7f864e4d7850c607a97fde0ecbf876a5827f0;p=gentoo.git

Move -9999 to virtualization overlay and revbump xen-tools to EAPI4

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
---

diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index b5f0815169f6..083b15ced172 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -11,23 +11,22 @@ DIST xen-4.1.2.tar.gz 10365786 RMD160 457797ec4be286afbbcad940a9ce04e44f3f40d6 S
 DIST zlib-1.2.3.tar.gz 496597 RMD160 89a57e336c24f7f6eebda3a1724e14b71187e117 SHA1 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e
 EBUILD xen-pvgrub-4.1.1-r1.ebuild 4349 RMD160 cc2af3e579cca8ecb128588d8ccfa87bb6410f82 SHA1 01bfe40e66a3844197573a7f72939d80695276bb SHA256 ec5f6334bc11f842b5771fc974faf6a4bdffb273a3e7a700dc7876d6abe53875
 EBUILD xen-pvgrub-4.1.2.ebuild 4211 RMD160 ca4c438101411b80879e49548fa123a804cce78e SHA1 db72ae1d8d5abf3392cf585fa9f004c07e54f721 SHA256 eb78b4414cafef215fac53c8c05f22138e1e031a49bd4da56abcd702d5263b9b
-EBUILD xen-pvgrub-9999.ebuild 3466 RMD160 68770effb33a802ee204b3f4f05316a2b104435a SHA1 c93c306847180ae3ad1ac1dade6323519e12faf0 SHA256 4e41e7a47c381e9dc11800bfa9838f45432efafd6dbc1d482810d17830eaf888
-MISC ChangeLog 2182 RMD160 e7726e961a630ab095156587b807c1d63d10f094 SHA1 e08ac9c66e4afa7b5ecdfe3b4e624e7177964a65 SHA256 a0df0188cf46be8f84fd1f65eb4374d4163e018b1d16040972940aebcae48399
+MISC ChangeLog 2308 RMD160 44b54bf4452e2fc94d0febe80a6c2b4a0082de80 SHA1 4670a0a517e5b8e2df5d311abb9887260f0551ef SHA256 5db48d9ff43773a06db256831e9e3db68f5489fe533b320466bd462613522c1a
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOuBgWAAoJEOf+E+/4L5LmUqEQAJDGgjNAKZgKiu2YxB2JsoEB
-7Bs17BxVxhx5EKDEQlpGlMDKJ1zeKqPpj3U9pdfuc0zC+rDCHfEiO4wwLX2IYYYg
-eZuno6p4KgLRQzbjCoZ0dOYpjQ8CziCwvq9rnVhj5MHPyiiFTtO54wpsmGpQgTHl
-AxbbttTHM4zg1yINUHOTMi2L08kWqPHFSsSqNynaJAEAqwB60oBG8VT8MG036FIc
-PsvUBcnwpY/YMAn3GnHMnwMRjoaRTQmK93hGxzppnAKqbuwctK5Kr064yUfuybnq
-bqFyVZnQnbYBj4KpBz1Yba6+LonJuvNTD/yKnptznXq4nzex1pW1FqVyCcw2UAE/
-BLVEJ5QJs26T/HMp2Nbnw1RY7+awKNB2BSi1mV6HLIW+4JSIZf61FZn2qwEcnlmT
-ttRCedgUvGymJ9g0k1ukuHYoyJSvFpU7QKer/5pbrBm7Fv4J0g7ufsrgBCbu1de2
-d/TwJ727+PAa7u7G2C4nqBe+77UAe0aeyFHQtpFeiaOZQ9F6VmmWC1x8xJhRcnud
-yPVrecLq+hfe2IzUds7tOvQdADjkOadPY8cMYQzLC0XPE+CsEvJmL5WAb8JqgcwJ
-Ei+twn11cNEDxRKYnWE4o7No7AIHJY0/KeyRSMTIUFTbEVS3CE3WheKIt8XvwpwY
-uGJRsBB7LwEUt7QIERfe
-=nqYy
+iQIcBAEBCAAGBQJO09NxAAoJEOf+E+/4L5Lm0WwP/iwyJ1VwLvIS4gmqGS/2iZsT
+iLJzvVoq7F41JBcqSfdolQM6iRuvZH6UZulG6NKYbldk9n12dWHUqkM3ioWeHUfF
+igSIHc4nxthdF+L2w8etEKNs6ckxhzjoX9yZCwUHVuZcg6VbcVcSZakQ7GWW3SV0
+l/PXuMt+r6ekso95aw5+buZ2emEB7YTv7LvunVbBl35Zf4NsAZ4CXkTB2fYv/2Q7
+V0K4rcLrRCCwPtj4SYXGSdGkbkkdXyaoyVoibx4ln7/fK383yMhHgIVBseIVXP8v
+lQFreTGcB+lhmdoI8LTTj2n9gNGuVYc6ipe9MoDiLuf4XHConrwHuLy11AQ5cz5r
+6cLra00qUwAhHitn0955wjdayH7kqJAfoxtEgyiFGZfoUg4NNL9hw2xbT4VTDjAO
+5aEucs+lAodtnIPO9zrpbrpsjNkMdzyZDuRnPr/PI9MNj4+soXv5o5mMssRtgGAF
++MbPTFegsJz4KW0UHWwaFjCa//eoYrKAuh3UZRy/H6AQ2wU1QMlqKFdqsVUtdr5L
+AArSHkwQzn9SwdkKbPnQPh1brVTcLvRTwf3Yj1PTreujmadk6L2f170CKSJ/6Yau
+urY9V/USoCmaogrzSABar5kv6mDcL60OmZTUM/q0tE0P/MnRFQ495R7pIRzG2dGR
+5MH//PIQRdjH2Q4yox2e
+=2fCY
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index d2de6515a444..721fde3c7775 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.108 2011/11/11 17:50:59 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.109 2011/11/28 18:29:19 alexxy Exp $
+
+*xen-tools-4.1.2-r2 (28 Nov 2011)
+
+  28 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org> +xen-tools-4.1.2-r2.ebuild,
+  -xen-tools-4.1.2-r1.ebuild, -xen-tools-9999.ebuild, files/xendomains.initd-r2:
+  Move -9999 to virtualization overlay and revbump xen-tools to EAPI4
 
 *xen-tools-4.1.2-r1 (11 Nov 2011)
 
diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
index 9240376cc7dc..6ab163f4939d 100644
--- a/app-emulation/xen-tools/files/xendomains.initd-r2
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # 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/files/xendomains.initd-r2,v 1.2 2011/09/10 17:22:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.3 2011/11/28 18:29:19 alexxy Exp $
 
 opts="start stop status restart"
 
 depend() {
-	need xenstored xenconsoled xend
-	after dhcp
+	need xenstored xenconsoled
+	after dhcp xend
 }
 
 get_domname() {
diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
similarity index 72%
rename from app-emulation/xen-tools/xen-tools-4.1.2-r1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
index a618ad4ed907..78df2ffe7b7d 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
@@ -1,11 +1,10 @@
 # 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-r1.ebuild,v 1.1 2011/11/11 17:50:59 neurogeek Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.1 2011/11/28 18:29:19 alexxy Exp $
 
+EAPI="4"
 PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml"
+PYTHON_USE_WITH="xml threads"
 
 if [[ $PV == *9999 ]]; then
 	KEYWORDS=""
@@ -25,11 +24,19 @@ 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
@@ -46,7 +53,7 @@ DEPEND="${CDEPEND}
 	dev-ml/findlib
 	doc? (
 		app-doc/doxygen
-		dev-tex/latex2html
+		dev-tex/latex2html[png,gif]
 		media-gfx/transfig
 		media-gfx/graphviz
 		dev-tex/xcolor
@@ -60,7 +67,8 @@ DEPEND="${CDEPEND}
 	hvm? (
 		x11-proto/xproto
 		sys-devel/dev86
-	)"
+	)	pygrub? ( dev-lang/python[ncurses] )
+	"
 
 RDEPEND="${CDEPEND}
 	sys-apps/iproute2
@@ -82,7 +90,6 @@ RESTRICT="test"
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
-
 	export "CONFIG_LOMOUNT=y"
 
 	if use qemu; then
@@ -110,33 +117,8 @@ pkg_setup() {
 		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() {
@@ -148,13 +130,14 @@ src_prepare() {
 	# 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"
+			-i tools/misc/Makefile || die "Disabling xend failed" || die
 		sed -e 's:^XEND_INITD:#XEND_INITD:' \
-			-i tools/examples/Makefile || "Disabling xend failed"
+			-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/' \
@@ -165,6 +148,10 @@ src_prepare() {
 		-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
@@ -172,15 +159,10 @@ src_prepare() {
 		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
 	fi
 
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/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
-		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" \
-			-i Makefile || die
+		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
@@ -202,17 +184,17 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
 
 	# Remove check_curl, new fix to Bug #386487
-	epatch "${FILESDIR}/xen-tools-4.1.1-curl.patch" || die
+	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
+		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" || die "Could not apply ipxe-nopie patch"
+	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" || die "Could not apply pyxml.patch"
+	epatch "${FILESDIR}/xen-tools-4.1.2-pyxml.patch"
 }
 
 src_compile() {
@@ -226,15 +208,15 @@ src_compile() {
 	fi
 
 	unset LDFLAGS
-	emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed"
+	emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt}
 
 	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"
+		emake docs
+		emake dev-docs
 	fi
 
-	emake -C docs man-pages || die "make man-pages failed"
+	emake -C docs man-pages
 }
 
 src_install() {
@@ -242,13 +224,11 @@ src_install() {
 	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"
-
+	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 -r "${D}"/etc/init.d/xen* "${D}"/etc/default || die
+	rm -rf "${ED}"/etc/init.d/xen* "${ED}"/etc/default || die
 
 	# uncomment lines in xl.conf
 	sed -e 's:^#autoballoon=1:autoballoon=1:' \
@@ -256,43 +236,36 @@ src_install() {
 		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
 		-i tools/examples/xl.conf  || die
 
-	dodoc README docs/README.xen-bugtool docs/ChangeLog
+#	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"
+		emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs
 
 		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
+		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 "${D}"/usr/share/doc/xen/
-
+	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 \
-		|| die "Couldn't install xendomains.confd"
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains \
-		|| die "Couldn't install xendomains.initd"
+	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 \
-		|| 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"
+		"${FILESDIR}"/xenconsoled.initd xenconsoled
 
 	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
+		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
 
@@ -332,19 +305,20 @@ pkg_postinst() {
 		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
-}
+}
\ No newline at end of file
diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild
deleted file mode 100644
index 171aad3932dd..000000000000
--- a/app-emulation/xen-tools/xen-tools-9999.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# 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-9999.ebuild,v 1.7 2011/10/23 10:49:29 patrick 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 ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm ioemu 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 ioemu; 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"
-}
-
-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 ioemu, only needed for fully virtualised guests
-	if ! use ioemu; 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
-
-	# 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
-}
-
-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 -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() {
-	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* || 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 ioemu 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
-}