Bump to 3.3.1. Fixes half of #254931

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 266 insertions, 3 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index f8201d942ad1..43bce105ea3b 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.43 2009/04/26 12:52:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.44 2009/04/26 13:14:23 patrick Exp $
+
+*xen-tools-3.3.1 (26 Apr 2009)
+
+  26 Apr 2009; Patrick Lauer <patrick@gentoo.org> +xen-tools-3.3.1.ebuild:
+  Bump to 3.3.1. Fixes half of #254931
 
   26 Apr 2009; Patrick Lauer <patrick@gentoo.org>
   +files/xen-tools-3.3.0-warning-fix.patch, xen-tools-3.3.0:
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 5af24de21736..5697031af7c5 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -16,9 +16,11 @@ AUX xendomains.initd 2609 RMD160 d606f752d3b1f9451bf9e1895f3a28350e8bdc87 SHA1 8
 DIST xen-3.1.3.tar.bz2 5852287 RMD160 df36208c8e709c61f2b4a74d18d2e81531ab4721 SHA1 5542d2bd07afaf80d70c85f7b75c6e6b432be08b SHA256 b94ab7a07269848dec8904625f348405c4af4ac7b579a402b2d830503ecd53a1
 DIST xen-3.2.1.tar.gz 6356315 RMD160 9ddda1185e6a19a6ccd73f5dde15640d2e31b125 SHA1 753f3d79d7ae2175e78b261765a9935db6255996 SHA256 dc3c057acab2173330db88d1f1d0587caf5717a4a882b93694a1bc90c71ad12a
 DIST xen-3.3.0.tar.gz 11338614 RMD160 c98c08617e302ef4004d17cb0ba161d0ed7af59c SHA1 b6365864eeb5125e0f66a056c4c72816e1789358 SHA256 89f5880b638b1149b042ab0b54f6a652085da0d05ac980ba611a617cc3a8f06d
+DIST xen-3.3.1.tar.gz 11329774 RMD160 31d3e801b4eec37715900c6247be403aaafdd5e1 SHA1 fa63c80e04dfc1bb376d98c5a0a0b08f7912b3f9 SHA256 88b4234eeee80560a3321c7e887cedd7696f45694e3e9557c21b150de1c54a49
 EBUILD xen-tools-3.1.3-r1.ebuild 6763 RMD160 6c6e3ebcd62eb7d08ef86f93aa18f0ae1da14689 SHA1 b3371b3558473c9b8206e47a3f0a438fb12e7229 SHA256 8ecd777599cd122daac05d70033738364d45078657b47c7470009eabb8dadf3a
 EBUILD xen-tools-3.1.3.ebuild 6657 RMD160 908c386349e533e85e7ed3aaf30c21960da26d69 SHA1 240d5ee186ca824ea9ea8a727c7dc1460c4acd84 SHA256 f77bde05f6bfb6fb1b111b51837eec57872b0533219ddb300843aeb1733ff414
 EBUILD xen-tools-3.2.1.ebuild 6831 RMD160 5c59bc41afbab20a9cd6d42aa48bbfc8bb71d187 SHA1 3fdec239a85be84b6f321f42ece5b9b7c01ab555 SHA256 60a352407c7e737ab278cbef4ea78091de26ee54e1d56ad09259d65c4bf1ce6e
 EBUILD xen-tools-3.3.0.ebuild 7817 RMD160 0e6ac767cb100959c3274a038bef0ce5c25a0428 SHA1 0eb2b151306888302ed5083abd6954bd4a2bb081 SHA256 5328c8d3b388fc4d2ea5a42f73db6aab4191dd339abfbccb3cedfafc2e381cdc
-MISC ChangeLog 12840 RMD160 2105df8973d1f956a818b0227c6229cea90c81d7 SHA1 75ad532eb271bec5a62ff0ba88a4630d4062271e SHA256 3d66d4a601e6f58d37e9d79e5421e2445aa08ab77203228828a9dd9176d5993b
+EBUILD xen-tools-3.3.1.ebuild 7687 RMD160 fb3c8af37390de4f26c6911fffa6d46f5a5717a7 SHA1 299227cea1c25c7ec709eddc19ea59481d42b1a6 SHA256 23f4b8c6638f1fb8b67e5bea6d4c7a09150af81c723450ba08cd4c5fa85a6442
+MISC ChangeLog 12987 RMD160 f948f24a9bd63e1b12cd69527cb30eeb133887b3 SHA1 13acaafef91a1279cabed6bfd6ba46cd022c51d3 SHA256 864259fa0fd23122b672c0aa830d011f4d1781af874c50010ce01239a0dff19c
 MISC metadata.xml 673 RMD160 021c0a8f46b9d3025871c246aa7611904be2e2f9 SHA1 3af764dc6af79bcda8611546d4fb8693f784fa0c SHA256 137fa204b41b1b552deff15a977df2a3acde6f263c5034f75735de4f80028609
diff --git a/app-emulation/xen-tools/xen-tools-3.3.1.ebuild b/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
new file mode 100644
index 000000000000..5b9223818b24
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-3.3.1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2009 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.3.1.ebuild,v 1.1 2009/04/26 13:14:23 patrick Exp $
+
+inherit flag-o-matic eutils multilib python
+
+# TPMEMUFILE=tpm_emulator-0.4.tar.gz
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+#	vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )"
+S="${WORKDIR}/xen-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
+
+CDEPEND="dev-lang/python
+	sys-libs/zlib
+	hvm? ( media-libs/libsdl )
+	acm? ( dev-libs/libxml2 )
+	api? ( dev-libs/libxml2 net-misc/curl )"
+#	vtpm? ( dev-libs/gmp dev-libs/openssl )
+
+DEPEND="${CDEPEND}
+	sys-devel/gcc
+	dev-lang/perl
+	app-misc/pax-utils
+	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 )"
+
+PYTHON_MODNAME="xen grub"
+
+# 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 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 && ! built_with_use -o 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 && ! built_with_use 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 ! built_with_use 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 vtpm    && export "VTPM_TOOLS=y"
+	use api     && export "LIBXENAPI_BINDINGS=y"
+	use acm     && export "ACM_SECURITY=y"
+	use flask   && export "FLASK_ENABLE=y"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+#	use vtpm && cp "${DISTDIR}"/${TPMEMUFILE}  tools/vtpm
+
+	# 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 -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk
+		sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile
+	fi
+
+	if ! use pygrub; then
+		sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
+	fi
+
+	# Fix network broadcast on bridged networks
+	epatch "${FILESDIR}/${PN}-3.1.3-network-bridge-broadcast.patch"
+
+	# Fix building small dumb utility called 'xen-detect' on hardened
+	epatch "${FILESDIR}/${PN}-3.3.0-xen-detect-nopie-fix.patch"
+
+	# Do not strip binaries
+	epatch "${FILESDIR}/${PN}-3.3.0-nostrip.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
+
+	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 -rf "${D}"/etc/sysconfig
+
+	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 xend \
+		|| die "Couldn't install xen.initd"
+	newconfd "${FILESDIR}"/xendomains.confd xendomains \
+		|| die "Couldn't install xendomains.confd"
+	newinitd "${FILESDIR}"/xendomains.initd xendomains \
+		|| die "Couldn't install xendomains.initd"
+
+	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 ! 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 built_with_use 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
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 38338d1e2d96..67b9537ef5f7 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -3,8 +3,10 @@ AUX xen-sed-gcc.patch 1026 RMD160 ddb00f6a04cb791fd895ca0221987df624fe8a35 SHA1
 DIST xen-3.1.3.tar.bz2 5852287 RMD160 df36208c8e709c61f2b4a74d18d2e81531ab4721 SHA1 5542d2bd07afaf80d70c85f7b75c6e6b432be08b SHA256 b94ab7a07269848dec8904625f348405c4af4ac7b579a402b2d830503ecd53a1
 DIST xen-3.2.1.tar.gz 6356315 RMD160 9ddda1185e6a19a6ccd73f5dde15640d2e31b125 SHA1 753f3d79d7ae2175e78b261765a9935db6255996 SHA256 dc3c057acab2173330db88d1f1d0587caf5717a4a882b93694a1bc90c71ad12a
 DIST xen-3.3.0.tar.gz 11338614 RMD160 c98c08617e302ef4004d17cb0ba161d0ed7af59c SHA1 b6365864eeb5125e0f66a056c4c72816e1789358 SHA256 89f5880b638b1149b042ab0b54f6a652085da0d05ac980ba611a617cc3a8f06d
+DIST xen-3.3.1.tar.gz 11329774 RMD160 31d3e801b4eec37715900c6247be403aaafdd5e1 SHA1 fa63c80e04dfc1bb376d98c5a0a0b08f7912b3f9 SHA256 88b4234eeee80560a3321c7e887cedd7696f45694e3e9557c21b150de1c54a49
 EBUILD xen-3.1.3.ebuild 2543 RMD160 d0f4eb913ebd5e9721698ad9c6f3baec75cb8372 SHA1 94fac9d73c522205c04ae37d500d7dc326317959 SHA256 dad9c783e17507e9461347add4529100c82ca331025d7485c4ca55527fc3ceb7
 EBUILD xen-3.2.1.ebuild 2565 RMD160 2a2829c2552c0df03834eaaf120a796fc3d22bf3 SHA1 82c5d1189e95edbb1d6085add13a3e05e7b8028c SHA256 8892ac5ff60d04b328794712568b7cbee543fb2aae332b465496eedd1388f844
 EBUILD xen-3.3.0.ebuild 3002 RMD160 64dcf0ba6f403954d6d47469163e27328bca1e3b SHA1 7e4c8b72eca436c31354192f82160937549568a3 SHA256 2bbb9db5ee93eb3bde0630dfc7cb1c96a00a0b3f71c1f6c11d20cceb9d1e0557
-MISC ChangeLog 9596 RMD160 d6fda6791a5ab0ab2850f07a94ef2989d5cb598f SHA1 956e0b3735cad8122ee246fbb3203487045eed85 SHA256 7eecdfeb6db8429e2ce09c6d6b304b8de23662b8e0f665a0c8f3e890d06635bd
+EBUILD xen-3.3.1.ebuild 2875 RMD160 a96987e2db6bfbb098b6f60b1274a85ef9d5253a SHA1 c8041ccaa2294da8787726500b02fd0b5e221719 SHA256 546778f9303988dbefd3bff516a8ac185add3c4f69ee709e82d5572622facf03
+MISC ChangeLog 9737 RMD160 6db1fe7d8a75d0e0eb8c243381c33d6f43424803 SHA1 7e2f67c1e52535e3c91c7eaa1acf6a2874546957 SHA256 560d9da0075932cb42fe94ea3e9b6ee1070a2b907699c802f9c509673aecf7a1
 MISC metadata.xml 454 RMD160 669ebed46522166118d55bf6f6917b5902a8edb4 SHA1 76bc8f2ae3abb50dbf778d8051fcf797b19b092c SHA256 383ef9830d024c489d6edec8c78bf391821c7f1076c6b56d6e1dd2a754754279