Redo xen-sources to use the new xen-patches tarballs

svn path=/overlay/; revision=27

18 files changed, 75 insertions, 436 deletions

diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest
index fd736a9..09a3179 100644
--- a/sys-kernel/xen-sources/Manifest
+++ b/sys-kernel/xen-sources/Manifest
@@ -1,65 +1,24 @@
-AUX xen-sources-2.6.18-always-enable-xen-genapic.patch 401 RMD160 14a580916379bf12ff9762b474baf9a77d0f32bc SHA1 86ade2875bc6098bf3ec413c0286011979a02fc2 SHA256 0970d462a0b7a3558eb881f14f03eb224aa22c912bd56fcf9974ada0c4c0cdd5
-MD5 4c699e40a11a22fc700416b4ee4039a1 files/xen-sources-2.6.18-always-enable-xen-genapic.patch 401
-RMD160 14a580916379bf12ff9762b474baf9a77d0f32bc files/xen-sources-2.6.18-always-enable-xen-genapic.patch 401
-SHA256 0970d462a0b7a3558eb881f14f03eb224aa22c912bd56fcf9974ada0c4c0cdd5 files/xen-sources-2.6.18-always-enable-xen-genapic.patch 401
-AUX xen-sources-2.6.18-make-install.patch 2654 RMD160 b711e16e5a09a8814059b43c2d7d7d1de07ed35d SHA1 ceb0ea3eeada61859cc227c6d80017f70b667f31 SHA256 e74c725f435394d2ab08b9537ea660afae166e2091045cbc2511899621454755
-MD5 026cd6940a1c9080c78adf9019a10f08 files/xen-sources-2.6.18-make-install.patch 2654
-RMD160 b711e16e5a09a8814059b43c2d7d7d1de07ed35d files/xen-sources-2.6.18-make-install.patch 2654
-SHA256 e74c725f435394d2ab08b9537ea660afae166e2091045cbc2511899621454755 files/xen-sources-2.6.18-make-install.patch 2654
-AUX xen-sources-2.6.20-console-tty-fix.patch 2237 RMD160 c092df76ccd3703c7776f00e98aa67882eea2df2 SHA1 b82629eef5f87a1258d3172569ddfc0b467646fc SHA256 9dff7f12e0e085b25e9b9d1edfab9d5f3d234f8ca4c2b8ab0b8f759f585ed0e2
-MD5 96eb55408e4670d1e8a3b1a15ab56eb8 files/xen-sources-2.6.20-console-tty-fix.patch 2237
-RMD160 c092df76ccd3703c7776f00e98aa67882eea2df2 files/xen-sources-2.6.20-console-tty-fix.patch 2237
-SHA256 9dff7f12e0e085b25e9b9d1edfab9d5f3d234f8ca4c2b8ab0b8f759f585ed0e2 files/xen-sources-2.6.20-console-tty-fix.patch 2237
-AUX xen-sources-2.6.20-quirks-no-smp-fix.patch 616 RMD160 325394a4c2ce7d292d40e4e9548e41c78384ad72 SHA1 a34f5e7f15eef8d448e871a38ea953d4f7e707f3 SHA256 f4e95b79460c5ace124ef57f8af936243d8dffed71f6c00816bdeb975c959132
-MD5 b7c3a11aa99ac926a2a78c96c7fa32c1 files/xen-sources-2.6.20-quirks-no-smp-fix.patch 616
-RMD160 325394a4c2ce7d292d40e4e9548e41c78384ad72 files/xen-sources-2.6.20-quirks-no-smp-fix.patch 616
-SHA256 f4e95b79460c5ace124ef57f8af936243d8dffed71f6c00816bdeb975c959132 files/xen-sources-2.6.20-quirks-no-smp-fix.patch 616
-DIST debian-security-patches-2.6.18.1-12etch2.tar.bz2 8142 RMD160 5591a611ddf07f5ceb79694d0f388507bc6d1131 SHA1 c6fc99b9c8e412659e0f0eb86fad96622cba4319 SHA256 a2a8ddc7f0c74236af8862827520853868698aa24ed300949c59001a19c73318
-DIST fedora-xen-2.6.20-2925.11.fc7.tar.bz2 520695 RMD160 fe39a1f0e758d1e951e118ba4ac33ccf69163e40 SHA1 651a3bf6bcccb0d0e62d19b07d07605a89616689 SHA256 3ea3d3f316ab6315759efa5c8a754331f7792a3159c05c521db16d7ed97f20ed
-DIST fedora-xen-patches-2.6.20-2925.13.fc7.tar.bz2 4666 RMD160 13307c9a125d413b0b7520f03d98e5ce1b1ebe56 SHA1 e3d68cfe7352bf412cfcb2b613ddc9537bd9b00b SHA256 4ab97483af69732582f07640076e9d386212b544d479949f877e5f20df0abb89
 DIST genpatches-2.6.18-10.base.tar.bz2 113483 RMD160 9f19f7147c50650369afddec946b281aff817a48 SHA1 a2655a9d923624603a31a1e62cdd5e2a5c45066b SHA256 2d72cbe1e238318438a6ee9375a0ed42432a95c4d6fccb5afb14f8655a4a15b2
-DIST genpatches-2.6.20-13.base.tar.bz2 114313 RMD160 e6d41f0e15444f17cfbae55499ea2f079a7913ce SHA1 70e5da99ef34975f705a6041adaa48291d401e0c SHA256 51eb630e880c693c1a2bcc31451d4e8b3c1c2b0b3cc2dad1a7130322197b733f
+DIST genpatches-2.6.20-14.base.tar.bz2 122757 RMD160 a796aa78a0049bc08257ea792f50b169cf6e5089 SHA1 cbb11e495c5aafe1e7b84e07e321be4a05a3b940 SHA256 27ca4b3eee185cecc6825f4d298ec82e4b8e49ba75a32da0dd5d15e24ba59a2e
 DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
 DIST linux-2.6.20.tar.bz2 43375937 RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 SHA1 e730979adfb287528263e779c91284659672510d SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
-DIST patch-2.6.18.2_to_xen-3.1.0.bz2 598933 RMD160 1c3ff9cafcc2168b6b738feee9d7ca74107b63ac SHA1 ede34a316083e8745ce7ad8fc11e63c97542bdb0 SHA256 05d97e029b8ca35794329a1c59c1d7fb84fbd7d68b6df0388bbe6d18e5bbdeda
-DIST patch-2.6.18_to_xen-3.1.0.bz2 598640 RMD160 2365a93cd056aa0829d00cff9a92a4368e3b0dba SHA1 a1ffbbb86bee0fbf2fc82a4afb27bc33aaf09ecc SHA256 ac3e4c165d4d77c7720be498133f4a5a999a7aaeb646c7b2c21c7aeedd809e83
-DIST patch-2.6.20_to_xen-3.1.0-fc7-2925.bz2 518262 RMD160 11bcbed63afe74d118772cd3b6200b7ed639dc59 SHA1 5cad1b92923667383ea6468964323801bba3b549 SHA256 abcdb5ba2dc7d1f3172434e3e244fac4b64fc7d281819b1e475da31470d4ca47
-EBUILD xen-sources-2.6.18-r1.ebuild 1086 RMD160 cab352d048236caa29c7d52cd9a720cdd71c4b84 SHA1 451700e2f6bb18b290669b955d1f0b3e6ec7ab92 SHA256 200ef1353eac35b3beab78267ff5425c6188083ce5c7a231c591bbc8d37d78f6
-MD5 b3a588a0f2527be1f27bfafd9a8f2f1e xen-sources-2.6.18-r1.ebuild 1086
-RMD160 cab352d048236caa29c7d52cd9a720cdd71c4b84 xen-sources-2.6.18-r1.ebuild 1086
-SHA256 200ef1353eac35b3beab78267ff5425c6188083ce5c7a231c591bbc8d37d78f6 xen-sources-2.6.18-r1.ebuild 1086
-EBUILD xen-sources-2.6.18-r2.ebuild 1320 RMD160 ddced427be7c396a773ee0d40b9e5436bd489a5a SHA1 e2f01c65288fe81fbed3eef103e787be3ce2bf88 SHA256 63dc38a44e61339aa5c6e9193039fc41796713f04d8764fdf944c6b0dae88c2b
-MD5 b8e28d9248e07b5c39649e1b53d6c613 xen-sources-2.6.18-r2.ebuild 1320
-RMD160 ddced427be7c396a773ee0d40b9e5436bd489a5a xen-sources-2.6.18-r2.ebuild 1320
-SHA256 63dc38a44e61339aa5c6e9193039fc41796713f04d8764fdf944c6b0dae88c2b xen-sources-2.6.18-r2.ebuild 1320
-EBUILD xen-sources-2.6.18.ebuild 967 RMD160 9c7030d41272192bffd453730fc1ea15aab6c782 SHA1 5a68f91daac27457fcfb856c02434068c1b28ae2 SHA256 55ee5773dcf3254d78677d29d09d0b8d8daea6afeb09993e6bfbf3d97716b133
-MD5 c029688996eb33695721d2edfe44dd2b xen-sources-2.6.18.ebuild 967
-RMD160 9c7030d41272192bffd453730fc1ea15aab6c782 xen-sources-2.6.18.ebuild 967
-SHA256 55ee5773dcf3254d78677d29d09d0b8d8daea6afeb09993e6bfbf3d97716b133 xen-sources-2.6.18.ebuild 967
-EBUILD xen-sources-2.6.20-r1.ebuild 1399 RMD160 75d819989b832d134ca5dc3428df932a6b826a4f SHA1 95a898449b24761d77d4f92593596cd5ed49876d SHA256 7473d93d252056ec025bc02bbdd113b054e9803f1c7e1d1ccdf28f7505b188d6
-MD5 a69f57142816629d281b0007cd3b5f21 xen-sources-2.6.20-r1.ebuild 1399
-RMD160 75d819989b832d134ca5dc3428df932a6b826a4f xen-sources-2.6.20-r1.ebuild 1399
-SHA256 7473d93d252056ec025bc02bbdd113b054e9803f1c7e1d1ccdf28f7505b188d6 xen-sources-2.6.20-r1.ebuild 1399
-EBUILD xen-sources-2.6.20.ebuild 1110 RMD160 9c12ec5843b58c4d50546326252948ab1de0374a SHA1 f25ef085db1aed52122842bd155dbb67bcd3ea63 SHA256 424730013b065c0b1d00c3f65e15ca605b90fa27fd2bee69c762d5a9e54bc066
-MD5 c1cff6a7103a1c73ca5ea1218b1a1f32 xen-sources-2.6.20.ebuild 1110
-RMD160 9c12ec5843b58c4d50546326252948ab1de0374a xen-sources-2.6.20.ebuild 1110
-SHA256 424730013b065c0b1d00c3f65e15ca605b90fa27fd2bee69c762d5a9e54bc066 xen-sources-2.6.20.ebuild 1110
+DIST xen-patches-2.6.18-1.tar.bz2 608323 RMD160 c4c0a07b8a95db6200c03781985cede716ba34ab SHA1 5f8d263d6302488fe659192fd0f2422ca279808c SHA256 89836f4d68d53f6973d2cac1bb48a349bfbb05e301044e887ade5b4e91050578
+DIST xen-patches-2.6.20-1.tar.bz2 524579 RMD160 a9b958f90b497a0c3839425c6f0e9c1dbcab4e7e SHA1 be3921ec88f75bbf458c8d027faa39ff1c9d5844 SHA256 eb4cd912c4aace4c95fce0afb3af01da70ade7ba1d2b5f32f2f632f72da1ee08
+EBUILD xen-sources-2.6.18-r3.ebuild 611 RMD160 a3bf30cc24050da6e5df795f69ee06ec0093392b SHA1 291b5840cdf701930afd1b64c364c18fcde54aba SHA256 03da0b8bad4df50d8b3f3bc5aa4db83ff241f424d8f370cb824d791c400034d3
+MD5 862fd002535a562a9f489be7b646a423 xen-sources-2.6.18-r3.ebuild 611
+RMD160 a3bf30cc24050da6e5df795f69ee06ec0093392b xen-sources-2.6.18-r3.ebuild 611
+SHA256 03da0b8bad4df50d8b3f3bc5aa4db83ff241f424d8f370cb824d791c400034d3 xen-sources-2.6.18-r3.ebuild 611
+EBUILD xen-sources-2.6.20-r2.ebuild 611 RMD160 5b5669bca24ead25461b7981d72498946827d75f SHA1 739b478d79995da69cbc5f2c8e8eb002d53a7ed3 SHA256 6ebc6c4f6dc4fd33fdd2017d6cd7d63b922768d5ec8bda6f2a69e2b29d88216b
+MD5 db38138f28527de908658fd16d066550 xen-sources-2.6.20-r2.ebuild 611
+RMD160 5b5669bca24ead25461b7981d72498946827d75f xen-sources-2.6.20-r2.ebuild 611
+SHA256 6ebc6c4f6dc4fd33fdd2017d6cd7d63b922768d5ec8bda6f2a69e2b29d88216b xen-sources-2.6.20-r2.ebuild 611
 MISC ChangeLog 1430 RMD160 b360303e4b1591c98cca20fce40fa85cee150376 SHA1 f5c1ebed3415d34bf2ba3b89df284fe53f724acc SHA256 888eed2b5ab014195eb4cf9c8a481a252b73c1f2cf80c9d6cb4a4d6eacb705cb
 MD5 98f34d0f7115f43b73a9ffbc80966334 ChangeLog 1430
 RMD160 b360303e4b1591c98cca20fce40fa85cee150376 ChangeLog 1430
 SHA256 888eed2b5ab014195eb4cf9c8a481a252b73c1f2cf80c9d6cb4a4d6eacb705cb ChangeLog 1430
-MD5 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
-MD5 ced2bb0edfe9143774dd6e3a1cea0eae files/digest-xen-sources-2.6.18-r1 801
-RMD160 891ca7b4a9feca7860cff3fb7ac565b48c173501 files/digest-xen-sources-2.6.18-r1 801
-SHA256 144ac502a6ad7d02acfc51d4d0ef72cd2641488aa3bed635cd6fc802fb0d4839 files/digest-xen-sources-2.6.18-r1 801
-MD5 0cb877e14ad52c66f5a913ff6ecb0023 files/digest-xen-sources-2.6.18-r2 1120
-RMD160 b1eab5e1ff259c32d0fc3b70e900aef2d4663969 files/digest-xen-sources-2.6.18-r2 1120
-SHA256 aa286d99d68a19342fd35626dba643c32af41ce923f8d941767962afb88e94ad files/digest-xen-sources-2.6.18-r2 1120
-MD5 fae6e4bf5e75fd998e4a88f1e472145c files/digest-xen-sources-2.6.20 819
-RMD160 87efcb5e339922c7ce33ac82e86f17cddeb1482d files/digest-xen-sources-2.6.20 819
-SHA256 5786f56c83224a7b8ec3a12c7a4da72641cfd9b6f677814c17961df343db6d87 files/digest-xen-sources-2.6.20 819
-MD5 76460f746d95392f9f17f99517ffcaee files/digest-xen-sources-2.6.20-r1 1132
-RMD160 7114e04413e86e3cbb0bd19f133eb9111181a1bd files/digest-xen-sources-2.6.20-r1 1132
-SHA256 a895f4b9ba2cad847615d6a0c02dbd2fa79f50fb2a6e7a65480aaa5add565772 files/digest-xen-sources-2.6.20-r1 1132
+MD5 f87469e20b17e730b94d80dd364758a7 files/digest-xen-sources-2.6.18-r3 792
+RMD160 54da89150c95d1624af718c064a5a34bf94429fe files/digest-xen-sources-2.6.18-r3 792
+SHA256 86dbfb0af15dca2898856833b6b9d0f87ac1d06d5384d788451515d3092c7c28 files/digest-xen-sources-2.6.18-r3 792
+MD5 6d7c4f19db75a7170390a314b5ac224f files/digest-xen-sources-2.6.20-r2 792
+RMD160 ad011cf87da185776bca3a2674e73a9a7cfa83cf files/digest-xen-sources-2.6.20-r2 792
+SHA256 ee789b789df4fe7e9e94f279e73224a6754e256a6710f8a581106b167961acd5 files/digest-xen-sources-2.6.20-r2 792
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18
deleted file mode 100644
index fb87580..0000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/digest-xen-sources-2.6.18-r2 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r2
deleted file mode 100644
index fab5738..0000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 1553fc6ede35a86cdb838bafee603fc9 debian-security-patches-2.6.18.1-12etch2.tar.bz2 8142
-RMD160 5591a611ddf07f5ceb79694d0f388507bc6d1131 debian-security-patches-2.6.18.1-12etch2.tar.bz2 8142
-SHA256 a2a8ddc7f0c74236af8862827520853868698aa24ed300949c59001a19c73318 debian-security-patches-2.6.18.1-12etch2.tar.bz2 8142
-MD5 7e3eaba91aa76d2b88ed7bb20f64d4c9 genpatches-2.6.18-10.base.tar.bz2 113483
-RMD160 9f19f7147c50650369afddec946b281aff817a48 genpatches-2.6.18-10.base.tar.bz2 113483
-SHA256 2d72cbe1e238318438a6ee9375a0ed42432a95c4d6fccb5afb14f8655a4a15b2 genpatches-2.6.18-10.base.tar.bz2 113483
-MD5 296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 41863580
-RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 linux-2.6.18.tar.bz2 41863580
-SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d linux-2.6.18.tar.bz2 41863580
-MD5 a644c8cfccf0e6b7c4357b38215ee1da patch-2.6.18.2_to_xen-3.1.0.bz2 598933
-RMD160 1c3ff9cafcc2168b6b738feee9d7ca74107b63ac patch-2.6.18.2_to_xen-3.1.0.bz2 598933
-SHA256 05d97e029b8ca35794329a1c59c1d7fb84fbd7d68b6df0388bbe6d18e5bbdeda patch-2.6.18.2_to_xen-3.1.0.bz2 598933
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r1 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r3
index 0ea6e03..16c5858 100644
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r1
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.18-r3
@@ -4,6 +4,6 @@ SHA256 2d72cbe1e238318438a6ee9375a0ed42432a95c4d6fccb5afb14f8655a4a15b2 genpatch
 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 a644c8cfccf0e6b7c4357b38215ee1da patch-2.6.18.2_to_xen-3.1.0.bz2 598933
-RMD160 1c3ff9cafcc2168b6b738feee9d7ca74107b63ac patch-2.6.18.2_to_xen-3.1.0.bz2 598933
-SHA256 05d97e029b8ca35794329a1c59c1d7fb84fbd7d68b6df0388bbe6d18e5bbdeda patch-2.6.18.2_to_xen-3.1.0.bz2 598933
+MD5 3f619a6271a358603b181b9598a6150f xen-patches-2.6.18-1.tar.bz2 608323
+RMD160 c4c0a07b8a95db6200c03781985cede716ba34ab xen-patches-2.6.18-1.tar.bz2 608323
+SHA256 89836f4d68d53f6973d2cac1bb48a349bfbb05e301044e887ade5b4e91050578 xen-patches-2.6.18-1.tar.bz2 608323
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20
deleted file mode 100644
index 59fb462..0000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 545747791907812daa79685852f78a9f fedora-xen-2.6.20-2925.11.fc7.tar.bz2 520695
-RMD160 fe39a1f0e758d1e951e118ba4ac33ccf69163e40 fedora-xen-2.6.20-2925.11.fc7.tar.bz2 520695
-SHA256 3ea3d3f316ab6315759efa5c8a754331f7792a3159c05c521db16d7ed97f20ed fedora-xen-2.6.20-2925.11.fc7.tar.bz2 520695
-MD5 93b2bfd84674f010ada4aa31ad4898ce genpatches-2.6.20-13.base.tar.bz2 114313
-RMD160 e6d41f0e15444f17cfbae55499ea2f079a7913ce genpatches-2.6.20-13.base.tar.bz2 114313
-SHA256 51eb630e880c693c1a2bcc31451d4e8b3c1c2b0b3cc2dad1a7130322197b733f genpatches-2.6.20-13.base.tar.bz2 114313
-MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
-RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
-SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r1 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r1
deleted file mode 100644
index 8a2554b..0000000
--- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 66a15b1cccb4a1353a3b0823a3d3fbd5 fedora-xen-patches-2.6.20-2925.13.fc7.tar.bz2 4666
-RMD160 13307c9a125d413b0b7520f03d98e5ce1b1ebe56 fedora-xen-patches-2.6.20-2925.13.fc7.tar.bz2 4666
-SHA256 4ab97483af69732582f07640076e9d386212b544d479949f877e5f20df0abb89 fedora-xen-patches-2.6.20-2925.13.fc7.tar.bz2 4666
-MD5 93b2bfd84674f010ada4aa31ad4898ce genpatches-2.6.20-13.base.tar.bz2 114313
-RMD160 e6d41f0e15444f17cfbae55499ea2f079a7913ce genpatches-2.6.20-13.base.tar.bz2 114313
-SHA256 51eb630e880c693c1a2bcc31451d4e8b3c1c2b0b3cc2dad1a7130322197b733f genpatches-2.6.20-13.base.tar.bz2 114313
-MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
-RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
-SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
-MD5 ebd2150d1472918c8eeb024b05fa6d85 patch-2.6.20_to_xen-3.1.0-fc7-2925.bz2 518262
-RMD160 11bcbed63afe74d118772cd3b6200b7ed639dc59 patch-2.6.20_to_xen-3.1.0-fc7-2925.bz2 518262
-SHA256 abcdb5ba2dc7d1f3172434e3e244fac4b64fc7d281819b1e475da31470d4ca47 patch-2.6.20_to_xen-3.1.0-fc7-2925.bz2 518262
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r2 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r2
new file mode 100644
index 0000000..6cd2fe1
--- /dev/null
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.20-r2
@@ -0,0 +1,9 @@
+MD5 c2cfd59003729827fd1d2fefd8af4cbd genpatches-2.6.20-14.base.tar.bz2 122757
+RMD160 a796aa78a0049bc08257ea792f50b169cf6e5089 genpatches-2.6.20-14.base.tar.bz2 122757
+SHA256 27ca4b3eee185cecc6825f4d298ec82e4b8e49ba75a32da0dd5d15e24ba59a2e genpatches-2.6.20-14.base.tar.bz2 122757
+MD5 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 43375937
+RMD160 14657ade7be4363143dbd5593f5710d21eda7a03 linux-2.6.20.tar.bz2 43375937
+SHA256 2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558 linux-2.6.20.tar.bz2 43375937
+MD5 79d18554ef76d0f43863a07b34f7ef08 xen-patches-2.6.20-1.tar.bz2 524579
+RMD160 a9b958f90b497a0c3839425c6f0e9c1dbcab4e7e xen-patches-2.6.20-1.tar.bz2 524579
+SHA256 eb4cd912c4aace4c95fce0afb3af01da70ade7ba1d2b5f32f2f632f72da1ee08 xen-patches-2.6.20-1.tar.bz2 524579
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.18-always-enable-xen-genapic.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.18-always-enable-xen-genapic.patch
deleted file mode 100644
index a9b8b77..0000000
--- a/sys-kernel/xen-sources/files/xen-sources-2.6.18-always-enable-xen-genapic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru linux-2.6.18-xen.orig/arch/x86_64/Kconfig linux-2.6.18-xen/arch/x86_64/Kconfig
---- linux-2.6.18-xen.orig/arch/x86_64/Kconfig	2007-08-07 17:37:58.000000000 -0700
-+++ linux-2.6.18-xen/arch/x86_64/Kconfig	2007-08-07 17:39:32.000000000 -0700
-@@ -234,7 +234,7 @@
- config X86_XEN_GENAPIC
- 	bool
- 	depends X86_64_XEN
--	default XEN_PRIVILEGED_GUEST || SMP
-+	default y
- 
- config X86_LOCAL_APIC
- 	bool
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.18-make-install.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.18-make-install.patch
deleted file mode 100644
index 108c648..0000000
--- a/sys-kernel/xen-sources/files/xen-sources-2.6.18-make-install.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ru linux-2.6.18-xen.orig/arch/i386/Makefile linux-2.6.18-xen/arch/i386/Makefile
---- linux-2.6.18-xen.orig/arch/i386/Makefile	2007-07-16 17:58:05.000000000 -0700
-+++ linux-2.6.18-xen/arch/i386/Makefile	2007-07-16 18:22:18.000000000 -0700
-@@ -125,7 +125,7 @@
- 	$(Q)$(MAKE) $(build)=$(boot) $@
- 
- install:
--	$(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
-+	$(Q)$(MAKE) $(build)=$(boot) $@
- else
- all: bzImage
- 
-diff -ru linux-2.6.18-xen.orig/arch/i386/boot-xen/Makefile linux-2.6.18-xen/arch/i386/boot-xen/Makefile
---- linux-2.6.18-xen.orig/arch/i386/boot-xen/Makefile	2007-07-16 17:58:05.000000000 -0700
-+++ linux-2.6.18-xen/arch/i386/boot-xen/Makefile	2007-07-16 18:36:08.000000000 -0700
-@@ -10,12 +10,17 @@
- INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH))
- 
- XINSTALL_NAME ?= $(KERNELRELEASE)
-+
-+ifdef CONFIG_XEN_PRIVILEGED_GUEST
-+XENGUEST=
-+else
-+XENGUEST=-domU
-+endif
-+
- install:
- 	mkdir -p $(INSTALL_ROOT)/boot
--	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
--	rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
--	install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
--	install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
--	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
--	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
--	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-+	install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX)
-+	install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX)
-+	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX)
-+	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(XENGUEST)$(INSTALL_SUFFIX)
-+	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)-xen$(XENGUEST)$(INSTALL_SUFFIX)
-diff -ru linux-2.6.18-xen.orig/arch/x86_64/Makefile linux-2.6.18-xen/arch/x86_64/Makefile
---- linux-2.6.18-xen.orig/arch/x86_64/Makefile	2007-07-16 17:58:05.000000000 -0700
-+++ linux-2.6.18-xen/arch/x86_64/Makefile	2007-07-16 18:22:34.000000000 -0700
-@@ -91,7 +91,7 @@
- 	$(Q)$(MAKE) $(build)=$(boot) $@
- 
- install:
--	$(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@
-+	$(Q)$(MAKE) $(build)=$(boot) $@
- else
- #Default target when executing "make"
- all: bzImage
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.20-console-tty-fix.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.20-console-tty-fix.patch
deleted file mode 100644
index 72a90a8..0000000
--- a/sys-kernel/xen-sources/files/xen-sources-2.6.20-console-tty-fix.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -rup linux-2.6.20-xen.orig/drivers/char/tty_io.c linux-2.6.20-xen/drivers/char/tty_io.c
---- linux-2.6.20-xen.orig/drivers/char/tty_io.c	2007-07-16 11:14:52.000000000 -0700
-+++ linux-2.6.20-xen/drivers/char/tty_io.c	2007-07-16 15:57:19.000000000 -0700
-@@ -133,6 +133,8 @@ LIST_HEAD(tty_drivers);			/* linked list
- DEFINE_MUTEX(tty_mutex);
- EXPORT_SYMBOL(tty_mutex);
- 
-+int console_use_vt = 1;
-+
- #ifdef CONFIG_UNIX98_PTYS
- extern struct tty_driver *ptm_driver;	/* Unix98 pty masters; for /dev/ptmx */
- extern int pty_limit;		/* Config limit on Unix98 ptys */
-@@ -2518,7 +2520,7 @@ retry_open:
- 		goto got_driver;
- 	}
- #ifdef CONFIG_VT
--	if (device == MKDEV(TTY_MAJOR,0)) {
-+	if (console_use_vt && (device == MKDEV(TTY_MAJOR,0))) {
- 		extern struct tty_driver *console_driver;
- 		driver = console_driver;
- 		index = fg_console;
-@@ -3910,6 +3912,8 @@ static int __init tty_init(void)
- #endif
- 
- #ifdef CONFIG_VT
-+	if (!console_use_vt)
-+		goto out_vt;
- 	cdev_init(&vc0_cdev, &console_fops);
- 	if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
- 	    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
-@@ -3917,6 +3921,7 @@ static int __init tty_init(void)
- 	device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), "tty0");
- 
- 	vty_init();
-+ out_vt:
- #endif
- 	return 0;
- }
-diff -rup linux-2.6.20-xen.orig/drivers/xen/console/console.c linux-2.6.20-xen/drivers/xen/console/console.c
---- linux-2.6.20-xen.orig/drivers/xen/console/console.c	2007-07-16 11:14:52.000000000 -0700
-+++ linux-2.6.20-xen/drivers/xen/console/console.c	2007-07-16 16:02:26.000000000 -0700
-@@ -86,23 +86,30 @@ static unsigned long sysrq_requested;
- 
- void xencons_early_setup(void)
- {
--	if (is_initial_xendomain())
-+	extern int console_use_vt;
-+
-+	if (is_initial_xendomain()) {
- 		xc_mode = XC_SERIAL;
--	else
--		xc_mode = XC_XVC;
-+	} else {
-+		xc_mode = XC_TTY;
-+		console_use_vt = 0;
-+	}
- }
- 
- static int __init xencons_setup(char *str)
- {
- 	char *q;
- 	int n;
-+	extern int console_use_vt;
- 
-+	console_use_vt = 1;
- 	if (!strncmp(str, "ttyS", 4)) {
- 		xc_mode = XC_SERIAL;
- 		str += 4;
- 	} else if (!strncmp(str, "tty", 3)) {
- 		xc_mode = XC_TTY;
- 		str += 3;
-+		console_use_vt = 0;
- 	} else if (!strncmp(str, "xvc", 3)) {
- 		xc_mode = XC_XVC;
- 		str += 3;
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.20-quirks-no-smp-fix.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.20-quirks-no-smp-fix.patch
deleted file mode 100644
index 77de84c..0000000
--- a/sys-kernel/xen-sources/files/xen-sources-2.6.20-quirks-no-smp-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup linux-2.6.20-xen.orig/arch/i386/kernel/quirks.c linux-2.6.20-xen/arch/i386/kernel/quirks.c
---- linux-2.6.20-xen.orig/arch/i386/kernel/quirks.c	2007-07-23 10:59:51.000000000 -0700
-+++ linux-2.6.20-xen/arch/i386/kernel/quirks.c	2007-07-23 11:02:15.000000000 -0700
-@@ -7,7 +7,7 @@
- #include <asm/genapic.h>
- #include <asm/cpu.h>
- 
--#if defined(CONFIG_X86_IO_APIC) && (defined(CONFIG_SMP) || defined(CONFIG_XEN)) && defined(CONFIG_PCI)
-+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)
- static void __devinit verify_quirk_intel_irqbalance(struct pci_dev *dev)
- {
- 	u8 config, rev;
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.18-r1.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.18-r1.ebuild
deleted file mode 100644
index 01029b5..0000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.18-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="10"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-
-XEN_VERSION="3.1.0"
-XEN_BASE_KV="2.6.18.2"
-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} ${GENPATCHES_URI} ${PATCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
-			${FILESDIR}/${P}-always-enable-xen-genapic.patch
-			${FILESDIR}/${P}-make-install.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-r2.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.18-r2.ebuild
deleted file mode 100644
index 41fd18e..0000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.18-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="10"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
-HOMEPAGE="http://www.xensource.com/xen/xen/"
-
-XEN_VERSION="3.1.0"
-XEN_BASE_KV="2.6.18.2"
-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}"
-
-# Security bugfixes included by Debian
-SECURITY_BUGFIXES="debian-security-patches-2.6.18.1-12etch2.tar.bz2"
-SECURITY_URI="http://dev.gentoo.org/~rbu/distfiles/${SECURITY_BUGFIXES}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${PATCH_URI} ${SECURITY_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
-			${DISTDIR}/${SECURITY_BUGFIXES}
-			${FILESDIR}/${P}-always-enable-xen-genapic.patch
-			${FILESDIR}/${P}-make-install.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-r3.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.18-r3.ebuild
new file mode 100644
index 0000000..ab1b632
--- /dev/null
+++ b/sys-kernel/xen-sources/xen-sources-2.6.18-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ETYPE="sources"
+UNIPATCH_STRICTORDER="1"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="10"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
+HOMEPAGE="http://www.xensource.com/xen/xen/"
+
+KEYWORDS="~x86 ~amd64"
+
+XENPATCHES_VER="1"
+XENPATCHES="xen-patches-${PV}-${XENPATCHES_VER}.tar.bz2"
+XENPATCHES_URI="mirror://gentoo/${XENPATCHES}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${XENPATCHES_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${XENPATCHES}"
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.18.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.18.ebuild
deleted file mode 100644
index 896d469..0000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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}
-			${FILESDIR}/${P}-make-install.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.20-r1.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.20-r1.ebuild
deleted file mode 100644
index 94e976a..0000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.20-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ETYPE="sources"
-UNIPATCH_STRICTORDER="1"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="13"
-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/"
-
-# Basic XEN functionality
-XEN_VERSION="3.1.0-fc7-2925"
-XEN_BASE_KV="2.6.20"
-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}"
-
-# Bugfixes included by fedora
-XEN_BUGFIXES="fedora-xen-patches-2.6.20-2925.13.fc7.tar.bz2"
-BUGFIX_URI="http://dev.gentoo.org/~rbu/distfiles/${XEN_BUGFIXES}"
-
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${PATCH_URI} ${BUGFIX_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
-			${DISTDIR}/${XEN_BUGFIXES}
-			${FILESDIR}/${P}-console-tty-fix.patch
-			${FILESDIR}/${P}-quirks-no-smp-fix.patch
-			${FILESDIR}/${PN}-2.6.18-always-enable-xen-genapic.patch
-			${FILESDIR}/${PN}-2.6.18-make-install.patch"
-
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-	>=sys-devel/binutils-2.17"
-
-pkg_postinst() {
-	postinst_sources
-
-	elog "This kernel is for Xen 3.1.0 and based on RedHat's patchset in"
-	elog "Fedora 7. If you have troubles, try xen-sources-2.6.18* which is"
-	elog "based on the patches released with Xen."
-}
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.20-r2.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.20-r2.ebuild
new file mode 100644
index 0000000..4d331bd
--- /dev/null
+++ b/sys-kernel/xen-sources/xen-sources-2.6.20-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ETYPE="sources"
+UNIPATCH_STRICTORDER="1"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="14"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
+HOMEPAGE="http://www.xensource.com/xen/xen/"
+
+KEYWORDS="~x86 ~amd64"
+
+XENPATCHES_VER="1"
+XENPATCHES="xen-patches-${PV}-${XENPATCHES_VER}.tar.bz2"
+XENPATCHES_URI="mirror://gentoo/${XENPATCHES}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${XENPATCHES_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${XENPATCHES}"
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild
deleted file mode 100644
index ba67465..0000000
--- a/sys-kernel/xen-sources/xen-sources-2.6.20.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ETYPE="sources"
-UNIPATCH_STRICTORDER="1"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="13"
-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_PATCH="fedora-xen-2.6.20-2925.11.fc7.tar.bz2"
-#PATCH_URI="mirror://gentoo/${XEN_PATCH}"
-PATCH_URI="http://dev.gentoo.org/~marineam/files/xen/${XEN_PATCH}"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${PATCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
-			${FILESDIR}/${P}-console-tty-fix.patch
-			${FILESDIR}/${P}-quirks-no-smp-fix.patch
-			${FILESDIR}/${PN}-2.6.18-always-enable-xen-genapic.patch
-			${FILESDIR}/${PN}-2.6.18-make-install.patch"
-
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="${DEPEND}
-	>=sys-devel/binutils-2.17"
-
-pkg_postinst() {
-	postinst_sources
-
-	elog "This kernel is for Xen 3.1.0 and based on RedHat's patchset in"
-	elog "Fedora 7, if you have troubles try xen-sources-2.6.18* which is"
-	elog "based on the patches released with Xen."
-}