Initial import from portage tree.

svn path=/; revision=1

15 files changed, 679 insertions, 0 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
new file mode 100644
index 0000000..6cd6a91
--- /dev/null
+++ b/app-emulation/xen-tools/ChangeLog
@@ -0,0 +1,95 @@
+# ChangeLog for app-emulation/xen-tools
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.17 2006/08/14 07:11:47 aross Exp $
+
+*xen-tools-3.0.2-r3 (15 Aug 2006)
+
+  15 Aug 2006; Andrew Ross <aross@gentoo.org> +files/xen-consoles.logrotate,
+  -files/xend-conf, +files/xendomains.confd, +files/xendomains.initd,
+  +files/xendomains-screen.confd, metadata.xml, -xen-tools-3.0.2-r1.ebuild,
+  xen-tools-3.0.2-r2.ebuild, +xen-tools-3.0.2-r3.ebuild:
+  Fix bugs #141981, #142011, #141866, and #137886. Thanks to Brad Plant
+  <bplant@westnet.com.au>, Nedd Ludd <solar@gentoo.org>, Nick Devito
+  <nick125@gmail.com>, and Mike Williams <mike@gaima.co.uk>.
+
+  10 Aug 2006; Sven Wegener <swegener@gentoo.org>
+  +files/xen-tools-3.0.2-bxclobber.patch,
+  +files/xen-tools-3.0.2-pushpop.patch, -files/hardened-bx-clobber.patch,
+  metadata.xml, xen-tools-3.0.2-r2.ebuild:
+  Fix push and pop usage for amd64, bug #142682. Disable the 32bit-only
+  vmxassist, if we can't compile x86 32bit code, bug #138314.
+
+  10 Aug 2006; Andrew Ross <aross@gentoo.org> xen-tools-3.0.2-r2.ebuild:
+  Fix minor bug (debug USE flag ignored) introduced by the fix for bug #124361
+
+  10 Aug 2006; Andrew Ross <aross@gentoo.org>
+  +files/xen-tools-3.0.2-test-uuid.patch,
+  +files/xen-tools-3.0.2-test-xauthority.patch, metadata.xml,
+  xen-tools-3.0.2-r1.ebuild, xen-tools-3.0.2-r2.ebuild:
+  Fix bug #141233 and add myself as a maintainer.
+
+*xen-tools-3.0.2-r2 (04 Aug 2006)
+
+  04 Aug 2006; Chris Bainbridge <chrb@gentoo.org>
+  +xen-tools-3.0.2-r2.ebuild:
+  Add support for vnc and sdl - thanks to Nick Devito and Andrew Ross in bug
+  #124361
+
+*xen-tools-3.0.2-r1 (09 Jun 2006)
+
+  09 Jun 2006; Chris Bainbridge <chrb@gentoo.org> -xen-tools-3.0.2.ebuild,
+  +xen-tools-3.0.2-r1.ebuild:
+  Clean up .pyc files, thanks to Andrew Ross, bug #136159
+
+  02 Jun 2006; Roy Marples <uberlord@gentoo.org>
+  +files/xen-tools-3.0.2--as-needed.patch, -xen-tools-3.0.1.ebuild,
+  -xen-tools-3.0.1_p9029.ebuild, xen-tools-3.0.2.ebuild:
+  Add patch to enable --as-needed LDFLAG, #135145
+
+  26 Apr 2006; Aron Griffis <agriffis@gentoo.org> xen-tools-3.0.1.ebuild,
+  xen-tools-3.0.1_p9029.ebuild, xen-tools-3.0.2.ebuild:
+  Remove ~ia64 since this ebuild deps on app-emulation/xen, which won't have
+  ia64 keywords for a while yet
+
+  11 Apr 2006; <chrb@gentoo.org> +files/hardened-bx-clobber.patch,
+  xen-tools-3.0.2.ebuild:
+  add hardened patch and IUSE flag, #129491
+
+  10 Apr 2006; <chrb@gentoo.org> xen-tools-3.0.2.ebuild:
+  Fix hardened flags for hvmloader and vmxassist, #129491
+
+  10 Apr 2006; <chrb@gentoo.org> xen-tools-3.0.2.ebuild:
+  removed the hardened stripping flags - now that the hypervisor is split out,
+  the tools should be compilable with hardened flags. There is currently a bug
+  with register clobbering which has been filed at bugzilla.xensource.com #609
+
+  10 Apr 2006; <chrb@gentoo.org> xen-tools-3.0.2.ebuild:
+  add some extra man pages, #129189
+
+  10 Apr 2006; <chrb@gentoo.org> xen-tools-3.0.2.ebuild:
+  remove sed fix, #129429
+
+  10 Apr 2006; <chrb@gentoo.org> files/digest-xen-tools-3.0.2, Manifest:
+  new digest
+
+*xen-tools-3.0.2 (09 Apr 2006)
+
+  09 Apr 2006; <chrb@gentoo.org> +xen-tools-3.0.2.ebuild:
+  bump, #129191
+
+  01 Apr 2006; Aron Griffis <agriffis@gentoo.org> xen-tools-3.0.1.ebuild,
+  xen-tools-3.0.1_p9029.ebuild:
+  Add warning regarding dev-lang/python built without USE=ncurses #128175
+
+*xen-tools-3.0.1_p9029 (24 Mar 2006)
+*xen-tools-3.0.1 (24 Mar 2006)
+
+  24 Mar 2006; Aron Griffis <agriffis@gentoo.org> +files/xend-conf,
+  +files/xend-init, +files/xendomains-conf, +files/xendomains-init,
+  +metadata.xml, +xen-tools-3.0.1.ebuild, +xen-tools-3.0.1_p9029.ebuild:
+  Split xen-tools from xen; this package installs xend and the tools, but not
+  the hypervisor or include files. Unify the release and snapshot ebuilds for
+  easier maintenance. Switch to a snapshot versioning scheme that keeps
+  release/snapshot versions in order. Add myself as an additional maintainer
+  in metadata.xml
+
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
new file mode 100644
index 0000000..b845dcb
--- /dev/null
+++ b/app-emulation/xen-tools/Manifest
@@ -0,0 +1,64 @@
+AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19
+MD5 9df68ac65dc3f372f5d61183abdc83ff files/xen-consoles.logrotate 63
+RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 files/xen-consoles.logrotate 63
+SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 files/xen-consoles.logrotate 63
+AUX xen-tools-3.0.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 xend-init 854 RMD160 e19cc95563c3e128255f3575297bc0d35786b5a4 SHA1 820fa00ddea6ba4c42c8d089b61c48b7a37bba80 SHA256 3991a74268dd4bc8b6fe53ed784f3cd764eb7112844dee34f3115bcd15d33377
+MD5 b8d59e2eba1f6b245eb22e39c01df78c files/xend-init 854
+RMD160 e19cc95563c3e128255f3575297bc0d35786b5a4 files/xend-init 854
+SHA256 3991a74268dd4bc8b6fe53ed784f3cd764eb7112844dee34f3115bcd15d33377 files/xend-init 854
+AUX xendomains-conf 180 RMD160 17f791a0369e9e1f1cbd15c7513a4ca14d3f5f18 SHA1 b0448805ff0dd0567f5b7d5ce3832553852e6f11 SHA256 78427be48c93ec744206df4dcafaedb584dee8a200efbbc54cba432d96cf0ca3
+MD5 11ef318e35fcfed12931f182fc01955a files/xendomains-conf 180
+RMD160 17f791a0369e9e1f1cbd15c7513a4ca14d3f5f18 files/xendomains-conf 180
+SHA256 78427be48c93ec744206df4dcafaedb584dee8a200efbbc54cba432d96cf0ca3 files/xendomains-conf 180
+AUX xendomains-init 1681 RMD160 8a274725bee24929b97d5e199da4e5cfd0f3edf5 SHA1 cf50100aa4363868e1ad81f4afd7136242c57cbb SHA256 c3537920096cd94e80024b4d05706cd901f546c54ea8449b45399419b2ca51d0
+MD5 23de87e566971e687ab2a7c2353a3c17 files/xendomains-init 1681
+RMD160 8a274725bee24929b97d5e199da4e5cfd0f3edf5 files/xendomains-init 1681
+SHA256 c3537920096cd94e80024b4d05706cd901f546c54ea8449b45399419b2ca51d0 files/xendomains-init 1681
+AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
+MD5 65a57a4fae5a300aed8b84c24cdeee42 files/xendomains-screen.confd 594
+RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 files/xendomains-screen.confd 594
+SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a files/xendomains-screen.confd 594
+AUX xendomains.confd 163 RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 SHA1 bf9a43a4812947189c9bedbf0f1b457f39f50893 SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef
+MD5 b9420a9887a4b4ca6749006f5586f130 files/xendomains.confd 163
+RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 files/xendomains.confd 163
+SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef files/xendomains.confd 163
+AUX xendomains.initd 2272 RMD160 ef57e016a0c6076f385ece4da77ea62b18349924 SHA1 2cca3a2aff6a42db6c00e228da84a23220f3a760 SHA256 6cdba349028a8af689a960a700f32f2e146334c38ae75b8afd7141dbd160d000
+MD5 99faf5e0acd1af480c0676189ffe7c9a files/xendomains.initd 2272
+RMD160 ef57e016a0c6076f385ece4da77ea62b18349924 files/xendomains.initd 2272
+SHA256 6cdba349028a8af689a960a700f32f2e146334c38ae75b8afd7141dbd160d000 files/xendomains.initd 2272
+DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951
+EBUILD xen-tools-3.0.2-r3.ebuild 5530 RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf SHA1 421419794bd2c77c6780d936c91f1c19c000dfb2 SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e
+MD5 11588a83ffd3177430efeca5cc668ba3 xen-tools-3.0.2-r3.ebuild 5530
+RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf xen-tools-3.0.2-r3.ebuild 5530
+SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e xen-tools-3.0.2-r3.ebuild 5530
+MISC ChangeLog 4062 RMD160 78653570587403aa5e04541b135ddd0f4f60835f SHA1 ec6271ba72eabdf409404613d9429a1f624ccb73 SHA256 07d9d83bfd17a744f49111142b2e827367a5aad766666461017407f48ce079f5
+MD5 e53a1414ff96596d233b5b7d2202d739 ChangeLog 4062
+RMD160 78653570587403aa5e04541b135ddd0f4f60835f ChangeLog 4062
+SHA256 07d9d83bfd17a744f49111142b2e827367a5aad766666461017407f48ce079f5 ChangeLog 4062
+MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
+MD5 559b4095659a2a2a489784de8a6ef95e metadata.xml 156
+RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 metadata.xml 156
+SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2 metadata.xml 156
+MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r3 235
+RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r3 235
+SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r3 235
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r3 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r3
new file mode 100644
index 0000000..724d092
--- /dev/null
+++ b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r3
@@ -0,0 +1,3 @@
+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/xen-consoles.logrotate b/app-emulation/xen-tools/files/xen-consoles.logrotate
new file mode 100644
index 0000000..c644523
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-consoles.logrotate
@@ -0,0 +1,5 @@
+/var/log/xen-consoles/*.log {
+	rotate 7
+	missingok
+	compress
+}
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
new file mode 100644
index 0000000..362e495
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 0000000..8f0b561
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch
@@ -0,0 +1,26 @@
+# 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
new file mode 100644
index 0000000..807e007
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch
@@ -0,0 +1,32 @@
+# 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
new file mode 100644
index 0000000..b4829e4
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch
@@ -0,0 +1,17 @@
+# 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
new file mode 100644
index 0000000..c462c59
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch
@@ -0,0 +1,72 @@
+# 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/xend-init b/app-emulation/xen-tools/files/xend-init
new file mode 100644
index 0000000..891ab66
--- /dev/null
+++ b/app-emulation/xen-tools/files/xend-init
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend-init,v 1.1 2006/03/24 23:55:01 agriffis Exp $
+
+opts="start stop status restart"
+
+depend() {
+	need net
+	before xendomains sshd ntpd nfs nfsmount rsyncd portmap dhcp
+}
+
+await_daemons_up() {
+	for ((i=0; i<5; i++)); do
+		sleep 1
+		/usr/sbin/xend status && return 0
+	done
+	return 1
+}
+
+start() {
+	ebegin "Starting Xen control daemon"
+	/usr/sbin/xend start
+	/usr/sbin/xend status || await_daemons_up
+	eend $?
+}
+
+stop() {
+	if [ "$(xm list | wc -l)" -gt 2 ]; then
+		ebegin "  Stopping all domains"
+		/usr/sbin/xm shutdown --all --wait >/dev/null
+		eend $?
+	fi
+
+	ebegin "Stopping Xen control daemon"
+	/usr/sbin/xend stop
+	eend $?
+}
+
+status() {
+	/usr/sbin/xend status
+}
diff --git a/app-emulation/xen-tools/files/xendomains-screen.confd b/app-emulation/xen-tools/files/xendomains-screen.confd
new file mode 100644
index 0000000..1482c0a
--- /dev/null
+++ b/app-emulation/xen-tools/files/xendomains-screen.confd
@@ -0,0 +1,15 @@
+# When SCREEN="yes", domains in AUTODIR have their consoles connected to a
+# screen session named SCREEN_NAME, with output logged to individual files 
+# named after each domain and written to /var/log/xen-consoles/ . These files
+# are rotated (using app-admin/logrotate) every time xendomains is started.
+
+SCREEN="yes"
+SCREEN_NAME="xen"
+
+# Number of seconds between writes to screen's logfiles.
+#
+# Lower values mean more disk activity and hence a possible performance
+# impact, but higher values mean a greater chance of loosing some output
+# in the event of a crash.
+
+SCREEN_LOG_INTERVAL="1"
diff --git a/app-emulation/xen-tools/files/xendomains.confd b/app-emulation/xen-tools/files/xendomains.confd
new file mode 100644
index 0000000..f1d810d
--- /dev/null
+++ b/app-emulation/xen-tools/files/xendomains.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/xendomains
+
+# Directory of domains to boot. AUTODIR should contain one or more symlinks
+# to domain config files in /etc/xen
+
+AUTODIR=/etc/xen/auto
+
diff --git a/app-emulation/xen-tools/files/xendomains.initd b/app-emulation/xen-tools/files/xendomains.initd
new file mode 100755
index 0000000..15a263a
--- /dev/null
+++ b/app-emulation/xen-tools/files/xendomains.initd
@@ -0,0 +1,96 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd,v 1.1 2006/08/14 07:11:47 aross Exp $
+
+opts="start stop status restart"
+
+depend() {
+	need xend
+	after dhcp
+}
+
+get_domname() {
+	local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alpha:]_]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
+
+	if [[ -z ${name_from_file} ]] ; then
+		basename "${1}"
+	else
+		echo ${name_from_file}	
+	fi
+}
+
+is_running() {
+	/usr/sbin/xm list "${1}" >/dev/null 2>&1
+}
+
+using_screen() {
+	[[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]]	
+}
+
+set_screen_cmd() {
+	screen_cmd="screen -q -r ${SCREEN_NAME:=xen} -X"
+}
+
+start() {
+	set_screen_cmd
+
+	einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}"
+	if using_screen ; then
+		ebegin "Creating screen session to hold domain consoles"
+		(  screen -d -m -S ${SCREEN_NAME} -t dom0 \
+		&& ${screen_cmd} zombie dr \
+		&& logrotate -f /etc/xen/xen-consoles.logrotate \
+		&& ${screen_cmd} logfile  /var/log/xen-consoles/%t.log \
+		&& ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \
+		&& ${screen_cmd} log on \
+		&& ${screen_cmd} deflog on ) >/dev/null
+		if [[ $? -ne 0 ]] ; then
+			eend 1
+			return 1
+		else
+			eend
+		fi
+	fi
+	# Create all domains with config files in AUTODIR.
+	for dom in $(ls "${AUTODIR}/"* 2>/dev/null); do
+		name=$(get_domname ${dom})
+		if ! is_running ${name} ; then
+			ebegin "  Starting domain ${name}"
+			if using_screen ; then
+				${screen_cmd} screen -t ${name} xm create ${dom} -c
+			else
+				xm create --quiet ${dom}
+			fi
+			eend $?
+		else
+			einfo "  Not starting domain ${name} - already running"
+		fi
+	done
+}
+
+stop() {
+	set_screen_cmd
+
+	einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}"
+	# Stop all domains with config files in AUTODIR.
+	for dom in $(ls "${AUTODIR}/"* 2>/dev/null); do
+		name=$(get_domname ${dom})
+		if is_running ${name} ; then
+			ebegin "  Stopping domain ${name}"
+				xm shutdown --wait ${name} >/dev/null
+			eend $?
+		else
+			einfo "  Not stopping domain ${name} - not running"
+		fi
+	done
+	if using_screen ; then
+		ebegin "Closing screen session ${SCREEN_NAME}"
+		${screen_cmd} quit
+		eend $?
+	fi
+}
+
+status() {
+	/usr/sbin/xm list
+}
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
new file mode 100644
index 0000000..cc9d568
--- /dev/null
+++ b/app-emulation/xen-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>xen</herd>
+</pkgmetadata>
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild
new file mode 100644
index 0000000..3457ddd
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2006 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-r3.ebuild,v 1.1 2006/08/14 07:11:47 aross Exp $
+
+inherit mount-boot flag-o-matic distutils eutils multilib
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.sourceforge.net"
+if [[ ${PV} == *_p* ]]; then
+	XEN_UNSTABLE="xen-unstable-${PV#*_p}"
+	SRC_URI="mirror://gentoo/${XEN_UNSTABLE}.tar.bz2"
+	S="${WORKDIR}/${XEN_UNSTABLE}"
+else
+	SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-${PV}-src.tgz"
+	S="${WORKDIR}/xen-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug screen custom-cflags hardened vnc sdl"
+
+CDEPEND="dev-lang/python
+	sys-libs/zlib
+	sdl? ( media-libs/libsdl )
+	vnc? ( media-libs/libsdl )"
+
+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-3.0.2
+	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 `which python`)" ]] ; then
+		eerror "xend doesn't work when python is built with stack smashing protection (ssp)."
+		eerror "Please append the following to your CFLAGS and remerge python:"
+		eerror "  '-fno-stack-protector -fno-stack-protector-all'"
+		die "python was built with stack smashing protection (ssp)"
+	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
+	# for some reason the xen gcc checks don't work on gentoo-hardened
+	if use hardened; then
+		HARDFLAGS="-nopie -fno-stack-protector -fno-stack-protector-all"
+		sed -e "s/CFLAGS :=/CFLAGS := ${HARDFLAGS}/" \
+		-i "${S}"/tools/firmware/hvmloader/Makefile \
+		"${S}"/tools/firmware/vmxassist/Makefile
+	fi
+
+	# 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
+
+	# 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
+
+	# Fix upstream's broken test cases (bug #141233)
+	epatch "${FILESDIR}/${P}"-test-uuid.patch
+	epatch "${FILESDIR}/${P}"-test-xauthority.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-init 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
+
+
+	# for upstream change tracking
+	if [[ -n ${XEN_UNSTABLE} ]]; then
+		dodoc "${S}"/XEN-VERSION
+	fi
+}
+
+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
+
+	if [[ -n ${XEN_UNSTABLE} ]]; then
+		echo
+		elog "This is a snapshot of the xen-unstable tree."
+		elog "Please report bugs in xen itself (and not the packaging) to"
+		elog "bugzilla.xensource.com"
+	fi
+}