Adding 2.1.1_rc21-r3, seems like I screwed -r2 by putting in a patch for 2.6.17

(Portage version: 2.1_rc3-r4)
 (Signed Manifest commit)

3 files changed, 15 insertions, 55 deletions

diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
index 5293cf18f08a..b8f84b584288 100644
--- a/sys-kernel/vserver-sources/Manifest
+++ b/sys-kernel/vserver-sources/Manifest
@@ -10,7 +10,7 @@ DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4
 DIST vserver-patches-2.6.15_2.0.1-r5.tar.bz2 108429 RMD160 b99b7bb4df164ed4bb56c94b140cc9ce4a71d907 SHA1 ea17d443ff08fc48446704d499d96c0d9b880aef SHA256 41447bcc201d98506e31d238ee2d53360101cf2f8bc75efb3edf66d2794059a1
 DIST vserver-patches-2.6.16_2.0.2_rc21.tar.bz2 111686 RMD160 8f72bcce3abf7e563e675209483a7763489d4096 SHA1 b1f0010cb16d0568edcd41bcca708c0765430dc9 SHA256 a14f3f23e65494de1a7aaa601c598d13fefdd972563f4b7ed7d7c24d5dcf7d99
 DIST vserver-patches-2.6.16_2.1.1_rc21-r1.tar.bz2 152362 RMD160 5bb3afdaf92d8d692e57b474346aebe775d9f5ff SHA1 e712f1b99bff4fa7323d5a4587a70ec17a7615fa SHA256 a2c1be2214dd6919ad59c61a923687ed814c4a882dc0b7ddf90a41b3d888e457
-DIST vserver-patches-2.6.16_2.1.1_rc21-r2.tar.bz2 155094 RMD160 ac29f80a5444f64f40202054fc69d67f14fd5a98 SHA1 2fccb016fa1de1472fc3e173ebc661caf0f941c8 SHA256 ca1513cb051c3133370302d1ba79c96efd73c7a31e1dfb80fcd49ad063f3e7b1
+DIST vserver-patches-2.6.16_2.1.1_rc21-r3.tar.bz2 153880 RMD160 b16f42a8f047bcb583bd5cae9708284b3f016257 SHA1 0101c5ad7e3138db36696c1e2197284248743d4e SHA256 e8b2679cc75689bad5b02c48c58fb4eb4cd0deae269ee8f7e049ddf39ceb88bd
 EBUILD vserver-sources-2.0.1-r5.ebuild 895 RMD160 b0fb9e9264cdd9113c80131185a8d86f52c5ac07 SHA1 714e2e9a8f72e2a8baf97074b43389071045a257 SHA256 33e2729e338db09dd07347aa5c2111801a2b6f9aa3f44f47de32191bf5cc4d95
 MD5 0664af92e8f17605573dacb0947810c4 vserver-sources-2.0.1-r5.ebuild 895
 RMD160 b0fb9e9264cdd9113c80131185a8d86f52c5ac07 vserver-sources-2.0.1-r5.ebuild 895
@@ -23,14 +23,14 @@ EBUILD vserver-sources-2.1.1_rc21-r1.ebuild 902 RMD160 d5af4b62292f338fee6052339
 MD5 37b8e6d97b09016d83f6b2931e67205f vserver-sources-2.1.1_rc21-r1.ebuild 902
 RMD160 d5af4b62292f338fee60523393ca50fca9cce234 vserver-sources-2.1.1_rc21-r1.ebuild 902
 SHA256 aabde1a9614ba574a0fc31652302e0570b7cac0554db88de3f025e750c548ac5 vserver-sources-2.1.1_rc21-r1.ebuild 902
-EBUILD vserver-sources-2.1.1_rc21-r2.ebuild 902 RMD160 1d28be872847608bc5b120596445d8f1994104a7 SHA1 5cd66ac4e71f1e0d5c134e16ddc04e734f66a9d1 SHA256 cc60b3e575693beae4336f02d2694e589c581fa22b2ce20f18661becad7468f7
-MD5 497ae85088aed7250014a33f008c2d99 vserver-sources-2.1.1_rc21-r2.ebuild 902
-RMD160 1d28be872847608bc5b120596445d8f1994104a7 vserver-sources-2.1.1_rc21-r2.ebuild 902
-SHA256 cc60b3e575693beae4336f02d2694e589c581fa22b2ce20f18661becad7468f7 vserver-sources-2.1.1_rc21-r2.ebuild 902
-MISC ChangeLog 20002 RMD160 9c97198d25fc0eef742cbf9d624f10c68ae5aea4 SHA1 0f383bcd841e430bc48c4946fb512fd9ad10b4e1 SHA256 ff07c2677ab083851583e1f5d30a4127b3868081f12fcc121df703305b367b31
-MD5 91932f6ade560af1ce040776ca80ea28 ChangeLog 20002
-RMD160 9c97198d25fc0eef742cbf9d624f10c68ae5aea4 ChangeLog 20002
-SHA256 ff07c2677ab083851583e1f5d30a4127b3868081f12fcc121df703305b367b31 ChangeLog 20002
+EBUILD vserver-sources-2.1.1_rc21-r3.ebuild 902 RMD160 9db94399cd49d9cea9c5779ef935a5d4c2ef8df8 SHA1 9f8f46680122caad70c8c599b1e4ae0a682aa965 SHA256 373af4e579a88a592be4baac420b63fb4989c99b8cfc721ea7baf71570a2913d
+MD5 be31a2164555300ad628b0f361d128f2 vserver-sources-2.1.1_rc21-r3.ebuild 902
+RMD160 9db94399cd49d9cea9c5779ef935a5d4c2ef8df8 vserver-sources-2.1.1_rc21-r3.ebuild 902
+SHA256 373af4e579a88a592be4baac420b63fb4989c99b8cfc721ea7baf71570a2913d vserver-sources-2.1.1_rc21-r3.ebuild 902
+MISC ChangeLog 20263 RMD160 4357e42bb8b023416b382ab08333a8ad6714bbb7 SHA1 49b0550d10320788e5cc7ac9632d0edb48f86ffa SHA256 99333be73383a8cb2eaa03282bb0a49cd6382e74f9025b9858385a7856b62afa
+MD5 8d7a9d2ddc6e193cbca9786064421fe7 ChangeLog 20263
+RMD160 4357e42bb8b023416b382ab08333a8ad6714bbb7 ChangeLog 20263
+SHA256 99333be73383a8cb2eaa03282bb0a49cd6382e74f9025b9858385a7856b62afa ChangeLog 20263
 MISC metadata.xml 526 RMD160 a4f731a00e46035b9b461489748060dcfbba3cb8 SHA1 c745838c611475cc8f5314dfb2741e9ee339bd70 SHA256 09231c6b5cfedbd6574007a6d96a51e6257a23ba623a70df62e6674d0d94d068
 MD5 f703b135c202d58849f005abf3c728b4 metadata.xml 526
 RMD160 a4f731a00e46035b9b461489748060dcfbba3cb8 metadata.xml 526
@@ -44,13 +44,13 @@ SHA256 db4c3c2970246ce640e02a6ad9e4985aa70e9ecc4c04d5c6107c37489ffb12e1 files/di
 MD5 93421332705795df9ce5b7839b91f5e4 files/digest-vserver-sources-2.1.1_rc21-r1 1123
 RMD160 f9e78340be9e54025b27eb8f3af6c64d24648267 files/digest-vserver-sources-2.1.1_rc21-r1 1123
 SHA256 90ffc0037fd29ad1a32d03fe57f3502e69fae88457ebe5a50d19245d0f8c222e files/digest-vserver-sources-2.1.1_rc21-r1 1123
-MD5 571788a29e86cd107e5f940ceef5d9df files/digest-vserver-sources-2.1.1_rc21-r2 1123
-RMD160 c8f91f01a54ee8c014d26ce810480e57b3e47846 files/digest-vserver-sources-2.1.1_rc21-r2 1123
-SHA256 470b8aecafd9141544f3f43bf88e94c69fc8eab1d2b243097905205886905725 files/digest-vserver-sources-2.1.1_rc21-r2 1123
+MD5 9af6ae0786c02805fde55c7754ed4c54 files/digest-vserver-sources-2.1.1_rc21-r3 1123
+RMD160 81f49a560236cefe06e6d7b59fcca60c6473c44d files/digest-vserver-sources-2.1.1_rc21-r3 1123
+SHA256 efaecc94fbd6a06627d1c9f82424f06d7d0c72e309983df5211e77ffcb7013e0 files/digest-vserver-sources-2.1.1_rc21-r3 1123
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEfB7WflZ8QqxhrsMRArWCAJ9wmT3WNDpDx0/bpfWe0liyg6WbsQCfUCqp
-efPlrl/0mJ5BvbiQN8AZAZY=
-=TKDu
+iD8DBQFEfy9YflZ8QqxhrsMRAtl3AKCDrybu/TVp03HihxI4dxxzc947WgCfSSft
+rosXDz+WtZrjqKuaCG08ZTQ=
+=ghz8
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.1.1_rc21-r2 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.1.1_rc21-r2
deleted file mode 100644
index 0eaeef12856b..000000000000
--- a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.1.1_rc21-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 c50be16fea12b0f27a77b4e1ed9afc13 genpatches-2.6.16-10.base.tar.bz2 86380
-RMD160 026cd281fbc043aada57ba3362affe7b330da787 genpatches-2.6.16-10.base.tar.bz2 86380
-SHA256 856bf04d928f410e7c40d493e2c5c4a0809902bdb302dbcdc6caf4f19c5f0748 genpatches-2.6.16-10.base.tar.bz2 86380
-MD5 90d5a32ef3815f0efdaf3b3840f256f9 genpatches-2.6.16-10.extras.tar.bz2 137758
-RMD160 4800c6612a3d9f1c2d7f4af923ae5c254416fbcb genpatches-2.6.16-10.extras.tar.bz2 137758
-SHA256 6ce07f500b9b76a988d2384cb7fd73dda70543f9a6429f5ffea1ea737c534fad genpatches-2.6.16-10.extras.tar.bz2 137758
-MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005
-RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005
-SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005
-MD5 c89bb44cfc4a02da8577578b52db2764 vserver-patches-2.6.16_2.1.1_rc21-r2.tar.bz2 155094
-RMD160 ac29f80a5444f64f40202054fc69d67f14fd5a98 vserver-patches-2.6.16_2.1.1_rc21-r2.tar.bz2 155094
-SHA256 ca1513cb051c3133370302d1ba79c96efd73c7a31e1dfb80fcd49ad063f3e7b1 vserver-patches-2.6.16_2.1.1_rc21-r2.tar.bz2 155094
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.1.1_rc21-r2.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.1.1_rc21-r2.ebuild
deleted file mode 100644
index 9e808f69f3b8..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.1.1_rc21-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.1.1_rc21-r2.ebuild,v 1.1 2006/05/30 08:30:34 phreak Exp $
-
-ETYPE="sources"
-CKV="2.6.16"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="10"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-MY_PN=${PN/-sources/-patches}
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DESCRIPTION="Full sources including gentoo and Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="http://dev.croup.de/proj/gentoo-vps"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-	http://dev.gentoo.org/~hollow/distfiles/${MY_PN}-${CKV}_${PVR}.tar.bz2
-	http://dev.gentoo.org/~phreak/distfiles/${MY_PN}-${CKV}_${PVR}.tar.bz2"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/${MY_PN}-${CKV}_${PVR}.tar.bz2"