From 23a0208875ca127e21929ad7451e870c7d5e3915 Mon Sep 17 00:00:00 2001
From: Michael Marineau <marineam@gentoo.org>
Date: Tue, 10 Jul 2007 21:26:21 +0000
Subject: Initial commit of xen 3.1.0, includes some tweeks from bug #179412
 and rbu's overlay

svn path=/xen/; revision=31
---
 app-emulation/xen-tools/Manifest                   |  60 ++-----
 .../xen-tools/files/digest-xen-tools-3.0.2-r4      |   3 -
 .../xen-tools/files/digest-xen-tools-3.1.0         |   3 +
 .../files/xen-tools-3.0.2--as-needed.patch         |  10 --
 .../files/xen-tools-3.0.2-bxclobber.patch          |  26 ---
 .../xen-tools/files/xen-tools-3.0.2-pushpop.patch  |  32 ----
 .../files/xen-tools-3.0.2-test-uuid.patch          |  17 --
 .../files/xen-tools-3.0.2-test-xauthority.patch    |  72 --------
 .../files/xen-tools-3.0.2-xc_ptrace.patch          |  24 ---
 ...ols-3.0.4_p1-remove-monitor-mode-from-vnc.patch |  23 ---
 .../files/xen-tools-3.0.4_p1-vnclisten.patch       |  13 --
 .../xen-tools-3.1.0-python-site-packages.patch     |  31 ++++
 app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild  | 199 ---------------------
 app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild  | 194 --------------------
 app-emulation/xen-tools/xen-tools-3.1.0.ebuild     | 193 ++++++++++++++++++++
 app-emulation/xen/Manifest                         |  28 +--
 app-emulation/xen/files/digest-xen-3.1.0           |   3 +
 app-emulation/xen/xen-3.0.2.ebuild                 |  93 ----------
 app-emulation/xen/xen-3.0.4_p1.ebuild              |  98 ----------
 app-emulation/xen/xen-3.1.0.ebuild                 |  89 +++++++++
 sys-kernel/xen-sources/Manifest                    |  28 +--
 .../xen-sources/files/digest-xen-sources-2.6.16.46 |   9 -
 .../xen-sources/files/digest-xen-sources-2.6.16.49 |   9 -
 .../xen-sources/files/digest-xen-sources-2.6.18    |   6 +
 .../xen-sources/xen-sources-2.6.16.33.ebuild       |  51 ------
 .../xen-sources/xen-sources-2.6.16.49.ebuild       |  29 ---
 sys-kernel/xen-sources/xen-sources-2.6.18.ebuild   |  29 +++
 27 files changed, 383 insertions(+), 989 deletions(-)
 delete mode 100644 app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4
 create mode 100644 app-emulation/xen-tools/files/digest-xen-tools-3.1.0
 delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch
 delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch
 delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch
 delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch
 delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch
 delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch
 delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch
 delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch
 create mode 100644 app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch
 delete mode 100644 app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
 delete mode 100644 app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
 create mode 100644 app-emulation/xen-tools/xen-tools-3.1.0.ebuild
 create mode 100644 app-emulation/xen/files/digest-xen-3.1.0
 delete mode 100644 app-emulation/xen/xen-3.0.2.ebuild
 delete mode 100644 app-emulation/xen/xen-3.0.4_p1.ebuild
 create mode 100644 app-emulation/xen/xen-3.1.0.ebuild
 delete mode 100644 sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.46
 delete mode 100644 sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.49
 create mode 100644 sys-kernel/xen-sources/files/digest-xen-sources-2.6.18
 delete mode 100644 sys-kernel/xen-sources/xen-sources-2.6.16.33.ebuild
 delete mode 100644 sys-kernel/xen-sources/xen-sources-2.6.16.49.ebuild
 create mode 100644 sys-kernel/xen-sources/xen-sources-2.6.18.ebuild

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index ee03bbc..cbe6243 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -2,30 +2,6 @@ AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SH
 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.2--as-needed.patch 283 RMD160 852e850b72b9860420f5f2132c2e071474bc87ba SHA1 cb33bd39091a7ddca2a97a3e80d673adcec77895 SHA256 9fcf772662863f74f4dc7cbc7ec195c2ad447ea757364e0cd6907d633d237919
-MD5 7c8f508f547c0e1f78b185fd9f980b1b files/xen-tools-3.0.2--as-needed.patch 283
-RMD160 852e850b72b9860420f5f2132c2e071474bc87ba files/xen-tools-3.0.2--as-needed.patch 283
-SHA256 9fcf772662863f74f4dc7cbc7ec195c2ad447ea757364e0cd6907d633d237919 files/xen-tools-3.0.2--as-needed.patch 283
-AUX xen-tools-3.0.2-bxclobber.patch 734 RMD160 a23e93b14048ac091b044673a6bc12fffdfaca19 SHA1 438b38917239aa4e40d65b2378ca44f2c2aaca5f SHA256 8e72dfeb69b1ac6409177d2943966d89aeca5a5a96f5fc142b3f2bd1af936191
-MD5 fc279066e82ced30850c046be2642ee1 files/xen-tools-3.0.2-bxclobber.patch 734
-RMD160 a23e93b14048ac091b044673a6bc12fffdfaca19 files/xen-tools-3.0.2-bxclobber.patch 734
-SHA256 8e72dfeb69b1ac6409177d2943966d89aeca5a5a96f5fc142b3f2bd1af936191 files/xen-tools-3.0.2-bxclobber.patch 734
-AUX xen-tools-3.0.2-pushpop.patch 796 RMD160 d15cb8ed948f4706912da53d9406852103438895 SHA1 1fc228381bfcbfa5c0203cd37352d912e66f7b37 SHA256 b09d5ff8afc0bf5878b97e1a59a9bfe8ec028a99f62b824c68fc9d42eb576b96
-MD5 d77478e538be4f38ca70f3b3ead939f4 files/xen-tools-3.0.2-pushpop.patch 796
-RMD160 d15cb8ed948f4706912da53d9406852103438895 files/xen-tools-3.0.2-pushpop.patch 796
-SHA256 b09d5ff8afc0bf5878b97e1a59a9bfe8ec028a99f62b824c68fc9d42eb576b96 files/xen-tools-3.0.2-pushpop.patch 796
-AUX xen-tools-3.0.2-test-uuid.patch 777 RMD160 268ddfc7d8c194d43e8c24a9966561df04246196 SHA1 2c60427e1dcc7995a25e38295297a2c7ae620893 SHA256 e789ef34b4a7066b7b476675d04d14b1a4272708c8ba51c5d4930119acbec76c
-MD5 3b1e6f226e33f6d583cd1a6b6760c9f4 files/xen-tools-3.0.2-test-uuid.patch 777
-RMD160 268ddfc7d8c194d43e8c24a9966561df04246196 files/xen-tools-3.0.2-test-uuid.patch 777
-SHA256 e789ef34b4a7066b7b476675d04d14b1a4272708c8ba51c5d4930119acbec76c files/xen-tools-3.0.2-test-uuid.patch 777
-AUX xen-tools-3.0.2-test-xauthority.patch 2362 RMD160 4974965318e02b151c0ba2cb516b4f246388e465 SHA1 45ad2861132d7dda81788cc2854cf8be33afb7d6 SHA256 a232f43a7a560b6cdea93daca422addbbc85f3ee75d10895423db3d5d3c6a452
-MD5 0f94816ea4743531f5919592ce077c00 files/xen-tools-3.0.2-test-xauthority.patch 2362
-RMD160 4974965318e02b151c0ba2cb516b4f246388e465 files/xen-tools-3.0.2-test-xauthority.patch 2362
-SHA256 a232f43a7a560b6cdea93daca422addbbc85f3ee75d10895423db3d5d3c6a452 files/xen-tools-3.0.2-test-xauthority.patch 2362
-AUX xen-tools-3.0.2-xc_ptrace.patch 661 RMD160 926f246fcc65c707bf4bb822749e81cd844a0966 SHA1 5e059cbf266944cc9fb5eb62ea9cbbdd967a5a23 SHA256 62aabe6052ae89aec55d79582df16a3302e6aedbea86dc5ad44c657ad2f7a4b8
-MD5 7f74bc1ef57300624b22bd6409106e99 files/xen-tools-3.0.2-xc_ptrace.patch 661
-RMD160 926f246fcc65c707bf4bb822749e81cd844a0966 files/xen-tools-3.0.2-xc_ptrace.patch 661
-SHA256 62aabe6052ae89aec55d79582df16a3302e6aedbea86dc5ad44c657ad2f7a4b8 files/xen-tools-3.0.2-xc_ptrace.patch 661
 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
@@ -34,14 +10,10 @@ AUX xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841 RMD160 21fd0a5e50109cb
 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.0.4_p1-remove-monitor-mode-from-vnc.patch 592 RMD160 a7b29d6563c2124d218658d56083c2847a9a287a SHA1 a92ed78cfc1dd04f7342a58e725f5279af84a14d SHA256 de0a6bcc6461f49c7ee32b843fcf4deee157c980db5b164aeb7b8859e3614389
-MD5 8cefd2566392cb8a27190b54dfaa0620 files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch 592
-RMD160 a7b29d6563c2124d218658d56083c2847a9a287a files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch 592
-SHA256 de0a6bcc6461f49c7ee32b843fcf4deee157c980db5b164aeb7b8859e3614389 files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch 592
-AUX xen-tools-3.0.4_p1-vnclisten.patch 519 RMD160 96a88fcd593bbc4461d87fb50b3ecaf06bab8729 SHA1 95e37aa7d92fcd87616a39be032bc91c18077881 SHA256 4f368dada2c7c5538ac6c2a2e23693828dea18a4b27e54c3d4a65e5603812dcb
-MD5 423ad930eef2e40ee30b6f648f0340f2 files/xen-tools-3.0.4_p1-vnclisten.patch 519
-RMD160 96a88fcd593bbc4461d87fb50b3ecaf06bab8729 files/xen-tools-3.0.4_p1-vnclisten.patch 519
-SHA256 4f368dada2c7c5538ac6c2a2e23693828dea18a4b27e54c3d4a65e5603812dcb files/xen-tools-3.0.4_p1-vnclisten.patch 519
+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
@@ -58,19 +30,11 @@ AUX xendomains.initd 2168 RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 SHA1 a
 MD5 a3b477fa44710894c47b0aeca7d6a57a files/xendomains.initd 2168
 RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 files/xendomains.initd 2168
 SHA256 ed1adcb24e5ffe1c0abc33d6bd69f129b31b3d4f068222ee343809a8dd12b8d0 files/xendomains.initd 2168
-DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951
-DIST xen-3.0.4_1-src.tgz 6473636 RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b SHA1 7ca5af70996215229e143c7563e69b3719284a95 SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb
-EBUILD xen-tools-3.0.2-r4.ebuild 5849 RMD160 8e19634534edbc9e091582e6448115a543b8c7e6 SHA1 352b36045865b58a088d48a50bfaa65902fd2176 SHA256 95d6a5bee0439d711e900471e164961d7664a0a8d382317625d217735245b39b
-MD5 d25b10dae46ccc264d4f9cb58bafbcb0 xen-tools-3.0.2-r4.ebuild 5849
-RMD160 8e19634534edbc9e091582e6448115a543b8c7e6 xen-tools-3.0.2-r4.ebuild 5849
-SHA256 95d6a5bee0439d711e900471e164961d7664a0a8d382317625d217735245b39b xen-tools-3.0.2-r4.ebuild 5849
-EBUILD xen-tools-3.0.4_p1.ebuild 5578 RMD160 3e43d07e7326cf73933859ef5ce512b5f4c59ef6 SHA1 ed0d184406f908d157c9435cd3c09163ae126efd SHA256 9ab55a91a4df37591adfc68a4fe275b9fdc3bc2fffd431448a0432974bdfa258
-MD5 7e8dd8e637cd190607a3cfd6494e462a xen-tools-3.0.4_p1.ebuild 5578
-RMD160 3e43d07e7326cf73933859ef5ce512b5f4c59ef6 xen-tools-3.0.4_p1.ebuild 5578
-SHA256 9ab55a91a4df37591adfc68a4fe275b9fdc3bc2fffd431448a0432974bdfa258 xen-tools-3.0.4_p1.ebuild 5578
-MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r4 235
-RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r4 235
-SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r4 235
-MD5 de126addfd4101f35f8880ab0817ab03 files/digest-xen-tools-3.0.4_p1 241
-RMD160 b65ff6928079bc0ee81b68ab27f3f4c9e1d36856 files/digest-xen-tools-3.0.4_p1 241
-SHA256 66cfb008cc25de8a507359e492d6896908bc619901d901ae018fb135d2d91345 files/digest-xen-tools-3.0.4_p1 241
+DIST xen-3.1.0-src.tgz 6831094 RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 SHA1 fa4b54c36626f2cce9b15dc99cafda0b42c54777 SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7
+EBUILD xen-tools-3.1.0.ebuild 5753 RMD160 a0a474e6d06dd5fd05f54762c8c2ea82172f6ed7 SHA1 c97f16f51a1acb503dfa009b80190593cbc58331 SHA256 866ef333c12a8c5ab593d489f7d358b4a10125bc4567125c0fd3a3022b3647fa
+MD5 59346209a9fcc7ed46b43550322dfd7b xen-tools-3.1.0.ebuild 5753
+RMD160 a0a474e6d06dd5fd05f54762c8c2ea82172f6ed7 xen-tools-3.1.0.ebuild 5753
+SHA256 866ef333c12a8c5ab593d489f7d358b4a10125bc4567125c0fd3a3022b3647fa xen-tools-3.1.0.ebuild 5753
+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.0.2-r4 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4
deleted file mode 100644
index 724d092..0000000
--- a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4
+++ /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-tools/files/digest-xen-tools-3.1.0 b/app-emulation/xen-tools/files/digest-xen-tools-3.1.0
new file mode 100644
index 0000000..e436de9
--- /dev/null
+++ b/app-emulation/xen-tools/files/digest-xen-tools-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-tools/files/xen-tools-3.0.2--as-needed.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch
deleted file mode 100644
index 362e495..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xen-3.0.2/tools/xenmon/Makefile	2006-06-01 13:40:40.468687762 +0100
-+++ xen-3.0.2/tools/xenmon/Makefile	2006-06-01 13:41:04.000000000 +0100
-@@ -43,6 +43,6 @@
- 
- 
- %: %.c Makefile
--	$(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl
- 
- 
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch
deleted file mode 100644
index 8f0b561..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# User vhanquez@kneesa.uk.xensource.com
-# Date Mon Apr 10 14:51:10 2006 +0000
-# Node ID bdec77028194e6f51872b66b0575ed86ad542333
-# parent: 07af1b34d4c49ac52faaff6cb315231655212316
-fix bug #609 - error: PIC register `bx' clobbered in `asm'
-
-Signed-off-by: Vincent Hanquez <vincent@xensource.com>
-
-
---- a/tools/ioemu/hw/vga.c	Mon Apr 10 14:47:51 2006 +0100
-+++ b/tools/ioemu/hw/vga.c	Mon Apr 10 14:51:10 2006 +0000
-@@ -1369,10 +1369,10 @@ static inline unsigned int cpuid_edx(uns
- {
-     unsigned int eax, edx;
- 
--    __asm__("cpuid"
-+    __asm__("pushl %%ebx; cpuid; popl %%ebx"
-             : "=a" (eax), "=d" (edx)
-             : "0" (op)
--            : "bx", "cx");
-+            : "cx");
- 
-     return edx;
- }
-
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch
deleted file mode 100644
index 807e007..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User kaf24@firebug.cl.cam.ac.uk
-# Date Mon Apr 10 17:25:42 2006 +0100
-# Node ID c89d62e7015a25a48225daa929616a5ed44205b4
-# parent: 4088dd0856a9cbc7ef050d7272e81666b7dfbcc7
-Fix push/pop usage in tools/ioemu for x86/64.
-
-Signed-off-by: Keir Fraser <keir@xensource.com>
-
-
-
---- a/tools/ioemu/hw/vga.c	Mon Apr 10 17:16:25 2006 +0100
-+++ b/tools/ioemu/hw/vga.c	Mon Apr 10 17:25:42 2006 +0100
-@@ -1369,10 +1369,16 @@ static inline unsigned int cpuid_edx(uns
- {
-     unsigned int eax, edx;
- 
--    __asm__("pushl %%ebx; cpuid; popl %%ebx"
-+#ifdef __x86_64__
-+#define __bx "rbx"
-+#else
-+#define __bx "ebx"
-+#endif
-+    __asm__("push %%"__bx"; cpuid; pop %%"__bx
-             : "=a" (eax), "=d" (edx)
-             : "0" (op)
-             : "cx");
-+#undef __ebx
- 
-     return edx;
- }
-
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch
deleted file mode 100644
index b4829e4..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Backported from
-# http://lists.xensource.com/archives/html/xen-changelog/2006-04/msg00086.html
-
---- tools/python/xen/xend/tests/test_uuid.py	2006-07-22 12:10:00.000000000 +1000
-+++ tools/python/xen/xend/tests/test_uuid.py	2006-07-22 12:11:01.000000000 +1000
-@@ -21,9 +21,9 @@
-             self.assertEqual(uuid.toString(inp), expected)
-             self.assertEqual(uuid.fromString(expected), inp)
- 
--        t([0 for _ in range(0, 16)], "00000000-00000000-00000000-00000000")
-+        t([0 for _ in range(0, 16)], "00000000-0000-0000-0000-000000000000")
-         t([185, 158, 125, 206, 250, 178, 125, 57, 2, 6, 162, 74, 178, 236,
--           196, 5], "b99e7dce-fab27d39-0206a24a-b2ecc405")
-+           196, 5], "b99e7dce-fab2-7d39-0206-a24ab2ecc405")
- 
- 
- def test_suite():
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch
deleted file mode 100644
index c462c59..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-# Backported from
-# http://lists.xensource.com/archives/html/xen-changelog/2006-04/msg00087.html
-
---- tools/python/xen/xm/create.py	2006-07-22 12:50:35.000000000 +1000
-+++ tools/python/xen/xm/create.py	2006-07-22 12:52:52.000000000 +1000
-@@ -850,6 +850,16 @@
-     opts.info("Started domain %s" % (dom))
-     return int(sxp.child_value(dominfo, 'domid'))
- 
-+def get_xauthority():
-+    xauth = os.getenv("XAUTHORITY")
-+    if not xauth:
-+        home = os.getenv("HOME")
-+        if not home:
-+            import posix, pwd
-+            home = pwd.getpwuid(posix.getuid())[5]
-+        xauth = home + "/.Xauthority"
-+    return xauth
-+
- def parseCommandLine(argv):
-     gopts.reset()
-     args = gopts.parse(argv)
-@@ -864,14 +874,7 @@
-         gopts.vals.display = os.getenv("DISPLAY")
- 
-     if not gopts.vals.xauthority:
--        xauth = os.getenv("XAUTHORITY")
--        if not xauth:
--            home = os.getenv("HOME")
--            if not home:
--                import posix, pwd
--                home = pwd.getpwuid(posix.getuid())[5]
--            xauth = home + "/.Xauthority"
--        gopts.vals.xauthority = xauth
-+        gopts.vals.xauthority = get_xauthority()
- 
-     # Process remaining args as config variables.
-     for arg in args:
---- tools/python/xen/xm/tests/test_create.py	2006-07-22 12:59:13.000000000 +1000
-+++ tools/python/xen/xm/tests/test_create.py	2006-07-22 12:59:13.000000000 +1000
-@@ -51,6 +51,7 @@
-                  'path'      : '.:/etc/xen',
-                  'builder'   : 'linux',
-                  'nics'      : -1,
-+                 'xauthority': xen.xm.create.get_xauthority(),
-                  })
- 
- 
-@@ -99,6 +100,7 @@
-                  'interface'   : 'eth0',
-                  'path'        : '.:/etc/xen',
-                  'builder'     : 'linux',
-+                 'xauthority': xen.xm.create.get_xauthority(),
-                })
- 
- 
-@@ -138,6 +140,7 @@
-                  'path'       : '.:/etc/xen',
-                  'builder'    : 'linux',
-                  'nics'       : -1,
-+                 'xauthority': xen.xm.create.get_xauthority(),
-                  })
-             
- 
-@@ -188,6 +191,7 @@
-                  'dhcp'        : 'off',
-                  'interface'   : 'eth0',
-                  'path'        : '.:/etc/xen',
-+                 'xauthority': xen.xm.create.get_xauthority(),
-                })
- 
- 
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch
deleted file mode 100644
index af51c3d..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- tools/libxc/xc_ptrace.c-orig	2006-10-13 15:53:29.000000000 +1000
-+++ tools/libxc/xc_ptrace.c	2006-10-13 15:54:06.000000000 +1000
-@@ -597,17 +597,13 @@
-             online_vcpus_changed(cpumap);
-         break;
- 
--    case PTRACE_SETFPREGS:
--    case PTRACE_SETFPXREGS:
--    case PTRACE_PEEKUSER:
--    case PTRACE_POKEUSER:
--    case PTRACE_SYSCALL:
--    case PTRACE_KILL:
--        goto out_unspported; /* XXX not yet supported */
--
-     case PTRACE_TRACEME:
-         printf("PTRACE_TRACEME is an invalid request under Xen\n");
-         goto out_error;
-+
-+    default:
-+        goto out_unspported; /* XXX not yet supported */
-+
-     }
- 
-     return retval;
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 07e9735..0000000
--- 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 a22bebe..0000000
--- 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-python-site-packages.patch b/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch
new file mode 100644
index 0000000..ea5a217
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch
@@ -0,0 +1,31 @@
+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/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
deleted file mode 100644
index bcd95f3..0000000
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
+++ /dev/null
@@ -1,199 +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.2-r4.ebuild,v 1.3 2007/03/13 06:26:34 aross Exp $
-
-inherit mount-boot flag-o-matic distutils eutils multilib
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.sourceforge.net"
-SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-${PV}-src.tgz"
-S="${WORKDIR}/xen-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug screen custom-cflags pygrub vnc sdl"
-
-CDEPEND="dev-lang/python
-	sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	vnc? ( media-libs/libsdl )
-	pygrub? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )"
-
-DEPEND="${CDEPEND}
-	sys-devel/gcc
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		dev-tex/latex2html
-		media-gfx/transfig
-	)
-	vnc? ( net-libs/libvncserver )"
-
-RDEPEND="${CDEPEND}
-	~app-emulation/xen-${PV}
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	|| ( sys-fs/udev sys-apps/hotplug )"
-
-PYTHON_MODNAME="xen grub"
-
-pkg_setup() {
-	if use vnc && ! use sdl ; then
-		ewarn "You have the 'vnc' USE flag set, but not 'sdl'."
-		ewarn "VNC functionality requires SDL support, so it"
-		ewarn "will be enabled anyway."
-	fi
-
-	if [[ "$(scanelf -s __guard -q `type -P 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
-
-	# xen tries to be smart and filter out CFLAGs not supported by gcc.
-	# It doesn't handle no* flags though, but flag-o-matic's test-flag-CC does.
-	for FLAG in -nopie -fno-stack-protector -fno-stack-protector-all; do
-		test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}"
-	done
-	sed  -i "s/^CFLAGS :=$/& ${HARDFLAGS}/" \
-		"${S}"/tools/firmware/{hvmloader,vmxassist}/Makefile
-
-
-	# Disable the 32bit-only vmxassist if we are not on x86
-	# and we don't support the x86 ABI
-	if ! use x86 && ! has x86 $(get_all_abis); then
-		sed -i -e "/SUBDIRS += vmxassist/d" "${S}"tools/firmware/Makefile
-	fi
-
-	if use pygrub; then
-		# Upstream use Debian and hence progsreiserfs-0.3.0,
-		# which has a different API to 0.3.1
-		epatch "${FILESDIR}/${P}"-pygrub-progsreiserfs-0.3.1.patch
-	else
-		sed -i -e "/^SUBDIRS += pygrub$/d" "${S}"/tools/Makefile
-	fi
-
-	# Fixes for hardened and amd64
-	epatch "${FILESDIR}"/${P}-bxclobber.patch
-	epatch "${FILESDIR}"/${P}-pushpop.patch
-
-	# Allow --as-needed LDFLAGS
-	epatch "${FILESDIR}/${P}"--as-needed.patch
-
-	# Allow building with python-2.5 (bug #149138)
-	# Backported from upstream - should be in 3.0.3
-	sed -i 's/\.2|^2\.3|^2\.4/.[2345]/' "${S}"/tools/check/check_python
-
-	# Fix upstream's broken test cases (bug #141233)
-	epatch "${FILESDIR}/${P}"-test-uuid.patch
-	epatch "${FILESDIR}/${P}"-test-xauthority.patch
-
-	# Fix compilation error with newer glibc (bug #151014)
-	# Backported from upstream - should be in 3.0.3
-	epatch "${FILESDIR}/${P}"-xc_ptrace.patch
-}
-
-src_compile() {
-	local myopt myconf
-	use debug && myopt="${myopt} debug=y"
-
-	myconf="${myconf} $(use_enable vnc)"
-	if use vnc ; then
-		myconf="${myconf} --enable-sdl"
-	else
-		myconf="${myconf} $(use_enable sdl)"
-	fi
-
-	use custom-cflags || unset CFLAGS
-	gcc-specs-ssp && append-flags -fno-stack-protector -fno-stack-protector-all
-
-	(cd tools/ioemu && econf ${myconf}) || die "configure failured"
-	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
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newinitd "${FILESDIR}"/xendomains.initd xendomains
-
-	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
-}
-
-pkg_postinst() {
-	elog "Please visit the Xen and Gentoo wiki:"
-	elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
-
-	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 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.0.4_p1.ebuild b/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
deleted file mode 100644
index b20f8c4..0000000
--- a/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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
-	x11-proto/xproto
-	doc? (
-		dev-tex/latex2html
-		media-gfx/transfig
-	)
-	ioemu? (
-		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 ; 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
-
-	# xen tries to be smart and filter out CFLAGs not supported by gcc.
-	# It doesn't handle no* flags though, but flag-o-matic's test-flag-CC does.
-	for FLAG in -nopie -fno-stack-protector -fno-stack-protector-all; do
-		test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}"
-	done
-	sed  -i "s/^CFLAGS :=$/& ${HARDFLAGS}/" \
-		"${S}"/tools/firmware/{hvmloader,vmxassist}/Makefile
-
-
-	# 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
-		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
-}
-
-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 ! 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 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.ebuild b/app-emulation/xen-tools/xen-tools-3.1.0.ebuild
new file mode 100644
index 0000000..a6b7b89
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-3.1.0.ebuild
@@ -0,0 +1,193 @@
+# 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 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 ; 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 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}/${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 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}" -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 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/Manifest b/app-emulation/xen/Manifest
index d2baa66..e92d970 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,20 +1,8 @@
-AUX xen-3.0.2-nopiessp.patch 443 RMD160 6143efc84069b1d66c9b3fcc625e7c44b27dbce6 SHA1 d838ea87de1cbf13f3984cc05502a2491acd5c26 SHA256 b206dbb8bf55ece33a851f8c9de511d5abd031825b339df9446ef5689f05c088
-MD5 eb2960e0572c35e38e37d9f16282cfed files/xen-3.0.2-nopiessp.patch 443
-RMD160 6143efc84069b1d66c9b3fcc625e7c44b27dbce6 files/xen-3.0.2-nopiessp.patch 443
-SHA256 b206dbb8bf55ece33a851f8c9de511d5abd031825b339df9446ef5689f05c088 files/xen-3.0.2-nopiessp.patch 443
-DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951
-DIST xen-3.0.4_1-src.tgz 6473636 RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b SHA1 7ca5af70996215229e143c7563e69b3719284a95 SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb
-EBUILD xen-3.0.2.ebuild 2368 RMD160 9939c026dd9a562d47e751dd946fa7caf7f305ad SHA1 aae1825a0febaa514497f05909db95285f5cb04c SHA256 6342a5fea3c1e86a75f1dc1f8ae06836265e3364935584ef37cb148b6d944e0f
-MD5 8c78fc5c90e6c3eb433e700ab305be25 xen-3.0.2.ebuild 2368
-RMD160 9939c026dd9a562d47e751dd946fa7caf7f305ad xen-3.0.2.ebuild 2368
-SHA256 6342a5fea3c1e86a75f1dc1f8ae06836265e3364935584ef37cb148b6d944e0f xen-3.0.2.ebuild 2368
-EBUILD xen-3.0.4_p1.ebuild 2695 RMD160 afbc380a50e71cec4a4340a55e8b893c3907fe65 SHA1 454f03ca8d14058a7c4b900f1f1ffd2bb4dc5411 SHA256 aeab0f9363ad35eb648dafbb8adf3850cce315e3aaa99975a25e392c1c58d89f
-MD5 d87b5d08e7f61c66219d1b434935f0b9 xen-3.0.4_p1.ebuild 2695
-RMD160 afbc380a50e71cec4a4340a55e8b893c3907fe65 xen-3.0.4_p1.ebuild 2695
-SHA256 aeab0f9363ad35eb648dafbb8adf3850cce315e3aaa99975a25e392c1c58d89f xen-3.0.4_p1.ebuild 2695
-MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-3.0.2 235
-RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-3.0.2 235
-SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-3.0.2 235
-MD5 de126addfd4101f35f8880ab0817ab03 files/digest-xen-3.0.4_p1 241
-RMD160 b65ff6928079bc0ee81b68ab27f3f4c9e1d36856 files/digest-xen-3.0.4_p1 241
-SHA256 66cfb008cc25de8a507359e492d6896908bc619901d901ae018fb135d2d91345 files/digest-xen-3.0.4_p1 241
+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
new file mode 100644
index 0000000..e436de9
--- /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/xen-3.0.2.ebuild b/app-emulation/xen/xen-3.0.2.ebuild
deleted file mode 100644
index 5eca785..0000000
--- a/app-emulation/xen/xen-3.0.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2006 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://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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug custom-cflags pae hardened"
-
-RDEPEND="sys-boot/grub
-		 ~sys-kernel/xen-sources-2.6.16.28"
-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; 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
-	if use hardened; then
-		cd "${S}"
-		epatch "${FILESDIR}/${PN}"-3.0.2-nopiessp.patch
-	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"
-
-	make DESTDIR="${D}" install-xen ${myopt} || 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.0.4_p1.ebuild b/app-emulation/xen/xen-3.0.4_p1.ebuild
deleted file mode 100644
index de6457f..0000000
--- a/app-emulation/xen/xen-3.0.4_p1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2006 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/"
-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; 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
-
-	# xen tries to be smart and filter out CFLAGs not supported by gcc.
-	# It doesn't handle no* flags though, but flag-o-matic's test-flag-CC does.
-	for FLAG in -nopie -fno-stack-protector -fno-stack-protector-all; do
-		test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}"
-	done
-	sed  -i "s/^CFLAGS-y.*__XEN__.*$/& ${HARDFLAGS}/" \
-		"${S}"/xen/Rules.mk
-}
-
-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"
-
-	make 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
new file mode 100644
index 0000000..01d3ff2
--- /dev/null
+++ b/app-emulation/xen/xen-3.1.0.ebuild
@@ -0,0 +1,89 @@
+# 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/Manifest b/sys-kernel/xen-sources/Manifest
index 152e8b6..7c2f8ee 100644
--- a/sys-kernel/xen-sources/Manifest
+++ b/sys-kernel/xen-sources/Manifest
@@ -1,19 +1,9 @@
-DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 SHA1 bef21cd5063a648f33a99a26f4742dd05eb4dca2 SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
-DIST patch-2.6.16.33.bz2 119729 RMD160 00168955e8219783b39896ba53ebbd36361a8e8a SHA1 25b107a8cc0d97fc2798482090dccd9701fe0c71 SHA256 25cec957b2057381f61c5d1e6963dd6fab46264cda160cd6550ead3bdb4ccaba
-DIST patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094 RMD160 5c595e8b4c6565de241a5b3a31f2e34afb24face SHA1 26cc01234bed90f3dc7695dcbbb35e190ba4c864 SHA256 0ce11436602401447763688819c4f62db87cac644e093304b7522b073693f9da
-DIST patch-2.6.16.49.bz2 309537 RMD160 4ae48c9432e1ed61d0e882174d8174de9b52593d SHA1 d020057af20817812ebd71dbc67a03d1379b75b8 SHA256 ed6fb9875dc2f263c9f405092713435c91337393b937a2dc8c3c82c7223cfd8d
-DIST xen-3.0.4_1-src.tgz 6473636 RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b SHA1 7ca5af70996215229e143c7563e69b3719284a95 SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb
-EBUILD xen-sources-2.6.16.33.ebuild 1505 RMD160 e3f5d84c3e5670dbb4842e34513e295635c28078 SHA1 6902fc12d70a636549782bdf9c5f5d4ada886542 SHA256 bd1d8e84a7a578d452aa0fe9679369006317c206caa860e477b54c6a22333b56
-MD5 8d6111536d6d5635207a416eec51c78a xen-sources-2.6.16.33.ebuild 1505
-RMD160 e3f5d84c3e5670dbb4842e34513e295635c28078 xen-sources-2.6.16.33.ebuild 1505
-SHA256 bd1d8e84a7a578d452aa0fe9679369006317c206caa860e477b54c6a22333b56 xen-sources-2.6.16.33.ebuild 1505
-EBUILD xen-sources-2.6.16.49.ebuild 822 RMD160 f71f8d4d035f8a6fc561db1babe3199fa95bfb3b SHA1 683728cd613c360805af0d105b57d83f2f286a5f SHA256 dfe76474a2fb07d6e7ab4f3fe718580b4a61d221e5aa2b8aa4e0f57e9830b2ff
-MD5 de93ee0116890f33db2173ffc77a0d36 xen-sources-2.6.16.49.ebuild 822
-RMD160 f71f8d4d035f8a6fc561db1babe3199fa95bfb3b xen-sources-2.6.16.49.ebuild 822
-SHA256 dfe76474a2fb07d6e7ab4f3fe718580b4a61d221e5aa2b8aa4e0f57e9830b2ff xen-sources-2.6.16.49.ebuild 822
-MD5 707fecb3c7ba0da784d91b5085543389 files/digest-xen-sources-2.6.16.33 726
-RMD160 b23d1951f2f34444e36efbcd706851bf6879beae files/digest-xen-sources-2.6.16.33 726
-SHA256 4fd98ee4a2c2608c4d4c910cfd6a2976353de973d078e90cd7b3427dd64e277f files/digest-xen-sources-2.6.16.33 726
-MD5 d764599ea5c1b68fe63be37d89512661 files/digest-xen-sources-2.6.16.49 768
-RMD160 c95e530a85c3d4ba130e2e861d26e391f166e635 files/digest-xen-sources-2.6.16.49 768
-SHA256 cb5bf466d9417590decadd22ce06e9a6278d6dbc5cb38600ec73f500d2d32a2b files/digest-xen-sources-2.6.16.49 768
+DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
+DIST patch-2.6.18_to_xen-3.1.0.bz2 598640 RMD160 2365a93cd056aa0829d00cff9a92a4368e3b0dba SHA1 a1ffbbb86bee0fbf2fc82a4afb27bc33aaf09ecc SHA256 ac3e4c165d4d77c7720be498133f4a5a999a7aaeb646c7b2c21c7aeedd809e83
+EBUILD xen-sources-2.6.18.ebuild 928 RMD160 a485c4b1af2d52b096a674958ed09a1bbe6a908d SHA1 1cf6085d71718fd340fb4934ad5b7b784e93fb8f SHA256 8a23020fbf2ea887b525077e2662fd3731f606e572feee4edd3098549293133a
+MD5 c2611cc13a6abda2cc86a4784284a21f xen-sources-2.6.18.ebuild 928
+RMD160 a485c4b1af2d52b096a674958ed09a1bbe6a908d xen-sources-2.6.18.ebuild 928
+SHA256 8a23020fbf2ea887b525077e2662fd3731f606e572feee4edd3098549293133a xen-sources-2.6.18.ebuild 928
+MD5 e4d2e4167b43bdedfe39e87e65902c70 files/digest-xen-sources-2.6.18 515
+RMD160 ca27044079907ac488736a4f26c4fe0f88894e30 files/digest-xen-sources-2.6.18 515
+SHA256 148da1abe7d72ebaaf428de2e2506fb4579b7392b030a6378c58c23b8352c1e9 files/digest-xen-sources-2.6.18 515
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.46 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.46
deleted file mode 100644
index fa46abc..0000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.46
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005
-RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005
-SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005
-MD5 a45805635c1e1f53edebe01486761ecc patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
-RMD160 5c595e8b4c6565de241a5b3a31f2e34afb24face patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
-SHA256 0ce11436602401447763688819c4f62db87cac644e093304b7522b073693f9da patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
-MD5 5ceac58367a2d1d3ea6ac333626c26d6 patch-2.6.16.46.bz2 293622
-RMD160 fc615e67291b9fbae364eff6b91b9ff1d3ec08b8 patch-2.6.16.46.bz2 293622
-SHA256 286fba6c069e9e8e7e811f1de035c26af0fc1204d21ce8d6760b0de44cfc0e13 patch-2.6.16.46.bz2 293622
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.49 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.49
deleted file mode 100644
index c8da723..0000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.49
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005
-RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005
-SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005
-MD5 a45805635c1e1f53edebe01486761ecc patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
-RMD160 5c595e8b4c6565de241a5b3a31f2e34afb24face patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
-SHA256 0ce11436602401447763688819c4f62db87cac644e093304b7522b073693f9da patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
-MD5 e46be5ef52ae991575d45ad433132ac8 patch-2.6.16.49.bz2 309537
-RMD160 4ae48c9432e1ed61d0e882174d8174de9b52593d patch-2.6.16.49.bz2 309537
-SHA256 ed6fb9875dc2f263c9f405092713435c91337393b937a2dc8c3c82c7223cfd8d patch-2.6.16.49.bz2 309537
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18
new file mode 100644
index 0000000..fb87580
--- /dev/null
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18
@@ -0,0 +1,6 @@
+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 84a8f645581c457d09e25cd5f4d6d62b patch-2.6.18_to_xen-3.1.0.bz2 598640
+RMD160 2365a93cd056aa0829d00cff9a92a4368e3b0dba patch-2.6.18_to_xen-3.1.0.bz2 598640
+SHA256 ac3e4c165d4d77c7720be498133f4a5a999a7aaeb646c7b2c21c7aeedd809e83 patch-2.6.18_to_xen-3.1.0.bz2 598640
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.33.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.33.ebuild
deleted file mode 100644
index 7d2c3fe..0000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.16.33.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ETYPE="sources"
-inherit kernel-2 eutils
-detect_arch
-detect_version
-
-DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-XEN_VERSION="3.0.4_1"
-MY_P="xen-${XEN_VERSION}-src"
-XEN_URI="http://bits.xensource.com/oss-xen/release/${XEN_VERSION/_/-}/src.tgz/${MY_P}.tgz"
-SRC_URI="${KERNEL_URI} ${XEN_URI}"
-
-KEYWORDS="~x86 ~amd64"
-
-src_unpack() {
-	kernel-2_src_unpack
-	cd "${WORKDIR}"
-	unpack "${MY_P}.tgz"
-
-	cd "${WORKDIR}"/${MY_P}
-	sed -e 's:relative_lndir \([^(].*\):cp -dpPR \1/* .:' \
-		-i linux-2.6-xen-sparse/mkbuildtree || die
-
-	# Don't munge up EXTRAVERSION
-	sed -e 's:$$(XENGUEST)::' -i buildconfigs/mk.linux-2.6-xen
-
-	# No need to run oldconfig
-	sed -e 's:$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) oldconfig::' \
-		-i buildconfigs/mk.linux-2.6-xen
-
-	# Move the kernel sources to pristine-linux-${PV}
-	mv "${WORKDIR}"/linux-${KV} pristine-linux-${PV} || die
-	touch pristine-linux-${PV}/.valid-pristine || die
-	
-	make LINUX_SRC_PATH=${DISTDIR} XEN_ROOT=${WORKDIR}/${MY_P} \
-		-f buildconfigs/mk.linux-2.6-xen \
-		linux-${PV}-xen/include/linux/autoconf.h || die
-	mv linux-${PV}-xen "${WORKDIR}"/linux-${KV} || die
-	rm -rf "${WORKDIR}/${MY_P}" || die
-}
-
-pkg_postinst() {
-	postinst_sources
-
-	elog "This kernel uses the linux patches released with Xen ${XEN_VERSION}"
-	elog "It may not work with other versions of Xen"
-}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.49.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.49.ebuild
deleted file mode 100644
index debd816..0000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.16.49.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ETYPE="sources"
-UNIPATCH_STRICTORDER="1"
-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/"
-
-XEN_VERSION="3.0.4_1"
-XEN_BASE_KV="2.6.16.33"
-XEN_PATCH="patch-${XEN_BASE_KV}_to_xen-${XEN_VERSION}.bz2"
-# Change to gentoo mirror when pushed into portage:
-PATCH_URI="http://dev.gentoo.org/~marineam/files/xen/${XEN_PATCH}"
-SRC_URI="${KERNEL_URI} ${PATCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}"
-
-KEYWORDS="~x86 ~amd64"
-
-pkg_postinst() {
-	postinst_sources
-
-	elog "This kernel uses the linux patches released with Xen 3.0.4"
-	elog "It claims to have a 3.0.2 compatibility option but it may not work."
-}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.18.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.18.ebuild
new file mode 100644
index 0000000..0198ac9
--- /dev/null
+++ b/sys-kernel/xen-sources/xen-sources-2.6.18.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.16.49.ebuild,v 1.1 2007/05/02 03:31:45 marineam Exp $
+
+ETYPE="sources"
+UNIPATCH_STRICTORDER="1"
+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/"
+
+XEN_VERSION="3.1.0"
+XEN_BASE_KV="2.6.18"
+XEN_PATCH="patch-${XEN_BASE_KV}_to_xen-${XEN_VERSION}.bz2"
+#PATCH_URI="mirror://gentoo/${XEN_PATCH}"
+PATCH_URI="http://dev.gentoo.org/~marineam/files/xen/${XEN_PATCH}"
+SRC_URI="${KERNEL_URI} ${PATCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}"
+
+KEYWORDS="~x86 ~amd64"
+
+#pkg_postinst() {
+#	postinst_sources
+#
+#	elog "This kernel uses the linux patches released with Xen 3.0.4"
+#	elog "It claims to have a 3.0.2 compatibility option but it may not work."
+#}
-- 
cgit v1.2.3-65-gdbad