new revision with updated bfq patch. bug #327415. removed bfq from 2.6.34_p1. switched to EAPI 2.

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

3 files changed, 23 insertions, 25 deletions

diff --git a/sys-kernel/zen-sources/ChangeLog b/sys-kernel/zen-sources/ChangeLog
index d2b825efb321..83b46bc4a196 100644
--- a/sys-kernel/zen-sources/ChangeLog
+++ b/sys-kernel/zen-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/zen-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.39 2010/07/07 12:18:20 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.40 2010/07/27 14:03:21 wired Exp $
+
+*zen-sources-2.6.34_p1-r2 (27 Jul 2010)
+
+  27 Jul 2010; Alex Alexander <wired@gentoo.org>
+  zen-sources-2.6.34_p1.ebuild, -zen-sources-2.6.34_p1-r1.ebuild,
+  +zen-sources-2.6.34_p1-r2.ebuild:
+  new revision with updated bfq patch. bug #327415. removed bfq from
+  2.6.34_p1. switched to EAPI 2.
 
 *zen-sources-2.6.34_p1-r1 (07 Jul 2010)
 
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r1.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r2.ebuild
index fa5008fcf510..029c8ba8a994 100644
--- a/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r1.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r1.ebuild,v 1.1 2010/07/07 12:18:20 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1-r2.ebuild,v 1.1 2010/07/27 14:03:21 wired Exp $
+
+EAPI="2"
 
 COMPRESSTYPE=".lzma"
 K_USEPV="yes"
@@ -24,7 +26,7 @@ ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${ZE
 ZEN_PATCHES="
 	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0001-block-prepare-I-O-context-code-for-BFQ.patch
 	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch
-	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0003-block-introduce-the-BFQ-I-O-scheduler.patch
+	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0003-block-introduce-the-BFQ-I-O-scheduler.patch -> 0003-block-introduce-the-BFQ-I-O-scheduler-r1.patch
 "
 SRC_URI="${KERNEL_URI} ${ZEN_URI} bfq? ( ${ZEN_PATCHES} )"
 
@@ -47,15 +49,13 @@ pkg_setup(){
 	kernel-2_pkg_setup
 }
 
-src_unpack(){
-	kernel-2_src_unpack
-	cd "${S}"
+src_prepare(){
 	epatch "${DISTDIR}"/"${ZEN_FILE}"
 	if use bfq; then
 		EPATCH_OPTS="-p1"
-		for p in ${ZEN_PATCHES}; do
-			epatch "${DISTDIR}/${p/*\/}"
-		done
+		epatch "${DISTDIR}/0001-block-prepare-I-O-context-code-for-BFQ.patch"
+		epatch "${DISTDIR}/0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch"
+		epatch "${DISTDIR}/0003-block-introduce-the-BFQ-I-O-scheduler-r1.patch"
 	fi
 }
 
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild
index 9b4a777fd2ab..3fcfd04fab7d 100644
--- a/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild,v 1.2 2010/07/07 08:04:05 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.34_p1.ebuild,v 1.3 2010/07/27 14:03:21 wired Exp $
+
+EAPI="2"
 
 COMPRESSTYPE=".lzma"
 K_USEPV="yes"
@@ -21,15 +23,10 @@ ZEN_KERNEL="${PV/_p[0-9]*}"
 ZEN_KERNEL="${ZEN_KERNEL/_/-}"
 ZEN_FILE="${ZEN_KERNEL}-zen${ZEN_PATCHSET}.patch${COMPRESSTYPE}"
 ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${ZEN_FILE}"
-ZEN_PATCHES="
-	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0001-block-prepare-I-O-context-code-for-BFQ.patch
-	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0002-block-add-cgroups-kconfig-and-build-bits-for-BFQ.patch
-	http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.34-zen1/0003-block-introduce-the-BFQ-I-O-scheduler.patch
-"
-SRC_URI="${KERNEL_URI} ${ZEN_URI} bfq? ( ${ZEN_PATCHES} )"
+SRC_URI="${KERNEL_URI} ${ZEN_URI}"
 
 KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="bfq"
+IUSE=""
 
 DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )"
 
@@ -47,15 +44,8 @@ pkg_setup(){
 	kernel-2_pkg_setup
 }
 
-src_unpack(){
-	kernel-2_src_unpack
-	cd "${S}"
+src_prepare(){
 	epatch "${DISTDIR}"/"${ZEN_FILE}"
-	if use bfq; then
-		for p in ${ZEN_PATCHES}; do
-			epatch "${DISTDIR}/${p/*\/}"
-		done
-	fi
 }
 
 K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \