From d64327614ca09fa183b5844d77c37b354b97f2fc Mon Sep 17 00:00:00 2001
From: Markos Chandras <hwoarang@gentoo.org>
Date: Wed, 6 Jan 2010 12:45:15 +0000
Subject: Revbump with patch which fixes kernel configuration issue (Portage
 version: 2.2_rc61/cvs/Linux x86_64)

---
 sys-kernel/zen-sources/ChangeLog                   | 14 +++++-
 ...zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch | 20 ++++++++
 .../zen-sources-2.6.33_rc2_p1-r1.ebuild            | 55 ++++++++++++++++++++++
 .../zen-sources/zen-sources-2.6.33_rc2_p1.ebuild   | 54 ---------------------
 4 files changed, 88 insertions(+), 55 deletions(-)
 create mode 100644 sys-kernel/zen-sources/files/zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch
 create mode 100644 sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1-r1.ebuild
 delete mode 100644 sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1.ebuild

(limited to 'sys-kernel')

diff --git a/sys-kernel/zen-sources/ChangeLog b/sys-kernel/zen-sources/ChangeLog
index 9cc68d055c8f..5ae40383f327 100644
--- a/sys-kernel/zen-sources/ChangeLog
+++ b/sys-kernel/zen-sources/ChangeLog
@@ -1,6 +1,18 @@
 # 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.21 2010/01/03 22:00:58 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.22 2010/01/06 12:45:14 hwoarang Exp $
+
+*zen-sources-2.6.33_rc2_p1-r1 (06 Jan 2010)
+
+  06 Jan 2010; <hwoarang@gentoo.org> -zen-sources-2.6.33_rc2_p1.ebuild,
+  +zen-sources-2.6.33_rc2_p1-r1.ebuild,
+  +files/zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch:
+  Bump to fix a kernel configuration issue which is not fixed on zen-sources
+  git
+  repository
+  Related commit:
+  http://git.zen-kernel.org/?p=kernel/zen.git;a=commitdiff;h=3764e86df27a810
+  77ed043ce5c659c7970541371
 
   03 Jan 2010; Alex Alexander <wired@gentoo.org>
   zen-sources-2.6.30_p11.ebuild, zen-sources-2.6.31_p8.ebuild,
diff --git a/sys-kernel/zen-sources/files/zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch b/sys-kernel/zen-sources/files/zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch
new file mode 100644
index 000000000000..77f0db707e3f
--- /dev/null
+++ b/sys-kernel/zen-sources/files/zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch
@@ -0,0 +1,20 @@
+X-Git-Url: http://git.zen-kernel.org/?p=kernel%2Fzen.git;a=blobdiff_plain;f=kernel%2Fsysctl.c;h=3232e2f9019635b5536fc4cd49f9a55ea33f016d;hp=98ebfe1b5859e5269877c8daee4104787002af58;hb=3764e86df27a81077ed043ce5c659c7970541371;hpb=e6e35ff4f4de3d5c0929a3fd34801803445a1d1e
+
+diff --git a/kernel/sysctl.c b/kernel/sysctl.c
+index 98ebfe1..3232e2f 100644
+--- a/kernel/sysctl.c
++++ b/kernel/sysctl.c
+@@ -237,13 +237,11 @@ static struct ctl_table root_table[] = {
+ 	},
+ #ifdef CONFIG_FB_CON_DECOR
+ 	{
+-		.ctl_name	= CTL_UNNUMBERED,
+ 		.procname	= "fbcondecor",
+ 		.data		= &fbcon_decor_path,
+ 		.maxlen		= KMOD_PATH_LEN,
+ 		.mode		= 0644,
+ 		.proc_handler	= &proc_dostring,
+-		.strategy	= &sysctl_string,
+ 	},
+ #endif
+ 
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1-r1.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1-r1.ebuild
new file mode 100644
index 000000000000..fc294b183a1d
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+COMPRESSTYPE=".lzma"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+
+RESTRICT="binchecks strip primaryuri mirror"
+
+CKV="${PV/_p[0-9]*}"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+
+DESCRIPTION="The Zen Kernel Sources v2.6"
+HOMEPAGE="http://zen-kernel.org"
+
+ZEN_PATCHSET="${PV/*_p}"
+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}"
+SRC_URI="${KERNEL_URI} ${ZEN_URI}"
+
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+KV_FULL="${PVR/_p/-zen}"
+S="${WORKDIR}"/linux-"${KV_FULL}"
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the Zen developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	ebeep 8
+	kernel-2_pkg_setup
+}
+
+src_unpack(){
+	kernel-2_src_unpack
+	cd "${S}"
+	epatch "${DISTDIR}"/"${ZEN_FILE}"
+	epatch "${FILESDIR}"/"${P}-kernel-sysctl.c.patch"
+}
+
+K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \
+${HOMEPAGE}. You may also visit #zen-sources on irc.rizon.net"
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1.ebuild
deleted file mode 100644
index 3d6d58d69ef4..000000000000
--- a/sys-kernel/zen-sources/zen-sources-2.6.33_rc2_p1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-COMPRESSTYPE=".lzma"
-K_USEPV="yes"
-UNIPATCH_STRICTORDER="yes"
-K_SECURITY_UNSUPPORTED="1"
-
-RESTRICT="binchecks strip primaryuri mirror"
-
-CKV="${PV/_p[0-9]*}"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-K_NOSETEXTRAVERSION="don't_set_it"
-
-DESCRIPTION="The Zen Kernel Sources v2.6"
-HOMEPAGE="http://zen-kernel.org"
-
-ZEN_PATCHSET="${PV/*_p}"
-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}"
-SRC_URI="${KERNEL_URI} ${ZEN_URI}"
-
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )"
-
-KV_FULL="${PVR/_p/-zen}"
-S="${WORKDIR}"/linux-"${KV_FULL}"
-
-pkg_setup(){
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the Zen developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	ebeep 8
-	kernel-2_pkg_setup
-}
-
-src_unpack(){
-	kernel-2_src_unpack
-	cd "${S}"
-	epatch "${DISTDIR}"/"${ZEN_FILE}"
-}
-
-K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \
-${HOMEPAGE}. You may also visit #zen-sources on irc.rizon.net"
-- 
cgit v1.2.3-65-gdbad