Removed old ugly hack.

(Portage version: 2.1.2-r9)

4 files changed, 35 insertions, 7 deletions

diff --git a/sys-cluster/dlm-kernel/ChangeLog b/sys-cluster/dlm-kernel/ChangeLog
index ebdead7a72d0..fd6ef742a0b0 100644
--- a/sys-cluster/dlm-kernel/ChangeLog
+++ b/sys-cluster/dlm-kernel/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2007/03/09 15:51:02 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/ChangeLog,v 1.28 2007/03/10 11:55:39 xmerlin Exp $
+
+  10 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:
+  Removed old ugly hack.
 
 *dlm-kernel-1.04.00 (03 Mar 2007)
 
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 4d28c42f9d8e..a0188d18cd27 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,6 +1,6 @@
 # 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.10 2007/03/09 15:51:02 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild,v 1.11 2007/03/10 11:55:39 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
@@ -40,6 +40,15 @@ 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"
+		fi
+	fi
 }
 
 src_compile() {
@@ -50,7 +59,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
+	emake DESTDIR=${D} install || die "install problem"
 	rm -f ${D}/usr/include/cluster/*
 }
 
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 0634f0a09fd6..48386709a843 100644
--- a/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild
+++ b/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2007/03/09 15:51:02 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild,v 1.8 2007/03/10 11:55:39 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
@@ -33,6 +33,20 @@ 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"
+		fi
+	fi
+}
+
 src_compile() {
 	set_arch_to_kernel
 
@@ -41,7 +55,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
+	emake DESTDIR=${D} install || die "install problem"
 	rm -f ${D}/usr/include/cluster/*
 }
 
diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild
index eea5ae582fc7..7e832fb7076d 100644
--- a/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild
+++ b/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.04.00.ebuild,v 1.2 2007/03/10 11:55:39 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
@@ -55,7 +55,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
+	emake DESTDIR=${D} install || die "install problem"
 	rm -f ${D}/usr/include/cluster/*
 }