Bugs #115970 (/var/xen/dump), #115969 (dhcp), #116332 (hotplug). Removed xen-2 as bugs are not being fixed upstream since the xen-3.0.0 release.

Package-Manager: portage-2.0.53

8 files changed, 21 insertions, 117 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index b6c85f49b5e3..2357f504344b 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.20 2005/12/21 08:34:02 astinus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.21 2005/12/23 14:22:55 chrb Exp $
+
+*xen-3.0.0-r2 (23 Dec 2005)
+
+  23 Dec 2005; <chrb@gentoo.org> files/xend-init, files/xendomains-init,
+  -xen-2.0.7.ebuild, -xen-3.0.0-r1.ebuild, +xen-3.0.0-r2.ebuild:
+  Bugs #115970 (/var/xen/dump), #115969 (dhcp), #116332 (hotplug). Removed
+  xen-2 as bugs are not being fixed upstream since the xen-3.0.0 release.
 
   21 Dec 2005; Alex Howells <astinus@gentoo.org> xen-3.0.0-r1.ebuild:
   Keyword ~amd64 added, works fine for me!
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 2b5863e8458e..933066020a9b 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,10 +1,8 @@
-MD5 d444967da8bf6d24543047b64aa632fb ChangeLog 3462
-MD5 6eaea330ed78459069eb5ba608e654dd files/digest-xen-2.0.7 63
-MD5 90e5b1c2b898e75ca70fb693f1767d74 files/digest-xen-3.0.0-r1 78
+MD5 ba2e4b199a09070fb4903cd0a64f28ab ChangeLog 3776
+MD5 90e5b1c2b898e75ca70fb693f1767d74 files/digest-xen-3.0.0-r2 78
 MD5 16d372298e94a8eef72c1943b1ed5561 files/xend-conf 347
-MD5 b659e1e802207d647698236ddbc2e7a3 files/xend-init 838
+MD5 b16cb40a29cb947b2a9b76cc8f9f3894 files/xend-init 844
 MD5 11ef318e35fcfed12931f182fc01955a files/xendomains-conf 180
-MD5 f13640a07af78a60cfb562fa1d2088f3 files/xendomains-init 1659
+MD5 a3c0c26c30ce1271b439661b68ca9e74 files/xendomains-init 1671
 MD5 23ec60d5040f966fda250a47d8903428 metadata.xml 252
-MD5 b25e5ad259e28bab5d8d3b4c0a62d278 xen-2.0.7.ebuild 2853
-MD5 1d5d392a3fefba67964397260f174458 xen-3.0.0-r1.ebuild 2954
+MD5 8019f3910bed2c172f1727f903ccb46f xen-3.0.0-r2.ebuild 3009
diff --git a/app-emulation/xen/files/digest-xen-2.0.7 b/app-emulation/xen/files/digest-xen-2.0.7
deleted file mode 100644
index 3751206323a3..000000000000
--- a/app-emulation/xen/files/digest-xen-2.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce09744be2b34ad6ffd8eb15dae2eb1f xen-2.0.7-src.tgz 2580390
diff --git a/app-emulation/xen/files/digest-xen-3.0.0-r1 b/app-emulation/xen/files/digest-xen-3.0.0-r2
index cdf26f872710..cdf26f872710 100644
--- a/app-emulation/xen/files/digest-xen-3.0.0-r1
+++ b/app-emulation/xen/files/digest-xen-3.0.0-r2
diff --git a/app-emulation/xen/files/xend-init b/app-emulation/xen/files/xend-init
index ad0486e52fef..8d35528a7968 100644
--- a/app-emulation/xen/files/xend-init
+++ b/app-emulation/xen/files/xend-init
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/files/xend-init,v 1.3 2005/10/08 12:32:33 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/files/xend-init,v 1.4 2005/12/23 14:22:55 chrb Exp $
 
 opts="start stop status restart"
 
 depend() {
 	need net
-	before xendomain sshd ntpd nfs nfsmount rsyncd portmap
+	before xendomains sshd ntpd nfs nfsmount rsyncd portmap dhcp
 }
 
 await_daemons_up() {
diff --git a/app-emulation/xen/files/xendomains-init b/app-emulation/xen/files/xendomains-init
index 1ef25e6b9fc9..9e68970f60c6 100644
--- a/app-emulation/xen/files/xendomains-init
+++ b/app-emulation/xen/files/xendomains-init
@@ -1,12 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/files/xendomains-init,v 1.4 2005/10/27 16:40:23 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/files/xendomains-init,v 1.5 2005/12/23 14:22:55 chrb Exp $
 
 opts="start stop status restart"
 
 depend() {
 	need xend
+	after dhcp
 }
 
 get_domname() {
diff --git a/app-emulation/xen/xen-2.0.7.ebuild b/app-emulation/xen/xen-2.0.7.ebuild
deleted file mode 100644
index 8fa759abe6d4..000000000000
--- a/app-emulation/xen/xen-2.0.7.ebuild
+++ /dev/null
@@ -1,103 +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/xen-2.0.7.ebuild,v 1.3 2005/09/22 22:18:34 chrb Exp $
-
-inherit mount-boot
-
-DESCRIPTION="The Xen virtual machine monitor and Xend daemon"
-HOMEPAGE="http://xen.sourceforge.net"
-SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/${P}-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc debug"
-
-DEPEND="sys-apps/iproute2
-	net-misc/bridge-utils
-	dev-lang/python
-	=dev-python/twisted-1.3.0
-	net-misc/curl
-	sys-libs/zlib
-	doc? (
-		dev-tex/latex2html
-		media-gfx/transfig
-	)"
-
-S="${WORKDIR}/${PN}-2.0"
-
-src_unpack() {
-	unpack ${A}
-	# hardened flags
-	echo "CFLAGS += -nopie -fno-stack-protector -fno-stack-protector-all" \
-	    >> ${S}/xen/arch/x86/Rules.mk
-}
-
-src_compile() {
-	local myopt
-	if use debug; then
-		myopt="${myopt} debug=y"
-	fi
-
-	unset CFLAGS
-	emake ${myopt} -C xen || die "compiling xen failed"
-	emake ${myopt} -C tools || die "compiling tools failed"
-
-	if use doc; then
-		sh ./docs/check_pkgs || die "package check failed"
-		emake ${myopt} -C docs || die "compiling docs failed"
-	fi
-
-}
-
-src_install() {
-	make DESTDIR=${D} -C xen install || die "installing xen failed"
-
-	make DESTDIR=${D} XEN_PYTHON_NATIVE_INSTALL=1 -C tools install \
-	    || die "installing tools failed"
-
-	if use doc; then
-		make DESTDIR=${D} -C docs install \
-			|| die "installing docs failed"
-		# Rename doc/xen to the Gentoo-style doc/xen-2.0
-		mv ${D}/usr/share/doc/{${PN},${PF}}
-	fi
-
-	# bind xend to localhost per default
-	sed -i -e "s/\((xend-address  *\)'')/\1\'localhost\')/" \
-		${D}/etc/xen/xend-config.sxp
-
-	newinitd ${FILESDIR}/xend-init xend
-	newconfd ${FILESDIR}/xend-conf xend
-	newconfd ${FILESDIR}/xendomains-conf xendomains
-	newinitd ${FILESDIR}/xendomains-init xendomains
-
-	# install kernel specific source patches
-	dodir /usr/share/xen/patches
-	rm patches/linux-2.6.11/linux-2.6.11.12.patch
-	cd patches
-	for x in *; do tar -jcvf ${D}/usr/share/xen/patches/${x}.tar.bz2 ${x}/; done
-	cd ..
-
-	# we need to do whatever mkbuildtree would've done for each platform
-	# linux-2.6: copy public include files, and xenstored.h
-	mkdir linux-2.6.11-xen-sparse/include/asm-xen/xen-public
-	# include files for kernel
-	rm xen/include/public/COPYING
-	cp -dpPR xen/include/public/* linux-2.6.11-xen-sparse/include/asm-xen/xen-public
-	# fixme: insert code for other sparse trees here
-
-	# install xen kernel sparse trees
-	mv linux-2.6.11-xen-sparse linux-2.6-xen-sparse
-	mv linux-2.4.30-xen-sparse linux-2.4-xen-sparse
-	for x in *-xen-sparse; do
-	    if [ -e ${x}/mkbuildtree ]; then rm ${x}/mkbuildtree; fi
-	    tar -jcvf ${D}/usr/share/xen/${x}.tar.bz2 -C ${x} .
-	done
-
-}
-
-pkg_postinst() {
-	einfo "Please visit the Xen and Gentoo wiki:"
-	einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
-}
diff --git a/app-emulation/xen/xen-3.0.0-r1.ebuild b/app-emulation/xen/xen-3.0.0-r2.ebuild
index 8ae5feed3cbc..2ffd10676320 100644
--- a/app-emulation/xen/xen-3.0.0-r1.ebuild
+++ b/app-emulation/xen/xen-3.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.0-r1.ebuild,v 1.3 2005/12/21 08:34:02 astinus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.0-r2.ebuild,v 1.1 2005/12/23 14:22:55 chrb Exp $
 
 inherit mount-boot flag-o-matic
 
@@ -28,7 +28,8 @@ DEPEND="sys-apps/iproute2
 		app-misc/screen
 		app-admin/logrotate
 	)
-	sys-devel/dev86"
+	sys-devel/dev86
+	|| ( sys-fs/udev sys-apps/hotplug )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -104,6 +105,7 @@ src_install() {
 	# xend expects these to exist
 	dodir /var/run/xenstored
 	dodir /var/lib/xenstored
+	dodir /var/xen/dump
 }
 
 pkg_postinst() {