fix #114188

(Portage version: 2.1_pre7-r5)

4 files changed, 77 insertions, 63 deletions

diff --git a/sys-kernel/vserver-sources/ChangeLog b/sys-kernel/vserver-sources/ChangeLog
index dc7166ba26ea..fa6b9f122499 100644
--- a/sys-kernel/vserver-sources/ChangeLog
+++ b/sys-kernel/vserver-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/vserver-sources
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.99 2006/04/20 12:17:31 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.100 2006/04/21 07:04:54 hollow Exp $
+
+*vserver-sources-2.0.1-r3 (21 Apr 2006)
+
+  21 Apr 2006; Benedikt Boehm <hollow@gentoo.org>
+  +vserver-sources-2.0.1-r3.ebuild:
+  fix #114188
 
 *vserver-sources-2.1.1_rc17 (19 Apr 2006)
 *vserver-sources-2.0.2_rc17 (19 Apr 2006)
diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
index f0e397e4b7ad..937ff18b5429 100644
--- a/sys-kernel/vserver-sources/Manifest
+++ b/sys-kernel/vserver-sources/Manifest
@@ -1,80 +1,48 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST genpatches-2.6.15-11.base.tar.bz2 54659 RMD160 2500afbafe0be03af24a8e9272cb558cb8bd1b48 SHA256 4de6e2264f690f2d6bedb4b58bf260e3a7bbe63989f6e255823561498fed6743 size 54659
-DIST genpatches-2.6.15-11.extras.tar.bz2 176962 RMD160 01a9fb60388a13f4c21299b9428afa498a69e607 SHA256 0b0dd6533c3e579adc2c35e305d151e91f378f0ce77176a7763a4914eeee750d size 176962
-DIST genpatches-2.6.16-4.base.tar.bz2 33194 RMD160 f22b63fb703a1b2d9e8445bea9b369d0f9105e19 SHA256 b702010e3ede2bdcbda66ada55b4403a49c08f99a80b174ed68b5eb255eb61b3 size 33194
-DIST genpatches-2.6.16-4.extras.tar.bz2 137758 RMD160 4800c6612a3d9f1c2d7f4af923ae5c254416fbcb SHA256 6ce07f500b9b76a988d2384cb7fd73dda70543f9a6429f5ffea1ea737c534fad size 137758
-DIST genpatches-2.6.16-5.base.tar.bz2 48590 RMD160 4f8081e3a4abe784dd0c9fdb0848975628f03ddc SHA256 511fe0481a76b7be8c6b13d89bf4d87dabe04b637ebb42e09af231d9aac89560 size 48590
-DIST genpatches-2.6.16-5.extras.tar.bz2 137758 RMD160 4800c6612a3d9f1c2d7f4af923ae5c254416fbcb SHA256 6ce07f500b9b76a988d2384cb7fd73dda70543f9a6429f5ffea1ea737c534fad size 137758
-DIST linux-2.6.15.tar.bz2 39832836 RMD160 e65904bf253b3515f8dd2a480c7e99ec7117cf60 SHA256 066ec56ce5f57c79a526b6bb3541d32dbf796c11c26c32073fc64b93f09825db size 39832836
-DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 size 40845005
-DIST vserver-patches-2.6.15_2.0.1-r2.tar.bz2 103326 RMD160 a831ddf7c2720a422fafe9d486659c740364ca23 SHA256 cd155fba4dcaae7c8ff7306157c608aae07fbf9488e624b996c184d55cb25f1e size 103326
-DIST vserver-patches-2.6.15_2.1.0-r2.tar.bz2 134700 RMD160 1ad3f87d1e892f060c76765f65143a302ba0849c SHA256 6fda07ed5cc8b93a7cff9b72abae6ebfe09f714467a44236425f41748664c710 size 134700
-DIST vserver-patches-2.6.16_2.0.2_rc16.tar.bz2 109634 RMD160 9ce861474d0cb2b30a1576e0f80549c5002f9cb5 SHA256 04acaececc592956d99da7e440cc796db37f8a175ca289698ac4badfea37c6f0 size 109634
-DIST vserver-patches-2.6.16_2.0.2_rc17.tar.bz2 109627 RMD160 8c9298c41d63d0753948541fa9f4488593fa7f57 SHA256 5166eb8fe1565bbbc9ecb4a385c5ac9887a179d4317050b1fa7acfaa18d2c526 size 109627
-DIST vserver-patches-2.6.16_2.1.1_rc16-r1.tar.bz2 150750 RMD160 fb8713ca045a3fdac6e6c175a1ab3b75034994a9 SHA256 13b1c685b1a1868447df831e9b74dec0fda9c01330018cf738037b85701e7de7 size 150750
-DIST vserver-patches-2.6.16_2.1.1_rc17.tar.bz2 148593 RMD160 00c94ed0a4d93c43bf56b3e3090b2c557928afc3 SHA256 5b3dbcf37a43740b7ab7e1de2e3ae1d20fb8f85d9df3f4179c08e3e469d179f1 size 148593
-EBUILD vserver-sources-2.0.1-r2.ebuild 895 RMD160 5ac8a65e91e49afdf282ee25354f0cff4027d12a SHA1 537e3379a4c89ef7e384c05f4c5820a26ed16605 SHA256 d77a54bb44bf7580473534810e521ca5328b536092cd2181399cfc3b223b8424 size 895
-MD5 504b9095af6f120e9b737ee201d1b8da vserver-sources-2.0.1-r2.ebuild 895
-RMD160 5ac8a65e91e49afdf282ee25354f0cff4027d12a vserver-sources-2.0.1-r2.ebuild 895
-SHA256 d77a54bb44bf7580473534810e521ca5328b536092cd2181399cfc3b223b8424 vserver-sources-2.0.1-r2.ebuild 895
-EBUILD vserver-sources-2.0.2_rc16.ebuild 898 RMD160 82f570a536768cdee433ac4e275d8f37e116213b SHA1 1881e5fc9a68d65aface0809389386f61b987cba SHA256 824b14102f397da6a933676e3e554f9e570f326991016fd86fbd573f084f2585 size 898
-MD5 5bfc8147c8dacf2af375f62ba7905685 vserver-sources-2.0.2_rc16.ebuild 898
-RMD160 82f570a536768cdee433ac4e275d8f37e116213b vserver-sources-2.0.2_rc16.ebuild 898
-SHA256 824b14102f397da6a933676e3e554f9e570f326991016fd86fbd573f084f2585 vserver-sources-2.0.2_rc16.ebuild 898
-EBUILD vserver-sources-2.0.2_rc17.ebuild 898 RMD160 f8339744c1136a9e7a088baa8870fc39a2efe6fb SHA1 1193db33d2948cef61b609c7faf0f10bee27a203 SHA256 34b4de5adfdc6e59777e64354401796c686032789947bd45a77a4826cf1de987 size 898
-MD5 2b97cd5f1079e60e245fb49e794531a1 vserver-sources-2.0.2_rc17.ebuild 898
-RMD160 f8339744c1136a9e7a088baa8870fc39a2efe6fb vserver-sources-2.0.2_rc17.ebuild 898
-SHA256 34b4de5adfdc6e59777e64354401796c686032789947bd45a77a4826cf1de987 vserver-sources-2.0.2_rc17.ebuild 898
-EBUILD vserver-sources-2.1.0-r2.ebuild 897 RMD160 822b1242a8d00b1235502ede7d12191836c1441a SHA1 ef33bfeed42cc3b99300c4dabf89aad1edc0f732 SHA256 3d5a24ce61ba161fd25251087b2da99151871fbb0bd4444e0d96a225644c5ebe size 897
-MD5 9d9c3d2820641001295118e61613f52d vserver-sources-2.1.0-r2.ebuild 897
-RMD160 822b1242a8d00b1235502ede7d12191836c1441a vserver-sources-2.1.0-r2.ebuild 897
-SHA256 3d5a24ce61ba161fd25251087b2da99151871fbb0bd4444e0d96a225644c5ebe vserver-sources-2.1.0-r2.ebuild 897
-EBUILD vserver-sources-2.1.1_rc16-r1.ebuild 901 RMD160 549c7eec672f3a652d20bbf6811c0b08407a4d82 SHA1 00ec7ecb4e429bbcc001eae7f3286c2ed3cea351 SHA256 f5f287ec4d96c271308cfd2125e258fe4fffbf2310a248fc3fbf15b060a6d59e size 901
-MD5 5d0e983eaa8757774089876a63b578de vserver-sources-2.1.1_rc16-r1.ebuild 901
-RMD160 549c7eec672f3a652d20bbf6811c0b08407a4d82 vserver-sources-2.1.1_rc16-r1.ebuild 901
-SHA256 f5f287ec4d96c271308cfd2125e258fe4fffbf2310a248fc3fbf15b060a6d59e vserver-sources-2.1.1_rc16-r1.ebuild 901
-EBUILD vserver-sources-2.1.1_rc17.ebuild 898 RMD160 f83aee6f75c98ce8d0aba0b9201098683ba0e40f SHA1 578dd65e2cda4f6de62566d6cdfb6532a3efb178 SHA256 20249f422b38bc317569e769a120e75b44e37b36ffe9f57900f3ba5c6a505434 size 898
-MD5 b021b2a61c78f3c4e439a1e53fe4894e vserver-sources-2.1.1_rc17.ebuild 898
-RMD160 f83aee6f75c98ce8d0aba0b9201098683ba0e40f vserver-sources-2.1.1_rc17.ebuild 898
-SHA256 20249f422b38bc317569e769a120e75b44e37b36ffe9f57900f3ba5c6a505434 vserver-sources-2.1.1_rc17.ebuild 898
-MISC ChangeLog 17512 RMD160 2e235abb0c47de36ea0a7c5dde76ed2c7499083c SHA1 aa275157a0fe5ee81ca1543f25dac8dcd748d257 SHA256 b40ef043fb6a83834f75e6002c8d514afc2086096a174a3e39799c55012d261a size 17512
-MD5 fe223c31301d25055f45aabe91b94f98 ChangeLog 17512
-RMD160 2e235abb0c47de36ea0a7c5dde76ed2c7499083c ChangeLog 17512
-SHA256 b40ef043fb6a83834f75e6002c8d514afc2086096a174a3e39799c55012d261a ChangeLog 17512
-MISC metadata.xml 526 RMD160 a4f731a00e46035b9b461489748060dcfbba3cb8 SHA1 c745838c611475cc8f5314dfb2741e9ee339bd70 SHA256 09231c6b5cfedbd6574007a6d96a51e6257a23ba623a70df62e6674d0d94d068 size 526
-MD5 f703b135c202d58849f005abf3c728b4 metadata.xml 526
-RMD160 a4f731a00e46035b9b461489748060dcfbba3cb8 metadata.xml 526
-SHA256 09231c6b5cfedbd6574007a6d96a51e6257a23ba623a70df62e6674d0d94d068 metadata.xml 526
+MD5 ec9e9ec2ee0595d1b5a83bf55e562087 ChangeLog 17654
+RMD160 2fb06889c07044d0942e58e8a91e0067903a36b4 ChangeLog 17654
+SHA256 946ddfc1b066493fa19ec7f6aef7ead9636482fc1db4fb8f97f7e32f2cad3e17 ChangeLog 17654
 MD5 6cce4fdf8b2cd56674856837f0b872a6 files/digest-vserver-sources-2.0.1-r2 1108
 RMD160 7dcbba3ee91b97b220f0f62080a2350f2035ced1 files/digest-vserver-sources-2.0.1-r2 1108
 SHA256 1d1fb9148d0fd40741d04ae8ac7e8e650ff899d2ee04075c9279ef1f5aa8473a files/digest-vserver-sources-2.0.1-r2 1108
-size 1108 files/digest-vserver-sources-2.0.1-r2 1108
+MD5 e9da024beb8fadebc65f5e62437fe01b files/digest-vserver-sources-2.0.1-r3 1108
+RMD160 badc69fd3808b98d4a3451a2a48e4ae3146f7d4f files/digest-vserver-sources-2.0.1-r3 1108
+SHA256 f1d8fb2f9af000b72dd4f4bab2d7e9742a624ac5b86a92431963ebbd823c70f5 files/digest-vserver-sources-2.0.1-r3 1108
 MD5 4ce3a4eb0b613077aff4f262ef63cfb8 files/digest-vserver-sources-2.0.2_rc16 1108
 RMD160 8609aebc83da81f2e6e42d1d8b67d450c8376ad5 files/digest-vserver-sources-2.0.2_rc16 1108
 SHA256 b3047f157dfb7eb8d8c5130af74cad818188be90ca9a45ce2b05435db4ed68d6 files/digest-vserver-sources-2.0.2_rc16 1108
-size 1108 files/digest-vserver-sources-2.0.2_rc16 1108
 MD5 a069151eb4c12132bf27d00a83fdd51f files/digest-vserver-sources-2.0.2_rc17 1108
 RMD160 173ae1d12f7dddb3c13e513b6bbc5b31290a54a4 files/digest-vserver-sources-2.0.2_rc17 1108
 SHA256 a4f1c3c249d4747853ba466a98e748e67dbfac37173c0b46b6f0cbbc355b78a0 files/digest-vserver-sources-2.0.2_rc17 1108
-size 1108 files/digest-vserver-sources-2.0.2_rc17 1108
 MD5 9b5b1946ad308afd3d51ee0d6b948c06 files/digest-vserver-sources-2.1.0-r2 1108
 RMD160 5fab6afda45b6c9f98c350c3e34786e340983360 files/digest-vserver-sources-2.1.0-r2 1108
 SHA256 6c1ca46165575a864f17ba47d950cc3fcf2e9f62dd0f7199100d0447767eea76 files/digest-vserver-sources-2.1.0-r2 1108
-size 1108 files/digest-vserver-sources-2.1.0-r2 1108
 MD5 42813fab2fd9c16aad3a0b98a869a707 files/digest-vserver-sources-2.1.1_rc16-r1 1117
 RMD160 3a5e4597daf2e4f8e1e50423f90c79d5882be667 files/digest-vserver-sources-2.1.1_rc16-r1 1117
 SHA256 c48ddee9dd3b07fe015333a864073f5f241074c9f38c470e81333e099f1c428b files/digest-vserver-sources-2.1.1_rc16-r1 1117
-size 1117 files/digest-vserver-sources-2.1.1_rc16-r1 1117
 MD5 504e1a8e00e35031a4ac5c291ed6d2d1 files/digest-vserver-sources-2.1.1_rc17 1108
 RMD160 5408c084a3d72a3ac821f5ea43d803e220e79bda files/digest-vserver-sources-2.1.1_rc17 1108
 SHA256 6450a800bc11f136938e463032783813ee438419c42adc595bfa65094942892c files/digest-vserver-sources-2.1.1_rc17 1108
-size 1108 files/digest-vserver-sources-2.1.1_rc17 1108
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFER3vqflZ8QqxhrsMRAuxyAJ9126g575l1kklSZpKe02aqVT/7rwCeJ2qq
-MaQUKg8AyL2eUrcvIYjDOKI=
-=S85z
------END PGP SIGNATURE-----
+MD5 f703b135c202d58849f005abf3c728b4 metadata.xml 526
+RMD160 a4f731a00e46035b9b461489748060dcfbba3cb8 metadata.xml 526
+SHA256 09231c6b5cfedbd6574007a6d96a51e6257a23ba623a70df62e6674d0d94d068 metadata.xml 526
+MD5 504b9095af6f120e9b737ee201d1b8da vserver-sources-2.0.1-r2.ebuild 895
+RMD160 5ac8a65e91e49afdf282ee25354f0cff4027d12a vserver-sources-2.0.1-r2.ebuild 895
+SHA256 d77a54bb44bf7580473534810e521ca5328b536092cd2181399cfc3b223b8424 vserver-sources-2.0.1-r2.ebuild 895
+MD5 504b9095af6f120e9b737ee201d1b8da vserver-sources-2.0.1-r3.ebuild 895
+RMD160 5ac8a65e91e49afdf282ee25354f0cff4027d12a vserver-sources-2.0.1-r3.ebuild 895
+SHA256 d77a54bb44bf7580473534810e521ca5328b536092cd2181399cfc3b223b8424 vserver-sources-2.0.1-r3.ebuild 895
+MD5 5bfc8147c8dacf2af375f62ba7905685 vserver-sources-2.0.2_rc16.ebuild 898
+RMD160 82f570a536768cdee433ac4e275d8f37e116213b vserver-sources-2.0.2_rc16.ebuild 898
+SHA256 824b14102f397da6a933676e3e554f9e570f326991016fd86fbd573f084f2585 vserver-sources-2.0.2_rc16.ebuild 898
+MD5 2b97cd5f1079e60e245fb49e794531a1 vserver-sources-2.0.2_rc17.ebuild 898
+RMD160 f8339744c1136a9e7a088baa8870fc39a2efe6fb vserver-sources-2.0.2_rc17.ebuild 898
+SHA256 34b4de5adfdc6e59777e64354401796c686032789947bd45a77a4826cf1de987 vserver-sources-2.0.2_rc17.ebuild 898
+MD5 9d9c3d2820641001295118e61613f52d vserver-sources-2.1.0-r2.ebuild 897
+RMD160 822b1242a8d00b1235502ede7d12191836c1441a vserver-sources-2.1.0-r2.ebuild 897
+SHA256 3d5a24ce61ba161fd25251087b2da99151871fbb0bd4444e0d96a225644c5ebe vserver-sources-2.1.0-r2.ebuild 897
+MD5 5d0e983eaa8757774089876a63b578de vserver-sources-2.1.1_rc16-r1.ebuild 901
+RMD160 549c7eec672f3a652d20bbf6811c0b08407a4d82 vserver-sources-2.1.1_rc16-r1.ebuild 901
+SHA256 f5f287ec4d96c271308cfd2125e258fe4fffbf2310a248fc3fbf15b060a6d59e vserver-sources-2.1.1_rc16-r1.ebuild 901
+MD5 b021b2a61c78f3c4e439a1e53fe4894e vserver-sources-2.1.1_rc17.ebuild 898
+RMD160 f83aee6f75c98ce8d0aba0b9201098683ba0e40f vserver-sources-2.1.1_rc17.ebuild 898
+SHA256 20249f422b38bc317569e769a120e75b44e37b36ffe9f57900f3ba5c6a505434 vserver-sources-2.1.1_rc17.ebuild 898
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0.1-r3 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0.1-r3
new file mode 100644
index 000000000000..768ad3996313
--- /dev/null
+++ b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0.1-r3
@@ -0,0 +1,12 @@
+MD5 e6ccc7ff196945e4156bef2a55f2dd30 genpatches-2.6.15-11.base.tar.bz2 54659
+RMD160 2500afbafe0be03af24a8e9272cb558cb8bd1b48 genpatches-2.6.15-11.base.tar.bz2 54659
+SHA256 4de6e2264f690f2d6bedb4b58bf260e3a7bbe63989f6e255823561498fed6743 genpatches-2.6.15-11.base.tar.bz2 54659
+MD5 a561eaa38567d6db81962dfb54ffd181 genpatches-2.6.15-11.extras.tar.bz2 176962
+RMD160 01a9fb60388a13f4c21299b9428afa498a69e607 genpatches-2.6.15-11.extras.tar.bz2 176962
+SHA256 0b0dd6533c3e579adc2c35e305d151e91f378f0ce77176a7763a4914eeee750d genpatches-2.6.15-11.extras.tar.bz2 176962
+MD5 cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 39832836
+RMD160 e65904bf253b3515f8dd2a480c7e99ec7117cf60 linux-2.6.15.tar.bz2 39832836
+SHA256 066ec56ce5f57c79a526b6bb3541d32dbf796c11c26c32073fc64b93f09825db linux-2.6.15.tar.bz2 39832836
+MD5 7827373a7e14aed1fa1be73ac475ef90 vserver-patches-2.6.15_2.0.1-r3.tar.bz2 107685
+RMD160 4adcddf3b8cb68cb366cfff33291f0ed6bad404b vserver-patches-2.6.15_2.0.1-r3.tar.bz2 107685
+SHA256 1a56f0d5502fd49da39a257625ad838864dc871963c772f4f07563beb15638a7 vserver-patches-2.6.15_2.0.1-r3.tar.bz2 107685
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.0.1-r3.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..dcd5a3b3558b
--- /dev/null
+++ b/sys-kernel/vserver-sources/vserver-sources-2.0.1-r3.ebuild
@@ -0,0 +1,28 @@
+# 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.0.1-r3.ebuild,v 1.1 2006/04/21 07:04:55 hollow Exp $
+
+ETYPE="sources"
+CKV="2.6.15"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="11"
+
+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"