[app-emulation/xen-tools] Version bump per bug #313791

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

6 files changed, 310 insertions, 8 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index e4e86f8636d3..89f63224d92d 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.59 2010/04/07 16:46:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.60 2010/05/03 19:46:31 alexxy Exp $
+
+*xen-tools-4.0.0 (12 Apr 2010)
+
+  12 Apr 2010; Alexey Shvetsov <alexxy@gentoo.org> +xen-tools-4.0.0.ebuild,
+  +files/xen-tools-4.0.0-as-needed.patch:
+  Version bump per bug #313791
 
   07 Apr 2010; Patrick Lauer <patrick@gentoo.org>
   files/xen-tools-3.4.0-network-bridge-broadcast.patch:
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index edc6a462344f..ca7539479090 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19
 AUX xen-tools-3.0.4_p1--as-needed.patch 517 RMD160 579721dff853f9762c649f17af86ef920b5e98eb SHA1 2cbf34f6daa27ff09a2d0e23396c775f0d2eb3e0 SHA256 37d64ba6b5b76f15d6300855a808ac632a1e228e9d3dc4bf8f3ddaac3d326c8a
 AUX xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841 RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 SHA1 88142952527acc47b00c98a4ccde15661449ee04 SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223
@@ -14,6 +17,7 @@ AUX xen-tools-3.4.0-network-bridge-broadcast.patch 496 RMD160 3a8c57fe70837861f6
 AUX xen-tools-3.4.0-udevinfo.patch 610 RMD160 dd786337bc5be9dc5b0ef0f054b4aba7339208e5 SHA1 b203bfb1d5ee31692952d7b84e995401971ecff4 SHA256 687912b0a12960689abd02f11e96b8bb7e9fbf606a877394336534219d1c1b4a
 AUX xen-tools-3.4.1-xc_core-memset.patch 347 RMD160 06535aa08f52cf2cd6594a15db56129e1446f9e6 SHA1 0fca5a66a82b7f8477c6ce9f2c6e062a04e0a762 SHA256 4ca87102dc1487c3966449e4b7389ecd8844ffa6d8e9ef8fc5cb1264b10875b3
 AUX xen-tools-3.4.2-as-needed.patch 765 RMD160 dbb5ad2ec52e96c40f109e28c91b566e88cb6220 SHA1 9e38f5c06153b5293daa55abe00106404ff6555f SHA256 91f9bf0723462a70d025c8b7ce0dee50e170b68f1a22092f28d92b140a4e5772
+AUX xen-tools-4.0.0-as-needed.patch 765 RMD160 dbb5ad2ec52e96c40f109e28c91b566e88cb6220 SHA1 9e38f5c06153b5293daa55abe00106404ff6555f SHA256 91f9bf0723462a70d025c8b7ce0dee50e170b68f1a22092f28d92b140a4e5772
 AUX xend.initd 1291 RMD160 96659d237688d0c42e5c30491ad883d4af0f1c0f SHA1 2ffe2b29df7014d1dbf69f850a23a95e1b294288 SHA256 41ae7f38565a477abc1fb8ac5af9d6285bf90d171b922c6413aa8aefe5b00889
 AUX xend.initd-r1 1664 RMD160 8d7ea19e96c49631a8f432dd93ae91ca4f37d26b SHA1 bd3a8f083288cd89624d31f3c7932e1a831d99a3 SHA256 6ea8848ca1203c5ef8490014ded86ec67100385c217660d393b25dc6519d254d
 AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
@@ -25,6 +29,7 @@ DIST xen-3.2.1.tar.gz 6356315 RMD160 9ddda1185e6a19a6ccd73f5dde15640d2e31b125 SH
 DIST xen-3.4.0.tar.gz 66400209 RMD160 8cabb48586fa00609419204e7e00efc1ad5d652b SHA1 10a4136e1e63a5cd50440e36c947eab08a67dc2a SHA256 894d6392c71fdb0d7c8d40e51b94c5754a135f7cf89f5f6d88c1706ba98c50b3
 DIST xen-3.4.1.tar.gz 11180776 RMD160 2ed3f9b475d7c31b701d74e8ed44617eab02fc9c SHA1 42138d6c888efadbce340a63c6600deb61a68eeb SHA256 204d768a8cc1b0d49627118de94547c11110543b4df66ad60862a70536ed1c6c
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
+DIST xen-4.0.0.tar.gz 11850784 RMD160 cab84eb7eb65c2c4f0b157a652d59f728ff6a0e9 SHA1 bf2430c896aed0deae99b1b8c3fa73e8aaf125ee SHA256 ea4757d7947b64f01d6e850f34048db7e053731f626d8342b6a15dee8b871289
 EBUILD xen-tools-3.1.3-r1.ebuild 6754 RMD160 16583e0ff353f64af8b72957b664deacf9b4685e SHA1 77208f99e66f36f8b3cb96e201d68bc45e963ae5 SHA256 ac18b4f5b36f0ab841cf11e63fb9a0eda5108df720859319941a6f673251dd7d
 EBUILD xen-tools-3.1.3.ebuild 6648 RMD160 0f9899c336dacf0503a0ae4c0eedfd258f0ca898 SHA1 49f2f0482c22d22d9b9cf6936cf365b7c7300093 SHA256 787d4fc07bc94ecf3fc778cb7f6a43a4017195f3b9741035e55ba2b6fcd7b0c8
 EBUILD xen-tools-3.2.1.ebuild 6827 RMD160 3a42d3a5f90f6a7f3f8f97f92c0a2fd779e5078f SHA1 1ce94e9be4782d734c5437a01ce03dac54083002 SHA256 6f43bc81ad9c25c795fe168d922db635b81616f5d40783617ce9d65397e1fe15
@@ -33,5 +38,13 @@ EBUILD xen-tools-3.4.0.ebuild 6942 RMD160 8a12d902da29fa1c6c859a13ecbe8b6096a657
 EBUILD xen-tools-3.4.1-r1.ebuild 7047 RMD160 dfc25efb8f3117b0d9e176317b07b9ee37371126 SHA1 eb9bc86b91122bfb2fe6374060ac937eb3897d88 SHA256 0abf697214ea09fbec3d0d5af542804604fa5ea3eef3ef06b66de4b44b22aa54
 EBUILD xen-tools-3.4.1.ebuild 7019 RMD160 c4c5eda3b843e5ee8f50d4201f37b62cece3b80a SHA1 52186225682429a4b68447b7743445b973cf1f83 SHA256 f25b234321a35d92fa88084f5b871821abc9073be8c4ff0fd53e9e87e0080e7b
 EBUILD xen-tools-3.4.2.ebuild 7131 RMD160 eca829b941e6b00b0f418e35346149e4d914d413 SHA1 592b38d5f00e61a7d46a55fe9a61e7e69e5c9dee SHA256 66fb826d4f3f7b1eb78067dd5398e56a515c112aaab084b29a9600b04af5f29b
-MISC ChangeLog 15556 RMD160 bd6ecbb0caea4021f360e0a3b0da458cafdb0fa9 SHA1 0f8097643546e764e6110334f5055a87d2b367b2 SHA256 193e2042b53d9e4e697b8a3dfd45bbf4fe2c20de67148c65981e96d9cc707f52
-MISC metadata.xml 673 RMD160 021c0a8f46b9d3025871c246aa7611904be2e2f9 SHA1 3af764dc6af79bcda8611546d4fb8693f784fa0c SHA256 137fa204b41b1b552deff15a977df2a3acde6f263c5034f75735de4f80028609
+EBUILD xen-tools-4.0.0.ebuild 8530 RMD160 dd7a1f084b92caa90bf5641ecd6305e75c71b644 SHA1 d7a28bbca71938315702e967f3ac399523dad34a SHA256 b77932a549a7f84d2c71ac97a3a6bbb265729e35fdf4cc8941331ecbf6a5926e
+MISC ChangeLog 15737 RMD160 662780e1befd3489eeec9973a668556d138b9073 SHA1 edf46f4b9a0d11d8588031628d580f34f888a3fe SHA256 f63b7b7ce221f6fe708ebb5306d2485728393996af7b35bf5c8d2e914c45d3c7
+MISC metadata.xml 721 RMD160 af4a7d279110ca38f4252f2723a86c628d413b23 SHA1 77cf6f5f1a56f928e4d9b0ebe373372d75f314d1 SHA256 670188614bc7d1e2b4c027ac559559cf2228b28f1b1289acef62206e784e6a53
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvfKK8ACgkQ5BmOA85PVLiZRQCgki8TwBWzVv1+h7q1hZe7gyh1
+aLoAoImpq5y1Vk/wnCnaMQamTMnxwJzr
+=8TPh
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xen-tools-4.0.0-as-needed.patch b/app-emulation/xen-tools/files/xen-tools-4.0.0-as-needed.patch
new file mode 100644
index 000000000000..5d973732fb31
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4.0.0-as-needed.patch
@@ -0,0 +1,13 @@
+--- xen-3.4.2.orig/tools/libxc/Makefile	2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/libxc/Makefile	2009-12-12 18:46:27.547714651 +0100
+@@ -167,9 +167,8 @@
+ xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
+ xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
+ 
+-libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
+ libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l)
+ 
+ -include $(DEPS)
+ 
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index 36039791e5c5..9315e31403eb 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -11,6 +11,7 @@
 	<flag name='acm'>Enable the ACM/sHype XSM module from IBM</flag>
 	<flag name='flask'>Enable the Flask XSM module from NSA</flag>
 	<flag name='api'>Build the C libxenapi bindings</flag>
+	<flag name='ioemu'>Enable IOEMU support</flag>
 <!--	<flag name='vtpm'>Enable TPM emulation</flag> -->
 </use>
 </pkgmetadata>
diff --git a/app-emulation/xen-tools/xen-tools-4.0.0.ebuild b/app-emulation/xen-tools/xen-tools-4.0.0.ebuild
new file mode 100644
index 000000000000..8f252487d9a7
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.0.0.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2010 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.0.0.ebuild,v 1.1 2010/05/03 19:46:31 alexxy Exp $
+
+EAPI="3"
+
+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"
+S="${WORKDIR}/xen-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug screen custom-cflags pygrub hvm api acm flask ioemu"
+
+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 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 vtpm    && export "VTPM_TOOLS=y"
+	use api     && export "LIBXENAPI_BINDINGS=y"
+	use acm     && export "ACM_SECURITY=y"
+	use flask   && export "FLASK_ENABLE=y"
+}
+
+src_prepare() {
+#	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
+	# Don't bother with ioemu, only needed for fully virtualised guests
+	if ! use ioemu; then
+		sed -i -e "/^CONFIG_IOEMU := y$/d" "${S}"/config/*.mk
+		sed -i -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" \
+			"${S}/Makefile"
+	fi
+	# Fix network broadcast on bridged networks                                                                                                                                 
+	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
+
+	# Do not strip binaries
+	epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"
+
+	# fix variable declaration to avoid sandbox issue, #253134                                                                                                                  
+	epatch "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
+
+	# fix gcc 4.4 failure                                                                                                                                                       
+	#epatch "${FILESDIR}/${PN}-3.4.1-xc_core-memset.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 -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 ! 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
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index f181da94f2ab..de05f883a4ee 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -10,18 +10,20 @@ DIST xen-3.2.1.tar.gz 6356315 RMD160 9ddda1185e6a19a6ccd73f5dde15640d2e31b125 SH
 DIST xen-3.4.0.tar.gz 66400209 RMD160 8cabb48586fa00609419204e7e00efc1ad5d652b SHA1 10a4136e1e63a5cd50440e36c947eab08a67dc2a SHA256 894d6392c71fdb0d7c8d40e51b94c5754a135f7cf89f5f6d88c1706ba98c50b3
 DIST xen-3.4.1.tar.gz 11180776 RMD160 2ed3f9b475d7c31b701d74e8ed44617eab02fc9c SHA1 42138d6c888efadbce340a63c6600deb61a68eeb SHA256 204d768a8cc1b0d49627118de94547c11110543b4df66ad60862a70536ed1c6c
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
+DIST xen-4.0.0.tar.gz 11850784 RMD160 cab84eb7eb65c2c4f0b157a652d59f728ff6a0e9 SHA1 bf2430c896aed0deae99b1b8c3fa73e8aaf125ee SHA256 ea4757d7947b64f01d6e850f34048db7e053731f626d8342b6a15dee8b871289
 EBUILD xen-3.1.3.ebuild 2534 RMD160 6637cbf8f561bd9b9a0af0bd878164ba9ea21eb3 SHA1 a4ae66409800508245c4171dae660a7c22146f04 SHA256 82abd0312b07615ec93c80ddba36a7fe9bbf1f6b6daa55fbab3e7b0c1d21c8ac
 EBUILD xen-3.2.1.ebuild 2561 RMD160 9537bed6330694cc0b1705e071d047273ce00a3c SHA1 e0b669908b7d5ef82365bfa1054ad0ded5520e8f SHA256 759de1f56a6d29b77c92d746a1c7457e12814f82dad7db5cddf7420de2352748
 EBUILD xen-3.4.0.ebuild 2967 RMD160 1c3db8f8d008449b1c6460811c789427952d92a3 SHA1 a2ae3102ef78fb00ca819c58f4875ba67f7b47b8 SHA256 4975c1070b9ef42e3a18451d4ceb51a0133a720e253b67c545280dc8e71f5a6a
 EBUILD xen-3.4.1.ebuild 2967 RMD160 31cd3463b753971e5ac2dfecd7022ffc16f8ebfc SHA1 f9291e5b5e65eddf61afce728ca567aedbd189cd SHA256 3b0fddb56e46fc96f180505ae4645a94711ad529140abae8b9ebd7b37c9a9a48
 EBUILD xen-3.4.2-r1.ebuild 3057 RMD160 2d8da199f9c763ac3cc7ac467d2600a93b06a387 SHA1 ec6a72a0df3f9caa4313ab888a6344ace84562d6 SHA256 ec8bdca5ea9ebbee2e6b27937aac7fb46466d04df26904e8d2fa01f741bae258
 EBUILD xen-3.4.2.ebuild 2967 RMD160 4d2ee9a2cfcb21fbf39397423b1fa70e08360991 SHA1 56c6155dfa213f60f24e1b8211b9d3921672c6bf SHA256 889bf15fed44d5db400b6180b0715204419d4ab6b83f67d890c677eb1c632f13
-MISC ChangeLog 11015 RMD160 714ca9ed92cc95efa28e5b9a68a6b025fa97b494 SHA1 11e829f3e10d89fd19a24926d279f15feb63445b SHA256 049420f81e2686c208d4a35930d1766ae9d7ffcd40b2999fdae509120da41cb2
+EBUILD xen-4.0.0.ebuild 2831 RMD160 fe11bd8b8574f9d8a7364579993063341bace951 SHA1 ebf1a90801810c57c0fb37ae784bda6222550ec6 SHA256 367c525414204655d4e392d0c16fee4a49477c3c2d99d8b751d0ddf63f7315f8
+MISC ChangeLog 11144 RMD160 3b9de025e8d932f673291eb0dcfef1e2d6c8a9fc SHA1 f089d408fabe031c328c1c0574ac8a559b55293e SHA256 298751ecad03be02a763f84d90e1f9ab7cdb8080990eea2b57355488fcd59374
 MISC metadata.xml 454 RMD160 669ebed46522166118d55bf6f6917b5902a8edb4 SHA1 76bc8f2ae3abb50dbf778d8051fcf797b19b092c SHA256 383ef9830d024c489d6edec8c78bf391821c7f1076c6b56d6e1dd2a754754279
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktR9+wACgkQNQqtfCuFneOpJACdGRiWrMJxIeAp6hn6UEKiF1I9
-zDMAn3S48AX5Ey84R0P3Rsna+QzD1t4o
-=2jhm
+iEYEARECAAYFAkvfKNsACgkQ5BmOA85PVLibqwCfXD7rNKv5nlhZnJClGQf9++dG
+vuQAn1jNxEM3TGfYPzxiLXAmvDGfpgON
+=PcFe
 -----END PGP SIGNATURE-----