Bump unstable. Add PAE support thanks to Christopher G. Stach II (bug #124355).

Package-Manager: portage-2.0.54

7 files changed, 47 insertions, 33 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index a0f2e547e15b..f8d834b7be84 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.25 2006/02/19 15:59:23 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.26 2006/03/02 11:43:49 chrb Exp $
+
+*xen-9029 (02 Mar 2006)
+*xen-3.0.1-r2 (02 Mar 2006)
+
+  02 Mar 2006; <chrb@gentoo.org> -xen-3.0.1-r1.ebuild, +xen-3.0.1-r2.ebuild,
+  -xen-8885.ebuild, +xen-9029.ebuild:
+  Bump unstable. Add PAE support thanks to Christopher G. Stach II (bug #124355).
 
 *xen-8885 (19 Feb 2006)
 
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index b0c6f94dc44e..bf81d2c347da 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,10 +1,10 @@
-MD5 71247da73ce6094877c44901920d3923 ChangeLog 4172
-MD5 7934c87d6994825fb9e8ff09a531d0ae files/digest-xen-3.0.1-r1 63
-MD5 19ac706176443a42b9b1cab8f17be305 files/digest-xen-8885 71
+MD5 11f7db09760c2152e16d6ee84b3be7f9 ChangeLog 4423
+MD5 7934c87d6994825fb9e8ff09a531d0ae files/digest-xen-3.0.1-r2 63
+MD5 5ace6b215eeb362c499e447966c429d0 files/digest-xen-9029 71
 MD5 16d372298e94a8eef72c1943b1ed5561 files/xend-conf 347
 MD5 b16cb40a29cb947b2a9b76cc8f9f3894 files/xend-init 844
 MD5 11ef318e35fcfed12931f182fc01955a files/xendomains-conf 180
 MD5 a3c0c26c30ce1271b439661b68ca9e74 files/xendomains-init 1671
 MD5 23ec60d5040f966fda250a47d8903428 metadata.xml 252
-MD5 5214c524a30e89593485454acdf55b61 xen-3.0.1-r1.ebuild 3093
-MD5 53e3274385aa4f3c7a9abde54349cae6 xen-8885.ebuild 3161
+MD5 4c12070b8b64dc6929f01324a6605982 xen-3.0.1-r2.ebuild 3059
+MD5 01651dcd8723920e431b8349806a29e4 xen-9029.ebuild 3284
diff --git a/app-emulation/xen/files/digest-xen-3.0.1-r1 b/app-emulation/xen/files/digest-xen-3.0.1-r2
index 2e700fc09ce3..2e700fc09ce3 100644
--- a/app-emulation/xen/files/digest-xen-3.0.1-r1
+++ b/app-emulation/xen/files/digest-xen-3.0.1-r2
diff --git a/app-emulation/xen/files/digest-xen-8885 b/app-emulation/xen/files/digest-xen-8885
deleted file mode 100644
index 3cd1558023db..000000000000
--- a/app-emulation/xen/files/digest-xen-8885
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cebdc6f0523a64a7a2f218d947b2109e xen-unstable-8885.tar.bz2 3429557
diff --git a/app-emulation/xen/files/digest-xen-9029 b/app-emulation/xen/files/digest-xen-9029
new file mode 100644
index 000000000000..eef4e4a4edf9
--- /dev/null
+++ b/app-emulation/xen/files/digest-xen-9029
@@ -0,0 +1 @@
+MD5 d8183137f5cffdb1078c675c8b05369e xen-unstable-9029.tar.bz2 3450223
diff --git a/app-emulation/xen/xen-3.0.1-r1.ebuild b/app-emulation/xen/xen-3.0.1-r2.ebuild
index 2561d0bf64f6..0bceee2a3479 100644
--- a/app-emulation/xen/xen-3.0.1-r1.ebuild
+++ b/app-emulation/xen/xen-3.0.1-r2.ebuild
@@ -1,20 +1,17 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.1-r1.ebuild,v 1.1 2006/02/05 10:37:28 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.1-r2.ebuild,v 1.1 2006/03/02 11:43:49 chrb Exp $
 
 inherit mount-boot flag-o-matic
 
 DESCRIPTION="The Xen virtual machine monitor and Xend daemon"
 HOMEPAGE="http://xen.sourceforge.net"
-#REV="8738"
-#MY_P="xen-3.0-testing-${REV}"
-#SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.1-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="doc debug screen custom-cflags"
+IUSE="doc debug screen custom-cflags pae"
 
 DEPEND="sys-apps/iproute2
 	net-misc/bridge-utils
@@ -32,8 +29,6 @@ DEPEND="sys-apps/iproute2
 	sys-devel/dev86
 	|| ( sys-fs/udev sys-apps/hotplug )"
 
-#S="${WORKDIR}/${MY_P}"
-
 src_unpack() {
 	unpack ${A}
 	# if the user *really* wants to use their own custom-cflags, let them
@@ -60,6 +55,10 @@ src_compile() {
 		myopt="${myopt} debug=y"
 	fi
 
+	if use pae; then
+		myopt="${myopt} XEN_TARGET_X86_PAE=y"
+	fi
+
 	if ! use custom-cflags; then
 		unset CFLAGS
 	fi
@@ -75,9 +74,13 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} -C xen install || die "installing xen failed"
+	local myopt
+	if use pae; then
+		myopt="${myopt} XEN_TARGET_X86_PAE=y"
+	fi
 
-	make DESTDIR=${D} XEN_PYTHON_NATIVE_INSTALL=1 -C tools install \
+	make DESTDIR=${D} ${myopt} -C xen install || die "installing xen failed"
+	make DESTDIR=${D} ${myopt} XEN_PYTHON_NATIVE_INSTALL=1 -C tools install \
 	    || die "installing tools failed"
 
 	if use doc; then
@@ -87,18 +90,11 @@ src_install() {
 		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
 
-	# for upstream change tracking
-	#dodoc ${S}/XEN-VERSION
-
 	if use screen; then
 		sed -i -e 's/SCREEN="no"/SCREEN="yes"/' ${D}/etc/init.d/xendomains
 	fi
@@ -112,4 +108,8 @@ src_install() {
 pkg_postinst() {
 	einfo "Please visit the Xen and Gentoo wiki:"
 	einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+	if use pae; then
+		einfo ""
+		einfo "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	fi
 }
diff --git a/app-emulation/xen/xen-8885.ebuild b/app-emulation/xen/xen-9029.ebuild
index bee9903fd532..aa79863ef111 100644
--- a/app-emulation/xen/xen-8885.ebuild
+++ b/app-emulation/xen/xen-9029.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-8885.ebuild,v 1.1 2006/02/19 15:59:23 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-9029.ebuild,v 1.1 2006/03/02 11:43:49 chrb Exp $
 
 inherit mount-boot flag-o-matic
 
 DESCRIPTION="The Xen virtual machine monitor and Xend daemon"
 HOMEPAGE="http://xen.sourceforge.net"
-REV="8885"
-MY_P="xen-unstable-${REV}"
+MY_P="xen-unstable-${PV}"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="doc debug screen custom-cflags"
+IUSE="doc debug screen custom-cflags pae"
 
 DEPEND="sys-apps/iproute2
 	net-misc/bridge-utils
@@ -59,6 +58,10 @@ src_compile() {
 		myopt="${myopt} debug=y"
 	fi
 
+	if use pae; then
+		myopt="${myopt} XEN_TARGET_X86_PAE=y"
+	fi
+
 	if ! use custom-cflags; then
 		unset CFLAGS
 	fi
@@ -74,9 +77,13 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} -C xen install || die "installing xen failed"
+	local myopt
+	if use pae; then
+		myopt="${myopt} XEN_TARGET_X86_PAE=y"
+	fi
 
-	make DESTDIR=${D} XEN_PYTHON_NATIVE_INSTALL=1 -C tools install \
+	make DESTDIR=${D} ${myopt} -C xen install || die "installing xen failed"
+	make DESTDIR=${D} ${myopt} XEN_PYTHON_NATIVE_INSTALL=1 -C tools install \
 	    || die "installing tools failed"
 
 	if use doc; then
@@ -86,10 +93,6 @@ src_install() {
 		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
@@ -111,6 +114,10 @@ src_install() {
 pkg_postinst() {
 	einfo "Please visit the Xen and Gentoo wiki:"
 	einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+	if use pae; then
+		einfo ""
+		einfo "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	fi
 	einfo ""
 	einfo "This is a snapshot of the xen-unstable tree."
 	einfo "Please report bugs in xen itself (and not the packaging) to"