Splitted path, now gfs-kernel compiles fine with 2.6.17 and older kernels

Package-Manager: portage-2.1-r1

4 files changed, 42 insertions, 25 deletions

diff --git a/sys-cluster/gfs-kernel/ChangeLog b/sys-cluster/gfs-kernel/ChangeLog
index e21296bb7b80..a8f4f9a43810 100644
--- a/sys-cluster/gfs-kernel/ChangeLog
+++ b/sys-cluster/gfs-kernel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/gfs-kernel
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.14 2006/07/14 12:20:30 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.15 2006/07/14 15:01:46 xmerlin Exp $
+
+  14 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org>
+  gfs-kernel-1.02.00-r1.ebuild:
+  Splitted path, now gfs-kernel compiles fine with 2.6.17 and older kernels
 
 *gfs-kernel-1.02.00-r1 (13 Jul 2006)
 
diff --git a/sys-cluster/gfs-kernel/Manifest b/sys-cluster/gfs-kernel/Manifest
index 2cc06a3f21bb..65274af54c2c 100644
--- a/sys-cluster/gfs-kernel/Manifest
+++ b/sys-cluster/gfs-kernel/Manifest
@@ -7,23 +7,24 @@ RMD160 35b90bf495110cd36ffd986108f9eafbcfda8c75 files/gfs-kernel-1.02.00-2006071
 SHA256 16091ba242bf1842b512c2527c91676d57f8d230fd650374123e850db415e2ae files/gfs-kernel-1.02.00-20060714-cvs-compile.patch 339
 DIST cluster-1.01.00.tar.gz 1321031 RMD160 11dc08a02b61c5a16c8d373630a1ff767e2b56ae SHA1 554fa8a5795b5f44ff59181dd49d1a471b61ca16 SHA256 5edeb995958975fdecaded0d841433be755479227a76d04faef8a624ed986e20
 DIST cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 SHA1 d74cadb1ef21d1cfda333b20d7ef20272e0002d6 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849
-DIST gfs-kernel-1.02.00-20060714-cvs.patch.gz 5731 RMD160 8bc62c94968fa018ca303f55495cc1e74d218298 SHA1 c85d43f203c1263ee593d3e8df8b008cfb4ce433 SHA256 1e90dbc6e3e446efee520bf61e098a413f145347dfb120f63452de4570390487
+DIST gfs-kernel-1.02.00-20060714-cvs-part1.patch.gz 4919 RMD160 9cd7c3df465a1c85fc59a57ee601f4b6b589284f SHA1 ba1db2ebc3aae95ce690a1ada0f1ca6f593ec0da SHA256 39fb40d83cd4547a45ef00c11714392a7cc15b968b5c7aa05fd96eb63d9c7196
+DIST gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086 RMD160 bc10691dbdd4afb6d8fa8618f3b42d54792fb3bf SHA1 2f2ace6894aec9ba92d779afeb294ff0551d169f SHA256 7a6a7b531f9cd73a3b2ab46849372862d1903a9a0d879544ef60599762ad9ff6
 EBUILD gfs-kernel-1.01.00.ebuild 1133 RMD160 be8a8f2d61394a4db8aea969bbb76fe1daafbd47 SHA1 3eb54b32a9253bcb19d15ddc04c0100354596cbf SHA256 5953c86e943f2c0e7bb4ba2db6ff5fefe18a04f85bf73f36a65158aff8f7fd06
 MD5 6ad496edbc2d8ec34ee881cb3b13ccf7 gfs-kernel-1.01.00.ebuild 1133
 RMD160 be8a8f2d61394a4db8aea969bbb76fe1daafbd47 gfs-kernel-1.01.00.ebuild 1133
 SHA256 5953c86e943f2c0e7bb4ba2db6ff5fefe18a04f85bf73f36a65158aff8f7fd06 gfs-kernel-1.01.00.ebuild 1133
-EBUILD gfs-kernel-1.02.00-r1.ebuild 1534 RMD160 b6a63f75715f30e7bf63240e8b0f2cc863feadc6 SHA1 c55e8464a9aa8448f6d15b34b702cee7c608520d SHA256 b2b4beaf8f348e5196468d7a48897ec43da216c0072112915e3e36cf51b08fc3
-MD5 ad0a11de49d6cc84f591a26df9193fbe gfs-kernel-1.02.00-r1.ebuild 1534
-RMD160 b6a63f75715f30e7bf63240e8b0f2cc863feadc6 gfs-kernel-1.02.00-r1.ebuild 1534
-SHA256 b2b4beaf8f348e5196468d7a48897ec43da216c0072112915e3e36cf51b08fc3 gfs-kernel-1.02.00-r1.ebuild 1534
+EBUILD gfs-kernel-1.02.00-r1.ebuild 1858 RMD160 9843e5cadd04fe71089410a5eca1dc7621926a40 SHA1 100d6a785bb568b0a77e81c7f1025fd15f3513ed SHA256 c09ce3029e57936a7d5d172e2d093eee7d03b80c833d4efb988f7ea68c1e4063
+MD5 7ca7b2cd410716090141b2a6b72c624d gfs-kernel-1.02.00-r1.ebuild 1858
+RMD160 9843e5cadd04fe71089410a5eca1dc7621926a40 gfs-kernel-1.02.00-r1.ebuild 1858
+SHA256 c09ce3029e57936a7d5d172e2d093eee7d03b80c833d4efb988f7ea68c1e4063 gfs-kernel-1.02.00-r1.ebuild 1858
 EBUILD gfs-kernel-1.02.00.ebuild 1134 RMD160 fa91cd929f03142d3050ecdfdededfe001e5b068 SHA1 e7be4c32eb878fe433cf573780f0bef98bc2a729 SHA256 d95724c66b69ac68a4b1e72fa875282754bca2f09d6c3745a18b8373eb0417f3
 MD5 a2c0d7d4a7be2935eed0f41d147b9c0f gfs-kernel-1.02.00.ebuild 1134
 RMD160 fa91cd929f03142d3050ecdfdededfe001e5b068 gfs-kernel-1.02.00.ebuild 1134
 SHA256 d95724c66b69ac68a4b1e72fa875282754bca2f09d6c3745a18b8373eb0417f3 gfs-kernel-1.02.00.ebuild 1134
-MISC ChangeLog 2172 RMD160 c7de35f3a7f03a01e3f5da44a5caba86d0cca775 SHA1 c1e872420bc04eb5c9f5adeeb0d09f4fb89b06eb SHA256 e6a5ef8c69ca6cfd1a0ca4a3292e8e2ce9451d6ce0d67abd2505259bb3bb4ebb
-MD5 90c1d96bb5e3e0a5420667a102cfa328 ChangeLog 2172
-RMD160 c7de35f3a7f03a01e3f5da44a5caba86d0cca775 ChangeLog 2172
-SHA256 e6a5ef8c69ca6cfd1a0ca4a3292e8e2ce9451d6ce0d67abd2505259bb3bb4ebb ChangeLog 2172
+MISC ChangeLog 2335 RMD160 29b56c33949596e0e2e17cd2be85612b79a9bfc9 SHA1 fc389ec3693d2cfcd2abdb27c4d17e86a3a302b5 SHA256 6a2bbea8cd304a8495b72b5176b01e4a8a5c8fef4d4ecd1c1c187a69aada09e8
+MD5 35719cddcc530c3d3829d1b3f672e60f ChangeLog 2335
+RMD160 29b56c33949596e0e2e17cd2be85612b79a9bfc9 ChangeLog 2335
+SHA256 6a2bbea8cd304a8495b72b5176b01e4a8a5c8fef4d4ecd1c1c187a69aada09e8 ChangeLog 2335
 MISC metadata.xml 223 RMD160 f9651ff0237b684fc6b65b83bb9140623b669a6d SHA1 033d2c47eb2bfe68e657ac2d68a7bfd28aab5b22 SHA256 b75b89c431f244420a0c81f9157c9fc656a919a8aac011778e1b410f70851bd3
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
 RMD160 f9651ff0237b684fc6b65b83bb9140623b669a6d metadata.xml 223
@@ -34,13 +35,13 @@ SHA256 68dadc3821c333ce4f03fb8890ee54e567913a0d9534fd9a3ff5e4c96d3a238b files/di
 MD5 5d1e39dd5db4b072c6b15766fa046623 files/digest-gfs-kernel-1.02.00 250
 RMD160 519c8fd0f439c76c46ed51ea7daa575ccdab19d1 files/digest-gfs-kernel-1.02.00 250
 SHA256 a9ab8df812818d1d317b96829080a28a21cc9ccb3521e8c27660772696f76218 files/digest-gfs-kernel-1.02.00 250
-MD5 7746712bd6781328e66f6734c6b4ee29 files/digest-gfs-kernel-1.02.00-r1 545
-RMD160 fdefdaa3d62f0d3e5e4c46dda7d39306458ae73e files/digest-gfs-kernel-1.02.00-r1 545
-SHA256 4f9fd515cac03d4c02dea88746b188538395e95605fe8b30e928c689418a0c24 files/digest-gfs-kernel-1.02.00-r1 545
+MD5 ed2372ea9aebb7aef466e3c3ab76d550 files/digest-gfs-kernel-1.02.00-r1 876
+RMD160 a795aefc14c11c67fad505144d0cd57fd33b5ad1 files/digest-gfs-kernel-1.02.00-r1 876
+SHA256 afcadf1830cccdeda274e04db7d483ce2ea53c3fdee08b9b46172ee23eb9ccab files/digest-gfs-kernel-1.02.00-r1 876
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEt5t7gMUyd/cdjWsRAogHAKCN5ZHT0bZHFRreFccVCZhHCOTqHgCeKsik
-mPx3sRsRgMZcBErhHkTp7t0=
-=3CIY
+iD8DBQFEt8FIgMUyd/cdjWsRAndLAJ9bR1D5aqBa3IhQOfVAnswRO8a+RACffwrl
+KNtCOytjhnBpYgKeGB7LYsU=
+=RLB/
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.02.00-r1 b/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.02.00-r1
index 9292298b6a0b..7b137a3e5d96 100644
--- a/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.02.00-r1
+++ b/sys-cluster/gfs-kernel/files/digest-gfs-kernel-1.02.00-r1
@@ -1,6 +1,9 @@
 MD5 131c34c8b66d8d7d74384839ed4091d0 cluster-1.02.00.tar.gz 1356451
 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 cluster-1.02.00.tar.gz 1356451
 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849 cluster-1.02.00.tar.gz 1356451
-MD5 578820bbc46d547ad82ce57f6c30c4fa gfs-kernel-1.02.00-20060714-cvs.patch.gz 5731
-RMD160 8bc62c94968fa018ca303f55495cc1e74d218298 gfs-kernel-1.02.00-20060714-cvs.patch.gz 5731
-SHA256 1e90dbc6e3e446efee520bf61e098a413f145347dfb120f63452de4570390487 gfs-kernel-1.02.00-20060714-cvs.patch.gz 5731
+MD5 67c38ef215cfccbafbfcd7d8e40867b4 gfs-kernel-1.02.00-20060714-cvs-part1.patch.gz 4919
+RMD160 9cd7c3df465a1c85fc59a57ee601f4b6b589284f gfs-kernel-1.02.00-20060714-cvs-part1.patch.gz 4919
+SHA256 39fb40d83cd4547a45ef00c11714392a7cc15b968b5c7aa05fd96eb63d9c7196 gfs-kernel-1.02.00-20060714-cvs-part1.patch.gz 4919
+MD5 916c21631d512bda65fcbdc43bcba1b5 gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086
+RMD160 bc10691dbdd4afb6d8fa8618f3b42d54792fb3bf gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086
+SHA256 7a6a7b531f9cd73a3b2ab46849372862d1903a9a0d879544ef60599762ad9ff6 gfs-kernel-1.02.00-20060714-cvs-part2.patch.gz 1086
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild
index bd419c3ba570..2d54ba00ed7c 100644
--- a/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild
+++ b/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild,v 1.1 2006/07/14 12:20:30 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild,v 1.2 2006/07/14 15:01:46 xmerlin Exp $
 
 inherit eutils linux-mod
 
@@ -10,8 +10,11 @@ MY_P="cluster-${PV}"
 DESCRIPTION="GFS kernel module"
 HOMEPAGE="http://sources.redhat.com/cluster/"
 SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz
-	mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs.patch.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs.patch.gz"
+	mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part1.patch.gz
+	mirror://gentoo/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part2.patch.gz
+	http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part1.patch.gz
+	http://dev.gentoo.org/~xmerlin/gfs/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-part2.patch.gz
+	"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,8 +23,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="|| (
-		>=sys-kernel/vanilla-sources-2.6.17
-		>=sys-kernel/gentoo-sources-2.6.17
+		>=sys-kernel/vanilla-sources-2.6.12
+		>=sys-kernel/gentoo-sources-2.6.12
 	)
 	>=sys-cluster/dlm-headers-1.02.00-r1
 	>=sys-cluster/cman-headers-1.02.00-r1"
@@ -33,7 +36,13 @@ S="${WORKDIR}/${MY_P}/${PN}"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${WORKDIR}/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs.patch || die
+
+	epatch ${WORKDIR}/gfs-kernel-1.02.00-20060714-cvs-part1.patch || die
+	if kernel_is 2 6; then
+		if [ "$KV_PATCH" -gt "16" ] ; then
+			epatch ${WORKDIR}/gfs-kernel-1.02.00-20060714-cvs-part2.patch || die
+		fi
+	fi
 	epatch ${FILESDIR}/${PN/headers/kernel}-${PV}-${CVS_RELEASE}-cvs-compile.patch || die
 }