Use KV_OUT_DIR instead of relying on the /lib/modules build symlink pointing to the correct directory. Set RDEPEND="${DEPEND}".

(Portage version: 2.1.5.5)

6 files changed, 26 insertions, 16 deletions

diff --git a/sys-fs/btrfs/ChangeLog b/sys-fs/btrfs/ChangeLog
index 927035e68454..66b686ac4879 100644
--- a/sys-fs/btrfs/ChangeLog
+++ b/sys-fs/btrfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/btrfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.7 2008/06/12 05:24:48 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/ChangeLog,v 1.8 2008/06/14 20:28:21 swegener Exp $
+
+  14 Jun 2008; Sven Wegener <swegener@gentoo.org> btrfs-0.14.ebuild,
+  btrfs-0.15.ebuild, btrfs-0.15-r1.ebuild, btrfs-0.15-r2.ebuild,
+  btrfs-9999.ebuild:
+  Use KV_OUT_DIR instead of relying on the /lib/modules build symlink
+  pointing to the correct directory. Set RDEPEND="${DEPEND}".
 
 *btrfs-0.15-r2 (12 Jun 2008)
 
diff --git a/sys-fs/btrfs/btrfs-0.14.ebuild b/sys-fs/btrfs/btrfs-0.14.ebuild
index 045372a6f274..52d7224c3b37 100644
--- a/sys-fs/btrfs/btrfs-0.14.ebuild
+++ b/sys-fs/btrfs/btrfs-0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.14.ebuild,v 1.3 2008/06/09 17:01:34 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.14.ebuild,v 1.4 2008/06/14 20:28:21 swegener Exp $
 
 inherit eutils linux-mod
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-fs/e2fsprogs"
+RDEPEND="${DEPEND}"
 PDEPEND="~sys-fs/btrfs-progs-${PV}"
 
 pkg_setup()
@@ -21,7 +22,7 @@ pkg_setup()
 	linux-mod_pkg_setup
 
 	BUILD_TARGETS="all"
-	BUILD_PARAMS="KERNELDIR=/lib/modules/${KV_FULL}/build"
+	BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
 	MODULE_NAMES="btrfs(fs:${S}/"
 
 	if ! kernel_is 2 6; then
diff --git a/sys-fs/btrfs/btrfs-0.15-r1.ebuild b/sys-fs/btrfs/btrfs-0.15-r1.ebuild
index 23f7aed1e46c..84bbef0bc4df 100644
--- a/sys-fs/btrfs/btrfs-0.15-r1.ebuild
+++ b/sys-fs/btrfs/btrfs-0.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.15-r1.ebuild,v 1.2 2008/06/09 17:01:34 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.15-r1.ebuild,v 1.3 2008/06/14 20:28:21 swegener Exp $
 
 inherit eutils linux-mod
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-fs/e2fsprogs"
+RDEPEND="${DEPEND}"
 PDEPEND="~sys-fs/btrfs-progs-${PV}"
 
 pkg_setup()
@@ -21,7 +22,7 @@ pkg_setup()
 	linux-mod_pkg_setup
 
 	BUILD_TARGETS="all"
-	BUILD_PARAMS="KERNELDIR=/lib/modules/${KV_FULL}/build"
+	BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
 	MODULE_NAMES="btrfs(fs:${S}/"
 
 	if ! kernel_is 2 6; then
@@ -55,7 +56,7 @@ pkg_postinst() {
 	ewarn "WARNING: Btrfs is under heavy development and is not suitable for"
 	ewarn "         any uses other than benchmarking and review."
 	ewarn "         The Btrfs disk format is not yet finalized."
-	ewarn ""
+	ewarn
 	ewarn "Note: If upgrading from 0.14, there is no disk format change,"
 	ewarn "      but it might be prudent to fsck after upgrading."
 }
diff --git a/sys-fs/btrfs/btrfs-0.15-r2.ebuild b/sys-fs/btrfs/btrfs-0.15-r2.ebuild
index fcff35773802..abc37da410c3 100644
--- a/sys-fs/btrfs/btrfs-0.15-r2.ebuild
+++ b/sys-fs/btrfs/btrfs-0.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.15-r2.ebuild,v 1.1 2008/06/12 05:24:48 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.15-r2.ebuild,v 1.2 2008/06/14 20:28:21 swegener Exp $
 
 inherit eutils linux-mod
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-fs/e2fsprogs"
+RDEPEND="${DEPEND}"
 PDEPEND="~sys-fs/btrfs-progs-${PV}"
 
 pkg_setup()
@@ -21,7 +22,7 @@ pkg_setup()
 	linux-mod_pkg_setup
 
 	BUILD_TARGETS="all"
-	BUILD_PARAMS="KERNELDIR=/lib/modules/${KV_FULL}/build"
+	BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
 	MODULE_NAMES="btrfs(fs:${S}/"
 
 	if ! kernel_is 2 6; then
@@ -56,7 +57,7 @@ pkg_postinst() {
 	ewarn "WARNING: Btrfs is under heavy development and is not suitable for"
 	ewarn "         any uses other than benchmarking and review."
 	ewarn "         The Btrfs disk format is not yet finalized."
-	ewarn ""
+	ewarn
 	ewarn "Note: If upgrading from 0.14, there is no disk format change,"
 	ewarn "      but it might be prudent to fsck after upgrading."
 }
diff --git a/sys-fs/btrfs/btrfs-0.15.ebuild b/sys-fs/btrfs/btrfs-0.15.ebuild
index 6e5022780afa..cf8fc0a0eb75 100644
--- a/sys-fs/btrfs/btrfs-0.15.ebuild
+++ b/sys-fs/btrfs/btrfs-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.15.ebuild,v 1.2 2008/06/09 17:01:34 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-0.15.ebuild,v 1.3 2008/06/14 20:28:21 swegener Exp $
 
 inherit eutils linux-mod
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-fs/e2fsprogs"
+RDEPEND="${DEPEND}"
 PDEPEND="~sys-fs/btrfs-progs-${PV}"
 
 pkg_setup()
@@ -21,7 +22,7 @@ pkg_setup()
 	linux-mod_pkg_setup
 
 	BUILD_TARGETS="all"
-	BUILD_PARAMS="KERNELDIR=/lib/modules/${KV_FULL}/build"
+	BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
 	MODULE_NAMES="btrfs(fs:${S}/"
 
 	if ! kernel_is 2 6; then
@@ -53,7 +54,7 @@ pkg_postinst() {
 	ewarn "WARNING: Btrfs is under heavy development and is not suitable for"
 	ewarn "         any uses other than benchmarking and review."
 	ewarn "         The Btrfs disk format is not yet finalized."
-	ewarn ""
+	ewarn
 	ewarn "Note: If upgrading from 0.14, there is no disk format change,"
 	ewarn "      but it might be prudent to fsck after upgrading."
 }
diff --git a/sys-fs/btrfs/btrfs-9999.ebuild b/sys-fs/btrfs/btrfs-9999.ebuild
index 15662799e91a..d0dc606bccaf 100644
--- a/sys-fs/btrfs/btrfs-9999.ebuild
+++ b/sys-fs/btrfs/btrfs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-9999.ebuild,v 1.2 2008/06/09 18:03:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs/btrfs-9999.ebuild,v 1.3 2008/06/14 20:28:21 swegener Exp $
 
 inherit eutils linux-mod mercurial
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-fs/e2fsprogs"
+RDEPEND="${DEPEND}"
 PDEPEND="~sys-fs/btrfs-progs-${PV}"
 
 S="${WORKDIR}/kernel-unstable"
@@ -23,7 +24,7 @@ pkg_setup()
 	linux-mod_pkg_setup
 
 	BUILD_TARGETS="all"
-	BUILD_PARAMS="KERNELDIR=/lib/modules/${KV_FULL}/build"
+	BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
 	MODULE_NAMES="btrfs(fs:${S}/"
 
 	if ! kernel_is 2 6; then
@@ -39,7 +40,6 @@ pkg_setup()
 
 src_unpack() {
 	mercurial_fetch http://www.kernel.org/hg/btrfs/kernel-unstable
-	cd "${S}"
 }
 
 src_install()
@@ -55,7 +55,7 @@ pkg_postinst() {
 	ewarn "WARNING: Btrfs is under heavy development and is not suitable for"
 	ewarn "         any uses other than benchmarking and review."
 	ewarn "         The Btrfs disk format is not yet finalized."
-	ewarn ""
+	ewarn
 	ewarn "Note: This version is installed from a live ebuild, so the disk"
 	ewarn "      format can change from install to install as the upstream"
 	ewarn "      source changes."