Doing some major ebuild cleanups, removing 022.078-r*, adding 026.020. The ebuilds now directly fetch the combined patchtarball from OpenVZ and directly use that.

Package-Manager: portage-2.1.2_rc1-r2

11 files changed, 90 insertions, 47 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index e44c1dc1c1d6..e4fda661f3d6 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/openvz-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.43 2006/11/02 17:55:33 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.44 2006/11/02 18:47:11 phreak Exp $
+
+*openvz-sources-026.020 (02 Nov 2006)
+
+  02 Nov 2006; Christian Heim <phreak@gentoo.org>
+  openvz-sources-022.077.ebuild, -openvz-sources-022.078-r2.ebuild,
+  -openvz-sources-022.078-r3.ebuild, openvz-sources-026.015-r2.ebuild,
+  openvz-sources-026.017.ebuild, openvz-sources-026.018.ebuild,
+  +openvz-sources-026.020.ebuild:
+  Doing some major ebuild cleanups, removing 022.078-r*, adding 026.020. The
+  ebuilds now directly fetch the combined patchtarball from OpenVZ and
+  directly use that.
 
 *openvz-sources-023.030 (02 Nov 2006)
 
diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-022.077 b/sys-kernel/openvz-sources/files/digest-openvz-sources-022.077
index 5708b8eed822..d6a15c774bd0 100644
--- a/sys-kernel/openvz-sources/files/digest-openvz-sources-022.077
+++ b/sys-kernel/openvz-sources/files/digest-openvz-sources-022.077
@@ -1,6 +1,6 @@
-MD5 2f8b0030ce970f3c1a460faf5d2b1cec linux-2.6.8.tar.bz2 35634061
-RMD160 4aac2f7a109d710330e84cf246a36959e5caea4b linux-2.6.8.tar.bz2 35634061
-SHA256 42619b1dd4bd896d167a61cc0956d2b36ef922086018bbc27149627360c5a7f7 linux-2.6.8.tar.bz2 35634061
-MD5 611ed21fa49d0d141ed7d2c0d1f4d481 openvz-patches-2.6.8_022.077.tar.bz2 2856725
-RMD160 21bd0d386cfa96ebc9990ae1b77acb92684f2044 openvz-patches-2.6.8_022.077.tar.bz2 2856725
-SHA256 e026dd3a8f59a5a7b514c1085cfd90a00ca0231032e0dc1ac43f5377a2596dab openvz-patches-2.6.8_022.077.tar.bz2 2856725
+MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440
+RMD160 42e5fd6e633dcd3a0762f7e284158dd7f3e71aa0 linux-2.6.9.tar.bz2 36261440
+SHA256 f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1 linux-2.6.9.tar.bz2 36261440
+MD5 f97f0c739ecf298401aeadae5af4249a patch-022stab077-combined.gz 3530417
+RMD160 5ee03912a4fff381afe5ce42a80e76aa60ea4503 patch-022stab077-combined.gz 3530417
+SHA256 514f7a3eb930b8aa93a3d5f0f54775a5cb9b6256f41fce45dc941b80a32decbc patch-022stab077-combined.gz 3530417
diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-026.015-r2 b/sys-kernel/openvz-sources/files/digest-openvz-sources-026.015-r2
index 546604e2ddca..b47b1ebf4ea4 100644
--- a/sys-kernel/openvz-sources/files/digest-openvz-sources-026.015-r2
+++ b/sys-kernel/openvz-sources/files/digest-openvz-sources-026.015-r2
@@ -1,6 +1,6 @@
 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 9836bce8218a3c838cc41536122f273b openvz-patches-2.6.16_026.015-r2.tar.bz2 494012
-RMD160 81d75345721e1e99569452a07e016f393f24f609 openvz-patches-2.6.16_026.015-r2.tar.bz2 494012
-SHA256 a5bfa325727bbed8f0dd53741f778c086f52443f84a8da8cbee39cb306250159 openvz-patches-2.6.16_026.015-r2.tar.bz2 494012
+MD5 b5dc9170ec9568adf00169df4cf30536 patch-026test015-combined.gz 652692
+RMD160 7bb6383bac35a16e3e0d0eb136c13e8a87cbd940 patch-026test015-combined.gz 652692
+SHA256 5b819c4b693017cebe9a93399ba55a1ca111ce3313f1953d65d45df1c573c9f6 patch-026test015-combined.gz 652692
diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-026.017 b/sys-kernel/openvz-sources/files/digest-openvz-sources-026.017
index a75c385c9376..d7360689f178 100644
--- a/sys-kernel/openvz-sources/files/digest-openvz-sources-026.017
+++ b/sys-kernel/openvz-sources/files/digest-openvz-sources-026.017
@@ -1,6 +1,6 @@
 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 bc67e97f5bd49671ce040fef89d7b71a openvz-patches-2.6.16_026.017.tar.bz2 498435
-RMD160 ff83694d91adae211105dd1e9723654f2b6bfe1d openvz-patches-2.6.16_026.017.tar.bz2 498435
-SHA256 ead5f104e938dbbc1a14a5b3a90355a4e132170d2fbef346be90925646e0a74b openvz-patches-2.6.16_026.017.tar.bz2 498435
+MD5 eb151e6df261ca618d1cb549d3de6bc6 patch-026test017-combined.gz 660085
+RMD160 53190b216f69b26e85fe0131ec24c1c5329ede8b patch-026test017-combined.gz 660085
+SHA256 78962cdaa191611eea8320f284a2502e2ffb0d75a5223e06b824c7bc5cda88fd patch-026test017-combined.gz 660085
diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-026.018 b/sys-kernel/openvz-sources/files/digest-openvz-sources-026.018
index 9134edad77fa..8afbfde61096 100644
--- a/sys-kernel/openvz-sources/files/digest-openvz-sources-026.018
+++ b/sys-kernel/openvz-sources/files/digest-openvz-sources-026.018
@@ -1,6 +1,6 @@
 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 f739d4cc2ce9595b88186b129c26ae6e openvz-patches-2.6.16_026.018.tar.bz2 542921
-RMD160 67b4f8ff49ff8d4161c8d99ec6a5969c9b371397 openvz-patches-2.6.16_026.018.tar.bz2 542921
-SHA256 02196ea056de4a63fe695f23e283420dedb3d1a7da11ddbac35c893352fa3bb0 openvz-patches-2.6.16_026.018.tar.bz2 542921
+MD5 9ba80b22b9bab24944b20cbde09e7e2f patch-026test018-combined.gz 707250
+RMD160 ad00e68c1d9f86f06da01304f73df22505a7d3ef patch-026test018-combined.gz 707250
+SHA256 b0d070b07eb32aec2a170b829630a6a580a06e4c23a18af9f8316d5250042b7d patch-026test018-combined.gz 707250
diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-026.020 b/sys-kernel/openvz-sources/files/digest-openvz-sources-026.020
new file mode 100644
index 000000000000..22dd2a44f9a2
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/digest-openvz-sources-026.020
@@ -0,0 +1,6 @@
+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 fecf237ff2ab9fb5fb85ca661d2b0740 patch-026test020-combined.gz 722360
+RMD160 3ae8d65b6515491d9e863c158137cda48dd9bc3c patch-026test020-combined.gz 722360
+SHA256 1c080366a0c021b084bb662baa90cf194541f39e3a54c4d7125de3d075837edd patch-026test020-combined.gz 722360
diff --git a/sys-kernel/openvz-sources/openvz-sources-022.077.ebuild b/sys-kernel/openvz-sources/openvz-sources-022.077.ebuild
index aaf3dfa204a6..4eecf416cc9b 100644
--- a/sys-kernel/openvz-sources/openvz-sources-022.077.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-022.077.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-022.077.ebuild,v 1.2 2006/07/09 17:11:18 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-022.077.ebuild,v 1.3 2006/11/02 18:47:11 phreak Exp $
 
 ETYPE="sources"
-CKV="2.6.8"
+CKV="2.6.9"
 
 K_USEPV=1
 K_NOSETEXTRAVERSION=1
 
-MY_PN="${PN/-sources/-patches}"
-
 inherit kernel-2
 detect_version
 
+OVZ_KERNEL="${PV%%.*}stab${PV##*.}"
+OVZ_REV="1"
+
 KEYWORDS="amd64 x86"
 IUSE=""
 
 DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 HOMEPAGE="http://www.openvz.org"
 SRC_URI="${KERNEL_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"
+	http://download.openvz.org/kernel/stable/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${OVZ_KERNEL}-combined.gz"
 
 UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/${MY_PN}-${CKV}_${PVR}.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KERNEL}-combined.gz"
diff --git a/sys-kernel/openvz-sources/openvz-sources-026.015-r2.ebuild b/sys-kernel/openvz-sources/openvz-sources-026.015-r2.ebuild
index 35866690c538..92a58873dff9 100644
--- a/sys-kernel/openvz-sources/openvz-sources-026.015-r2.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-026.015-r2.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-026.015-r2.ebuild,v 1.1 2006/07/15 15:05:13 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-026.015-r2.ebuild,v 1.2 2006/11/02 18:47:11 phreak Exp $
 
 ETYPE="sources"
 CKV="2.6.16"
 
-K_USEPV="1"
-K_NOSETEXTRAVERSION="1"
-
-MY_PN="${PN/-sources/-patches}"
+K_USEPV=1
+K_NOSETEXTRAVERSION=1
 
 inherit kernel-2
 detect_version
 
+OVZ_KERNEL="${PV%%.*}test${PV##*.}"
+OVZ_REV="1"
+
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 HOMEPAGE="http://www.openvz.org"
 SRC_URI="${KERNEL_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"
+	http://download.openvz.org/kernel/devel/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${OVZ_KERNEL}-combined.gz"
 
 UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/${MY_PN}-${CKV}_${PVR}.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KERNEL}-combined.gz"
diff --git a/sys-kernel/openvz-sources/openvz-sources-026.017.ebuild b/sys-kernel/openvz-sources/openvz-sources-026.017.ebuild
index 89832d4d5531..faef6000e133 100644
--- a/sys-kernel/openvz-sources/openvz-sources-026.017.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-026.017.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-026.017.ebuild,v 1.1 2006/08/28 12:11:11 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-026.017.ebuild,v 1.2 2006/11/02 18:47:11 phreak Exp $
 
 ETYPE="sources"
 CKV="2.6.16"
 
-K_USEPV="1"
-K_NOSETEXTRAVERSION="1"
-
-MY_PN="${PN/-sources/-patches}"
+K_USEPV=1
+K_NOSETEXTRAVERSION=1
 
 inherit kernel-2
 detect_version
 
+OVZ_KERNEL="${PV%%.*}test${PV##*.}"
+OVZ_REV="1"
+
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 HOMEPAGE="http://www.openvz.org"
 SRC_URI="${KERNEL_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"
+	http://download.openvz.org/kernel/devel/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${OVZ_KERNEL}-combined.gz"
 
 UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/${MY_PN}-${CKV}_${PVR}.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KERNEL}-combined.gz"
diff --git a/sys-kernel/openvz-sources/openvz-sources-026.018.ebuild b/sys-kernel/openvz-sources/openvz-sources-026.018.ebuild
index 0fea5d55351b..204e269b2603 100644
--- a/sys-kernel/openvz-sources/openvz-sources-026.018.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-026.018.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-026.018.ebuild,v 1.1 2006/09/26 15:11:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-026.018.ebuild,v 1.2 2006/11/02 18:47:11 phreak Exp $
 
 ETYPE="sources"
 CKV="2.6.16"
 
-K_USEPV="1"
-K_NOSETEXTRAVERSION="1"
-
-MY_PN="${PN/-sources/-patches}"
+K_USEPV=1
+K_NOSETEXTRAVERSION=1
 
 inherit kernel-2
 detect_version
 
+OVZ_KERNEL="${PV%%.*}test${PV##*.}"
+OVZ_REV="1"
+
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 HOMEPAGE="http://www.openvz.org"
 SRC_URI="${KERNEL_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"
+	http://download.openvz.org/kernel/devel/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${OVZ_KERNEL}-combined.gz"
 
 UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/${MY_PN}-${CKV}_${PVR}.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KERNEL}-combined.gz"
diff --git a/sys-kernel/openvz-sources/openvz-sources-026.020.ebuild b/sys-kernel/openvz-sources/openvz-sources-026.020.ebuild
new file mode 100644
index 000000000000..190b8550dc61
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-026.020.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-026.020.ebuild,v 1.1 2006/11/02 18:47:11 phreak Exp $
+
+ETYPE="sources"
+CKV="2.6.16"
+
+K_USEPV=1
+K_NOSETEXTRAVERSION=1
+
+inherit kernel-2
+detect_version
+
+OVZ_KERNEL="${PV%%.*}test${PV##*.}"
+OVZ_REV="1"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="http://www.openvz.org"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+	http://download.openvz.org/kernel/devel/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${OVZ_KERNEL}-combined.gz"
+
+UNIPATCH_STRICTORDER=1
+UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KERNEL}-combined.gz"