remove old ebuilds; 2.0-r1 to stable; add 2.0.1-pre2 for testing

(Portage version: 2.0.51.22-r2)

13 files changed, 23 insertions, 135 deletions

diff --git a/sys-kernel/vserver-sources/ChangeLog b/sys-kernel/vserver-sources/ChangeLog
index c30e5b0fbeee..3f68638ba40a 100644
--- a/sys-kernel/vserver-sources/ChangeLog
+++ b/sys-kernel/vserver-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/vserver-sources
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.41 2005/08/30 06:48:56 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.42 2005/08/31 07:22:48 hollow Exp $
+
+*vserver-sources-2.0.1_pre2 (31 Aug 2005)
+
+  31 Aug 2005; Benedikt Boehm <hollow@gentoo.org>
+  -files/delta-locks-fix02.diff, -vserver-sources-1.9.5.ebuild,
+  -vserver-sources-2.0_rc6.ebuild, -vserver-sources-2.0.ebuild,
+  -vserver-sources-2.0_rc8.ebuild, vserver-sources-2.0-r1.ebuild,
+  +vserver-sources-2.0.1_pre2.ebuild:
+  remove old ebuilds; 2.0-r1 to stable; add 2.0.1-pre2 for testing
 
 *vserver-sources-2.1.0_pre5 (30 Aug 2005)
 
diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
index 2c7ea6910800..aa03a2d4628c 100644
--- a/sys-kernel/vserver-sources/Manifest
+++ b/sys-kernel/vserver-sources/Manifest
@@ -1,25 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ab2e633ac9d3097367c9f7cabe006c0e ChangeLog 4770
+MD5 2ec0349a718f89644d845f536a068ec8 ChangeLog 5163
 MD5 0f960f0c8cbf4395346622ce8a433dea metadata.xml 469
-MD5 57666c0cdbfc95b7d7e87e0bb2ca9d07 vserver-sources-1.9.5.ebuild 751
-MD5 22f3abff922822380e6d48a7fb894c1f vserver-sources-2.0_rc6.ebuild 719
-MD5 44210ae39fb0c34ba34878b4b77db0e2 vserver-sources-2.0_rc8.ebuild 778
-MD5 32b24f2ddde7e33d66fdd675b085467a vserver-sources-2.0.ebuild 740
-MD5 1245f073146eda9b8e97c12462c7bf47 vserver-sources-2.0-r1.ebuild 743
+MD5 c09b8f7579d63b38b4959d0e774c3830 vserver-sources-2.0-r1.ebuild 742
 MD5 898a05429a45f513d29cc965a9dbfab3 vserver-sources-2.1.0_pre5.ebuild 746
-MD5 6e89fc7860e9cb1c51f6fe718320f88d files/delta-locks-fix02.diff 682
-MD5 eeba2c8f8e1d02662a34ddbb3821f384 files/digest-vserver-sources-1.9.5 199
+MD5 898a05429a45f513d29cc965a9dbfab3 vserver-sources-2.0.1_pre2.ebuild 746
 MD5 9ad64ba1a94849ed87ff74df46547308 files/digest-vserver-sources-2.0-r1 299
-MD5 be5caa6f1100b337de66289210b3bd80 files/digest-vserver-sources-2.0 296
-MD5 b7971fff5cbeaa464da2dd22c2d82c8b files/digest-vserver-sources-2.0_rc6 298
-MD5 3c1bfbd29376cc0f5d8e499e1dc19007 files/digest-vserver-sources-2.0_rc8 300
+MD5 4111b274edfb4a0a1bc00162896de7e7 files/digest-vserver-sources-2.0.1_pre2 301
 MD5 540c09f6fdf64dd8150f1107089f606a files/digest-vserver-sources-2.1.0_pre5 301
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDFAFtmPFBzbX68WERAqzTAJ9zA8gvAKnkbHfD7n57nYaCoSmKEQCeMD8X
-Y/oI5RJspxLp5m6xkQ7W/KQ=
-=GVRo
------END PGP SIGNATURE-----
diff --git a/sys-kernel/vserver-sources/files/delta-locks-fix02.diff b/sys-kernel/vserver-sources/files/delta-locks-fix02.diff
deleted file mode 100644
index 4e57fc6a56d2..000000000000
--- a/sys-kernel/vserver-sources/files/delta-locks-fix02.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -NurpP --minimal linux-2.6.12.3-vs2.0-rc8/fs/locks.c linux-2.6.12.3-vs2.0-rc8.1/fs/locks.c
---- linux-2.6.12.3-vs2.0-rc8/fs/locks.c	2005-07-17 03:01:38 +0200
-+++ linux-2.6.12.3-vs2.0-rc8.1/fs/locks.c	2005-07-17 15:40:11 +0200
-@@ -461,9 +461,10 @@ static int lease_alloc(struct file *filp
- 	if (fl == NULL)
- 		return -ENOMEM;
- 
--	vxd_assert(filp->f_xid == vx_current_xid(),
--		"f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
--	fl->fl_xid = filp->f_xid;
-+	fl->fl_xid = vx_current_xid();
-+	if (filp)
-+		vxd_assert(filp->f_xid == fl->fl_xid,
-+			"f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid);
- 	vx_locks_inc(fl);
- 	error = lease_init(filp, type, fl);
- 	if (error)
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-1.9.5 b/sys-kernel/vserver-sources/files/digest-vserver-sources-1.9.5
deleted file mode 100644
index fd09d9ca06b6..000000000000
--- a/sys-kernel/vserver-sources/files/digest-vserver-sources-1.9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e3c197b36659759f47fc1a3bd15b5c8e patch-2.6.11.6.bz2 8619
-MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 95aac5777279384fb3850628bd685495 vspatches-1.9.5-00.tar.bz2 279863
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0
deleted file mode 100644
index 7972421d916d..000000000000
--- a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 e691055686f00a6a8e7ca30e0a11a7f9 genpatches-2.6.12-11.base.tar.bz2 39237
-MD5 1e50ea34e63e0145b71d91b10cce2499 genpatches-2.6.12-11.extras.tar.bz2 229274
-MD5 dc07a0f8be7dd080a4ed1c91c54b3fff vserver-sources-2.0.tar.bz2 107015
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0.1_pre2 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0.1_pre2
new file mode 100644
index 000000000000..30c13d4252d0
--- /dev/null
+++ b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0.1_pre2
@@ -0,0 +1,4 @@
+MD5 560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2 38372729
+MD5 ac43582ec7a1280eee78eabb9c416662 genpatches-2.6.13-1.base.tar.bz2 16013
+MD5 21163359c3e79381e428198707f63167 genpatches-2.6.13-1.extras.tar.bz2 159820
+MD5 970b2782c05a751fd13e4802f2acc2bc vserver-sources-2.0.1_pre2.tar.bz2 111561
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0_rc6 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0_rc6
deleted file mode 100644
index 1ba8abe59fb7..000000000000
--- a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0_rc6
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 ddab7b1cb14955286ed3ac849bb79ae8 genpatches-2.6.12-7.base.tar.bz2 21193
-MD5 2d9aad1136dafa46665320ba4dec2d76 genpatches-2.6.12-7.extras.tar.bz2 227527
-MD5 695915b08337c3d9c0e8d71398f9661a vserver-sources-2.0_rc6.tar.bz2 106073
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0_rc8 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0_rc8
deleted file mode 100644
index db45a7abe5f2..000000000000
--- a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.0_rc8
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c5d2a1b62e1dad502c871bba267337d5 linux-2.6.12.tar.bz2 37511570
-MD5 f63017b130a37704894b14f8cf7695ad genpatches-2.6.12-10.base.tar.bz2 29871
-MD5 2d9aad1136dafa46665320ba4dec2d76 genpatches-2.6.12-10.extras.tar.bz2 227527
-MD5 0b411d271edcff9d0b2f9e0e3fca8494 vserver-sources-2.0_rc8.tar.bz2 106935
diff --git a/sys-kernel/vserver-sources/vserver-sources-1.9.5.ebuild b/sys-kernel/vserver-sources/vserver-sources-1.9.5.ebuild
deleted file mode 100644
index 5c925fa2da9d..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-1.9.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-1.9.5.ebuild,v 1.3 2005/07/14 23:26:02 swegener Exp $
-
-ETYPE="sources"
-CKV="2.6.11.6"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-
-VSPV="${PV/_rc/-rc}"
-PATCHR="00"
-
-DESCRIPTION="vserver patched sources for the ${KV_MAJOR}.${KV_MINOR} kernel branch"
-HOMEPAGE="http://www.linux-vserver.org"
-SRC_URI="${KERNEL_URI} 	mirror://gentoo/vspatches-${VSPV}-${PATCHR}.tar.bz2"
-
-KEYWORDS="~amd64 x86"
-IUSE="ngnet"
-
-UNIPATCH_LIST="${DISTDIR}/vspatches-${VSPV}-${PATCHR}.tar.bz2"
-UNIPATCH_STRICTORDER=1
-
-pkg_setup() {
-	use ngnet || UNIPATCH_EXCLUDE="9910"
-}
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.0-r1.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.0-r1.ebuild
index 72f2252c7bcf..5635b48da5b5 100644
--- a/sys-kernel/vserver-sources/vserver-sources-2.0-r1.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/08/22 07:03:40 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.0-r1.ebuild,v 1.2 2005/08/31 07:22:48 hollow Exp $
 
 ETYPE="sources"
 CKV="2.6.12"
@@ -14,7 +14,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 DESCRIPTION="Full sources including gentoo and Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 HOMEPAGE="http://dev.gentoo.org/~hollow/vserver"
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.0.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.0.1_pre2.ebuild
index 319301a95d4a..1f87dd56c6a4 100644
--- a/sys-kernel/vserver-sources/vserver-sources-2.0.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-2.0.1_pre2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 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.ebuild,v 1.1 2005/08/08 19:09:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.0.1_pre2.ebuild,v 1.1 2005/08/31 07:22:48 hollow Exp $
 
 ETYPE="sources"
-CKV="2.6.12"
+CKV="2.6.13"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="11"
+K_GENPATCHES_VER="1"
 
 K_USEPV=1
 K_NOSETEXTRAVERSION=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.0_rc6.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.0_rc6.ebuild
deleted file mode 100644
index 2e0ac359c96c..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.0_rc6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 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_rc6.ebuild,v 1.1 2005/07/09 17:55:03 hollow Exp $
-
-ETYPE="sources"
-CKV="2.6.12"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="7"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Full sources including gentoo and Linux-VServerpatchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="http://dev.gentoo.org/~hollow/vserver"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${HOMEPAGE}/patches/${PF}.tar.bz2"
-
-UNIPATCH_LIST="${DISTDIR}/${PF}.tar.bz2"
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.0_rc8.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.0_rc8.ebuild
deleted file mode 100644
index dcabdaf7cdd6..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.0_rc8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 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_rc8.ebuild,v 1.2 2005/07/20 06:14:04 hollow Exp $
-
-ETYPE="sources"
-CKV="2.6.12"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="10"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Full sources including gentoo and Linux-VServerpatchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="http://dev.gentoo.org/~hollow/vserver"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${HOMEPAGE}/patches/${PF}.tar.bz2"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/${PF}.tar.bz2 ${FILESDIR}/delta-locks-fix02.diff"