Copy xen-tools 3.0.2 into overlay and reorganize the files dir. This is what the portage commit will look like.

svn path=/xen/; revision=25

19 files changed, 673 insertions, 49 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 1527df0..d79879c 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,44 +1,76 @@
-AUX 3.0.4_p1/xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19
-MD5 9df68ac65dc3f372f5d61183abdc83ff files/3.0.4_p1/xen-consoles.logrotate 63
-RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 files/3.0.4_p1/xen-consoles.logrotate 63
-SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 files/3.0.4_p1/xen-consoles.logrotate 63
-AUX 3.0.4_p1/xen-tools--as-needed.patch 517 RMD160 579721dff853f9762c649f17af86ef920b5e98eb SHA1 2cbf34f6daa27ff09a2d0e23396c775f0d2eb3e0 SHA256 37d64ba6b5b76f15d6300855a808ac632a1e228e9d3dc4bf8f3ddaac3d326c8a
-MD5 79a4dfd90d23e1a01a334c3c2ee29bb2 files/3.0.4_p1/xen-tools--as-needed.patch 517
-RMD160 579721dff853f9762c649f17af86ef920b5e98eb files/3.0.4_p1/xen-tools--as-needed.patch 517
-SHA256 37d64ba6b5b76f15d6300855a808ac632a1e228e9d3dc4bf8f3ddaac3d326c8a files/3.0.4_p1/xen-tools--as-needed.patch 517
-AUX 3.0.4_p1/xen-tools-network-bridge-broadcast.patch 841 RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 SHA1 88142952527acc47b00c98a4ccde15661449ee04 SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223
-MD5 2812525317e8827f626962738e4643d4 files/3.0.4_p1/xen-tools-network-bridge-broadcast.patch 841
-RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 files/3.0.4_p1/xen-tools-network-bridge-broadcast.patch 841
-SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223 files/3.0.4_p1/xen-tools-network-bridge-broadcast.patch 841
-AUX 3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 592 RMD160 a7b29d6563c2124d218658d56083c2847a9a287a SHA1 a92ed78cfc1dd04f7342a58e725f5279af84a14d SHA256 de0a6bcc6461f49c7ee32b843fcf4deee157c980db5b164aeb7b8859e3614389
-MD5 8cefd2566392cb8a27190b54dfaa0620 files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 592
-RMD160 a7b29d6563c2124d218658d56083c2847a9a287a files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 592
-SHA256 de0a6bcc6461f49c7ee32b843fcf4deee157c980db5b164aeb7b8859e3614389 files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch 592
-AUX 3.0.4_p1/xen-tools-vnclisten.patch 519 RMD160 96a88fcd593bbc4461d87fb50b3ecaf06bab8729 SHA1 95e37aa7d92fcd87616a39be032bc91c18077881 SHA256 4f368dada2c7c5538ac6c2a2e23693828dea18a4b27e54c3d4a65e5603812dcb
-MD5 423ad930eef2e40ee30b6f648f0340f2 files/3.0.4_p1/xen-tools-vnclisten.patch 519
-RMD160 96a88fcd593bbc4461d87fb50b3ecaf06bab8729 files/3.0.4_p1/xen-tools-vnclisten.patch 519
-SHA256 4f368dada2c7c5538ac6c2a2e23693828dea18a4b27e54c3d4a65e5603812dcb files/3.0.4_p1/xen-tools-vnclisten.patch 519
-AUX 3.0.4_p1/xend.initd 1187 RMD160 6e5313e02198700204b27e4b02f8579a247aa2a0 SHA1 f16d2d5e014c91b6bc0ff63da717e79b4faada1d SHA256 1e619990ccebe11dab4c6fa1a6e4e0e1101854f633ef9c05836d0e9fba25d5cd
-MD5 e62f964336e77b320dcff0321d6166cf files/3.0.4_p1/xend.initd 1187
-RMD160 6e5313e02198700204b27e4b02f8579a247aa2a0 files/3.0.4_p1/xend.initd 1187
-SHA256 1e619990ccebe11dab4c6fa1a6e4e0e1101854f633ef9c05836d0e9fba25d5cd files/3.0.4_p1/xend.initd 1187
-AUX 3.0.4_p1/xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
-MD5 65a57a4fae5a300aed8b84c24cdeee42 files/3.0.4_p1/xendomains-screen.confd 594
-RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 files/3.0.4_p1/xendomains-screen.confd 594
-SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a files/3.0.4_p1/xendomains-screen.confd 594
-AUX 3.0.4_p1/xendomains.confd 163 RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 SHA1 bf9a43a4812947189c9bedbf0f1b457f39f50893 SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef
-MD5 b9420a9887a4b4ca6749006f5586f130 files/3.0.4_p1/xendomains.confd 163
-RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 files/3.0.4_p1/xendomains.confd 163
-SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef files/3.0.4_p1/xendomains.confd 163
-AUX 3.0.4_p1/xendomains.initd 2168 RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 SHA1 a7f75a7aff0ffdb3ca330f853855b888cfb7f752 SHA256 ed1adcb24e5ffe1c0abc33d6bd69f129b31b3d4f068222ee343809a8dd12b8d0
-MD5 a3b477fa44710894c47b0aeca7d6a57a files/3.0.4_p1/xendomains.initd 2168
-RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 files/3.0.4_p1/xendomains.initd 2168
-SHA256 ed1adcb24e5ffe1c0abc33d6bd69f129b31b3d4f068222ee343809a8dd12b8d0 files/3.0.4_p1/xendomains.initd 2168
+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 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
+SHA256 37d64ba6b5b76f15d6300855a808ac632a1e228e9d3dc4bf8f3ddaac3d326c8a files/xen-tools-3.0.4_p1--as-needed.patch 517
+AUX xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841 RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 SHA1 88142952527acc47b00c98a4ccde15661449ee04 SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223
+MD5 2812525317e8827f626962738e4643d4 files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841
+RMD160 21fd0a5e50109cb9665717e17522afded6c26c26 files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841
+SHA256 75c0739f55cc63f1d17d16465ec681c943155ae57b5c9d67ed7c6be6254d3223 files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch 841
+AUX xen-tools-3.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 xend.initd 1187 RMD160 6e5313e02198700204b27e4b02f8579a247aa2a0 SHA1 f16d2d5e014c91b6bc0ff63da717e79b4faada1d SHA256 1e619990ccebe11dab4c6fa1a6e4e0e1101854f633ef9c05836d0e9fba25d5cd
+MD5 e62f964336e77b320dcff0321d6166cf files/xend.initd 1187
+RMD160 6e5313e02198700204b27e4b02f8579a247aa2a0 files/xend.initd 1187
+SHA256 1e619990ccebe11dab4c6fa1a6e4e0e1101854f633ef9c05836d0e9fba25d5cd files/xend.initd 1187
+AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
+MD5 65a57a4fae5a300aed8b84c24cdeee42 files/xendomains-screen.confd 594
+RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 files/xendomains-screen.confd 594
+SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a files/xendomains-screen.confd 594
+AUX xendomains.confd 163 RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 SHA1 bf9a43a4812947189c9bedbf0f1b457f39f50893 SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef
+MD5 b9420a9887a4b4ca6749006f5586f130 files/xendomains.confd 163
+RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 files/xendomains.confd 163
+SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef files/xendomains.confd 163
+AUX xendomains.initd 2168 RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 SHA1 a7f75a7aff0ffdb3ca330f853855b888cfb7f752 SHA256 ed1adcb24e5ffe1c0abc33d6bd69f129b31b3d4f068222ee343809a8dd12b8d0
+MD5 a3b477fa44710894c47b0aeca7d6a57a files/xendomains.initd 2168
+RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 files/xendomains.initd 2168
+SHA256 ed1adcb24e5ffe1c0abc33d6bd69f129b31b3d4f068222ee343809a8dd12b8d0 files/xendomains.initd 2168
+DIST xen-3.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.4_p1.ebuild 5638 RMD160 5a06073e22877a25e1f43143a45685f36b2fde20 SHA1 92dc2793cc9df4a282718a8120f413ab4832e64f SHA256 a04c9cad6cae180f94fa8d60553ff821c8371c60b378149de64c17e49be2fb0a
-MD5 38e51f173d9982b4f533915132725dbd xen-tools-3.0.4_p1.ebuild 5638
-RMD160 5a06073e22877a25e1f43143a45685f36b2fde20 xen-tools-3.0.4_p1.ebuild 5638
-SHA256 a04c9cad6cae180f94fa8d60553ff821c8371c60b378149de64c17e49be2fb0a xen-tools-3.0.4_p1.ebuild 5638
+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 5571 RMD160 3698d980a84a81457464eeb84eaeff55145da247 SHA1 1ca0c814f1e9eb3cab4853f7ca3eb725467991e9 SHA256 835783cb6dc158fe9907d29072a36576810791c69e82fabf73e10823b879fae6
+MD5 d946733c792f96f13d5b8d1514681832 xen-tools-3.0.4_p1.ebuild 5571
+RMD160 3698d980a84a81457464eeb84eaeff55145da247 xen-tools-3.0.4_p1.ebuild 5571
+SHA256 835783cb6dc158fe9907d29072a36576810791c69e82fabf73e10823b879fae6 xen-tools-3.0.4_p1.ebuild 5571
+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
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
new file mode 100644
index 0000000..724d092
--- /dev/null
+++ b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4
@@ -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/xen-tools-3.0.2-xc_ptrace.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch
new file mode 100644
index 0000000..af51c3d
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch
@@ -0,0 +1,24 @@
+--- 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--as-needed.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1--as-needed.patch
new file mode 100644
index 0000000..8243ac8
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1--as-needed.patch
@@ -0,0 +1,12 @@
+diff -rpuN xen-3.0.4_1-src.orig/tools/xenmon/Makefile xen-3.0.4_1-src/tools/xenmon/Makefile
+--- xen-3.0.4_1-src.orig/tools/xenmon/Makefile	2007-01-08 15:00:51.000000000 +0000
++++ xen-3.0.4_1-src/tools/xenmon/Makefile	2007-02-09 01:02:08.000000000 +0000
+@@ -42,6 +42,6 @@ clean:
+ 
+ 
+ %: %.c Makefile
+-	$(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl
+ xentrace_%: %.c Makefile
+-	$(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl
diff --git a/app-emulation/xen-tools/files/3.0.4_p1/xen-tools-network-bridge-broadcast.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch
index e830de5..e830de5 100644
--- a/app-emulation/xen-tools/files/3.0.4_p1/xen-tools-network-bridge-broadcast.patch
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-network-bridge-broadcast.patch
diff --git a/app-emulation/xen-tools/files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch
index 07e9735..07e9735 100644
--- a/app-emulation/xen-tools/files/3.0.4_p1/xen-tools-remove-monitor-mode-from-vnc.patch
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch
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
new file mode 100644
index 0000000..a22bebe
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch
@@ -0,0 +1,13 @@
+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/xend.initd b/app-emulation/xen-tools/files/xend.initd
new file mode 100644
index 0000000..7c24793
--- /dev/null
+++ b/app-emulation/xen-tools/files/xend.initd
@@ -0,0 +1,61 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+opts="start stop status restart"
+
+depend() {
+	need net
+	before xendomains sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
+}
+
+await_daemons_up() {
+	for ((i=0; i<5; i++)); do
+		sleep 1
+		/usr/sbin/xend status && return 0
+	done
+	return 1
+}
+
+is_privileged_domain() {
+	grep -qsE '^control_d$' /proc/xen/capabilities
+	return $?
+}
+
+start() {
+	if is_privileged_domain ; then
+		ebegin "Starting Xen control daemon"
+		/usr/sbin/xend start
+		/usr/sbin/xend status || await_daemons_up
+		eend $?
+	else
+		eerror "Can't start xend - this is not a privileged domain."
+		return 1
+	fi
+}
+
+stop() {
+	if [ "$(xm list | wc -l)" -gt 2 ]; then
+		ebegin "  Stopping all domains"
+		/usr/sbin/xm shutdown --all --wait >/dev/null
+		eend $?
+	fi
+
+	ebegin "Stopping Xen control daemon"
+	/usr/sbin/xend stop
+	eend $?
+
+	# This needs more testing (bug #149321)
+	#ebegin "Stopping xenconsoled"
+	#kill $(</var/run/xenconsoled.pid)
+	#eend $?
+
+	#ebegin "Stopping xenstored"
+	#kill $(</var/run/xenstore.pid)
+	#eend $?
+}
+
+status() {
+	is_privileged_domain && /usr/sbin/xend status
+}
diff --git a/app-emulation/xen-tools/files/xendomains-screen.confd b/app-emulation/xen-tools/files/xendomains-screen.confd
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 100644
index 0000000..6b408f9
--- /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: $
+
+opts="start stop status restart"
+
+depend() {
+	need xend
+	after dhcp
+}
+
+get_domname() {
+	local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
+
+	if [[ -z ${name_from_file} ]] ; then
+		basename "${1}"
+	else
+		echo ${name_from_file}	
+	fi
+}
+
+is_running() {
+	/usr/sbin/xm list "${1}" >/dev/null 2>&1
+}
+
+using_screen() {
+	[[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]]	
+}
+
+set_screen_cmd() {
+	screen_cmd="screen -q -r ${SCREEN_NAME:=xen} -X"
+}
+
+start() {
+	set_screen_cmd
+
+	einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}"
+	if using_screen ; then
+		ebegin "Creating screen session to hold domain consoles"
+		(  screen -d -m -S ${SCREEN_NAME} -t dom0 \
+		&& ${screen_cmd} zombie dr \
+		&& logrotate -f /etc/xen/xen-consoles.logrotate \
+		&& ${screen_cmd} logfile  /var/log/xen-consoles/%t.log \
+		&& ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \
+		&& ${screen_cmd} log on \
+		&& ${screen_cmd} deflog on ) >/dev/null
+		if [[ $? -ne 0 ]] ; then
+			eend 1
+			return 1
+		else
+			eend
+		fi
+	fi
+	# Create all domains with config files in AUTODIR.
+	for dom in $(ls "${AUTODIR}/"* 2>/dev/null); do
+		name=$(get_domname ${dom})
+		if ! is_running ${name} ; then
+			ebegin "  Starting domain ${name}"
+			if using_screen ; then
+				${screen_cmd} screen -t ${name} xm create ${dom} -c
+			else
+				xm create --quiet ${dom}
+			fi
+			eend $?
+		else
+			einfo "  Not starting domain ${name} - already running"
+		fi
+	done
+}
+
+stop() {
+	set_screen_cmd
+
+	einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}"
+	# Stop all domains with config files in AUTODIR.
+	for dom in $(ls "${AUTODIR}/"* 2>/dev/null); do
+		name=$(get_domname ${dom})
+		if is_running ${name} ; then
+			ebegin "  Stopping domain ${name}"
+				xm shutdown --wait ${name} >/dev/null
+			eend $?
+		else
+			einfo "  Not stopping domain ${name} - not running"
+		fi
+	done
+	if using_screen ; then
+		ebegin "Closing screen session ${SCREEN_NAME}"
+		${screen_cmd} quit
+		eend $?
+	fi
+}
+
+status() {
+	/usr/sbin/xm list
+}
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
new file mode 100644
index 0000000..bcd95f3
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
@@ -0,0 +1,199 @@
+# 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
index d75e3e2..98f6029 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
@@ -108,16 +108,16 @@ src_unpack() {
 	fi
 
 	# Allow --as-needed LDFLAGS
-	epatch "${FILESDIR}/${PVR}/${PN}"--as-needed.patch
+	epatch "${FILESDIR}/${P}"--as-needed.patch
 
 	# Fix vnclisten
-	epatch "${FILESDIR}/${PVR}/${PN}"-vnclisten.patch
+	epatch "${FILESDIR}/${P}"-vnclisten.patch
 
 	# Fix network broadcast on bridged networks
-	epatch "${FILESDIR}/${PVR}/${PN}"-network-bridge-broadcast.patch
+	epatch "${FILESDIR}/${P}"-network-bridge-broadcast.patch
 	
 	# Disable QEMU monitor mode in VNC, bug #170917
-	epatch "${FILESDIR}/${PVR}/${PN}"-remove-monitor-mode-from-vnc.patch
+	epatch "${FILESDIR}/${P}"-remove-monitor-mode-from-vnc.patch
 }
 
 src_compile() {
@@ -159,16 +159,16 @@ src_install() {
 
 	doman docs/man?/*
 
-	newinitd "${FILESDIR}/${PVR}"/xend.initd xend \
+	newinitd "${FILESDIR}"/xend.initd xend \
 		|| die "Couldn't install xen.initd"
-	newconfd "${FILESDIR}/${PVR}"/xendomains.confd xendomains \
+	newconfd "${FILESDIR}"/xendomains.confd xendomains \
 		|| die "Couldn't install xendomains.confd"
-	newinitd "${FILESDIR}/${PVR}"/xendomains.initd xendomains \
+	newinitd "${FILESDIR}"/xendomains.initd xendomains \
 		|| die "Couldn't install xendomains.initd"
 
 	if use screen; then
-		cat "${FILESDIR}/${PVR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
-		cp "${FILESDIR}/${PVR}"/xen-consoles.logrotate "${D}"/etc/xen/
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
 		keepdir /var/log/xen-consoles
 	fi