[app-emulation/xen-tools] Add live version

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

3 files changed, 286 insertions, 15 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 679262c55740..ad3295faeaba 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.73 2011/04/05 21:25:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.74 2011/04/06 22:14:51 alexxy Exp $
+
+*xen-tools-9999 (06 Apr 2011)
+
+  06 Apr 2011; Alexey Shvetsov <alexxy@gentoo.org> +xen-tools-9999.ebuild:
+  Add live version
 
   05 Apr 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.0-r1.ebuild,
   +files/xend.initd-r2, +files/xendomains.initd-r2, -files/xend.initd,
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 0ecdfa0b908d..84e7aa3bce8a 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -20,22 +20,23 @@ DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 S
 DIST xen-4.1.0.tar.gz 10348539 RMD160 e9ef987b24503d6c993bccfd203be5af9f104f48 SHA1 4295e67524746ce155ff991db5fd2a611be27f67 SHA256 5df61e1b687acdd3d8f54a85be54990518f6679982499f19b28546f03b2909fa
 EBUILD xen-tools-3.4.2.ebuild 7086 RMD160 ce6037714a2bef2aa117157f200ddbcb4bd88484 SHA1 30f5ffe1852ba3c3676a12e1983898d1a89fa852 SHA256 23547d91a41cfe46579310004cb8edcd9119a1b8e5672ba3489f7b845f178b14
 EBUILD xen-tools-4.1.0-r1.ebuild 8359 RMD160 8604fae1dccf3516f258ab7077338d68c1a98277 SHA1 594abeaf580d0645b74c664dd2f16d6e2fd2509f SHA256 a87811466b91e714d4cd8e7b969590ced2be571ec0d43c5a084674953d1e39e4
-MISC ChangeLog 18873 RMD160 08a11fcf2a3b9a0d3e834cea2bf4cbaf5e4caa09 SHA1 e4aedbccad2918f498eb18a8d2b0b5d0fca70cfb SHA256 3a2c35ce181b23c57ef70b0cd2f1349cb28f3e1360df4719b2330bd23e1fe1df
+EBUILD xen-tools-9999.ebuild 8250 RMD160 5a263e084d817bf9722acb6cbdae7b6610021494 SHA1 ed42048fff9dc82b68e8b6e6944e69d8455977cb SHA256 b313f500ee03f621b34618c2f1834cbc31fdf5e7a1f735a35c092506917d804e
+MISC ChangeLog 18999 RMD160 609f89f2c9b054d93ab3149831819bc43cd8d1f7 SHA1 1e5fb45326bc44d860f937fc45d64c4c87052f63 SHA256 c8b7a83b1f74de181fe2ba180a472b1b8f2799c3d2159b56bcd3130a50bb79a3
 MISC metadata.xml 721 RMD160 af4a7d279110ca38f4252f2723a86c628d413b23 SHA1 77cf6f5f1a56f928e4d9b0ebe373372d75f314d1 SHA256 670188614bc7d1e2b4c027ac559559cf2228b28f1b1289acef62206e784e6a53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNm4itAAoJEOf+E+/4L5LmepoQAJv12DEYDF7G3LB9r09/8NYQ
-tquVkKZ+EUsSLRH1loVtdslY2MJAc0tQzeTBIvvr+8IXxA5sa1bxVwxTa0860xgF
-GFW77xIUtvCwlPmu0gpxMiuCDGZZGhz5DMFvXcDz4LQxMIXEoLRrAcv6v6kgjV44
-nPj7j046P7kX4mkkGEJ0vm33C54yjU15fZwxbEeWh4wgW3gguAEk82G3Yf3qlrPr
-TrSiX50a86ETh/o6OkS15jfcqaYjvt578f2xxb8q0urvqSEUjlSkt4RrBxNCaUvV
-Rr4a2C+yAXzqptsiOQZKml9mM1MR3D9Z9DAGZFQv5xO3qHkHUmiLgCn27PUb759e
-DH8TbW6YE8H/2xhTp2VXvCbe/o9W8rCFbyL2vcQKesiRZ6+pbwa5Uz+D5/DCMut2
-m5Xq1+8AKa3jA0TRzRAzctBr0e4vKmE1Q2wTtiqc+vRDs7zGaC+9m/Aalp6cpHbN
-91f3SNBTx2gAzB2Km00z4iOssKHk9MOfQ7IHUTy3srcq6WzJN9KpYcF/kxuz4Dw1
-3xenUhEKL+kNqjawb9iqCIV46foR9A8CWDOnZEeifoLJmai2IDD1H+ii3y5SvQ/w
-QU4ikP9xrSFHGDv7B+GqsgHSyFHpHoKBiRpSgKlO0snSZk7IVNslLt8jmGmG0OlX
-R+59aPm8k+JQBrV67SQ/
-=B63y
+iQIcBAEBCAAGBQJNnOXpAAoJEOf+E+/4L5LmkgMQAJbByLUOy5/udn2O7rAaUYLS
+t/xETXv1S1jz8m8QvVFRFqhqK8xYMhn/sYuBO+sY5OTv3SAE8MoZXhaAKxgkTIpx
+gMAXdCz1Aeh5+iERQDL7J4xqxvtXb60sknpSQrnPuXAh0ocXHnp+alOPBE69hK5R
+HEG1VJKmScnjh526c2POeML0SXDvw8hmM6GL1+vYXZOPlTnLAeLFybs04rdraDas
+ckioarDE/ZL1VDSBW9N4WEtnt50B/0rAmcw9yc7dQS9eTE71vyrPRwNQwWC/dHlY
+jiiNAGmBd+/3uqJU1GY2JSf9n5XSTfP32faSg/gTwcgBV5QhVyI6mo1t52PoUes1
+RWZaZz7umvxdCQdL2PL4diYSPba6r/TSyHkKBzDTvYlj9GFOvPc+QRaKvo0BQWvy
+A3CY8SlpDaoHgISR5FSHANgl/FJ9kcrXUIVeua5w65L6OhIhUZBLoO0Zqa1ZDvwu
+phBugfmaubN2jkTgFNpagwwkmvwHyIUMRi+VYhLEMEkUGSmYV0dmFiQsYF0g/Hel
+UMWg8ZQo+raeuhwsOocOUCmC+7+V/LAzegnSBkl0PtCfGy8YGSaab79fgY3Q/ipa
+XTeRfgSKW2+uIzBV2XRI+trwQU/G6OfH09Et7NqzPMWaeRsbvwgjFy9EvlFUDy3V
+d6SoMWlU2OSwDoD9yk3x
+=FaWA
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/xen-tools-9999.ebuild b/app-emulation/xen-tools/xen-tools-9999.ebuild
new file mode 100644
index 000000000000..3a3ac59e5dc2
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-9999.ebuild
@@ -0,0 +1,265 @@
+# 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.1 2011/04/06 22:14:51 alexxy Exp $
+
+EAPI="3"
+
+inherit flag-o-matic eutils multilib python mercurial
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+REPO="xen-unstable.hg"
+EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+S="${WORKDIR}/${REPO}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc debug screen custom-cflags pygrub hvm api acm flask ioemu"
+
+CDEPEND="dev-lang/python
+	sys-libs/zlib
+	hvm? ( media-libs/libsdl
+		sys-power/iasl )
+	acm? ( dev-libs/libxml2 )
+	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
+	)
+	hvm? (
+		x11-proto/xproto
+		sys-devel/dev86
+	)"
+
+RDEPEND="${CDEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	dev-python/pyxml
+	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() {
+	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 acm     && export "ACM_SECURITY=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"
+	# 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
+	# Fix network broadcast on bridged networks
+	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.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
+	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/default "${D}"/etc/init.d/xen* || 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?/*
+
+	newinitd "${FILESDIR}"/xend.initd-r2 xend \
+		|| die "Couldn't install xen.initd"
+	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 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
+}