From 3c54487e7537f6c0b888c679cd0270f4e275d1f0 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
 Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

---
 sys-kernel/zen-sources/ChangeLog                   | 14 +++++-
 sys-kernel/zen-sources/Manifest                    |  5 +-
 ...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 ---------------------
 5 files changed, 91 insertions(+), 57 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

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/Manifest b/sys-kernel/zen-sources/Manifest
index 731590727765..75e57116d879 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,4 +1,5 @@
 AUX zen-sources-2.6.31_p5-config_fb_fix.patch 416 RMD160 30c076002b76ee99bffca08a4a0f1346b52045c4 SHA1 7b36c837fc71c8929efcb335b9a7b13051730392 SHA256 cebc41750c46446d2edcfb506dc60a5bcc6f200bb7ecf499dc4db9b1fc45da74
+AUX zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch 711 RMD160 76699719dc16cc697063b1f965d6e570283c5d20 SHA1 1ee4d7d9e8b60ea103727e056e84061e4ed827d1 SHA256 ac0b48dc3d1ea730bb4591bafb721802520608b8a77c95d59578ded7d574e8ae
 DIST 2.6.30-zen11.patch.lzma 1844571 RMD160 2dd6c496bd425c34399a631ffa84c5af273b894a SHA1 6fe33e05c1f608711bd9d1d9e92b6b861dd9ced1 SHA256 d7894256b08c9766252b0575fc1ac298791194a8f298bcc929643aa92cd31949
 DIST 2.6.31-zen10.patch.lzma 1998610 RMD160 114ee9fd7a6778083d4db3e01db5e5c365d24fdf SHA1 2cbb5ab123fcb6d62e45ccffc4b5e7e7b579de81 SHA256 0118b721f5f495c4a17aebfeba2e82ae903e7d95d6054e2a24e85dd6395d4fe3
 DIST 2.6.31-zen8-drmnext.patch.lzma 426431 RMD160 80e6c76b9553e9e8c7b4a776108959a98896d213 SHA1 10e1d55db1f67eb34572b65afdf8a43938624e60 SHA256 3402f820548ccbdcfccca14bbd5af2df1795ff9765770e025fa5c88b114247b4
@@ -22,7 +23,7 @@ EBUILD zen-sources-2.6.32_p1.ebuild 1427 RMD160 0f14e202b1999f11015a73cda506b279
 EBUILD zen-sources-2.6.32_p2.ebuild 1427 RMD160 0f14e202b1999f11015a73cda506b279ec330187 SHA1 6321c200090232bac3ca27de9e9890aeaf1d3a27 SHA256 de97332019127686ec3bacd23d1d74914131ec840b381ec96e01215361ad7579
 EBUILD zen-sources-2.6.32_p3.ebuild 1427 RMD160 0f14e202b1999f11015a73cda506b279ec330187 SHA1 6321c200090232bac3ca27de9e9890aeaf1d3a27 SHA256 de97332019127686ec3bacd23d1d74914131ec840b381ec96e01215361ad7579
 EBUILD zen-sources-2.6.32_p4.ebuild 1427 RMD160 0f14e202b1999f11015a73cda506b279ec330187 SHA1 6321c200090232bac3ca27de9e9890aeaf1d3a27 SHA256 de97332019127686ec3bacd23d1d74914131ec840b381ec96e01215361ad7579
-EBUILD zen-sources-2.6.33_rc2_p1.ebuild 1427 RMD160 0f14e202b1999f11015a73cda506b279ec330187 SHA1 6321c200090232bac3ca27de9e9890aeaf1d3a27 SHA256 de97332019127686ec3bacd23d1d74914131ec840b381ec96e01215361ad7579
+EBUILD zen-sources-2.6.33_rc2_p1-r1.ebuild 1478 RMD160 18bf22f1a04f2563092fcb1360ae089fb27c49d1 SHA1 672e05979b58c9da7563e67e0e033af56b440b26 SHA256 7acc93c4a37b1fa8461fa33027b1430c9100205f77e79d49563fc0e504a76e2c
 EBUILD zen-sources-9999.ebuild 1289 RMD160 405869d34ec23f1bf638b5ddcb2c035f79368d8e SHA1 ad8f925c2c9c8229573737a819f58c72a9bff343 SHA256 51cec14683d8109787e6422e63dfc71a1f4b8be8db13423b4f51cc3be73069b4
-MISC ChangeLog 5138 RMD160 e283e41918c60ace559b60749bb825e1db074171 SHA1 3fad404961754bba14bd60307e9674fb79763c86 SHA256 037636500a5e0f5d99cf7840245da53b638f73d1b02a15508265c7a36bf30243
+MISC ChangeLog 5576 RMD160 74c64320731b0ae7793030fb46f7f880936964c4 SHA1 f2e81a648966c6cae42e9a80a3598385d5c27ab5 SHA256 b3bc1797f431a4acb88fd3e2e1d2f5fdeddc663a8ea77ae261e5c5e01a30b248
 MISC metadata.xml 462 RMD160 1a2551d61bd21846ff1b8469a4b8c367c000bb23 SHA1 ecb5a2310bce4cf73147fe137ca853cee4ca90c5 SHA256 62463389952546833d94a333f2a906c609848b85bda3b9379bac97c79f89dbf4
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