Add support for vnc and sdl - thanks to Nick Devito and Andrew Ross in bug #124361

Package-Manager: portage-2.1.1_pre4-r2

4 files changed, 180 insertions, 5 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 46da61cad293..a6cc7cf6244e 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.12 2006/06/09 17:59:12 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.13 2006/08/04 13:53:26 chrb Exp $
+
+*xen-tools-3.0.2-r2 (04 Aug 2006)
+
+  04 Aug 2006; Chris Bainbridge <chrb@gentoo.org>
+  +xen-tools-3.0.2-r2.ebuild:
+  Add support for vnc and sdl - thanks to Nick Devito and Andrew Ross in bug
+  #124361
 
 *xen-tools-3.0.2-r1 (09 Jun 2006)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 17b1d6f71457..f7ba341a3dad 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -27,10 +27,14 @@ EBUILD xen-tools-3.0.2-r1.ebuild 3790 RMD160 6de97a5ae04cc5368376f88d458070c097f
 MD5 d1ae3c3fbb8ba67b839d2484811c2c34 xen-tools-3.0.2-r1.ebuild 3790
 RMD160 6de97a5ae04cc5368376f88d458070c097f61f7f xen-tools-3.0.2-r1.ebuild 3790
 SHA256 7edf5561b6902c1a809715849c3bf8fb4f790d794d4dde76a3d9d90f143d6ff8 xen-tools-3.0.2-r1.ebuild 3790
-MISC ChangeLog 2586 RMD160 6b0e34b8714ddb4b5e8e55d3ccecae61aabd7d35 SHA1 6246240351214c25316fcee57c1be3de0c318571 SHA256 50dcba86747d77347ab1060fe430e89cf35a27fb452a3491f49c8e091ae21938
-MD5 edddf102935c317a911cd902e9cbcdd1 ChangeLog 2586
-RMD160 6b0e34b8714ddb4b5e8e55d3ccecae61aabd7d35 ChangeLog 2586
-SHA256 50dcba86747d77347ab1060fe430e89cf35a27fb452a3491f49c8e091ae21938 ChangeLog 2586
+EBUILD xen-tools-3.0.2-r2.ebuild 4299 RMD160 17e8b5e04a3e990a1e3625be8fba8061a5ac639a SHA1 0e69035f277b04038d4a10acf41df67dcf2c2f31 SHA256 ee69ecb468a22c0a8156349559724f2914f2e99ea8cc06e864f27aa8fdfccf45
+MD5 8c866ff645e665a8fd13f4602342d38c xen-tools-3.0.2-r2.ebuild 4299
+RMD160 17e8b5e04a3e990a1e3625be8fba8061a5ac639a xen-tools-3.0.2-r2.ebuild 4299
+SHA256 ee69ecb468a22c0a8156349559724f2914f2e99ea8cc06e864f27aa8fdfccf45 xen-tools-3.0.2-r2.ebuild 4299
+MISC ChangeLog 2789 RMD160 329b1c97b112c0de9c5025eb9c5d2679dbf2f0d2 SHA1 1d1bcc0e76f5d80b24269af604ec4de84bd680d5 SHA256 946a05115290ff5095470a7d66e1f3b16a4565a82f184824aaf24592b533b69c
+MD5 fc2aca30469f5a0fbc123e1ff6fff1b7 ChangeLog 2789
+RMD160 329b1c97b112c0de9c5025eb9c5d2679dbf2f0d2 ChangeLog 2789
+SHA256 946a05115290ff5095470a7d66e1f3b16a4565a82f184824aaf24592b533b69c ChangeLog 2789
 MISC metadata.xml 344 RMD160 237bf24416240057f09b2180e143579e22a24859 SHA1 da9f05207fa34cf639558c4d49b8f1e1dc9bf45f SHA256 79ddf2debe775cd0465984dd0d1e706e7b967b0590a3e36aba5b13239586272f
 MD5 1345a3b29c0fde61a34873dae98c7f34 metadata.xml 344
 RMD160 237bf24416240057f09b2180e143579e22a24859 metadata.xml 344
@@ -38,3 +42,6 @@ SHA256 79ddf2debe775cd0465984dd0d1e706e7b967b0590a3e36aba5b13239586272f metadata
 MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r1 235
 RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r1 235
 SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r1 235
+MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r2 235
+RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r2 235
+SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r2 235
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r2 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r2
new file mode 100644
index 000000000000..724d092d5489
--- /dev/null
+++ b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r2
@@ -0,0 +1,3 @@
+MD5 544eab940a0734a55459d648e5c3b224 xen-3.0.2-src.tgz 4933621
+RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af xen-3.0.2-src.tgz 4933621
+SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 xen-3.0.2-src.tgz 4933621
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r2.ebuild
new file mode 100644
index 000000000000..34e96c5d7aeb
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2006 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.0.2-r2.ebuild,v 1.1 2006/08/04 13:53:26 chrb Exp $
+
+inherit mount-boot flag-o-matic distutils eutils
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.sourceforge.net"
+if [[ ${PV} == *_p* ]]; then
+	XEN_UNSTABLE="xen-unstable-${PV#*_p}"
+	SRC_URI="mirror://gentoo/${XEN_UNSTABLE}.tar.bz2"
+	S="${WORKDIR}/${XEN_UNSTABLE}"
+else
+	SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-${PV}-src.tgz"
+	S="${WORKDIR}/xen-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug screen custom-cflags hardened vnc sdl"
+
+DEPEND="sys-devel/gcc
+	dev-lang/python"
+
+RDEPEND=">=app-emulation/xen-3.0.2
+	dev-lang/python
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	sys-libs/zlib
+	doc? (
+		dev-tex/latex2html
+		media-gfx/transfig
+	)
+	sdl? (
+		media-libs/libsdl
+	)
+	vnc? (
+		net-libs/libvncserver
+		media-libs/libsdl
+	)
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	|| ( sys-fs/udev sys-apps/hotplug )"
+
+PYTHON_MODNAME="xen grub"
+
+pkg_setup() {
+	if use vnc && ! use sdl ; then
+		ewarn "You have the 'vnc' USE flag set, but not 'sdl'."
+		ewarn "VNC functionality requires SDL support, so it"
+		ewarn "will be enabled anyway."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# 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
+	# for some reason the xen gcc checks don't work on gentoo-hardened
+	if use hardened; then
+		HARDFLAGS="-nopie -fno-stack-protector -fno-stack-protector-all"
+		sed -e "s/CFLAGS :=/CFLAGS := ${HARDFLAGS}/" \
+		-i "${S}"/tools/firmware/hvmloader/Makefile \
+		"${S}"/tools/firmware/vmxassist/Makefile
+		cd "${S}"
+		epatch "${FILESDIR}"/hardened-bx-clobber.patch
+	fi
+
+	# Allow --as-needed LDFLAGS
+	epatch "${FILESDIR}/${P}"--as-needed.patch
+}
+
+src_compile() {
+	local myopt, myconf
+	use debug && myopt="${myopt} debug=y"
+
+	myconf="${myconf} $(use_enable vnc)"
+	if use vnc ; then
+		myconf="${myconf} --enable-sdl"
+	else
+		myconf="${myconf} $(use_enable sdl)"
+	fi
+
+	use custom-cflags || unset CFLAGS
+
+	(cd tools/ioemu && econf ${myconf}) || die "configure failured"
+	emake -C tools ${myopt} || die "compile failed"
+
+	if use doc; then
+		sh ./docs/check_pkgs || die "package check failed"
+		emake -C docs || die "compiling docs failed"
+	fi
+
+	emake -C docs man-pages || die "make man-pages failed"
+}
+
+src_install() {
+	local myopt="XEN_PYTHON_NATIVE_INSTALL=1"
+
+	make DESTDIR=${D} ${myopt} install-tools \
+		|| die "install failed"
+
+	if use doc; then
+		make DESTDIR="${D}" -C docs install || die "install docs failed"
+		# Rename doc/xen to the Gentoo-style doc/xen-x.y
+		mv "${D}"/usr/share/doc/{${PN},${PF}}
+	fi
+
+	doman docs/man?/*
+
+	newinitd "${FILESDIR}"/xend-init xend
+	newconfd "${FILESDIR}"/xend-conf xend
+	newconfd "${FILESDIR}"/xendomains-conf xendomains
+	newinitd "${FILESDIR}"/xendomains-init xendomains
+
+	if use screen; then
+		sed -i -e 's/SCREEN="no"/SCREEN="yes"/' "${D}"/etc/init.d/xendomains
+	fi
+
+	# xend expects these to exist
+	keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump
+
+	# for upstream change tracking
+	if [[ -n ${XEN_UNSTABLE} ]]; then
+		dodoc "${S}"/XEN-VERSION
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please visit the Xen and Gentoo wiki:"
+	einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+
+	if ! built_with_use 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 [[ -n ${XEN_UNSTABLE} ]]; then
+		echo
+		einfo "This is a snapshot of the xen-unstable tree."
+		einfo "Please report bugs in xen itself (and not the packaging) to"
+		einfo "bugzilla.xensource.com"
+	fi
+}