Version bump, fixed compilation with older and newer kernels.

(Portage version: 2.1.2-r9)

5 files changed, 88 insertions, 7 deletions

diff --git a/sys-cluster/dlm-kernel/ChangeLog b/sys-cluster/dlm-kernel/ChangeLog
index aa89ca0d3a6e..ebdead7a72d0 100644
--- a/sys-cluster/dlm-kernel/ChangeLog
+++ b/sys-cluster/dlm-kernel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/dlm-kernel
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/ChangeLog,v 1.26 2007/01/13 01:55:27 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/ChangeLog,v 1.27 2007/03/09 15:51:02 xmerlin Exp $
+
+*dlm-kernel-1.04.00 (03 Mar 2007)
+
+  09 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  dlm-kernel-1.02.00-r1.ebuild, dlm-kernel-1.03.00.ebuild,
+  +dlm-kernel-1.04.00.ebuild:
+  Version bump, fixed compilation with older and newer kernels.
 
   13 Jan 2007; Michael Marineau <marineam@gentoo.org>
   dlm-kernel-1.02.00-r1.ebuild, dlm-kernel-1.03.00.ebuild:
diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild
index bbb236123d00..4d28c42f9d8e 100644
--- a/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild
+++ b/sys-cluster/dlm-kernel/dlm-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/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild,v 1.9 2007/01/13 01:55:27 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild,v 1.10 2007/03/09 15:51:02 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="General-purpose Distributed Lock Manager kernel module"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -22,7 +23,7 @@ DEPEND="|| (
 		>=sys-kernel/vanilla-sources-2.6.16
 		>=sys-kernel/gentoo-sources-2.6.16
 	)
-	>=sys-cluster/cman-headers-1.02.00-r1"
+	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
 
 RDEPEND=""
 
diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild
index f4293ce32471..0634f0a09fd6 100644
--- a/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild
+++ b/sys-cluster/dlm-kernel/dlm-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/dlm-kernel/dlm-kernel-1.03.00.ebuild,v 1.6 2007/01/13 01:55:27 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild,v 1.7 2007/03/09 15:51:02 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
-MY_P="cluster-${PV}"
+CLUSTER_RELEASE="1.03.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
 
 DESCRIPTION="General-purpose Distributed Lock Manager kernel module"
 HOMEPAGE="http://sources.redhat.com/cluster/"
@@ -19,7 +20,7 @@ DEPEND="|| (
 		>=sys-kernel/vanilla-sources-2.6.16
 		>=sys-kernel/gentoo-sources-2.6.16
 	)
-	>=sys-cluster/cman-headers-1.03.00"
+	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
 
 RDEPEND=""
 
diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild
new file mode 100644
index 000000000000..eea5ae582fc7
--- /dev/null
+++ b/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild,v 1.1 2007/03/09 15:51:02 xmerlin Exp $
+
+inherit eutils linux-mod linux-info
+
+CLUSTER_RELEASE="1.04.00"
+MY_P="cluster-${CLUSTER_RELEASE}"
+
+DESCRIPTION="General-purpose Distributed Lock Manager kernel module"
+HOMEPAGE="http://sources.redhat.com/cluster/"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="|| (
+		>=sys-kernel/vanilla-sources-2.6.16
+		>=sys-kernel/gentoo-sources-2.6.16
+	)
+	=sys-cluster/cman-headers-${CLUSTER_RELEASE}*"
+
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	case ${KV_FULL} in
+		2.2.*|2.4.*) die "${P} supports only 2.6 kernels";;
+	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"
+		fi
+	fi
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	./configure --kernel_src=${KERNEL_DIR} --verbose || die "configure problem"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
+	rm -f ${D}/usr/include/cluster/*
+}
+
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo ""
+	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
+	einfo ""
+}
diff --git a/sys-cluster/dlm-kernel/files/digest-dlm-kernel-1.04.00 b/sys-cluster/dlm-kernel/files/digest-dlm-kernel-1.04.00
new file mode 100644
index 000000000000..2f86eed7f8e5
--- /dev/null
+++ b/sys-cluster/dlm-kernel/files/digest-dlm-kernel-1.04.00
@@ -0,0 +1,3 @@
+MD5 d1a0363109d0188959ec35b7d6ebfb67 cluster-1.04.00.tar.gz 1663798
+RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 cluster-1.04.00.tar.gz 1663798
+SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 cluster-1.04.00.tar.gz 1663798