modified versioning scheme to allow revisions of the same patchset. the patchset version is now defined by _p. this was necessary in order to be able to add hotfixes (like the one in 2.6.31_p5-r1).

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

6 files changed, 56 insertions, 11 deletions

diff --git a/sys-kernel/zen-sources/ChangeLog b/sys-kernel/zen-sources/ChangeLog
index f7db3b7d4b70..4b3fbc169e16 100644
--- a/sys-kernel/zen-sources/ChangeLog
+++ b/sys-kernel/zen-sources/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-kernel/zen-sources
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.2 2009/10/29 07:35:41 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.3 2009/10/30 11:32:45 wired Exp $
+
+*zen-sources-2.6.31_p5-r1 (30 Oct 2009)
+*zen-sources-2.6.31_p4 (30 Oct 2009)
+*zen-sources-2.6.30_p9 (30 Oct 2009)
+
+  30 Oct 2009; Alex Alexander <wired@gentoo.org>
+  -zen-sources-2.6.30-r9.ebuild, +zen-sources-2.6.30_p9.ebuild,
+  -zen-sources-2.6.31-r4.ebuild, -zen-sources-2.6.31-r5.ebuild,
+  +zen-sources-2.6.31_p4.ebuild, +zen-sources-2.6.31_p5-r1.ebuild,
+  +files/zen-sources-2.6.31_p5-config_fb_fix.patch:
+  modified versioning scheme to allow revisions of the same patchset. the
+  patchset version is now defined by _p. this was necessary in order to be
+  able to add hotfixes (like the one in 2.6.31_p5-r1).
 
 *zen-sources-2.6.31-r5 (29 Oct 2009)
 
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index ff546b23eb21..d8085b9903f8 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,10 +1,11 @@
+AUX zen-sources-2.6.31_p5-config_fb_fix.patch 416 RMD160 30c076002b76ee99bffca08a4a0f1346b52045c4 SHA1 7b36c837fc71c8929efcb335b9a7b13051730392 SHA256 cebc41750c46446d2edcfb506dc60a5bcc6f200bb7ecf499dc4db9b1fc45da74
 DIST 2.6.30-zen9.patch.bz2 2022105 RMD160 0fe9f64e445634537ac0b4fd66292b94c5c17d50 SHA1 46ffc5b42149dd0979710cfec65dc54738482894 SHA256 e56b67b3db5e8402903290b3e29c1814f071dba5c0dd0e8ac68542c9618501a1
 DIST 2.6.31-zen4.patch.bz2 1964412 RMD160 7e70b3fa0004449207784cd91d44ca1292b36253 SHA1 47df276d3a26af91111564b1ab9562fa664fe8ff SHA256 a40220d3d4476a9fc686e29437503b344b34e5fe60007230175171dd28647413
 DIST 2.6.31-zen5.patch.lzma 2336309 RMD160 4ef986e4cc60c76c77ef962c63460e46388d0e85 SHA1 f478338293621facd849653bce560e300e361901 SHA256 35614bc21e7756649cec27c68e2446de04c33761b1d9137c1f6912328e4e3b6e
 DIST linux-2.6.30.tar.bz2 59435895 RMD160 72219f992c6266dfe78c6d803d0506c9db1e45b8 SHA1 5fb7f2ccdc59c57887d586971a157bee7af324d1 SHA256 d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f
 DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
-EBUILD zen-sources-2.6.30-r9.ebuild 1201 RMD160 12e5e7b53194b2a138296e7425f8074f779ce889 SHA1 479931f4252ff52f5e052deba2d1f1b86b4d8ecd SHA256 68d644223da5b0051ce9391e43fdda0d54c1e25bad040bf6e18e883856580d0e
-EBUILD zen-sources-2.6.31-r4.ebuild 1201 RMD160 12e5e7b53194b2a138296e7425f8074f779ce889 SHA1 479931f4252ff52f5e052deba2d1f1b86b4d8ecd SHA256 68d644223da5b0051ce9391e43fdda0d54c1e25bad040bf6e18e883856580d0e
-EBUILD zen-sources-2.6.31-r5.ebuild 1202 RMD160 00ff9755f1f833f2200fed368528f044a1aea952 SHA1 0887ff11910091b744940f7ba3d0d625caf8af94 SHA256 88cdf3b74f8c5072e5cf3a53444fc7d7450d9912c10a5bf025428fc983a7836b
-MISC ChangeLog 706 RMD160 ef1324dce309f4f0a79d91ee1252e26f62756107 SHA1 89027ed119ec1a384415bf194f05356752c7a636 SHA256 a18dac594c2865a9256ef83900543229655c26ac788b64dd2a5f227ca5702e3f
+EBUILD zen-sources-2.6.30_p9.ebuild 1334 RMD160 d11daa53da8b2530215ebd0810c629fa22cedded SHA1 27d23d216459bd006e15bdb70f8b5e312ce77a2b SHA256 2e304e77e706bd16bfbaf08d887998b6b1c58915c75c04bdf904bfa652c4cdad
+EBUILD zen-sources-2.6.31_p4.ebuild 1334 RMD160 d11daa53da8b2530215ebd0810c629fa22cedded SHA1 27d23d216459bd006e15bdb70f8b5e312ce77a2b SHA256 2e304e77e706bd16bfbaf08d887998b6b1c58915c75c04bdf904bfa652c4cdad
+EBUILD zen-sources-2.6.31_p5-r1.ebuild 1384 RMD160 30b5c12a2eb63e21bdad598da1b842427e4d3e4e SHA1 b08324e6bc2ddb47a4840483448e567fc262c0fe SHA256 5e86718664f548dfad03c0aa4f721575862b2b0858fe4ce032573680cacd8a03
+MISC ChangeLog 1322 RMD160 d0dd08a8cd3f0dfd13ece9fc1501a57fd6af176e SHA1 8eeae3cd29132929cfcecbd823d293368a6b3250 SHA256 98ae46ee875492ef65f3265fdd65a20780b8b9689f15b0aa7e15b9222e81ae84
 MISC metadata.xml 343 RMD160 6ffa6e6403cc382eb3bd8758db7524a7ef4e100c SHA1 46211698fd96e3015ddc70374dd51f475ce12600 SHA256 72ea0d21ba8596b8280e4abc9e5730771c463cb3d0dd1a00ff3431367bf05f95
diff --git a/sys-kernel/zen-sources/files/zen-sources-2.6.31_p5-config_fb_fix.patch b/sys-kernel/zen-sources/files/zen-sources-2.6.31_p5-config_fb_fix.patch
new file mode 100644
index 000000000000..276c48efd17a
--- /dev/null
+++ b/sys-kernel/zen-sources/files/zen-sources-2.6.31_p5-config_fb_fix.patch
@@ -0,0 +1,12 @@
+diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
+index 70316a8..3d0ccc0 100644
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
+@@ -204,6 +204,7 @@ int fbcon_is_softback(const unsigned short *str)
+ 		return 1;
+ 	return 0;
+ }
++EXPORT_SYMBOL(fbcon_is_softback);
+ 
+ #ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION
+ static inline void fbcon_set_rotation(struct fb_info *info)
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.30-r9.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.30_p9.ebuild
index 21599bdccd5f..51fba5c891b7 100644
--- a/sys-kernel/zen-sources/zen-sources-2.6.30-r9.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-2.6.30_p9.ebuild
@@ -9,6 +9,7 @@ K_SECURITY_UNSUPPORTED="1"
 
 RESTRICT="binchecks strip primaryuri mirror"
 
+CKV="${PV/_p[0-9]*}"
 ETYPE="sources"
 inherit kernel-2
 detect_version
@@ -16,7 +17,12 @@ K_NOSETEXTRAVERSION="don't_set_it"
 
 DESCRIPTION="The Zen Kernel v${KV_MAJOR}.${KV_MINOR}-${PR}"
 HOMEPAGE="http://zen-kernel.org"
-ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${KV_FULL}.patch${COMPRESSTYPE}"
+
+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"
@@ -36,7 +42,7 @@ pkg_setup(){
 src_unpack(){
 	kernel-2_src_unpack
 	cd "${S}"
-	epatch "${DISTDIR}"/${KV_FULL}.patch${COMPRESSTYPE}
+	epatch "${DISTDIR}"/"${ZEN_FILE}"
 }
 
 K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.31-r4.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.31_p4.ebuild
index 21599bdccd5f..51fba5c891b7 100644
--- a/sys-kernel/zen-sources/zen-sources-2.6.31-r4.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-2.6.31_p4.ebuild
@@ -9,6 +9,7 @@ K_SECURITY_UNSUPPORTED="1"
 
 RESTRICT="binchecks strip primaryuri mirror"
 
+CKV="${PV/_p[0-9]*}"
 ETYPE="sources"
 inherit kernel-2
 detect_version
@@ -16,7 +17,12 @@ K_NOSETEXTRAVERSION="don't_set_it"
 
 DESCRIPTION="The Zen Kernel v${KV_MAJOR}.${KV_MINOR}-${PR}"
 HOMEPAGE="http://zen-kernel.org"
-ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${KV_FULL}.patch${COMPRESSTYPE}"
+
+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"
@@ -36,7 +42,7 @@ pkg_setup(){
 src_unpack(){
 	kernel-2_src_unpack
 	cd "${S}"
-	epatch "${DISTDIR}"/${KV_FULL}.patch${COMPRESSTYPE}
+	epatch "${DISTDIR}"/"${ZEN_FILE}"
 }
 
 K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.31-r5.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.31_p5-r1.ebuild
index 8cd675b96f1b..9043c5bd0e76 100644
--- a/sys-kernel/zen-sources/zen-sources-2.6.31-r5.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-2.6.31_p5-r1.ebuild
@@ -9,6 +9,7 @@ K_SECURITY_UNSUPPORTED="1"
 
 RESTRICT="binchecks strip primaryuri mirror"
 
+CKV="${PV/_p[0-9]*}"
 ETYPE="sources"
 inherit kernel-2
 detect_version
@@ -16,7 +17,12 @@ K_NOSETEXTRAVERSION="don't_set_it"
 
 DESCRIPTION="The Zen Kernel v${KV_MAJOR}.${KV_MINOR}-${PR}"
 HOMEPAGE="http://zen-kernel.org"
-ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${KV_FULL}.patch${COMPRESSTYPE}"
+
+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"
@@ -36,7 +42,8 @@ pkg_setup(){
 src_unpack(){
 	kernel-2_src_unpack
 	cd "${S}"
-	epatch "${DISTDIR}"/${KV_FULL}.patch${COMPRESSTYPE}
+	epatch "${DISTDIR}"/"${ZEN_FILE}"
+	epatch "${FILESDIR}"/"${P}-config_fb_fix.patch"
 }
 
 K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \