Version bump, fixed compilation with older and newer kernels.

Package-Manager: portage-2.1.2-r9

4 files changed, 77 insertions, 21 deletions

diff --git a/sys-cluster/cman-kernel/Manifest b/sys-cluster/cman-kernel/Manifest
index 5dbff1ddd913..4514e5e6f2ab 100644
--- a/sys-cluster/cman-kernel/Manifest
+++ b/sys-cluster/cman-kernel/Manifest
@@ -5,18 +5,18 @@ DIST cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269
 DIST cluster-1.03.00.tar.gz 1658274 RMD160 6fc16e2edba73dd1a83ecfad749b1553eca6d938 SHA1 c205d8ec034433c33f26724f7f69b0028d2a63d4 SHA256 e61c2438c7ee8d546aec9dd86ee1851c9a71f127c25ad1fb0c59eb4ed534e97b
 DIST cluster-1.04.00.tar.gz 1663798 RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 SHA1 af3bb244a11a6a26c31b142009f6c1f771799337 SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2
 DIST cman-kernel-1.02.00-20060714-cvs.patch.gz 3464 RMD160 8714f1bba3765fbee184f9ed0ac8f0f2e93fb2ea SHA1 77de473c2d2107129fdb1627553bcece65e8f0e7 SHA256 5ccc53894086e76e2bcb924ff1fb337a80b9fab2886882023aa30673f50770bb
-EBUILD cman-kernel-1.02.00-r1.ebuild 1455 RMD160 6e878db337d021302ba056339b2c4c1a0d37b2a6 SHA1 3e0aac1a0d8ac80f9756241c0db2f947138b7a1b SHA256 1fc316bac574ef74363fb79ffab3d8e7166c10e3898190da0ca9d1c30146edd8
-MD5 39522c9692cbb0918e8a6bfb953fd50d cman-kernel-1.02.00-r1.ebuild 1455
-RMD160 6e878db337d021302ba056339b2c4c1a0d37b2a6 cman-kernel-1.02.00-r1.ebuild 1455
-SHA256 1fc316bac574ef74363fb79ffab3d8e7166c10e3898190da0ca9d1c30146edd8 cman-kernel-1.02.00-r1.ebuild 1455
-EBUILD cman-kernel-1.03.00.ebuild 1186 RMD160 ba616174c3ee6eb421120c1684eec46a4627d7b1 SHA1 34cb92275b4a8583b6e401244bcec18da73dbb95 SHA256 87b4bb9ebd682eec063592bde12d2e1e37a920ff090d1936515fb7bc2cc355fc
-MD5 9c96c7ed8db89899694de4a534f50586 cman-kernel-1.03.00.ebuild 1186
-RMD160 ba616174c3ee6eb421120c1684eec46a4627d7b1 cman-kernel-1.03.00.ebuild 1186
-SHA256 87b4bb9ebd682eec063592bde12d2e1e37a920ff090d1936515fb7bc2cc355fc cman-kernel-1.03.00.ebuild 1186
-EBUILD cman-kernel-1.04.00.ebuild 1185 RMD160 8cb032225a0c18711ecd95ec8294fe4ff39d9f58 SHA1 a7d4550afc7adb81daf6f6916108860b6997ada7 SHA256 d90f66bd622a13b1aad4d8fef09b5ad7e54a7390b760d41b5103d9d695cbb4b4
-MD5 e6a14c551505e1ddb022da47718fb57a cman-kernel-1.04.00.ebuild 1185
-RMD160 8cb032225a0c18711ecd95ec8294fe4ff39d9f58 cman-kernel-1.04.00.ebuild 1185
-SHA256 d90f66bd622a13b1aad4d8fef09b5ad7e54a7390b760d41b5103d9d695cbb4b4 cman-kernel-1.04.00.ebuild 1185
+EBUILD cman-kernel-1.02.00-r1.ebuild 1775 RMD160 78774b442400c313ddad953de0d53f7f445df7c4 SHA1 633289584d0051b0f982b60fc6a815ecc8307642 SHA256 5aaf36fa4192b0c3dc447ffe3f4667afdd7188a05dc9e53a138f30b4a5dc6b99
+MD5 4f6054ad545dd185a0bc42f068d3628f cman-kernel-1.02.00-r1.ebuild 1775
+RMD160 78774b442400c313ddad953de0d53f7f445df7c4 cman-kernel-1.02.00-r1.ebuild 1775
+SHA256 5aaf36fa4192b0c3dc447ffe3f4667afdd7188a05dc9e53a138f30b4a5dc6b99 cman-kernel-1.02.00-r1.ebuild 1775
+EBUILD cman-kernel-1.03.00.ebuild 1545 RMD160 f5f376cdcb95266c4d556f37ccd989eb07219ceb SHA1 092aab3da7bc2213fef907e190e0a8a1e52b6d9f SHA256 82e16c0360591a4aea8195d941455eb5cc028140e3d5c2d6a87366c30b1441b0
+MD5 9055d45407e34d15230e27c220ea0f1c cman-kernel-1.03.00.ebuild 1545
+RMD160 f5f376cdcb95266c4d556f37ccd989eb07219ceb cman-kernel-1.03.00.ebuild 1545
+SHA256 82e16c0360591a4aea8195d941455eb5cc028140e3d5c2d6a87366c30b1441b0 cman-kernel-1.03.00.ebuild 1545
+EBUILD cman-kernel-1.04.00.ebuild 1545 RMD160 7f76a0d3a0991a50307759fb1ef34bf86cb4f3bd SHA1 df4ed507530b2b9e77d3869b931fd3d3c7ba198e SHA256 67fef9625bca4a4c44c782c10e88b99b5643cea9ab9b9077a45ccdbd458b1965
+MD5 9767cb791aabb1d848ac06409263dae3 cman-kernel-1.04.00.ebuild 1545
+RMD160 7f76a0d3a0991a50307759fb1ef34bf86cb4f3bd cman-kernel-1.04.00.ebuild 1545
+SHA256 67fef9625bca4a4c44c782c10e88b99b5643cea9ab9b9077a45ccdbd458b1965 cman-kernel-1.04.00.ebuild 1545
 MISC ChangeLog 3853 RMD160 a26698de4c47ff11fc044902dbfd7322b1eba1a4 SHA1 435f13e0f7740ee4e220a9c7f0b94ea148524300 SHA256 fc4bc297c7ad08bc6a6891a9da6fbc323fa679aecbeca85d7ca0012379177f12
 MD5 5406e87949a176631fbd0b3e5a3b204d ChangeLog 3853
 RMD160 a26698de4c47ff11fc044902dbfd7322b1eba1a4 ChangeLog 3853
@@ -37,7 +37,7 @@ SHA256 358be21a647dcb0388ec46ddf8044de17a3fdb8c57b0f63e5bcc6340eb476d31 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF8T8NgMUyd/cdjWsRAukWAKCEmTdtXislh/E8UeYZRYGhgHDzTgCggoPg
-Fo+M/UST12sx6K9U7MEAoNM=
-=q4F9
+iD8DBQFF8XicgMUyd/cdjWsRAtmSAJ9dIO9Ymag8dRD4ZORGYRrAujUlhgCfSQ19
+7DmucRA+QTxZo4MyXBSZfmQ=
+=DmNG
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild b/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild
index 299084f1241a..f45628f14a7f 100644
--- a/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild
+++ b/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild,v 1.10 2007/01/13 01:56:48 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild,v 1.11 2007/03/09 15:09:07 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
+CLUSTER_RELEASE="1.02.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 CVS_RELEASE="20060714"
-MY_P="cluster-${PV}"
 
 DESCRIPTION="CMAN cluster kernel module"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -37,8 +38,23 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${WORKDIR}/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die
+
+	if kernel_is 2 6; then
+		if [ "$KV_PATCH" -ge "18" ] ; then
+			sed -i \
+				-e 's|version.h|utsrelease.h|g' \
+				configure \
+				|| die "sed failed"
+
+			sed -i \
+				-e 's|system_utsname.nodename|init_utsname()->nodename|g' \
+				src/cnxman.c \
+				|| die "sed failed"
+		fi
+	fi
 }
 
+
 src_compile() {
 	set_arch_to_kernel
 
diff --git a/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild b/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild
index 02e0f0c2bc92..a24ac08a27d8 100644
--- a/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild
+++ b/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild,v 1.7 2007/01/13 01:56:48 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild,v 1.8 2007/03/09 15:09:07 xmerlin Exp $
 
 inherit linux-mod linux-info
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.03.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="CMAN cluster kernel module"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -30,6 +31,25 @@ pkg_setup() {
 	esac
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if kernel_is 2 6; then
+		if [ "$KV_PATCH" -ge "18" ] ; then
+			sed -i \
+				-e 's|version.h|utsrelease.h|g' \
+				configure \
+				|| die "sed failed"
+
+			sed -i \
+				-e 's|system_utsname.nodename|init_utsname()->nodename|g' \
+				src/cnxman.c \
+				|| die "sed failed"
+		fi
+	fi
+}
+
 src_compile() {
 	set_arch_to_kernel
 
diff --git a/sys-cluster/cman-kernel/cman-kernel-1.04.00.ebuild b/sys-cluster/cman-kernel/cman-kernel-1.04.00.ebuild
index 16fd874f05ec..2b615259cf50 100644
--- a/sys-cluster/cman-kernel/cman-kernel-1.04.00.ebuild
+++ b/sys-cluster/cman-kernel/cman-kernel-1.04.00.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-1.04.00.ebuild,v 1.1 2007/03/09 11:03:33 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-1.04.00.ebuild,v 1.2 2007/03/09 15:09:07 xmerlin Exp $
 
 inherit linux-mod linux-info
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.04.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="CMAN cluster kernel module"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -30,6 +31,25 @@ pkg_setup() {
 	esac
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if kernel_is 2 6; then
+		if [ "$KV_PATCH" -lt "18" ] ; then
+			sed -i \
+				-e 's|utsrelease.h|version.h|g' \
+				configure \
+				|| die "sed failed"
+
+			sed -i \
+				-e 's|init_utsname()->nodename|system_utsname.nodename|g' \
+				src/cnxman.c \
+				|| die "sed failed"
+		fi
+	fi
+}
+
 src_compile() {
 	set_arch_to_kernel