Version bump, #311279, thank Dennis Schridde for report. Drop old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 74 insertions, 49 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index 00e20614fa7d..e35d2c8447e6 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/openvz-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.127 2010/03/05 13:37:58 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.128 2010/03/26 07:29:22 pva Exp $
+
+*openvz-sources-2.6.27.4.1 (26 Mar 2010)
+*openvz-sources-2.6.18.028.068.5 (26 Mar 2010)
+
+  26 Mar 2010; Peter Volkov <pva@gentoo.org>
+  -openvz-sources-2.6.18.028.067.4.ebuild,
+  -openvz-sources-2.6.18.028.068.3.ebuild,
+  +openvz-sources-2.6.18.028.068.5.ebuild,
+  +openvz-sources-2.6.27.4.1.ebuild:
+  Version bump, #311279, thank Dennis Schridde for report. Drop old.
 
 *openvz-sources-2.6.18.028.068.3-r1 (05 Mar 2010)
 
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index a487475d9784..0ef207772140 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -2,12 +2,13 @@ AUX openvz-sources-2.6.18.028.064.7-bridgemac.patch 514 RMD160 bdd04c4dc86c79b91
 AUX openvz-sources-2.6.18.028.068.3-build-fix.patch 742 RMD160 1c6e51e8e9d490cfeae747229deafbe129b73be6 SHA1 9e21887303534a76956ba8cafdd31c7168f8eae1 SHA256 0e04df4445fcea66ea771b727dc50800ff4e7065fc5cda3767f8a5fedee9b786
 DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
 DIST linux-2.6.27.tar.bz2 50355835 RMD160 5be4595ad824a4af67c1ec0c692838ad0c31f0c0 SHA1 8425ec3be2652f9d511911ff4fcf99039d4574be SHA256 0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
-DIST patch-164.10.1.el5.028stab067.4-combined.gz 15462669 RMD160 6901b718b0cfc012fbc327b2f8776bac6ab5e156 SHA1 509f8e1b0c6a9c331582a44bd6c611ebf39af901 SHA256 7d74f17b73218355457611bbf7dafababc52c98f5c24839f81373c445e7a2d5e
 DIST patch-164.11.1.el5.028stab068.3-combined.gz 15482070 RMD160 41417473a56b8fd539b547e24e98a785a173a889 SHA1 56580b60c74f7a983c6e6e20b99690b64680f225 SHA256 5f3f44e7f691cd195b4c280659c855f95896691e6922a65333f1a62c75233629
+DIST patch-164.11.1.el5.028stab068.5-combined.gz 15481639 RMD160 917405b48e80088eac129ecec2d19f9f60ca0422 SHA1 1a165afd64631a90851118b19a0753a4f52df463 SHA256 8de1085fe7eceb84ce3736ff008ff232d3f765f813ff28c84d25f0e879226071
 DIST patch-chistyakov.1-combined.gz 1060640 RMD160 e66907ff56a7764591778bf82bfd2e9d34487732 SHA1 bea1905c4b00d1621cb4d872aedd03393f576a56 SHA256 d9d8b92cc236ac268bcfd23360f2e168a9154d3492d14bb1091c5a9af78fadf3
-EBUILD openvz-sources-2.6.18.028.067.4.ebuild 1833 RMD160 345ddf6f895d858e565868a42599a9f96e48d889 SHA1 0d292863543aceaad3910669f2a3606cd899e57f SHA256 09013035d62162f00205370d2dc734bcc14d1bc4a4b006f775116c6f5723c909
+DIST patch-kiprensky.1-combined.gz 1092532 RMD160 3995799ef6156476a47d36da07a81d71f0078820 SHA1 1b72e628bc7efa7e9cfd915de23f007f2ea9acc9 SHA256 b0d8cd33875ab64813ec995b6ae44515f8eedec9a0884631e4ade0fa00e971ba
 EBUILD openvz-sources-2.6.18.028.068.3-r1.ebuild 1869 RMD160 3f4cdda463f7962a2fe17318fab709e2dca3d55b SHA1 5d228ede4f36f3ed6cf1aa86e51928209eaf6ce0 SHA256 50b49d4413175b0ce2091e8bbcf9e540fc5bf527d684f8fd89260a79bebe0302
-EBUILD openvz-sources-2.6.18.028.068.3.ebuild 1833 RMD160 42a24e6434f5b41c2f53b406e1702230ab371274 SHA1 13c113e589c2cee892be378603295d58be4ac430 SHA256 67f5512eb3bad1fb79db7c200bcabc7c9df47ba558ac95335ce501721714fdba
+EBUILD openvz-sources-2.6.18.028.068.5.ebuild 1884 RMD160 046228a19828afe7e1afb67e54f1e4e2a275dee2 SHA1 2d41fd0e48f2b2e5caf025fa0d1da80f7990fdfa SHA256 5bd5bacded2104d17afed324c8adc17a81cc80d63295e6641844cb0a670084a4
 EBUILD openvz-sources-2.6.27.3.1.ebuild 1894 RMD160 f7e40525eb6d532490c3c7da77e361217cf708de SHA1 38765a51769221e24f81273e3c60ce316393d468 SHA256 999b13c06aff4b54c6a1897bccafadaa9d03657314ba25e557d8f7096c54f700
-MISC ChangeLog 32520 RMD160 76bdd30f7f1e073579963cc7678a21942084f22d SHA1 f1c2c2a2a8c2a5ccc3518d0f28c4e06c5a5517a2 SHA256 cbcf6dfe71b36ffdcf40da3dde07cf615b9abd6c139cfd29c60dc319dbce3536
+EBUILD openvz-sources-2.6.27.4.1.ebuild 1895 RMD160 ac9c121529a21840b11f161799f063d029a93645 SHA1 9e123ffe3318512228036821aeb2c657691ca163 SHA256 a8669d01e94f57b84320ed2fcd59c9c59715d3883a2794182de9f6b394ecac8f
+MISC ChangeLog 32890 RMD160 d198eaeaca2a38527224377fcebb19307917190e SHA1 eae314a09703243500c4830bcd2a6270dc03390f SHA256 9cef77eba24d6073d765153acde008c7e23b63addf72de1af8e69d2d0f0856d8
 MISC metadata.xml 554 RMD160 0d62a03694a7c0e0caa538a603b3a41916451887 SHA1 d4d18f1c2c52425a1a819ac0d76ff1c906853047 SHA256 78f7ce5323a1a18773d5a6a01cffcc729fb51f4a667b5d2df37450907a007a31
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.067.4.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.067.4.ebuild
deleted file mode 100644
index 119d6048fe5a..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.067.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.067.4.ebuild,v 1.1 2010/01/28 18:56:11 pva Exp $
-
-inherit versionator
-
-ETYPE="sources"
-
-CKV=$(get_version_component_range 1-3)
-OKV=${OKV:-${CKV}}
-if [[ ${PR} == "r0" ]]; then
-KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4-6)
-else
-KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4-6)-${PR}
-fi
-OVZ_KERNEL="$(get_version_component_range 4)stab$(get_version_component_range 5)"
-OVZ_REV="$(get_version_component_range 6)"
-EXTRAVERSION=-${OVZ_KERNEL}
-KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
-IUSE=""
-PATCHV="164.10.1.el5"
-DESCRIPTION="Full sources including OpenVZ patchset for the 2.6.18 kernel tree"
-HOMEPAGE="http://www.openvz.org"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://download.openvz.org/kernel/branches/rhel5-${CKV}/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${PATCHV}.${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/patch-${PATCHV}.${OVZ_KERNEL}.${OVZ_REV}-combined.gz
-${FILESDIR}/${PN}-2.6.18.028.064.7-bridgemac.patch"
-
-K_EXTRAEINFO="This openvz kernel uses RHEL5 patchset instead of vanilla kernel.
-This patchset considered to be more stable and security supported by upstream,
-that why they suggested us to use it. But note: RHEL5 patchset is very fragile
-and fails to build in many configurations so if you have problems use config
-files from openvz team http://wiki.openvz.org/Download/kernel/rhel5/${OVZ_KERNEL}"
-
-K_EXTRAEWARN="This kernel is stable only when built with gcc-4.1.x and is known
-to oops in random places if built with newer compilers."
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.3.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.5.ebuild
index e8f4dbf68e13..67bfe82b93a3 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.3.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.3.ebuild,v 1.1 2010/02/19 09:27:09 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.5.ebuild,v 1.1 2010/03/26 07:29:22 pva Exp $
 
 inherit versionator
 
@@ -31,6 +31,7 @@ SRC_URI="${KERNEL_URI} ${ARCH_URI}
 
 UNIPATCH_STRICTORDER=1
 UNIPATCH_LIST="${DISTDIR}/patch-${PATCHV}.${OVZ_KERNEL}.${OVZ_REV}-combined.gz
+${FILESDIR}/${PN}-2.6.18.028.068.3-build-fix.patch
 ${FILESDIR}/${PN}-2.6.18.028.064.7-bridgemac.patch"
 
 K_EXTRAEINFO="This openvz kernel uses RHEL5 patchset instead of vanilla kernel.
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1.ebuild
new file mode 100644
index 000000000000..f7c941dde885
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1.ebuild,v 1.1 2010/03/26 07:29:22 pva Exp $
+
+inherit versionator
+
+# Upstream uses string to version their releases. To make portage version
+# comparisment working we have to use numbers instead of strings, that is 4th
+# component of our version. So we have aivazovsky - 1, briullov - 2 and so on.
+# Keep this string on top since we have to modify it each new release.
+OVZ_CODENAME="kiprensky"
+OVZ_CODENAME_SUBRELEASE=$(get_version_component_range 5)
+
+#http://download.openvz.org/kernel/branches/2.6.27/2.6.27-chistyakov.1/patches/patch-chistyakov.1-combined.gz
+
+OVZ_KV="${OVZ_CODENAME}.${OVZ_CODENAME_SUBRELEASE}"
+
+ETYPE="sources"
+
+CKV=$(get_version_component_range 1-3)
+OKV=${OKV:-${CKV}}
+EXTRAVERSION=-${PN/-*}-${OVZ_KV}
+KV_FULL=${CKV}${EXTRAVERSION}
+if [[ ${PR} != r0 ]]; then
+	KV_FULL+=-${PR}
+	EXTRAVERSION+=-${PR}
+fi
+
+# ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} should succeed.
+KV_MAJOR=$(get_version_component_range 1 ${OKV})
+KV_MINOR=$(get_version_component_range 2 ${OKV})
+KV_PATCH=$(get_version_component_range 3 ${OKV})
+
+KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+
+inherit kernel-2
+detect_version
+
+SLOT=${CKV}-${OVZ_KV}
+if [[ ${PR} != r0 ]]; then
+	SLOT+=-${PR}
+fi
+
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DESCRIPTION="Kernel sources with OpenVZ patchset"
+HOMEPAGE="http://www.openvz.org"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+	http://download.openvz.org/kernel/branches/${CKV}/${CKV}-${OVZ_KV}/patches/patch-${OVZ_KV}-combined.gz"
+
+UNIPATCH_STRICTORDER=1
+UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KV}-combined.gz"
+
+K_EXTRAEINFO="For more information about this kernel take a look at:
+http://wiki.openvz.org/Download/kernel/${CKV}/${CKV}-${OVZ_KV}"