Fixed module install path bug #158572.

Package-Manager: portage-2.1.2-r9

6 files changed, 28 insertions, 32 deletions

diff --git a/sys-cluster/gfs-kernel/ChangeLog b/sys-cluster/gfs-kernel/ChangeLog
index 8cd3aaecaeb4..87e7ef5f1d17 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.21 2006/10/19 10:47:31 xmerlin Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/ChangeLog,v 1.22 2007/03/03 00:00:09 xmerlin Exp $
+
+  02 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  gfs-kernel-1.02.00-r1.ebuild, gfs-kernel-1.03.00.ebuild:
+  Fixed module install path bug #158572.
 
   19 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
   gfs-kernel-1.02.00-r1.ebuild, gfs-kernel-1.03.00.ebuild:
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 605b6ec74f56..31d11c6e7441 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
+# Copyright 1999-2007 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.7 2006/10/19 10:47:31 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.02.00-r1.ebuild,v 1.8 2007/03/03 00:00:09 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
@@ -22,10 +22,7 @@ KEYWORDS="~amd64 ~ppc x86"
 
 IUSE=""
 
-DEPEND="|| (
-		>=sys-kernel/vanilla-sources-2.6.16
-		>=sys-kernel/gentoo-sources-2.6.16
-	)
+DEPEND=">=virtual/linux-sources-2.6.16
 	>=sys-cluster/dlm-headers-1.02.00-r1
 	>=sys-cluster/cman-headers-1.02.00-r1"
 
@@ -61,7 +58,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "install problem"
+	emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
 	rm -f ${D}/usr/include/linux/* || die
 }
 
diff --git a/sys-cluster/gfs-kernel/gfs-kernel-1.03.00.ebuild b/sys-cluster/gfs-kernel/gfs-kernel-1.03.00.ebuild
index 8c9f0d321c03..81275ef53e3a 100644
--- a/sys-cluster/gfs-kernel/gfs-kernel-1.03.00.ebuild
+++ b/sys-cluster/gfs-kernel/gfs-kernel-1.03.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.03.00.ebuild,v 1.5 2006/10/19 10:47:31 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gfs-kernel/gfs-kernel-1.03.00.ebuild,v 1.6 2007/03/03 00:00:09 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
@@ -16,10 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 
-DEPEND="|| (
-		>=sys-kernel/vanilla-sources-2.6.16
-		>=sys-kernel/gentoo-sources-2.6.16
-	)
+DEPEND=">=virtual/linux-sources-2.6.16
 	>=sys-cluster/dlm-headers-1.03.00
 	>=sys-cluster/cman-headers-1.03.00"
 
@@ -53,7 +50,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "install problem"
+	emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
 	rm -f ${D}/usr/include/linux/* || die
 }
 
diff --git a/sys-cluster/gnbd-kernel/ChangeLog b/sys-cluster/gnbd-kernel/ChangeLog
index 9058f0d587a6..8dfa4366d063 100644
--- a/sys-cluster/gnbd-kernel/ChangeLog
+++ b/sys-cluster/gnbd-kernel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/gnbd-kernel
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/ChangeLog,v 1.19 2006/10/19 10:46:51 xmerlin Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/ChangeLog,v 1.20 2007/03/02 23:57:43 xmerlin Exp $
+
+  02 Mar 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  gnbd-kernel-1.02.00-r1.ebuild, gnbd-kernel-1.03.00.ebuild:
+  Fixed module install path bug #158572.
 
   19 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
   gnbd-kernel-1.02.00-r1.ebuild, gnbd-kernel-1.03.00.ebuild:
diff --git a/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild b/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild
index b1c8bbe570b8..6a4b3fd62f43 100644
--- a/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild
+++ b/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild,v 1.7 2006/10/19 10:46:51 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.02.00-r1.ebuild,v 1.8 2007/03/02 23:57:43 xmerlin Exp $
 
 inherit eutils linux-mod linux-info
 
@@ -18,10 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="|| (
-		>=sys-kernel/vanilla-sources-2.6.16
-		>=sys-kernel/gentoo-sources-2.6.16
-	)"
+DEPEND=">=virtual/linux-sources-2.6.16"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/${PN}"
@@ -47,7 +44,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "install problem"
+	emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
 	rm -f ${D}/usr/include/linux/gnbd.h || die
 }
 
diff --git a/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild b/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild
index da9dfcecbc67..47e75cd88b69 100644
--- a/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild
+++ b/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild,v 1.6 2006/10/19 10:46:51 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gnbd-kernel/gnbd-kernel-1.03.00.ebuild,v 1.7 2007/03/02 23:57:43 xmerlin Exp $
 
 inherit linux-mod linux-info
 
@@ -15,10 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="|| (
-		>=sys-kernel/vanilla-sources-2.6.16
-		>=sys-kernel/gentoo-sources-2.6.16
-	)"
+DEPEND=">=virtual/linux-sources-2.6.16"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}/${PN}"
@@ -38,7 +35,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "install problem"
+	emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem"
 	rm -f ${D}/usr/include/linux/gnbd.h || die
 }