more pae fixes

(Portage version: 2.0.54)

7 files changed, 51 insertions, 31 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index f8d834b7be84..0564d6c72660 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,14 @@
 # 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.26 2006/03/02 11:43:49 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.27 2006/03/03 12:20:56 chrb Exp $
+
+*xen-9029-r1 (03 Mar 2006)
+*xen-3.0.1-r3 (03 Mar 2006)
+
+  03 Mar 2006; <chrb@gentoo.org> +files/gentoo-makefile-targets,
+  -xen-3.0.1-r2.ebuild, +xen-3.0.1-r3.ebuild, -xen-9029.ebuild,
+  +xen-9029-r1.ebuild:
+  more pae fixes
 
 *xen-9029 (02 Mar 2006)
 *xen-3.0.1-r2 (02 Mar 2006)
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index bf81d2c347da..ccc3ccc47253 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,10 +1,11 @@
-MD5 11f7db09760c2152e16d6ee84b3be7f9 ChangeLog 4423
-MD5 7934c87d6994825fb9e8ff09a531d0ae files/digest-xen-3.0.1-r2 63
-MD5 5ace6b215eeb362c499e447966c429d0 files/digest-xen-9029 71
+MD5 eb2e0452ff805093dad06221efcc4f51 ChangeLog 4649
+MD5 7934c87d6994825fb9e8ff09a531d0ae files/digest-xen-3.0.1-r3 63
+MD5 5ace6b215eeb362c499e447966c429d0 files/digest-xen-9029-r1 71
+MD5 cbd69f44ee0f0649253e7ab4af11d909 files/gentoo-makefile-targets 118
 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 4c12070b8b64dc6929f01324a6605982 xen-3.0.1-r2.ebuild 3059
-MD5 01651dcd8723920e431b8349806a29e4 xen-9029.ebuild 3284
+MD5 afa635fc3975e698cfd971b0545872cd xen-3.0.1-r3.ebuild 2972
+MD5 1174433c81357bb608fc079ba9557a72 xen-9029-r1.ebuild 3203
diff --git a/app-emulation/xen/files/digest-xen-3.0.1-r2 b/app-emulation/xen/files/digest-xen-3.0.1-r3
index 2e700fc09ce3..2e700fc09ce3 100644
--- a/app-emulation/xen/files/digest-xen-3.0.1-r2
+++ b/app-emulation/xen/files/digest-xen-3.0.1-r3
diff --git a/app-emulation/xen/files/digest-xen-9029 b/app-emulation/xen/files/digest-xen-9029-r1
index eef4e4a4edf9..eef4e4a4edf9 100644
--- a/app-emulation/xen/files/digest-xen-9029
+++ b/app-emulation/xen/files/digest-xen-9029-r1
diff --git a/app-emulation/xen/files/gentoo-makefile-targets b/app-emulation/xen/files/gentoo-makefile-targets
new file mode 100644
index 000000000000..2f6defef048c
--- /dev/null
+++ b/app-emulation/xen/files/gentoo-makefile-targets
@@ -0,0 +1,8 @@
+
+gentoo-compile:
+	$(MAKE) -C xen
+	$(MAKE) -C tools
+
+gentoo-install:
+	$(MAKE) -C xen install
+	$(MAKE) -C tools install
diff --git a/app-emulation/xen/xen-3.0.1-r2.ebuild b/app-emulation/xen/xen-3.0.1-r3.ebuild
index 0bceee2a3479..589300f4b589 100644
--- a/app-emulation/xen/xen-3.0.1-r2.ebuild
+++ b/app-emulation/xen/xen-3.0.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2006/03/02 11:43:49 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.1-r3.ebuild,v 1.1 2006/03/03 12:20:56 chrb Exp $
 
 inherit mount-boot flag-o-matic
 
@@ -47,6 +47,8 @@ src_unpack() {
 		# odd fixes
 		sed -e "s/int mode/int mode=-1/" -i ${S}/tools/misc/xc_shadow.c
 	fi
+
+	cat ${FILESDIR}/gentoo-makefile-targets >> ${S}/Makefile
 }
 
 src_compile() {
@@ -64,8 +66,7 @@ src_compile() {
 	fi
 	filter-flags -fPIE -fstack-protector
 
-	make ${myopt} -C xen || die "compiling xen failed"
-	make ${myopt} -C tools || die "compiling tools failed"
+	make ${myopt} gentoo-compile || die "compile failed"
 
 	if use doc; then
 		sh ./docs/check_pkgs || die "package check failed"
@@ -74,18 +75,16 @@ src_compile() {
 }
 
 src_install() {
-	local myopt
+	local myopt="XEN_PYTHON_NATIVE_INSTALL=1"
+
 	if use pae; then
 		myopt="${myopt} XEN_TARGET_X86_PAE=y"
 	fi
 
-	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"
+	make DESTDIR=${D} ${myopt} gentoo-install || die "install xen failed"
 
 	if use doc; then
-		make DESTDIR=${D} -C docs install \
-			|| die "installing docs failed"
+		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
@@ -108,6 +107,7 @@ 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!"
diff --git a/app-emulation/xen/xen-9029.ebuild b/app-emulation/xen/xen-9029-r1.ebuild
index aa79863ef111..7c7c05d74616 100644
--- a/app-emulation/xen/xen-9029.ebuild
+++ b/app-emulation/xen/xen-9029-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-9029.ebuild,v 1.1 2006/03/02 11:43:49 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-9029-r1.ebuild,v 1.1 2006/03/03 12:20:56 chrb Exp $
 
 inherit mount-boot flag-o-matic
 
@@ -50,6 +50,8 @@ src_unpack() {
 		# odd fixes
 		sed -e "s/int mode/int mode=-1/" -i ${S}/tools/misc/xc_shadow.c
 	fi
+
+	cat ${FILESDIR}/gentoo-makefile-targets >> ${S}/Makefile
 }
 
 src_compile() {
@@ -67,8 +69,7 @@ src_compile() {
 	fi
 	filter-flags -fPIE -fstack-protector
 
-	make ${myopt} -C xen || die "compiling xen failed"
-	make ${myopt} -C tools || die "compiling tools failed"
+	make ${myopt} gentoo-compile || die "compile failed"
 
 	if use doc; then
 		sh ./docs/check_pkgs || die "package check failed"
@@ -77,18 +78,16 @@ src_compile() {
 }
 
 src_install() {
-	local myopt
+	local myopt="XEN_PYTHON_NATIVE_INSTALL=1"
+
 	if use pae; then
 		myopt="${myopt} XEN_TARGET_X86_PAE=y"
 	fi
 
-	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"
+	make DESTDIR=${D} ${myopt} gentoo-install || die "install xen failed"
 
 	if use doc; then
-		make DESTDIR=${D} -C docs install \
-			|| die "installing docs failed"
+		make DESTDIR=${D} -C docs install || die "installing docs failed"
 		# Rename doc/xen to the Gentoo-style doc/xen-x.y
 		mv ${D}/usr/share/doc/{${PN},${PF}}
 	fi
@@ -98,9 +97,6 @@ src_install() {
 	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
@@ -109,17 +105,24 @@ src_install() {
 	dodir /var/run/xenstored
 	dodir /var/lib/xenstored
 	dodir /var/xen/dump
+
+	# for upstream change tracking
+	dodoc ${S}/XEN-VERSION
+
 }
 
 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"
 	einfo "bugzilla.xensource.com"
+
+	if use pae; then
+		einfo ""
+		einfo "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	fi
+
 }