Copy Xen 3.1.0 ebuilds over from the Xen project overlay.

Package-Manager: portage-2.1.2.2

7 files changed, 12 insertions, 142 deletions

diff --git a/app-emulation/xen/files/digest-xen-3.0.2 b/app-emulation/xen/files/digest-xen-3.0.2
deleted file mode 100644
index 724d092d5489..000000000000
--- a/app-emulation/xen/files/digest-xen-3.0.2
+++ /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/files/digest-xen-3.1.0 b/app-emulation/xen/files/digest-xen-3.1.0
new file mode 100644
index 000000000000..e436de9ac59e
--- /dev/null
+++ b/app-emulation/xen/files/digest-xen-3.1.0
@@ -0,0 +1,3 @@
+MD5 b7ae1f652b071862ae4c90b72d549627 xen-3.1.0-src.tgz 6831094
+RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 xen-3.1.0-src.tgz 6831094
+SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7 xen-3.1.0-src.tgz 6831094
diff --git a/app-emulation/xen/files/xen-3.0.2-nopiessp.patch b/app-emulation/xen/files/xen-3.0.2-nopiessp.patch
deleted file mode 100644
index 27351247b925..000000000000
--- a/app-emulation/xen/files/xen-3.0.2-nopiessp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./xen/Rules.mk	2006-04-09 22:05:55.000000000 +0000
-+++ ./xen/Rules.mk	2006-04-16 16:39:26.000000000 +0000
-@@ -48,6 +48,7 @@
- ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o
- 
- CFLAGS-y               += -g -D__XEN__
-+CFLAGS-y               += -fno-pie -fno-stack-protector-all -fno-stack-protector
- CFLAGS-$(ACM_SECURITY) += -DACM_SECURITY
- CFLAGS-$(verbose)      += -DVERBOSE
- CFLAGS-$(crash_debug)  += -DCRASH_DEBUG
diff --git a/app-emulation/xen/files/xend-init b/app-emulation/xen/files/xend-init
deleted file mode 100644
index 8d35528a7968..000000000000
--- a/app-emulation/xen/files/xend-init
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/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.4 2005/12/23 14:22:55 chrb Exp $
-
-opts="start stop status restart"
-
-depend() {
-	need net
-	before xendomains sshd ntpd nfs nfsmount rsyncd portmap dhcp
-}
-
-await_daemons_up() {
-	for ((i=0; i<5; i++)); do
-		sleep 1
-		/usr/sbin/xend status && return 0
-	done
-	return 1
-}
-
-start() {
-	ebegin "Starting Xen control daemon"
-	/usr/sbin/xend start
-	/usr/sbin/xend status || await_daemons_up
-	eend $?
-}
-
-stop() {
-	if [ "$(xm list | wc -l)" -gt 2 ]; then
-		ebegin "  Stopping all domains"
-		/usr/sbin/xm shutdown --all --wait >/dev/null
-		eend $?
-	fi
-
-	ebegin "Stopping Xen control daemon"
-	/usr/sbin/xend stop
-	eend $?
-}
-
-status() {
-	/usr/sbin/xend status
-}
diff --git a/app-emulation/xen/files/xendomains-conf b/app-emulation/xen/files/xendomains-conf
deleted file mode 100644
index bbc8ff6c3b0d..000000000000
--- a/app-emulation/xen/files/xendomains-conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Directory of domain configs to automatically boot
-AUTODIR=/etc/xen/auto
-
-# set to yes to run all auto 'xm create's in screen
-# with logging to /var/log/xen-consoles/
-SCREEN="no"
diff --git a/app-emulation/xen/files/xendomains-init b/app-emulation/xen/files/xendomains-init
deleted file mode 100644
index 9e68970f60c6..000000000000
--- a/app-emulation/xen/files/xendomains-init
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/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.5 2005/12/23 14:22:55 chrb Exp $
-
-opts="start stop status restart"
-
-depend() {
-	need xend
-	after dhcp
-}
-
-get_domname() {
-	sed -ne 's/^[ \t]*name[ \t]*=[ \t]*"\([^"]*\)"/\1/p' $1
-}
-
-is_running() {
-	[ -n "`/usr/sbin/xm list | grep "^${1} "`" ]
-}
-
-start() {
-	einfo "Starting ${AUTODIR} Xen domains"
-	if [[ ${SCREEN} == "yes" ]]; then
-		screen -d -m -S xen -t dom0
-		screen -r xen -X zombie dr
-		logrotate -f /usr/share/xen/xen-consoles-logrotate
-		screen -r xen -X logfile /var/log/xen-consoles/%t
-		screen -r xen -X logfile flush 1
-		screen -r xen -X deflog on
-	fi
-	# Create all domains with config files in AUTODIR.
-	for dom in $(ls ${AUTODIR}/* 2>/dev/null); do
-		name=$(get_domname ${dom})
-		if ! is_running ${name} ; then
-			ebegin "  Starting domain ${name}"
-			if [[ ${SCREEN} == "yes" ]]; then
-				screen -r xen -X screen -t ${name} xm create ${dom} -c
-			else
-				xm create --quiet ${dom}
-			fi
-			eend $?
-		else
-			einfo "  Not Starting domain ${name} - allready running"
-		fi
-	done
-}
-
-stop() {
-	einfo "Shutting down ${AUTODIR} Xen domains"
-	# Stop all domains with config files in AUTODIR.
-	for dom in $(ls ${AUTODIR}/* 2>/dev/null); do
-		name=$(get_domname ${dom})
-		if is_running ${name} ; then
-			ebegin "  Stopping domain ${name}"
-				xm shutdown --wait ${name} >/dev/null
-			eend $?
-		else
-			einfo "  Not Stopping domain ${name} - not running"
-		fi
-	done
-	if [[ ${SCREEN} == "yes" ]]; then
-		screen -r xen -X quit
-	fi
-}
-
-status() {
-	/usr/sbin/xm list
-}
diff --git a/app-emulation/xen/xen-3.0.2.ebuild b/app-emulation/xen/xen-3.1.0.ebuild
index 9c65ac0724a8..7b0f04236c38 100644
--- a/app-emulation/xen/xen-3.0.2.ebuild
+++ b/app-emulation/xen/xen-3.1.0.ebuild
@@ -1,28 +1,28 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.2.ebuild,v 1.10 2007/07/12 06:39:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.1.0.ebuild,v 1.1 2007/08/24 23:22:32 marineam Exp $
 
 inherit mount-boot flag-o-matic
 
 DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.sourceforge.net"
-MY_PV=${PV/_p/_}
-SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV/_/-}/src.tgz/xen-${MY_PV}-src.tgz"
+HOMEPAGE="http://www.xensource.com/xen/xen/"
+SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/src.tgz/xen-${PV}-src.tgz"
+S="${WORKDIR}/xen-${PV}-src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug custom-cflags pae hardened"
+IUSE="debug custom-cflags pae"
 
 RDEPEND="|| ( sys-boot/grub
-		 sys-boot/grub-static )
-		 ~sys-kernel/xen-sources-2.6.16.28"
+		sys-boot/grub-static )
+		>=sys-kernel/xen-sources-2.6.18"
 PDEPEND="~app-emulation/xen-tools-${PV}"
 
 RESTRICT="test"
 
 # Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${MY_PV/_/-}"
+QA_WX_LOAD="boot/xen-syms-${PV}"
 
 pkg_setup() {
 	if [[ -z ${XEN_TARGET_ARCH} ]]; then
@@ -50,10 +50,6 @@ src_unpack() {
 			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
 			-i {} \;
 	fi
-	if use hardened; then
-		cd "${S}"
-		epatch "${FILESDIR}/${PN}"-3.0.2-nopiessp.patch
-	fi
 }
 
 src_compile() {
@@ -76,7 +72,7 @@ src_install() {
 	use debug && myopt="${myopt} debug=y"
 	use pae && myopt="${myopt} pae=y"
 
-	make DESTDIR="${D}" install-xen ${myopt} || die "install failed"
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install || die "install failed"
 }
 
 pkg_postinst() {