fixed older ebuilds to use kernel-2.eclass correctly + version bumpt to 1.9.4

(Portage version: 2.0.51.16)

9 files changed, 80 insertions, 36 deletions

diff --git a/sys-kernel/vserver-sources/ChangeLog b/sys-kernel/vserver-sources/ChangeLog
index a1c13f34511e..6df087558e9c 100644
--- a/sys-kernel/vserver-sources/ChangeLog
+++ b/sys-kernel/vserver-sources/ChangeLog
@@ -1,6 +1,14 @@
 # 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.21 2005/02/07 14:04:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.22 2005/02/12 13:14:55 hollow Exp $
+
+*vserver-sources-1.9.4 (12 Feb 2005)
+
+  12 Feb 2005; Benedikt Boehm <hollow@gentoo.org>
+  vserver-sources-1.9.3.ebuild, +vserver-sources-1.9.4.ebuild,
+  vserver-sources-1.9.4_rc1.ebuild, vserver-sources-1.9.4_rc2.ebuild,
+  vserver-sources-1.9.4_rc4.ebuild, vserver-sources-1.9.4_rc5.ebuild:
+  fixed older ebuilds to use kernel-2.eclass correctly + version bumpt to 1.9.4
 
 *vserver-sources-1.9.4_rc5 (07 Feb 2005)
 
diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
index 5edbda736138..1bc6b1931fb4 100644
--- a/sys-kernel/vserver-sources/Manifest
+++ b/sys-kernel/vserver-sources/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5fa412d3b81294760f4a2f756256a67e ChangeLog 1268
+MD5 c0388cdc7ec6545911f04816c2026fa0 ChangeLog 1640
 MD5 aa56cf15a7bbeb714ab4dae1e8c670e5 metadata.xml 546
-MD5 dc9c4b0a8ff5d91426a9eb8857a55453 vserver-sources-1.9.3.ebuild 633
-MD5 7ac8a90c916a5510fc0b39111d1ea3d4 vserver-sources-1.9.4_rc1.ebuild 643
-MD5 1b72a6fd94f6037836fbe83469eca6b3 vserver-sources-1.9.4_rc2.ebuild 643
-MD5 62993e7e4ab97da8eaebaf2ad1c1f4c7 vserver-sources-1.9.4_rc4.ebuild 643
-MD5 7ed592d02d36abaf2e26b4a95fcd602a vserver-sources-1.9.4_rc5.ebuild 688
+MD5 a4ad69c9c83633e6a6c57c2e947744da vserver-sources-1.9.3.ebuild 681
+MD5 028bb847d4cd3d10d5445bec56523d35 vserver-sources-1.9.4_rc1.ebuild 699
+MD5 028bb847d4cd3d10d5445bec56523d35 vserver-sources-1.9.4_rc2.ebuild 699
+MD5 028bb847d4cd3d10d5445bec56523d35 vserver-sources-1.9.4_rc4.ebuild 699
+MD5 99ba13e71c74cac9cac3682aa4377cce vserver-sources-1.9.4_rc5.ebuild 703
+MD5 c954c83b6d3794e588b2564b599f091d vserver-sources-1.9.4.ebuild 687
 MD5 90fec4ec5fc9d3ea8bf24823820837f7 files/digest-vserver-sources-1.9.3 135
+MD5 e17b723d0c9c7c910b80b441f95f45f0 files/digest-vserver-sources-1.9.4 207
 MD5 3db4cf63afcc70eb22f109178dec513f files/digest-vserver-sources-1.9.4_rc1 141
 MD5 3b8604d0c5bca1038704e1c54e442108 files/digest-vserver-sources-1.9.4_rc2 141
 MD5 83a5de20aa71c6d41a315ffc34179d34 files/digest-vserver-sources-1.9.4_rc4 141
 MD5 c1f33426c6c2238b2591e5f7dab15e42 files/digest-vserver-sources-1.9.4_rc5 211
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCB3WemPFBzbX68WERAlXPAJ0exG/CwB5GMenJn6ARiW8jYl2XfQCfS2aB
-U3pheLmCh89NNkM+CD6Dz+s=
-=qilJ
------END PGP SIGNATURE-----
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-1.9.4 b/sys-kernel/vserver-sources/files/digest-vserver-sources-1.9.4
new file mode 100644
index 000000000000..d0b3ed8b268d
--- /dev/null
+++ b/sys-kernel/vserver-sources/files/digest-vserver-sources-1.9.4
@@ -0,0 +1,3 @@
+MD5 7c2cf93cb5064520bd3c1bcf89fb0ddf patch-2.6.11-rc3.bz2 3826416
+MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
+MD5 37464e7e19b9d499b61f115aa594261a patch-2.6.11-rc3-vs1.9.4.diff 505684
diff --git a/sys-kernel/vserver-sources/vserver-sources-1.9.3.ebuild b/sys-kernel/vserver-sources/vserver-sources-1.9.3.ebuild
index b800bf0fdf20..b315bee64bae 100644
--- a/sys-kernel/vserver-sources/vserver-sources-1.9.3.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-1.9.3.ebuild
@@ -1,9 +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-1.9.3.ebuild,v 1.1 2005/01/14 11:58:41 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-1.9.3.ebuild,v 1.2 2005/02/12 13:14:55 hollow Exp $
 
 ETYPE="sources"
-OKV="2.6.9"
+CKV="2.6.9"
+
+K_USEPV=1
 K_NOSETEXTRAVERSION=1
 
 inherit kernel-2
@@ -11,8 +13,9 @@ detect_version
 
 DESCRIPTION="vserver patched sources for the ${KV_MAJOR}.${KV_MINOR} kernel branch"
 HOMEPAGE="http://www.linux-vserver.org"
-SRC_URI="${KERNEL_URI} http://www.13thfloor.at/vserver/d_rel${KV_MAJOR}${KV_MINOR}/v${PV}/patch-${OKV}-vs${PV}.diff"
+SRC_URI="${KERNEL_URI} http://www.13thfloor.at/vserver/d_rel${KV_MAJOR}${KV_MINOR}/v${PV}/patch-${CKV//_/-}-vs${PV}.diff"
 
 KEYWORDS="x86"
 
-UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-vs${PV}.diff"
+UNIPATCH_LIST="${DISTDIR}/patch-${CKV//_/-}-vs${PV}.diff"
+UNIPATCH_STRICTORDER=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-1.9.4.ebuild b/sys-kernel/vserver-sources/vserver-sources-1.9.4.ebuild
new file mode 100644
index 000000000000..b6ed666422c7
--- /dev/null
+++ b/sys-kernel/vserver-sources/vserver-sources-1.9.4.ebuild
@@ -0,0 +1,21 @@
+# 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.4.ebuild,v 1.1 2005/02/12 13:14:55 hollow Exp $
+
+ETYPE="sources"
+CKV="2.6.11_rc3"
+
+K_USEPV=1
+K_NOSETEXTRAVERSION=1
+
+inherit kernel-2
+detect_version
+
+DESCRIPTION="vserver patched sources for the ${KV_MAJOR}.${KV_MINOR} kernel branch"
+HOMEPAGE="http://www.linux-vserver.org"
+SRC_URI="${KERNEL_URI} http://www.13thfloor.at/vserver/d_rel${KV_MAJOR}${KV_MINOR}/v${PV}/patch-${CKV//_/-}-vs${PV}.diff"
+
+KEYWORDS="~x86"
+
+UNIPATCH_LIST="${DISTDIR}/patch-${CKV//_/-}-vs${PV}.diff"
+UNIPATCH_STRICTORDER=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc1.ebuild b/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc1.ebuild
index 8ee4b9f22bf0..29a41d1e9f7e 100644
--- a/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc1.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc1.ebuild
@@ -1,18 +1,23 @@
 # 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.4_rc1.ebuild,v 1.2 2005/02/03 13:05:07 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc1.ebuild,v 1.3 2005/02/12 13:14:55 hollow Exp $
 
 ETYPE="sources"
-OKV="2.6.10"
+CKV="2.6.10"
+
+K_USEPV=1
 K_NOSETEXTRAVERSION=1
 
 inherit kernel-2
 detect_version
 
+VSPV="${PV/_rc/-rc}"
+
 DESCRIPTION="vserver patched sources for the ${KV_MAJOR}.${KV_MINOR} kernel branch"
 HOMEPAGE="http://www.linux-vserver.org"
-SRC_URI="${KERNEL_URI} http://vserver.13thfloor.at/Experimental/RC-${PV/_rc*}/patch-${OKV}-vs${PV/_rc/-rc}.diff"
+SRC_URI="${KERNEL_URI} http://vserver.13thfloor.at/Experimental/RC-${VSPV/-rc*}/patch-${CKV//_/-}-vs${VSPV}.diff"
 
 KEYWORDS="~x86"
 
-UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-vs${PV/_rc/-rc}.diff"
+UNIPATCH_LIST="${DISTDIR}/patch-${CKV//_/-}-vs${VSPV}.diff"
+UNIPATCH_STRICTORDER=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc2.ebuild b/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc2.ebuild
index f756863b3443..d9d479b83dc1 100644
--- a/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc2.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc2.ebuild
@@ -1,18 +1,23 @@
 # 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.4_rc2.ebuild,v 1.2 2005/02/03 13:05:07 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc2.ebuild,v 1.3 2005/02/12 13:14:55 hollow Exp $
 
 ETYPE="sources"
-OKV="2.6.10"
+CKV="2.6.10"
+
+K_USEPV=1
 K_NOSETEXTRAVERSION=1
 
 inherit kernel-2
 detect_version
 
+VSPV="${PV/_rc/-rc}"
+
 DESCRIPTION="vserver patched sources for the ${KV_MAJOR}.${KV_MINOR} kernel branch"
 HOMEPAGE="http://www.linux-vserver.org"
-SRC_URI="${KERNEL_URI} http://vserver.13thfloor.at/Experimental/RC-${PV/_rc*}/patch-${OKV}-vs${PV/_rc/-rc}.diff"
+SRC_URI="${KERNEL_URI} http://vserver.13thfloor.at/Experimental/RC-${VSPV/-rc*}/patch-${CKV//_/-}-vs${VSPV}.diff"
 
 KEYWORDS="~x86"
 
-UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-vs${PV/_rc/-rc}.diff"
+UNIPATCH_LIST="${DISTDIR}/patch-${CKV//_/-}-vs${VSPV}.diff"
+UNIPATCH_STRICTORDER=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc4.ebuild b/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc4.ebuild
index b3d8c89cc8ab..f4b6a84133ed 100644
--- a/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc4.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc4.ebuild
@@ -1,18 +1,23 @@
 # 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.4_rc4.ebuild,v 1.1 2005/02/03 13:05:07 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc4.ebuild,v 1.2 2005/02/12 13:14:55 hollow Exp $
 
 ETYPE="sources"
-OKV="2.6.10"
+CKV="2.6.10"
+
+K_USEPV=1
 K_NOSETEXTRAVERSION=1
 
 inherit kernel-2
 detect_version
 
+VSPV="${PV/_rc/-rc}"
+
 DESCRIPTION="vserver patched sources for the ${KV_MAJOR}.${KV_MINOR} kernel branch"
 HOMEPAGE="http://www.linux-vserver.org"
-SRC_URI="${KERNEL_URI} http://vserver.13thfloor.at/Experimental/RC-${PV/_rc*}/patch-${OKV}-vs${PV/_rc/-rc}.diff"
+SRC_URI="${KERNEL_URI} http://vserver.13thfloor.at/Experimental/RC-${VSPV/-rc*}/patch-${CKV//_/-}-vs${VSPV}.diff"
 
 KEYWORDS="~x86"
 
-UNIPATCH_LIST="${DISTDIR}/patch-${OKV}-vs${PV/_rc/-rc}.diff"
+UNIPATCH_LIST="${DISTDIR}/patch-${CKV//_/-}-vs${VSPV}.diff"
+UNIPATCH_STRICTORDER=1
diff --git a/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc5.ebuild b/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc5.ebuild
index 7d3fce767fd4..427329e1c1bc 100644
--- a/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc5.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc5.ebuild
@@ -1,21 +1,23 @@
 # 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.4_rc5.ebuild,v 1.1 2005/02/07 14:04:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-1.9.4_rc5.ebuild,v 1.2 2005/02/12 13:14:55 hollow Exp $
 
 ETYPE="sources"
 CKV="2.6.11_rc3"
 
+K_USEPV=1
 K_NOSETEXTRAVERSION=1
 
 inherit kernel-2
 detect_version
 
+VSPV="${PV/_rc/-rc}"
 
 DESCRIPTION="vserver patched sources for the ${KV_MAJOR}.${KV_MINOR} kernel branch"
 HOMEPAGE="http://www.linux-vserver.org"
-SRC_URI="${KERNEL_URI} http://vserver.13thfloor.at/Experimental/RC-${PV/_rc*}/patch-${CKV/_rc/-rc}-vs${PV/_rc/-rc}.diff"
+SRC_URI="${KERNEL_URI} http://vserver.13thfloor.at/Experimental/RC-${VSPV/-rc*}/patch-${CKV//_/-}-vs${VSPV}.diff"
 
 KEYWORDS="~x86"
 
-UNIPATCH_LIST="${DISTDIR}/patch-${CKV/_rc/-rc}-vs${PV/_rc/-rc}.diff"
+UNIPATCH_LIST="${DISTDIR}/patch-${CKV//_/-}-vs${VSPV}.diff"
 UNIPATCH_STRICTORDER=1