Added revision with patchset up to 2.6.27.39 merged in. Dropped git sources as they are old.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 14 insertions, 53 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index d735635d2e8c..b5288bca03cb 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/openvz-sources
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.118 2009/11/04 07:57:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.119 2009/11/12 11:22:11 pva Exp $
+
+*openvz-sources-2.6.27.2.1-r4 (12 Nov 2009)
+
+  12 Nov 2009; Peter Volkov <pva@gentoo.org>
+  -openvz-sources-2.6.27.2.1-r2.ebuild,
+  +openvz-sources-2.6.27.2.1-r4.ebuild, -openvz-sources-2.6.27.9999.ebuild:
+  Added revision with patchset up to 2.6.27.39 merged in. Dropped git
+  sources as they are old.
 
   04 Nov 2009; Peter Volkov <pva@gentoo.org>
   openvz-sources-2.6.27.2.1-r3.ebuild:
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r2.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r4.ebuild
index dcda3b2f5246..70d196a193b2 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r2.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.2.1-r2.ebuild,v 1.3 2009/07/22 05:54:03 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r4.ebuild,v 1.1 2009/11/12 11:22:11 pva Exp $
 
 inherit versionator
 
@@ -39,23 +39,18 @@ if [[ ${PR} != r0 ]]; then
 	SLOT+=-${PR}
 fi
 
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
+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"
+	http://download.openvz.org/kernel/branches/${CKV}/${CKV}-${OVZ_KV}/patches/patch-${OVZ_KV}-combined.gz
+	mirror://gentoo/linux-2.6.27-openvz-2.6.27.39-merge.patch.bz2"
 
 UNIPATCH_STRICTORDER=1
 UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KV}-combined.gz
-${FILESDIR}/${PN}-2.6.27.2.1-ban-netns-creation.patch
-${FILESDIR}/${PN}-2.6.27.2.1-bridge-process-skbs.patch
-${FILESDIR}/${PN}-2.6.27.2.1-bridge-set_via_phys_dev_state.patch
-${FILESDIR}/${PN}-2.6.27.2.1-avoid-double-free.patch
-${FILESDIR}/${PN}-2.6.27.2.1-check-for-no-mmaps.patch
-${FILESDIR}/${PN}-2.6.27.2.1-pi-futex-pid-check-fixup.patch
-${FILESDIR}/${PN}-2.6.27.2.1-SLAB.patch"
+${DISTDIR}/linux-2.6.27-openvz-2.6.27.39-merge.patch.bz2"
 
 K_EXTRAEINFO="For more information about this kernel take a look at:
 http://wiki.openvz.org/Download/kernel/${CKV}/${CKV}-${OVZ_KV}"
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.27.9999.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.27.9999.ebuild
deleted file mode 100644
index 3922bbe9497c..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.27.9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 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.9999.ebuild,v 1.2 2009/05/18 06:52:20 pva Exp $
-
-ETYPE="sources"
-
-inherit kernel-2
-detect_version
-
-RC=${PVR##*_}
-
-KV_BASE=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}
-KV_MOD=${KV_FULL##*-}
-KV_MAIN="${KV_BASE}-${KV_MOD}"
-EGIT_PROJECT="linux-${KV_FULL}"
-EGIT_REPO_URI="git://git.openvz.org/pub/linux-${KV_MAIN}"
-EGIT_BRANCH="master"
-
-inherit git
-
-HOMEPAGE="http://openvz.org/"
-DESCRIPTION="Kernel sources with OpenVZ patchset"
-
-IUSE=""
-KEYWORDS=""
-K_NOUSENAME="yes"
-K_PREPATCHED="yes"
-
-src_unpack() {
-	git_src_unpack
-
-	cd "${EGIT_STORE_DIR}/${EGIT_PROJECT}"
-	local last_commit_abbrev=$(git log -n 1 --no-color --pretty='format:%h')
-
-	EXTRAVERSION="-${KV_MOD}.git-${last_commit_abbrev}"
-
-	S=${WORKDIR}/${EGIT_PROJECT}
-
-	cd "${S}"
-
-	unpack_set_extraversion
-}