Fix bugs #141981, #142011, #141866, and #137886.

Package-Manager: portage-2.1-r2

4 files changed, 35 insertions, 183 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 2790ac9c9938..d71081c3352d 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19
+MD5 9df68ac65dc3f372f5d61183abdc83ff files/xen-consoles.logrotate 63
+RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 files/xen-consoles.logrotate 63
+SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 files/xen-consoles.logrotate 63
 AUX xen-tools-3.0.2--as-needed.patch 283 RMD160 852e850b72b9860420f5f2132c2e071474bc87ba SHA1 cb33bd39091a7ddca2a97a3e80d673adcec77895 SHA256 9fcf772662863f74f4dc7cbc7ec195c2ad447ea757364e0cd6907d633d237919
 MD5 7c8f508f547c0e1f78b185fd9f980b1b files/xen-tools-3.0.2--as-needed.patch 283
 RMD160 852e850b72b9860420f5f2132c2e071474bc87ba files/xen-tools-3.0.2--as-needed.patch 283
@@ -21,10 +22,6 @@ AUX xen-tools-3.0.2-test-xauthority.patch 2362 RMD160 4974965318e02b151c0ba2cb51
 MD5 0f94816ea4743531f5919592ce077c00 files/xen-tools-3.0.2-test-xauthority.patch 2362
 RMD160 4974965318e02b151c0ba2cb516b4f246388e465 files/xen-tools-3.0.2-test-xauthority.patch 2362
 SHA256 a232f43a7a560b6cdea93daca422addbbc85f3ee75d10895423db3d5d3c6a452 files/xen-tools-3.0.2-test-xauthority.patch 2362
-AUX xend-conf 357 RMD160 e2b04f3d7cfb4fa8407adf2a4470e461901f9681 SHA1 b196023b5b9cf05be8d16e826d6709bcb6ea7ccc SHA256 7edcef347bfd373144140883ff9f38c9ff76614b71d912759fa635fb840911bc
-MD5 0664978b7f05728a0f4ffdbacec90f01 files/xend-conf 357
-RMD160 e2b04f3d7cfb4fa8407adf2a4470e461901f9681 files/xend-conf 357
-SHA256 7edcef347bfd373144140883ff9f38c9ff76614b71d912759fa635fb840911bc files/xend-conf 357
 AUX xend-init 854 RMD160 e19cc95563c3e128255f3575297bc0d35786b5a4 SHA1 820fa00ddea6ba4c42c8d089b61c48b7a37bba80 SHA256 3991a74268dd4bc8b6fe53ed784f3cd764eb7112844dee34f3115bcd15d33377
 MD5 b8d59e2eba1f6b245eb22e39c01df78c files/xend-init 854
 RMD160 e19cc95563c3e128255f3575297bc0d35786b5a4 files/xend-init 854
@@ -37,33 +34,38 @@ AUX xendomains-init 1681 RMD160 8a274725bee24929b97d5e199da4e5cfd0f3edf5 SHA1 cf
 MD5 23de87e566971e687ab2a7c2353a3c17 files/xendomains-init 1681
 RMD160 8a274725bee24929b97d5e199da4e5cfd0f3edf5 files/xendomains-init 1681
 SHA256 c3537920096cd94e80024b4d05706cd901f546c54ea8449b45399419b2ca51d0 files/xendomains-init 1681
+AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
+MD5 65a57a4fae5a300aed8b84c24cdeee42 files/xendomains-screen.confd 594
+RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 files/xendomains-screen.confd 594
+SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a files/xendomains-screen.confd 594
+AUX xendomains.confd 163 RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 SHA1 bf9a43a4812947189c9bedbf0f1b457f39f50893 SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef
+MD5 b9420a9887a4b4ca6749006f5586f130 files/xendomains.confd 163
+RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 files/xendomains.confd 163
+SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef files/xendomains.confd 163
+AUX xendomains.initd 2272 RMD160 ef57e016a0c6076f385ece4da77ea62b18349924 SHA1 2cca3a2aff6a42db6c00e228da84a23220f3a760 SHA256 6cdba349028a8af689a960a700f32f2e146334c38ae75b8afd7141dbd160d000
+MD5 99faf5e0acd1af480c0676189ffe7c9a files/xendomains.initd 2272
+RMD160 ef57e016a0c6076f385ece4da77ea62b18349924 files/xendomains.initd 2272
+SHA256 6cdba349028a8af689a960a700f32f2e146334c38ae75b8afd7141dbd160d000 files/xendomains.initd 2272
 DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951
-EBUILD xen-tools-3.0.2-r1.ebuild 3945 RMD160 326ea8e281030efb84b47dbbeea895b253a04752 SHA1 858ac99783b9f888cc23ae19c080ab76c891df83 SHA256 9550c198f5c2d03385d1708860f3be79cd612c51b1c0008485b08ba062df5ae9
-MD5 ad525ca59ea78e60e0a7c4c139ca57b3 xen-tools-3.0.2-r1.ebuild 3945
-RMD160 326ea8e281030efb84b47dbbeea895b253a04752 xen-tools-3.0.2-r1.ebuild 3945
-SHA256 9550c198f5c2d03385d1708860f3be79cd612c51b1c0008485b08ba062df5ae9 xen-tools-3.0.2-r1.ebuild 3945
-EBUILD xen-tools-3.0.2-r2.ebuild 4735 RMD160 d6d30a244905ac1a77f44464f207bca1b1ac1444 SHA1 a757b0f7ef59575bfce7f89090c5fe6bdde8d679 SHA256 31a5f0e02648e518b483025f99e5be7b89ff1b87334ec869ea54fd204abf7184
-MD5 19042a2a90d2e26d504d649459097c6e xen-tools-3.0.2-r2.ebuild 4735
-RMD160 d6d30a244905ac1a77f44464f207bca1b1ac1444 xen-tools-3.0.2-r2.ebuild 4735
-SHA256 31a5f0e02648e518b483025f99e5be7b89ff1b87334ec869ea54fd204abf7184 xen-tools-3.0.2-r2.ebuild 4735
-MISC ChangeLog 3547 RMD160 f4753ec24ac49fb87cd8a3f3a3b58262f915f035 SHA1 5ca9d112f10b079914c4dbe58e497423f2f7549e SHA256 0389074d89c6e92d1e6ec1761caf202f1ada098f38b2d3dd1a412a2d09a5ded5
-MD5 97929cc0abe05ad4c333a9f511796511 ChangeLog 3547
-RMD160 f4753ec24ac49fb87cd8a3f3a3b58262f915f035 ChangeLog 3547
-SHA256 0389074d89c6e92d1e6ec1761caf202f1ada098f38b2d3dd1a412a2d09a5ded5 ChangeLog 3547
-MISC metadata.xml 524 RMD160 a43ce42da1c3cfc48117f045ac519b57b77e06d2 SHA1 1ba13aa3a6a9f6edca131b8b0071a9513b8434de SHA256 730f26575bf2ac3451ee10b5b01a0eda163459ef40dfc79e0acc6c64c5f974c8
-MD5 639e560e9eb2bbfde0747a0712d35b02 metadata.xml 524
-RMD160 a43ce42da1c3cfc48117f045ac519b57b77e06d2 metadata.xml 524
-SHA256 730f26575bf2ac3451ee10b5b01a0eda163459ef40dfc79e0acc6c64c5f974c8 metadata.xml 524
-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
+EBUILD xen-tools-3.0.2-r2.ebuild 4690 RMD160 4fed8c5d8c94e48c7e246eb09c3476cc4a9d0996 SHA1 f099bca1327193feb1a1265d97336334022e682b SHA256 41f01585495e4b4e6a8651e61e29355a6033734ac11bc71ac9ee515b7d6e58c5
+MD5 628b3541b104bc0017e1a4c388407055 xen-tools-3.0.2-r2.ebuild 4690
+RMD160 4fed8c5d8c94e48c7e246eb09c3476cc4a9d0996 xen-tools-3.0.2-r2.ebuild 4690
+SHA256 41f01585495e4b4e6a8651e61e29355a6033734ac11bc71ac9ee515b7d6e58c5 xen-tools-3.0.2-r2.ebuild 4690
+EBUILD xen-tools-3.0.2-r3.ebuild 5530 RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf SHA1 421419794bd2c77c6780d936c91f1c19c000dfb2 SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e
+MD5 11588a83ffd3177430efeca5cc668ba3 xen-tools-3.0.2-r3.ebuild 5530
+RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf xen-tools-3.0.2-r3.ebuild 5530
+SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e xen-tools-3.0.2-r3.ebuild 5530
+MISC ChangeLog 4062 RMD160 78653570587403aa5e04541b135ddd0f4f60835f SHA1 ec6271ba72eabdf409404613d9429a1f624ccb73 SHA256 07d9d83bfd17a744f49111142b2e827367a5aad766666461017407f48ce079f5
+MD5 e53a1414ff96596d233b5b7d2202d739 ChangeLog 4062
+RMD160 78653570587403aa5e04541b135ddd0f4f60835f ChangeLog 4062
+SHA256 07d9d83bfd17a744f49111142b2e827367a5aad766666461017407f48ce079f5 ChangeLog 4062
+MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
+MD5 559b4095659a2a2a489784de8a6ef95e metadata.xml 156
+RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 metadata.xml 156
+SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2 metadata.xml 156
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE26UoI1lqEGTUzyQRAsLZAJ47FXw407FmHyDokSMd9mOGit8Z/gCgqMJt
-YXzDGXV2+mVk6LwqWDi5OMc=
-=PhOH
------END PGP SIGNATURE-----
+MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r3 235
+RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r3 235
+SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r3 235
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r1 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r1
deleted file mode 100644
index 724d092d5489..000000000000
--- a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/xend-conf b/app-emulation/xen-tools/files/xend-conf
deleted file mode 100644
index ad59105b2087..000000000000
--- a/app-emulation/xen-tools/files/xend-conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend-conf,v 1.1 2006/03/24 23:55:01 agriffis Exp $
-
-# set to YES to enable the web frontend to xend on port 8080.
-# To change the port, edit /usr/lib/python/xen/sv/params.py
-XENSV="NO"
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r1.ebuild
deleted file mode 100644
index 5cd47ac60a4a..000000000000
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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-r1.ebuild,v 1.2 2006/08/09 09:10:52 aross 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"
-
-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
-	)
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	|| ( sys-fs/udev sys-apps/hotplug )"
-
-PYTHON_MODNAME="xen grub"
-
-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
-
-	# Fix upstream's broken test cases (bug #141233)
-	cd "${S}"
-	epatch "${FILESDIR}/${P}"-test-uuid.patch
-	epatch "${FILESDIR}/${P}"-test-xauthority.patch
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-
-	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
-}