Clean out the ebuilds from this overlay, they are now in the portage tree.

svn path=/overlay/; revision=30

20 files changed, 3 insertions, 674 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
deleted file mode 100644
index f621f8e..0000000
--- a/app-emulation/xen-tools/Manifest
+++ /dev/null
@@ -1,40 +0,0 @@
-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.4_p1--as-needed.patch 517 RMD160 579721dff853f9762c649f17af86ef920b5e98eb SHA1 2cbf34f6daa27ff09a2d0e23396c775f0d2eb3e0 SHA256 37d64ba6b5b76f15d6300855a808ac632a1e228e9d3dc4bf8f3ddaac3d326c8a
-MD5 79a4dfd90d23e1a01a334c3c2ee29bb2 files/xen-tools-3.0.4_p1--as-needed.patch 517
-RMD160 579721dff853f9762c649f17af86ef920b5e98eb files/xen-tools-3.0.4_p1--as-needed.patch 517
-SHA256 37d64ba6b5b76f15d6300855a808ac632a1e228e9d3dc4bf8f3ddaac3d326c8a files/xen-tools-3.0.4_p1--as-needed.patch 517
-AUX xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841 RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 SHA1 88142952527acc47b00c98a4ccde15661449ee04 SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223
-MD5 2812525317e8827f626962738e4643d4 files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841
-RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841
-SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223 files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841
-AUX xen-tools-3.1.0-python-site-packages.patch 1205 RMD160 319e95a53b9860358849fef1eea6454a088f3b33 SHA1 8b850508f6caf189d04d5f2938599b5f2efacce4 SHA256 ff26da54fad7ac66b17774963220f265950d28ad167808bf41f9084425eb07d6
-MD5 e95f0b1dfd034e510237b90e9601c095 files/xen-tools-3.1.0-python-site-packages.patch 1205
-RMD160 319e95a53b9860358849fef1eea6454a088f3b33 files/xen-tools-3.1.0-python-site-packages.patch 1205
-SHA256 ff26da54fad7ac66b17774963220f265950d28ad167808bf41f9084425eb07d6 files/xen-tools-3.1.0-python-site-packages.patch 1205
-AUX xend.initd 1187 RMD160 6e5313e02198700204b27e4b02f8579a247aa2a0 SHA1 f16d2d5e014c91b6bc0ff63da717e79b4faada1d SHA256 1e619990ccebe11dab4c6fa1a6e4e0e1101854f633ef9c05836d0e9fba25d5cd
-MD5 e62f964336e77b320dcff0321d6166cf files/xend.initd 1187
-RMD160 6e5313e02198700204b27e4b02f8579a247aa2a0 files/xend.initd 1187
-SHA256 1e619990ccebe11dab4c6fa1a6e4e0e1101854f633ef9c05836d0e9fba25d5cd files/xend.initd 1187
-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 2168 RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 SHA1 a7f75a7aff0ffdb3ca330f853855b888cfb7f752 SHA256 ed1adcb24e5ffe1c0abc33d6bd69f129b31b3d4f068222ee343809a8dd12b8d0
-MD5 a3b477fa44710894c47b0aeca7d6a57a files/xendomains.initd 2168
-RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 files/xendomains.initd 2168
-SHA256 ed1adcb24e5ffe1c0abc33d6bd69f129b31b3d4f068222ee343809a8dd12b8d0 files/xendomains.initd 2168
-DIST xen-3.1.0-src.tgz 6831094 RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 SHA1 fa4b54c36626f2cce9b15dc99cafda0b42c54777 SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7
-EBUILD xen-tools-3.1.0.ebuild 5878 RMD160 2bab4a9c60fd626473ea664bcb6d1802df71f4ee SHA1 44a28f0fd65c09e4fb22aa1d33d5a242ec572260 SHA256 9024bde3406a4d3fbd6357e1c4f1215b14de29e6ab29a6aad7192c06a3cd7e4d
-MD5 a492bcdd19499465834137778efcd65f xen-tools-3.1.0.ebuild 5878
-RMD160 2bab4a9c60fd626473ea664bcb6d1802df71f4ee xen-tools-3.1.0.ebuild 5878
-SHA256 9024bde3406a4d3fbd6357e1c4f1215b14de29e6ab29a6aad7192c06a3cd7e4d xen-tools-3.1.0.ebuild 5878
-MD5 b2e86effae6681cbbecdbf864b193b4a files/digest-xen-tools-3.1.0 235
-RMD160 2366b7298f0125f11d41aca0c6088c20863dbed1 files/digest-xen-tools-3.1.0 235
-SHA256 12c130912c624791e6855ebeb932368fc8889371876db396055b02ac9a3b9892 files/digest-xen-tools-3.1.0 235
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.1.0 b/app-emulation/xen-tools/files/digest-xen-tools-3.1.0
deleted file mode 100644
index e436de9..0000000
--- a/app-emulation/xen-tools/files/digest-xen-tools-3.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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-tools/files/xen-consoles.logrotate b/app-emulation/xen-tools/files/xen-consoles.logrotate
deleted file mode 100644
index c644523..0000000
--- a/app-emulation/xen-tools/files/xen-consoles.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/xen-consoles/*.log {
-	rotate 7
-	missingok
-	compress
-}
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1--as-needed.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1--as-needed.patch
deleted file mode 100644
index 8243ac8..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1--as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rpuN xen-3.0.4_1-src.orig/tools/xenmon/Makefile xen-3.0.4_1-src/tools/xenmon/Makefile
---- xen-3.0.4_1-src.orig/tools/xenmon/Makefile	2007-01-08 15:00:51.000000000 +0000
-+++ xen-3.0.4_1-src/tools/xenmon/Makefile	2007-02-09 01:02:08.000000000 +0000
-@@ -42,6 +42,6 @@ clean:
- 
- 
- %: %.c Makefile
--	$(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl
- xentrace_%: %.c Makefile
--	$(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch
deleted file mode 100644
index e830de5..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru xen-3.0.4_1-src.orig/tools/examples/network-bridge xen-3.0.4_1-src/tools/examples/network-bridge
---- xen-3.0.4_1-src.orig/tools/examples/network-bridge	2007-01-08 07:00:48.000000000 -0800
-+++ xen-3.0.4_1-src/tools/examples/network-bridge	2007-03-05 17:37:32.000000000 -0800
-@@ -70,13 +70,13 @@
- vif0="vif0.${vifnum}"
- 
- get_ip_info() {
--    addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'`
-+    addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e "s/$1//"`
-     gateway=`ip route show dev $1 | fgrep default | sed 's/default via //'`
- }
-     
- do_ifup() {
-     if ! ifup $1 ; then
--        if [ ${addr_pfx} ] ; then
-+        if [ "${addr_pfx}" ] ; then
-             # use the info from get_ip_info()
-             ip addr flush $1
-             ip addr add ${addr_pfx} dev $1
diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch b/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch
deleted file mode 100644
index ea5a217..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-With xen-3.1.0 on Pardus 2007, "/usr/sbin/xend start" returns "Cannot find Xen 
-Python modules." cause Xen Python modules installed 
-into "/usr/lib/python2.4/site-packages/"
-
-Following patch adds site-packages into search path
-
-Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
-
-diff -r aee991c7723a tools/misc/xen-python-path
---- a/tools/misc/xen-python-path	Wed May 09 16:34:47 2007 +0100
-+++ b/tools/misc/xen-python-path	Sat May 19 02:24:24 2007 +0300
-@@ -30,12 +30,13 @@ import sys
- 
- for p in ['python%s' % sys.version[:3], 'python']:
-     for l in ['/usr/lib64', '/usr/lib']:
--        d = os.path.join(l, p)
--        if os.path.exists(os.path.join(d, AUXBIN)):
--            sys.path.append(d)
--            import xen.util.auxbin
--            print os.path.join(xen.util.auxbin.libpath(), p)
--            sys.exit(0)
-+        for k in ['', 'site-packages/']:
-+            d = os.path.join(l, p, k)
-+            if os.path.exists(os.path.join(d, AUXBIN)):
-+                sys.path.append(d)
-+                import xen.util.auxbin
-+                print os.path.join(xen.util.auxbin.libpath(), p)
-+                sys.exit(0)
- 
- print >>sys.stderr, "Cannot find Xen Python modules."
- sys.exit(1)
diff --git a/app-emulation/xen-tools/files/xend.initd b/app-emulation/xen-tools/files/xend.initd
deleted file mode 100644
index 7c24793..0000000
--- a/app-emulation/xen-tools/files/xend.initd
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-opts="start stop status restart"
-
-depend() {
-	need net
-	before xendomains sshd ntp-client 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
-}
-
-is_privileged_domain() {
-	grep -qsE '^control_d$' /proc/xen/capabilities
-	return $?
-}
-
-start() {
-	if is_privileged_domain ; then
-		ebegin "Starting Xen control daemon"
-		/usr/sbin/xend start
-		/usr/sbin/xend status || await_daemons_up
-		eend $?
-	else
-		eerror "Can't start xend - this is not a privileged domain."
-		return 1
-	fi
-}
-
-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 $?
-
-	# This needs more testing (bug #149321)
-	#ebegin "Stopping xenconsoled"
-	#kill $(</var/run/xenconsoled.pid)
-	#eend $?
-
-	#ebegin "Stopping xenstored"
-	#kill $(</var/run/xenstore.pid)
-	#eend $?
-}
-
-status() {
-	is_privileged_domain && /usr/sbin/xend status
-}
diff --git a/app-emulation/xen-tools/files/xendomains-screen.confd b/app-emulation/xen-tools/files/xendomains-screen.confd
deleted file mode 100644
index 1482c0a..0000000
--- a/app-emulation/xen-tools/files/xendomains-screen.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# When SCREEN="yes", domains in AUTODIR have their consoles connected to a
-# screen session named SCREEN_NAME, with output logged to individual files 
-# named after each domain and written to /var/log/xen-consoles/ . These files
-# are rotated (using app-admin/logrotate) every time xendomains is started.
-
-SCREEN="yes"
-SCREEN_NAME="xen"
-
-# Number of seconds between writes to screen's logfiles.
-#
-# Lower values mean more disk activity and hence a possible performance
-# impact, but higher values mean a greater chance of loosing some output
-# in the event of a crash.
-
-SCREEN_LOG_INTERVAL="1"
diff --git a/app-emulation/xen-tools/files/xendomains.confd b/app-emulation/xen-tools/files/xendomains.confd
deleted file mode 100644
index f1d810d..0000000
--- a/app-emulation/xen-tools/files/xendomains.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/xendomains
-
-# Directory of domains to boot. AUTODIR should contain one or more symlinks
-# to domain config files in /etc/xen
-
-AUTODIR=/etc/xen/auto
-
diff --git a/app-emulation/xen-tools/files/xendomains.initd b/app-emulation/xen-tools/files/xendomains.initd
deleted file mode 100644
index 6b408f9..0000000
--- a/app-emulation/xen-tools/files/xendomains.initd
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-opts="start stop status restart"
-
-depend() {
-	need xend
-	after dhcp
-}
-
-get_domname() {
-	local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
-
-	if [[ -z ${name_from_file} ]] ; then
-		basename "${1}"
-	else
-		echo ${name_from_file}	
-	fi
-}
-
-is_running() {
-	/usr/sbin/xm list "${1}" >/dev/null 2>&1
-}
-
-using_screen() {
-	[[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]]	
-}
-
-set_screen_cmd() {
-	screen_cmd="screen -q -r ${SCREEN_NAME:=xen} -X"
-}
-
-start() {
-	set_screen_cmd
-
-	einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}"
-	if using_screen ; then
-		ebegin "Creating screen session to hold domain consoles"
-		(  screen -d -m -S ${SCREEN_NAME} -t dom0 \
-		&& ${screen_cmd} zombie dr \
-		&& logrotate -f /etc/xen/xen-consoles.logrotate \
-		&& ${screen_cmd} logfile  /var/log/xen-consoles/%t.log \
-		&& ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \
-		&& ${screen_cmd} log on \
-		&& ${screen_cmd} deflog on ) >/dev/null
-		if [[ $? -ne 0 ]] ; then
-			eend 1
-			return 1
-		else
-			eend
-		fi
-	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 using_screen ; then
-				${screen_cmd} screen -t ${name} xm create ${dom} -c
-			else
-				xm create --quiet ${dom}
-			fi
-			eend $?
-		else
-			einfo "  Not starting domain ${name} - already running"
-		fi
-	done
-}
-
-stop() {
-	set_screen_cmd
-
-	einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}"
-	# 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 using_screen ; then
-		ebegin "Closing screen session ${SCREEN_NAME}"
-		${screen_cmd} quit
-		eend $?
-	fi
-}
-
-status() {
-	/usr/sbin/xm list
-}
diff --git a/app-emulation/xen-tools/xen-tools-3.1.0.ebuild b/app-emulation/xen-tools/xen-tools-3.1.0.ebuild
deleted file mode 100644
index bba7836..0000000
--- a/app-emulation/xen-tools/xen-tools-3.1.0.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2007 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.4_p1.ebuild,v 1.2 2007/05/16 00:57:34 marineam Exp $
-
-inherit flag-o-matic distutils eutils multilib
-
-DESCRIPTION="Xend daemon and tools"
-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="doc debug screen custom-cflags pygrub hvm"
-
-CDEPEND="dev-lang/python
-	sys-libs/zlib
-	hvm? ( media-libs/libsdl )"
-
-DEPEND="${CDEPEND}
-	sys-devel/gcc
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		dev-tex/latex2html
-		media-gfx/transfig
-	)
-	hvm? (
-		x11-proto/xproto
-		net-libs/libvncserver
-		sys-devel/dev86
-	)"
-
-RDEPEND="${CDEPEND}
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	|| ( sys-fs/udev sys-apps/hotplug )"
-
-PYTHON_MODNAME="xen grub"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-
-pkg_setup() {
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
-	if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then
-		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
-		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
-	fi
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 ; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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
-
-	# Disable hvm support on systems that don't support x86_32 binaries. 
-	if ! use hvm; then
-		chmod 644 tools/check/check_x11_devel
-		sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk
-		sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile
-	fi
-
-	if ! use pygrub; then
-		sed -i -e "/^SUBDIRS-y += pygrub$/d" "${S}"/tools/Makefile
-	fi
-
-	# Allow --as-needed LDFLAGS
-	epatch "${FILESDIR}/${PN}-3.0.4_p1--as-needed.patch"
-
-	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${PN}-3.0.4_p1-network-bridge-broadcast.patch"
-
-	# Also look in python's site packages for xen, as it installs there
-	epatch "${FILESDIR}/${PN}-3.1.0-python-site-packages.patch"
-}
-
-src_compile() {
-	local myopt myconf
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	#gcc-specs-ssp && append-flags -fno-stack-protector -fno-stack-protector-all
-
-	if use hvm; then
-		myconf="${myconf} --disable-system --disable-user"
-		(cd tools/ioemu && econf ${myconf}) || die "configure failured"
-	fi
-
-	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}" -C tools ${myopt} install \
-		|| die "install failed"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/etc/sysconfig
-
-	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.initd xend \
-		|| die "Couldn't install xen.initd"
-	newconfd "${FILESDIR}"/xendomains.confd xendomains \
-		|| die "Couldn't install xendomains.confd"
-	newinitd "${FILESDIR}"/xendomains.initd xendomains \
-		|| die "Couldn't install xendomains.initd"
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
-		keepdir /var/log/xen-consoles
-	fi
-
-	# xend expects these to exist
-	keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
-}
-
-pkg_postinst() {
-	elog "Please visit the Xen and Gentoo wiki:"
-	elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
-
-	if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then
-		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
-		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
-	fi
-
-	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 ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
-		echo
-		elog "The ioemu use flag has been removed and replaced with hvm."
-	fi
-
-	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-		echo
-		elog "xensv is broken upstream (Gentoo bug #142011)."
-		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-	fi
-}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
deleted file mode 100644
index e92d970..0000000
--- a/app-emulation/xen/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST xen-3.1.0-src.tgz 6831094 RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 SHA1 fa4b54c36626f2cce9b15dc99cafda0b42c54777 SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7
-EBUILD xen-3.1.0.ebuild 2327 RMD160 779eaee0c838ab46457190488f0ec0645bf8accf SHA1 91fbe6bb81e970cd68b90a489722cbc6a2b25406 SHA256 42f7bdf7e61a8fb7cc505fb447eab1d286735df1601f75fc361092b340f6ee25
-MD5 dad50dea588e2f44f043444cbf737874 xen-3.1.0.ebuild 2327
-RMD160 779eaee0c838ab46457190488f0ec0645bf8accf xen-3.1.0.ebuild 2327
-SHA256 42f7bdf7e61a8fb7cc505fb447eab1d286735df1601f75fc361092b340f6ee25 xen-3.1.0.ebuild 2327
-MD5 b2e86effae6681cbbecdbf864b193b4a files/digest-xen-3.1.0 235
-RMD160 2366b7298f0125f11d41aca0c6088c20863dbed1 files/digest-xen-3.1.0 235
-SHA256 12c130912c624791e6855ebeb932368fc8889371876db396055b02ac9a3b9892 files/digest-xen-3.1.0 235
diff --git a/app-emulation/xen/files/digest-xen-3.1.0 b/app-emulation/xen/files/digest-xen-3.1.0
deleted file mode 100644
index e436de9..0000000
--- a/app-emulation/xen/files/digest-xen-3.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-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/xen-3.1.0.ebuild b/app-emulation/xen/xen-3.1.0.ebuild
deleted file mode 100644
index 01d3ff2..0000000
--- a/app-emulation/xen/xen-3.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit mount-boot flag-o-matic
-
-DESCRIPTION="The Xen virtual machine monitor"
-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"
-
-RDEPEND="|| ( sys-boot/grub
-		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-${PV}"
-
-pkg_setup() {
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-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
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use pae && myopt="${myopt} pae=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-	else
-		unset CFLAGS
-	fi
-
-	# Send raw LDFLAGS so that --as-needed works
-	emake LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed"
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use pae && myopt="${myopt} pae=y"
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install || die "install failed"
-}
-
-pkg_postinst() {
-	elog "Please visit the Xen and Gentoo wiki:"
-	elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
-
-	echo
-	elog "Note: xen tools have been moved to app-emulation/xen-tools"
-
-	if use pae; then
-		echo
-		ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
-	fi
-}
diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog
index b310982..f85ce7d 100644
--- a/sys-kernel/xen-sources/ChangeLog
+++ b/sys-kernel/xen-sources/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Aug 2007; Michael Marineau <marineam@gentoo.org> ChangeLog:
+  Moved to the portage tree, removing everything currently in the overlay.
+
   24 Jul 2007; Robert Buchholz <rbu@gentoo.org>
   +xen-sources-2.6.18-r2.ebuild, +xen-sources-2.6.20-r1.ebuild:
   Adding 2.6.18-2 with security updates, see
diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest
deleted file mode 100644
index 09a3179..0000000
--- a/sys-kernel/xen-sources/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
-DIST genpatches-2.6.18-10.base.tar.bz2 113483 RMD160 9f19f7147c50650369afddec946b281aff817a48 SHA1 a2655a9d923624603a31a1e62cdd5e2a5c45066b SHA256 2d72cbe1e238318438a6ee9375a0ed42432a95c4d6fccb5afb14f8655a4a15b2
-DIST genpatches-2.6.20-14.base.tar.bz2 122757 RMD160 a796aa78a0049bc08257ea792f50b169cf6e5089 SHA1 cbb11e495c5aafe1e7b84e07e321be4a05a3b940 SHA256 27ca4b3eee185cecc6825f4d298ec82e4b8e49ba75a32da0dd5d15e24ba59a2e
-DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
-DIST linux-2.6.20.tar.bz2 43375937 RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 SHA1 e730979adfb287528263e779c91284659672510d SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
-DIST xen-patches-2.6.18-1.tar.bz2 608323 RMD160 c4c0a07b8a95db6200c03781985cede716ba34ab SHA1 5f8d263d6302488fe659192fd0f2422ca279808c SHA256 89836f4d68d53f6973d2cac1bb48a349bfbb05e301044e887ade5b4e91050578
-DIST xen-patches-2.6.20-1.tar.bz2 524579 RMD160 a9b958f90b497a0c3839425c6f0e9c1dbcab4e7e SHA1 be3921ec88f75bbf458c8d027faa39ff1c9d5844 SHA256 eb4cd912c4aace4c95fce0afb3af01da70ade7ba1d2b5f32f2f632f72da1ee08
-EBUILD xen-sources-2.6.18-r3.ebuild 611 RMD160 a3bf30cc24050da6e5df795f69ee06ec0093392b SHA1 291b5840cdf701930afd1b64c364c18fcde54aba SHA256 03da0b8bad4df50d8b3f3bc5aa4db83ff241f424d8f370cb824d791c400034d3
-MD5 862fd002535a562a9f489be7b646a423 xen-sources-2.6.18-r3.ebuild 611
-RMD160 a3bf30cc24050da6e5df795f69ee06ec0093392b xen-sources-2.6.18-r3.ebuild 611
-SHA256 03da0b8bad4df50d8b3f3bc5aa4db83ff241f424d8f370cb824d791c400034d3 xen-sources-2.6.18-r3.ebuild 611
-EBUILD xen-sources-2.6.20-r2.ebuild 611 RMD160 5b5669bca24ead25461b7981d72498946827d75f SHA1 739b478d79995da69cbc5f2c8e8eb002d53a7ed3 SHA256 6ebc6c4f6dc4fd33fdd2017d6cd7d63b922768d5ec8bda6f2a69e2b29d88216b
-MD5 db38138f28527de908658fd16d066550 xen-sources-2.6.20-r2.ebuild 611
-RMD160 5b5669bca24ead25461b7981d72498946827d75f xen-sources-2.6.20-r2.ebuild 611
-SHA256 6ebc6c4f6dc4fd33fdd2017d6cd7d63b922768d5ec8bda6f2a69e2b29d88216b xen-sources-2.6.20-r2.ebuild 611
-MISC ChangeLog 1430 RMD160 b360303e4b1591c98cca20fce40fa85cee150376 SHA1 f5c1ebed3415d34bf2ba3b89df284fe53f724acc SHA256 888eed2b5ab014195eb4cf9c8a481a252b73c1f2cf80c9d6cb4a4d6eacb705cb
-MD5 98f34d0f7115f43b73a9ffbc80966334 ChangeLog 1430
-RMD160 b360303e4b1591c98cca20fce40fa85cee150376 ChangeLog 1430
-SHA256 888eed2b5ab014195eb4cf9c8a481a252b73c1f2cf80c9d6cb4a4d6eacb705cb ChangeLog 1430
-MD5 f87469e20b17e730b94d80dd364758a7 files/digest-xen-sources-2.6.18-r3 792
-RMD160 54da89150c95d1624af718c064a5a34bf94429fe files/digest-xen-sources-2.6.18-r3 792
-SHA256 86dbfb0af15dca2898856833b6b9d0f87ac1d06d5384d788451515d3092c7c28 files/digest-xen-sources-2.6.18-r3 792
-MD5 6d7c4f19db75a7170390a314b5ac224f files/digest-xen-sources-2.6.20-r2 792
-RMD160 ad011cf87da185776bca3a2674e73a9a7cfa83cf files/digest-xen-sources-2.6.20-r2 792
-SHA256 ee789b789df4fe7e9e94f279e73224a6754e256a6710f8a581106b167961acd5 files/digest-xen-sources-2.6.20-r2 792
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r3 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r3
deleted file mode 100644
index 16c5858..0000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 7e3eaba91aa76d2b88ed7bb20f64d4c9 genpatches-2.6.18-10.base.tar.bz2 113483
-RMD160 9f19f7147c50650369afddec946b281aff817a48 genpatches-2.6.18-10.base.tar.bz2 113483
-SHA256 2d72cbe1e238318438a6ee9375a0ed42432a95c4d6fccb5afb14f8655a4a15b2 genpatches-2.6.18-10.base.tar.bz2 113483
-MD5 296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 41863580
-RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 linux-2.6.18.tar.bz2 41863580
-SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d linux-2.6.18.tar.bz2 41863580
-MD5 3f619a6271a358603b181b9598a6150f xen-patches-2.6.18-1.tar.bz2 608323
-RMD160 c4c0a07b8a95db6200c03781985cede716ba34ab xen-patches-2.6.18-1.tar.bz2 608323
-SHA256 89836f4d68d53f6973d2cac1bb48a349bfbb05e301044e887ade5b4e91050578 xen-patches-2.6.18-1.tar.bz2 608323
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r2 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r2
deleted file mode 100644
index 6cd2fe1..0000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 c2cfd59003729827fd1d2fefd8af4cbd genpatches-2.6.20-14.base.tar.bz2 122757
-RMD160 a796aa78a0049bc08257ea792f50b169cf6e5089 genpatches-2.6.20-14.base.tar.bz2 122757
-SHA256 27ca4b3eee185cecc6825f4d298ec82e4b8e49ba75a32da0dd5d15e24ba59a2e genpatches-2.6.20-14.base.tar.bz2 122757
-MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
-RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
-SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
-MD5 79d18554ef76d0f43863a07b34f7ef08 xen-patches-2.6.20-1.tar.bz2 524579
-RMD160 a9b958f90b497a0c3839425c6f0e9c1dbcab4e7e xen-patches-2.6.20-1.tar.bz2 524579
-SHA256 eb4cd912c4aace4c95fce0afb3af01da70ade7ba1d2b5f32f2f632f72da1ee08 xen-patches-2.6.20-1.tar.bz2 524579
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.18-r3.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.18-r3.ebuild
deleted file mode 100644
index ab1b632..0000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.18-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ETYPE="sources"
-UNIPATCH_STRICTORDER="1"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="10"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-
-KEYWORDS="~x86 ~amd64"
-
-XENPATCHES_VER="1"
-XENPATCHES="xen-patches-${PV}-${XENPATCHES_VER}.tar.bz2"
-XENPATCHES_URI="mirror://gentoo/${XENPATCHES}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${XENPATCHES_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${XENPATCHES}"
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.20-r2.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.20-r2.ebuild
deleted file mode 100644
index 4d331bd..0000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.20-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ETYPE="sources"
-UNIPATCH_STRICTORDER="1"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="14"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-
-KEYWORDS="~x86 ~amd64"
-
-XENPATCHES_VER="1"
-XENPATCHES="xen-patches-${PV}-${XENPATCHES_VER}.tar.bz2"
-XENPATCHES_URI="mirror://gentoo/${XENPATCHES}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${XENPATCHES_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${XENPATCHES}"