Bump to 3.1.2, clean out old versions

Package-Manager: portage-2.1.3.9

22 files changed, 31 insertions, 957 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index ee98d7402a07..96c0089c6fd0 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.32 2007/10/23 19:09:08 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.33 2007/11/17 00:13:28 marineam Exp $
+
+*xen-tools-3.1.2 (17 Nov 2007)
+
+  17 Nov 2007; Michael Marineau <marineam@gentoo.org>
+  -files/xen-tools-3.0.4_p1-pygrub-security-fix.patch,
+  -files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch,
+  -files/xen-tools-3.0.4_p1-vnclisten.patch,
+  -files/xen-tools-3.1.0-pygrub-security-fix.patch,
+  -files/xen-tools-3.1.0-python-site-packages.patch,
+  -files/xen-tools-3.1.1-insecure-file-creation-fix.patch,
+  -xen-tools-3.0.4_p1-r2.ebuild, -xen-tools-3.1.0-r2.ebuild,
+  -xen-tools-3.1.1-r1.ebuild, +xen-tools-3.1.2.ebuild:
+  Bump to 3.1.2. Clean out old versions.
 
 *xen-tools-3.1.1-r1 (23 Oct 2007)
 *xen-tools-3.1.0-r2 (23 Oct 2007)
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.0.4_p1-r2 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.4_p1-r2
deleted file mode 100644
index 7aadef066796..000000000000
--- a/app-emulation/xen-tools/files/digest-xen-tools-3.0.4_p1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e85e16ad3dc354338e3ac4a8951f9649 xen-3.0.4_1-src.tgz 6473636
-RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b xen-3.0.4_1-src.tgz 6473636
-SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb xen-3.0.4_1-src.tgz 6473636
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.1.0-r2 b/app-emulation/xen-tools/files/digest-xen-tools-3.1.0-r2
deleted file mode 100644
index e436de9ac59e..000000000000
--- a/app-emulation/xen-tools/files/digest-xen-tools-3.1.0-r2
+++ /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/digest-xen-tools-3.1.1-r1 b/app-emulation/xen-tools/files/digest-xen-tools-3.1.1-r1
deleted file mode 100644
index e739866b2661..000000000000
--- a/app-emulation/xen-tools/files/digest-xen-tools-3.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d5bafac9c819206d6a85c11352cc90fd xen-3.1.1.tgz 6868014
-RMD160 23f522a76815a64ba18eaf9eec19f38ea01e8c32 xen-3.1.1.tgz 6868014
-SHA256 c6c986177e75e41e7412920d453b5b759568a90266b09e2fea6043f8890f75e2 xen-3.1.1.tgz 6868014
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.1.2 b/app-emulation/xen-tools/files/digest-xen-tools-3.1.2
new file mode 100644
index 000000000000..9d0a411de636
--- /dev/null
+++ b/app-emulation/xen-tools/files/digest-xen-tools-3.1.2
@@ -0,0 +1,3 @@
+MD5 4bb2aec65694c880b5ff90a472dacca9 xen-3.1.2.tar.gz 6881935
+RMD160 c0644576a3f5d8552c7359f53a29296458804d3b xen-3.1.2.tar.gz 6881935
+SHA256 711e97d8a4e711cd0d9e368999d83366ee93296d26034e773be15964e4f6422d xen-3.1.2.tar.gz 6881935
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-pygrub-security-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-pygrub-security-fix.patch
deleted file mode 100644
index 73432d412faf..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-pygrub-security-fix.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Protect pygrub from possible malicious content in guest grub
-config file.  This fixes CVE-2007-4993.  Original patch from
-Jeremy Katz, I updated to close 2 remaining issues pointed out
-by Christian and Keir, and to use setattr(self, ...).
-
-Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-
-(Tweeked for Xen 3.0.4)
----
-diff -r a00cc97b392a tools/pygrub/src/GrubConf.py
---- a/tools/pygrub/src/GrubConf.py	Wed Sep 12 09:43:33 2007 +0100
-+++ b/tools/pygrub/src/GrubConf.py	Mon Sep 24 12:43:19 2007 -0700
-@@ -101,7 +101,7 @@ class GrubImage(object):
- 
-         if self.commands.has_key(com):
-             if self.commands[com] is not None:
--                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                setattr(self, self.commands[com], arg.strip())
-             else:
-                 logging.info("Ignored image directive %s" %(com,))
-         else:
-@@ -142,11 +142,11 @@ class GrubImage(object):
-     initrd = property(get_initrd, set_initrd)
- 
-     # set up command handlers
--    commands = { "title": "self.title",
--                 "root": "self.root",
--                 "rootnoverify": "self.root",
--                 "kernel": "self.kernel",
--                 "initrd": "self.initrd",
-+    commands = { "title": "title",
-+                 "root": "root",
-+                 "rootnoverify": "root",
-+                 "kernel": "kernel",
-+                 "initrd": "initrd",
-                  "chainloader": None,
-                  "module": None}
-         
-@@ -195,7 +195,7 @@ class GrubConfigFile(object):
-             (com, arg) = grub_exact_split(l, 2)
-             if self.commands.has_key(com):
-                 if self.commands[com] is not None:
--                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                    setattr(self, self.commands[com], arg.strip())
-                 else:
-                     logging.info("Ignored directive %s" %(com,))
-             else:
-@@ -208,7 +208,7 @@ class GrubConfigFile(object):
-         (com, arg) = grub_exact_split(line, 2)
-         if self.commands.has_key(com):
-             if self.commands[com] is not None:
--                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                setattr(self, self.commands[com], arg.strip())
-             else:
-                 logging.info("Ignored directive %s" %(com,))
-         else:
-@@ -236,12 +236,12 @@ class GrubConfigFile(object):
-     splash = property(get_splash, set_splash)
- 
-     # set up command handlers
--    commands = { "default": "self.default",
--                 "timeout": "self.timeout",
--                 "fallback": "self.fallback",
--                 "hiddenmenu": "self.hiddenmenu",
--                 "splashimage": "self.splash",
--                 "password": "self.password" }
-+    commands = { "default": "default",
-+                 "timeout": "timeout",
-+                 "fallback": "fallback",
-+                 "hiddenmenu": "hiddenmenu",
-+                 "splashimage": "splash",
-+                 "password": "password" }
-     for c in ("bootp", "color", "device", "dhcp", "hide", "ifconfig",
-               "pager", "partnew", "parttype", "rarp", "serial",
-               "setkey", "terminal", "terminfo", "tftpserver", "unhide"):
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch
deleted file mode 100644
index 07e9735ea8df..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/tools/ioemu/vnc.c b/tools/ioemu/vnc.c
-index 6d7cc31..9e2d535 100644
---- a/tools/ioemu/vnc.c
-+++ b/tools/ioemu/vnc.c
-@@ -962,18 +962,6 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
- 	case XK_Num_Lock:
- 	    vs->numlock = !vs->numlock;
- 	    break;
--
--	case XK_1 ... XK_9:
--	    if ((vs->ctl_keys & 3) != 3)
--		break;
--
--	    console_select(sym - XK_1);
--	    if (is_graphic_console()) {
--		/* tell the vga console to redisplay itself */
--		vga_hw_invalidate();
--		vnc_dpy_update(vs->ds, 0, 0, vs->ds->width, vs->ds->height);
--	    }
--	    break;
- 	}
-     }
- }
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch
deleted file mode 100644
index a22bebefbd32..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rpuN xen-3.0.4_1-src.orig/tools/python/xen/xend/XendConfig.py xen-3.0.4_1-src/tools/python/xen/xend/XendConfig.py
---- xen-3.0.4_1-src.orig/tools/python/xen/xend/XendConfig.py	Mon Dec 11 15:06:53 2006 +0000
-+++ xen-3.0.4_1-src/tools/python/xen/xend/XendConfig.py	Tue Jan 30 13:36:15 2007 -0500
-@@ -229,7 +229,8 @@ LEGACY_IMAGE_CFG = [
-     ('sdl', int),
-     ('vncdisplay', int),
-     ('vncunused', int),
--    ('vncpasswd', str),    
-+    ('vncpasswd', str),
-+    ('vnclisten', str),
- ]
-
- LEGACY_IMAGE_HVM_CFG = [
diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.0-pygrub-security-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.1.0-pygrub-security-fix.patch
deleted file mode 100644
index c4e1222caf7a..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.1.0-pygrub-security-fix.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-Protect pygrub from possible malicious content in guest grub
-config file.  This fixes CVE-2007-4993.  Original patch from
-Jeremy Katz, I updated to close 2 remaining issues pointed out
-by Christian and Keir, and to use setattr(self, ...).
-
-Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-
-(Tweeked for Xen 3.1.0)
-diff -rup xen-3.1.0-src.orig/tools/pygrub/src/GrubConf.py xen-3.1.0-src/tools/pygrub/src/GrubConf.py
---- xen-3.1.0-src.orig/tools/pygrub/src/GrubConf.py	2007-05-18 07:45:21.000000000 -0700
-+++ xen-3.1.0-src/tools/pygrub/src/GrubConf.py	2007-09-26 14:49:21.000000000 -0700
-@@ -101,7 +101,7 @@ class GrubImage(object):
- 
-         if self.commands.has_key(com):
-             if self.commands[com] is not None:
--                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                setattr(self, self.commands[com], arg.strip())
-             else:
-                 logging.info("Ignored image directive %s" %(com,))
-         else:
-@@ -142,11 +142,11 @@ class GrubImage(object):
-     initrd = property(get_initrd, set_initrd)
- 
-     # set up command handlers
--    commands = { "title": "self.title",
--                 "root": "self.root",
--                 "rootnoverify": "self.root",
--                 "kernel": "self.kernel",
--                 "initrd": "self.initrd",
-+    commands = { "title": "title",
-+                 "root": "root",
-+                 "rootnoverify": "root",
-+                 "kernel": "kernel",
-+                 "initrd": "initrd",
-                  "chainloader": None,
-                  "module": None}
-         
-@@ -195,7 +195,7 @@ class GrubConfigFile(object):
-             (com, arg) = grub_exact_split(l, 2)
-             if self.commands.has_key(com):
-                 if self.commands[com] is not None:
--                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                    setattr(self, self.commands[com], arg.strip())
-                 else:
-                     logging.info("Ignored directive %s" %(com,))
-             else:
-@@ -208,7 +208,7 @@ class GrubConfigFile(object):
-         (com, arg) = grub_exact_split(line, 2)
-         if self.commands.has_key(com):
-             if self.commands[com] is not None:
--                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                setattr(self, self.commands[com], arg.strip())
-             else:
-                 logging.info("Ignored directive %s" %(com,))
-         else:
-@@ -236,12 +236,12 @@ class GrubConfigFile(object):
-     splash = property(get_splash, set_splash)
- 
-     # set up command handlers
--    commands = { "default": "self.default",
--                 "timeout": "self.timeout",
--                 "fallback": "self.fallback",
--                 "hiddenmenu": "self.hiddenmenu",
--                 "splashimage": "self.splash",
--                 "password": "self.password" }
-+    commands = { "default": "default",
-+                 "timeout": "timeout",
-+                 "fallback": "fallback",
-+                 "hiddenmenu": "hiddenmenu",
-+                 "splashimage": "splash",
-+                 "password": "password" }
-     for c in ("bootp", "color", "device", "dhcp", "hide", "ifconfig",
-               "pager", "partnew", "parttype", "rarp", "serial",
-               "setkey", "terminal", "terminfo", "tftpserver", "unhide"):
-diff -rup xen-3.1.0-src.orig/tools/pygrub/src/LiloConf.py xen-3.1.0-src/tools/pygrub/src/LiloConf.py
---- xen-3.1.0-src.orig/tools/pygrub/src/LiloConf.py	2007-05-18 07:45:21.000000000 -0700
-+++ xen-3.1.0-src/tools/pygrub/src/LiloConf.py	2007-09-26 14:52:30.000000000 -0700
-@@ -30,7 +30,7 @@ class LiloImage(object):
- 
-         if self.commands.has_key(com):
-             if self.commands[com] is not None:
--                exec("%s = r\'%s\'" %(self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip())))
-+                setattr(self, self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip()))
-             else:
-                 logging.info("Ignored image directive %s" %(com,))
-         else:
-@@ -56,12 +56,12 @@ class LiloImage(object):
-     initrd = property(get_initrd, set_initrd)
- 
-     # set up command handlers
--    commands = { "label": "self.title",
--                 "root": "self.root",
--                 "rootnoverify": "self.root",
--                 "image": "self.kernel",
--                 "initrd": "self.initrd",
--                 "append": "self.args",
-+    commands = { "label": "title",
-+                 "root": "root",
-+                 "rootnoverify": "root",
-+                 "image": "kernel",
-+                 "initrd": "initrd",
-+                 "append": "args",
-                  "read-only": None,
-                  "chainloader": None,
-                  "module": None}
-@@ -111,7 +111,7 @@ class LiloConfigFile(object):
-             (com, arg) = GrubConf.grub_exact_split(l, 2)
-             if self.commands.has_key(com):
-                 if self.commands[com] is not None:
--                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                    setattr(self, self.commands[com], arg.strip())
-                 else:
-                     logging.info("Ignored directive %s" %(com,))
-             else:
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 ea5a2177b6a0..000000000000
--- 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/xen-tools-3.1.1-insecure-file-creation-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.1.1-insecure-file-creation-fix.patch
deleted file mode 100644
index 9746f6ffca64..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.1.1-insecure-file-creation-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-
-# HG changeset patch
-# User Keir Fraser <keir@xensource.com>
-# Date 1193128003 -3600
-# Node ID b28ae5f00553ea053bd4e4576634d8ea49e77bc3
-# Parent 118a21c66fd53a08d7191159e5b2888f8d9e4ad2
-xenmon: Fix security vulnerability CVE-2007-3919.
-
-The xenbaked daemon and xenmon utility communicate via a mmap'ed
-shared file. Since this file is located in /tmp, unprivileged users
-can cause arbitrary files to be truncated by creating a symlink from
-the well-known /tmp filename to e.g., /etc/passwd.
-
-The fix is to place the shared file in a directory to which only root
-should have access (in this case /var/run/).
-
-This bug was reported, and the fix suggested, by Steve Kemp
-<skx@debian.org>. Thanks!
-
-Signed-off-by: Keir Fraser <keir@xensource.com>
-
---- a/tools/xenmon/xenbaked.c	Mon Oct 22 21:06:11 2007 +0100
-+++ b/tools/xenmon/xenbaked.c	Tue Oct 23 09:26:43 2007 +0100
-@@ -589,7 +589,7 @@ error_t cmd_parser(int key, char *arg, s
-     return 0;
- }
- 
--#define SHARED_MEM_FILE "/tmp/xenq-shm"
-+#define SHARED_MEM_FILE "/var/run/xenq-shm"
- void alloc_qos_data(int ncpu)
- {
-     int i, n, pgsize, off=0;
---- a/tools/xenmon/xenmon.py	Mon Oct 22 21:06:11 2007 +0100
-+++ b/tools/xenmon/xenmon.py	Tue Oct 23 09:26:43 2007 +0100
-@@ -46,7 +46,7 @@ QOS_DATA_SIZE = struct.calcsize(ST_QDATA
- QOS_DATA_SIZE = struct.calcsize(ST_QDATA)*NSAMPLES + struct.calcsize(ST_DOM_INFO)*NDOMAINS + struct.calcsize("4i")
- 
- # location of mmaped file, hard coded right now
--SHM_FILE = "/tmp/xenq-shm"
-+SHM_FILE = "/var/run/xenq-shm"
- 
- # format strings
- TOTALS = 15*' ' + "%6.2f%%" + 35*' ' + "%6.2f%%"
-
diff --git a/app-emulation/xen-tools/xen-tools-3.0.4_p1-r2.ebuild b/app-emulation/xen-tools/xen-tools-3.0.4_p1-r2.ebuild
deleted file mode 100644
index 9ebac3d1a9a6..000000000000
--- a/app-emulation/xen-tools/xen-tools-3.0.4_p1-r2.ebuild
+++ /dev/null
@@ -1,213 +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-r2.ebuild,v 1.1 2007/10/23 19:09:08 marineam Exp $
-
-inherit flag-o-matic distutils eutils multilib
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-MY_PV=${PV/_p/_}
-SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV/_/-}/src.tgz/xen-${MY_PV}-src.tgz"
-S="${WORKDIR}/xen-${MY_PV}-src"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug screen custom-cflags pygrub ioemu"
-
-CDEPEND="dev-lang/python
-	sys-libs/zlib
-	ioemu? ( media-libs/libsdl )"
-
-DEPEND="${CDEPEND}
-	sys-devel/gcc
-	dev-lang/perl
-	sys-devel/dev86
-	app-misc/pax-utils
-	doc? (
-		dev-tex/latex2html
-		media-gfx/transfig
-	)
-	ioemu? (
-		x11-proto/xproto
-		net-libs/libvncserver
-	)"
-
-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 [[ "$(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 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif 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
-
-	if use doc && ! built_with_use -o dev-tex/latex2html png gif; then
-		# die early instead of later
-		eerror "USE=doc requires latex2html with image support. Please add"
-		eerror "'png' and/or 'gif' to your use flags and re-emerge latex2html"
-		die "latex2html missing both png and gif flags"
-	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 the 32bit-only vmxassist if we are not on x86 and we don't
-	# support the x86 ABI. Also disable hvmloader, since it requires vmxassist.
-	if ! use x86 && ! has x86 $(get_all_abis); then
-		sed -i -e "/SUBDIRS += vmxassist/d" "${S}"/tools/firmware/Makefile
-		sed -i -e "/SUBDIRS += hvmloader/d" "${S}"/tools/firmware/Makefile
-	fi
-
-	if ! use pygrub; then
-		sed -i -e "/^SUBDIRS-y += pygrub$/d" "${S}"/tools/Makefile
-	fi
-
-	# Don't bother with ioemu, only needed for fully virtualised guests
-	if ! use ioemu; then
-		chmod 644 tools/check/check_x11_devel
-		sed -i -e "/^CONFIG_IOEMU := y$/d" "${S}"/config/*.mk
-	fi
-
-	# Allow --as-needed LDFLAGS
-	epatch "${FILESDIR}/${P}"--as-needed.patch
-
-	# Fix vnclisten
-	epatch "${FILESDIR}/${P}"-vnclisten.patch
-
-	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${P}"-network-bridge-broadcast.patch
-
-	# Disable QEMU monitor mode in VNC, bug #170917
-	epatch "${FILESDIR}/${P}"-remove-monitor-mode-from-vnc.patch
-
-	# Security fix, CVE-2007-4993
-	# https://bugs.gentoo.org/show_bug.cgi?id=193808
-	epatch "${FILESDIR}/${P}-pygrub-security-fix.patch"
-
-	# Fix an insecure temp file creation, bug #196824, CVE-2007-3919
-	epatch "${FILESDIR}/${PN}-3.1.1-insecure-file-creation-fix.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 ioemu; 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}" ${myopt} install-tools \
-		|| 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 x86 && ! has x86 $(get_all_abis); then
-		echo
-		elog "Your system does not support building x86 binaries (amd64 no-multilib)"
-		elog "hvmloader has not been built, which is required for HVM guests."
-	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-tools/xen-tools-3.1.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-3.1.0-r2.ebuild
deleted file mode 100644
index cba90b808f63..000000000000
--- a/app-emulation/xen-tools/xen-tools-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,226 +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.1.0-r2.ebuild,v 1.1 2007/10/23 19:09:08 marineam Exp $
-
-inherit flag-o-matic 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
-		media-gfx/graphviz
-	)
-	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 [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif 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
-
-	if use doc && ! built_with_use -o dev-tex/latex2html png gif; then
-		# die early instead of later
-		eerror "USE=doc requires latex2html with image support. Please add"
-		eerror "'png' and/or 'gif' to your use flags and re-emerge latex2html"
-		die "latex2html missing both png and gif flags"
-	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"
-
-	# Fix building small dumb utility called 'xen-detect' on hardened
-	epatch "${FILESDIR}/${PN}-3.1.0-xen-detect-nopie-fix.patch"
-
-	# Security fix, CVE-2007-4993
-	# https://bugs.gentoo.org/show_bug.cgi?id=193808
-	epatch "${FILESDIR}/${PN}-3.1.0-pygrub-security-fix.patch"
-
-	# Fix an insecure temp file creation, bug #196824, CVE-2007-3919
-	epatch "${FILESDIR}/${PN}-3.1.1-insecure-file-creation-fix.patch"
-}
-
-src_compile() {
-	local myopt myconf
-	use debug && myopt="${myopt} debug=y"
-
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	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
-
-	# for xendomains
-	keepdir /etc/xen/auto
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the unoffical wiki page:"
-	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
-	elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
-
-	if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
-		echo
-		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"
-		ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug."
-	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 built_with_use sys-apps/iproute2 minimal; then
-		echo
-		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-		ewarn "will not work until you rebuild iproute2 without USE=minimal."
-	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-tools/xen-tools-3.1.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-3.1.2.ebuild
index 0e7494932720..8d6a87e0aa1b 100644
--- a/app-emulation/xen-tools/xen-tools-3.1.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.1.2.ebuild
@@ -1,16 +1,12 @@
 # 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.1.1-r1.ebuild,v 1.1 2007/10/23 19:09:08 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.1.2.ebuild,v 1.1 2007/11/17 00:13:28 marineam Exp $
 
 inherit flag-o-matic 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"
-
-# Temporary while we wait on the upstream tarball
-SRC_URI="mirror://gentoo//xen-${PV}.tgz"
+SRC_URI="mirror://gentoo/xen-${PV}.tar.gz"
 S="${WORKDIR}/xen-${PV}"
 
 LICENSE="GPL-2"
@@ -116,9 +112,6 @@ src_unpack() {
 
 	# Fix building small dumb utility called 'xen-detect' on hardened
 	epatch "${FILESDIR}/${PN}-3.1.0-xen-detect-nopie-fix.patch"
-
-	# Fix an insecure temp file creation, bug #196824, CVE-2007-3919
-	epatch "${FILESDIR}/${PN}-3.1.1-insecure-file-creation-fix.patch"
 }
 
 src_compile() {
diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 1c6b59937471..87fc16f86d37 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.49 2007/10/15 18:33:40 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.50 2007/11/17 00:13:55 marineam Exp $
+
+*xen-3.1.2 (17 Nov 2007)
+
+  17 Nov 2007; Michael Marineau <marineam@gentoo.org> -xen-3.0.4_p1.ebuild,
+  -xen-3.1.0.ebuild, -xen-3.1.1.ebuild, +xen-3.1.2.ebuild:
+  Bump to 3.1.2, fixes CVE-2007-5906, Bug #198995. Clean out old versions.
 
 *xen-3.1.1 (15 Oct 2007)
 
diff --git a/app-emulation/xen/files/digest-xen-3.0.4_p1 b/app-emulation/xen/files/digest-xen-3.0.4_p1
deleted file mode 100644
index 7aadef066796..000000000000
--- a/app-emulation/xen/files/digest-xen-3.0.4_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e85e16ad3dc354338e3ac4a8951f9649 xen-3.0.4_1-src.tgz 6473636
-RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b xen-3.0.4_1-src.tgz 6473636
-SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb xen-3.0.4_1-src.tgz 6473636
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 e436de9ac59e..000000000000
--- 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/files/digest-xen-3.1.1 b/app-emulation/xen/files/digest-xen-3.1.1
deleted file mode 100644
index e739866b2661..000000000000
--- a/app-emulation/xen/files/digest-xen-3.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d5bafac9c819206d6a85c11352cc90fd xen-3.1.1.tgz 6868014
-RMD160 23f522a76815a64ba18eaf9eec19f38ea01e8c32 xen-3.1.1.tgz 6868014
-SHA256 c6c986177e75e41e7412920d453b5b759568a90266b09e2fea6043f8890f75e2 xen-3.1.1.tgz 6868014
diff --git a/app-emulation/xen/files/digest-xen-3.1.2 b/app-emulation/xen/files/digest-xen-3.1.2
new file mode 100644
index 000000000000..9d0a411de636
--- /dev/null
+++ b/app-emulation/xen/files/digest-xen-3.1.2
@@ -0,0 +1,3 @@
+MD5 4bb2aec65694c880b5ff90a472dacca9 xen-3.1.2.tar.gz 6881935
+RMD160 c0644576a3f5d8552c7359f53a29296458804d3b xen-3.1.2.tar.gz 6881935
+SHA256 711e97d8a4e711cd0d9e368999d83366ee93296d26034e773be15964e4f6422d xen-3.1.2.tar.gz 6881935
diff --git a/app-emulation/xen/xen-3.0.4_p1.ebuild b/app-emulation/xen/xen-3.0.4_p1.ebuild
deleted file mode 100644
index 7874fc418765..000000000000
--- a/app-emulation/xen/xen-3.0.4_p1.ebuild
+++ /dev/null
@@ -1,92 +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/xen-3.0.4_p1.ebuild,v 1.5 2007/08/27 17:19:12 marineam Exp $
-
-inherit mount-boot flag-o-matic
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-MY_PV=${PV/_p/_}
-SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV/_/-}/src.tgz/xen-${MY_PV}-src.tgz"
-S="${WORKDIR}/xen-${MY_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.16.33"
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${MY_PV/_/-}"
-
-pkg_setup() {
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif 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}" ${myopt} install-xen || 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/app-emulation/xen/xen-3.1.0.ebuild b/app-emulation/xen/xen-3.1.0.ebuild
deleted file mode 100644
index dcc4d72fbaac..000000000000
--- a/app-emulation/xen/xen-3.1.0.ebuild
+++ /dev/null
@@ -1,91 +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/xen-3.1.0.ebuild,v 1.2 2007/08/27 17:19:12 marineam Exp $
-
-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 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif 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/app-emulation/xen/xen-3.1.1.ebuild b/app-emulation/xen/xen-3.1.2.ebuild
index ee4ae38a5603..8fa1e718e331 100644
--- a/app-emulation/xen/xen-3.1.1.ebuild
+++ b/app-emulation/xen/xen-3.1.2.ebuild
@@ -1,16 +1,12 @@
 # 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.1.1.ebuild,v 1.1 2007/10/15 18:33:40 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.1.2.ebuild,v 1.1 2007/11/17 00:13:55 marineam Exp $
 
 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"
-
-# Temporary while we wait on the upstream tarball
-SRC_URI="http://dev.gentoo.org/~marineam/files/xen/xen-${PV}.tgz"
+SRC_URI="mirror://gentoo/xen-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"