Migrate to python-r1, clean up a bit. Acked by idella4.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

3 files changed, 364 insertions, 9 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 187035d75de4..9a0b5787ef0f 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.119 2012/12/11 09:02:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.120 2012/12/16 16:15:44 mgorny Exp $
+
+*xen-tools-4.2.0-r2 (16 Dec 2012)
+
+  16 Dec 2012; Michał Górny <mgorny@gentoo.org> +xen-tools-4.2.0-r2.ebuild:
+  Migrate to python-r1, clean up a bit. Acked by idella4.
 
   11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   xen-tools-4.1.1-r6.ebuild, xen-tools-4.1.2-r3.ebuild,
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 69879112e473..dc51e509090b 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -34,16 +34,15 @@ EBUILD xen-tools-4.1.1-r6.ebuild 10850 SHA256 211488d3a1463ff5da42f9fd429bfbf951
 EBUILD xen-tools-4.1.2-r2.ebuild 9850 SHA256 02ad4fcf28cfc7a35136990d394ee539dffa2a2fa6292711d9cad1762d77dd02 SHA512 1688309835861894868572e047c8e910f4f54c0899760c119dec37c01b7ed6c45a50af30134564457a36a928c0e83d8df1aa7949580543778d62369a332bbc69 WHIRLPOOL 3b1ed42e1733e5d42c3cba47101f2376264c9b566e5b724c80f7f4e6e90303be2c60d632bc6d7daa044bc12a1328c5c8c8a8764520a97c02dc6d5bc30acf2391
 EBUILD xen-tools-4.1.2-r3.ebuild 9895 SHA256 90119e2cd13c0bf04185fdcc329a3d5e3c638c476a4402b2b1d840e52aa3fdd9 SHA512 e044dc74ba1dd63d2d8249bc55fd0a843792524fbe72fedda839317fe76fb8cb7663fda70fada77f9d83027b465b29e0dfa88c220911e96ab46bc922361a274d WHIRLPOOL bdb88576c3ae528115a8f89a831d0ad3cdb61eb23c517bf4e3fe43605e8cd2ccf36af9696f9e15a24848060a487a7dddb26e87e81cab80371f79556af3c733cc
 EBUILD xen-tools-4.2.0-r1.ebuild 10208 SHA256 0b96f2338d5b7faf8ae41bd9abcb6297df623e78b6ce884871910a6166397a9c SHA512 419ae1a963b6e1807d2ac34c99f19d06239e172f3084cc6dda6831edf536d19ad445c84bae391eb67f84b14e4c3f81ebc70a7b18ab720543011963068581a1fd WHIRLPOOL 7a81a3444f95bec0f3c12a43d8fae8442dc0e9736e5a07dd8cc2c748b8e974dbbb2f92dcf2fb41d89e4c145913140f5861c23e4b38dc36c3ff723992e6d3c32e
-MISC ChangeLog 29482 SHA256 7c0d6ed1d1f6eb17d681c82172fdfc087abf2c493bdaa34caee90293ef3e87ce SHA512 380cd48c5e6389dbdea4a169e512c9ac879f11ce883e7796e0fd2ad29caf9392c83729f3d21ceed31fcc0f149963cdd791099dd273908afd802de039722ca157 WHIRLPOOL 10be037fb84a78bfd50c128cf0b7cd6cbfd9ea9df8858fa8cfd4482051b62c1ca53e16a811171859b55daa6b8a9e43953afd46f57fec010e3c1d34aff84fe080
+EBUILD xen-tools-4.2.0-r2.ebuild 10545 SHA256 b5a7a9f4272a6f158006e023c244baa1411b393e7b0b0739dbe88c37af59db77 SHA512 18432e4c4a52271edb6f275f7902f6fdecd723d6a5cb0ebe64d959a6ef91d0530eabc4b6b107602ad3a0df36069127431e80b510125f27a0dc7d1e7404cf616e WHIRLPOOL 9283c9e4fb14b374fe7925bbadededc780906abfd7d42af29d9ef5eddd53a3748a02df04ba685885fee2d8cde99f610f5addbc036bbe4ee241b2b0baebaea45e
+MISC ChangeLog 29651 SHA256 9c45229ef6c1c0d9d45bb664f555f8099fa7f1c667d34d234a78dc471c4515de SHA512 c2bd740824fe72899b9f7ccccd326781532e90429b959f64f4af493c945ea23a7a0785e4177a8d5ec7950b29ef21dca5c34548cce385640735c7ce68e4660e0f WHIRLPOOL 3fa41eeb9e505482c1bc296955df937ebaeae50f769248d4d9b93eeb03d5c464d3cd694cf519a0c404671a30bfb0e24040862f90c7713c77d91a27ed7b3f78f9
 MISC metadata.xml 801 SHA256 44aaa6739a1add2cce5db154a3007e5aff3eacc9006e86ac332acd9b3ad3c627 SHA512 b791fd7a9ad54aa0374c8da46ec9197110918b4857d12416e2f76d604e92ce9f732bf94b236cc629c5cd0979dc5061fcffb94e846ed865ed0ca157457ffde720 WHIRLPOOL fb12683cfa3ea2d24c22fd87e88e2b5abd97b299edb9154658ab79def1eabd7b1fecf723a2c8ffc2d048bdea97e5ef374272398659f2ba76aa9000f1104eeb4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQxveUAAoJEEdUh39IaPFN0i8H/jjfN2AW4EkMSYLNl37M4lqq
-HNlPYvjW62bPG7SUc+YRHXisw6M3CQPxdpvew+bBLw4IrW7GNh9Qe9Ze+HX0a/IS
-k9KelWsUA914AbQeG+UQrQOGqEQJ9JQ5k5wjygU+ETuXpXd+I6X2q+MkZKUeKH10
-jN39sNNPTdW4kM/xasiWfdn3TAFAWsNCCt8iEazOmHgAHcM8gVrYqQD3v6ozto+2
-soDbQMZ/WD0f3UiEGCyCeiaQ4lY2mKKhylpuhqJwd/Iy0gSNgw2cycLtaOD6wv4c
-t3TKrC4OxvTZ8R50eGCj7z/z1Pq37x5t9o6fWyayWUxGMPmXymGzZR2gwXVkg0A=
-=z3tC
+iJwEAQEIAAYFAlDN87EACgkQfXuS5UK5QB1HwgQAj63Pge7LEATlu4pnLwVE8v/m
++gclqKMVcyFfA6glZXetYEuqiW0zpD9a1qI/i091kh8B/xff94dapXFITz7/wVAL
+M6c+Bi0mn2oYTTOV59D2I5w47oNH9WVFTnrcsnjKPj99JlqhGcN1cxBz6zdSZCOK
+RSbQZdpwWpRlqjhKLfQ=
+=GRtS
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..a3436ae0b918
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.2.0-r2.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2012 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.1 2012/12/16 16:15:44 mgorny Exp $
+
+EAPI="4"
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE='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-single-r1 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[${PYTHON_USEDEP}]
+	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 )
+	api? ( dev-libs/libxml2 net-misc/curl )
+	${PYTHON_DEPS}
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )"
+
+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
+	)
+	"
+
+RDEPEND="${CDEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	>=dev-lang/ocaml-3.12.0
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	|| ( virtual/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"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_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"
+		sed -e 's:^XEND_INITD:#XEND_INITD:' \
+			-i tools/examples/Makefile || die "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 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 || die
+
+	# 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=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	# TODO: add an appropriate func to python-single-r1.
+	sed -e "1s:python:${EPYTHON}:" \
+		-i "${ED}"usr/sbin/{xenmon.py,xen-ringwatch} || die 'shebang sed failed'
+	find "${D}$(python_get_sitedir)" -name '*.py' \
+		-exec sed -e "1s:python:${EPYTHON}:" -i {} + || die 'shebang find+sed failed'
+
+	# Remove RedHat-specific stuff
+	rm -rf "${ED}"tmp || 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
+
+	# 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
+	find "${ED}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || 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 "${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 problem may be resolved as of Xen 3.0.4, if not post in the bug."
+	fi
+
+	# TODO: we need to have the current Python slot here.
+	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
+}