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

Package-Manager: portage-2.1.5.5

7 files changed, 42 insertions, 22 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/Manifest b/sys-fs/btrfs/Manifest
index a6aa9040c699..5e4b99fcc13c 100644
--- a/sys-fs/btrfs/Manifest
+++ b/sys-fs/btrfs/Manifest
@@ -1,12 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX btrfs-0.14-hotfix.patch 14508 RMD160 df98080a725a9882ca3185c87421f8ac4c5266f2 SHA1 2d9dca87cde74b0943947d35cf6f0c09980cb9da SHA256 0e6370569cf70da7160398bbaa41b725b77a46ba1597b7db80bb1f85e4be0788
 AUX btrfs-0.15-acl-disable.patch 1260 RMD160 3700cd0baa293d02ff2ec490e081e8919ee64119 SHA1 8c02e30e6b844e837d2ce31109a7e50739cc9522 SHA256 8b410a8eea96d54b5cfc3d683d7fae9d8f9f8fdbff008289e37380cdf16a6808
 AUX btrfs-0.15-r2-hotfix.patch 7478 RMD160 adb3238cf17e1af33b4ab17ee5ece40addec5995 SHA1 3e48fe2ea46d172cb6cf555ba5821e4cd15c20cf SHA256 2c7edfeea3f2e2ff746cd185b3692cb23019879862c87652399b35c81dbeb9d1
 DIST btrfs-0.14.tar.bz2 103694 RMD160 0e3fa6ee1583452a4818356dff1f2868502811a1 SHA1 1265a79c9b0e87858fcba319854b601b865d097c SHA256 b57a853a0ec0152c3561688a1fd250b68e361b6d0fd0bd6526802a2d7829bcf9
 DIST btrfs-0.15.tar.bz2 107545 RMD160 ad8fbe78395d1f425a769eec9719bb60b63b73e6 SHA1 37930ab229b9795db41b02e25713f886758f3b42 SHA256 f6e0d004c0c13d375718c3ab063e1386e8e6262d78f958b15fad13a8d301433e
-EBUILD btrfs-0.14.ebuild 1360 RMD160 353e78e06d3d7286347424fd455f004a1f02b9bf SHA1 1979c6b2a42891d4d160a01ee0f093df68b45984 SHA256 8562f0fb68f0d6e1e522c72fd011919a8483a7c441d81774ce5b317cc1b40c38
-EBUILD btrfs-0.15-r1.ebuild 1513 RMD160 39a21dc1fa269741a804a5794e1dbed8e3ede49f SHA1 d496b6c7db2b4931443c379aab8997ff37c1df38 SHA256 5130c6b9c053dab335324edb4f66fc0d8f72dddea889c5ba52c17e695e5ae8bb
-EBUILD btrfs-0.15-r2.ebuild 1554 RMD160 321124b72ea4f57914acabaa23bbed21ec830615 SHA1 60996bc8e6f243976bfe311acb7b9dcc2c274065 SHA256 1688a6e90262f26ddbc675c53e134c5496a6b96bdca80319cbab263c7afd2fae
-EBUILD btrfs-0.15.ebuild 1464 RMD160 c445fcab88206a1570e37fee4b80dbb941d87307 SHA1 fa71ef16abd3dd378daa63e45cf20dd7e9fabf7d SHA256 e12a4e1303b1485e279ae4aabf52b789fb1ebb896f2f73c42ed62236f80332f8
-EBUILD btrfs-9999.ebuild 1529 RMD160 c5c2a6337ef006097f08c334d044389b95f0f9ed SHA1 f12da2c1d24dc8933a1823cae3bd10d7a9a06ef8 SHA256 d69263f3edf20461745f60185f2abc8ca48b896f33dce5396625f52e49c8484c
-MISC ChangeLog 1288 RMD160 f9a4fda133319d635c82be099b362e8f5ec2b6f4 SHA1 804f0f66ad27efa96a28ef7f478a1c42c1885493 SHA256 b573cbbefcc29dd3c7f44ba64c02073a0341b9564f0b49ae6657f54db0b7d3e1
+EBUILD btrfs-0.14.ebuild 1365 RMD160 9eccdb595a8db675d19797b95e624d2fc99ddc2a SHA1 073e5a18134f5b3debe6a0ffbda4b2fe3935db87 SHA256 ac432a61142754cee5a565039e496eb5f01f2a61cf64b9e1c7b5c390e9034d81
+EBUILD btrfs-0.15-r1.ebuild 1515 RMD160 4ef144bbcd2ecbe92ef9412e9f0419a819ddcd75 SHA1 e85e27b3a628050a5a9152b39eb83e940b3f6cde SHA256 4c8960c2cefd41dcbf0caa46086593e7e34ff13b3e0d3cb601ac4d7af7e88668
+EBUILD btrfs-0.15-r2.ebuild 1556 RMD160 3f052db542971346a887794fe49676b135a51de2 SHA1 15b2c7a0a89f50ea7ed757843ba77852c21d8ae0 SHA256 1a339346c7e39a49ef9051af562d2a8928a25551ad834d66b273c693160fa5fd
+EBUILD btrfs-0.15.ebuild 1466 RMD160 d30cede4cde5adccfc669312cfee9a0c48e450e5 SHA1 973ec21060936417d1c7497d405697c62fa43b2c SHA256 504745ff9c188f540f2839b7dd04d83f14cbf8185f001896f03a55df2b7ba3fc
+EBUILD btrfs-9999.ebuild 1520 RMD160 62093ab3ecc67675bc70c62e6588a876eb752489 SHA1 8f929db4990db59e7b18e9ccb48d8ad44a6b594c SHA256 a0531b4ca420b37cc22876eb972a0c824c2dcc77225b559c93ccf6e7f03d4a4c
+MISC ChangeLog 1577 RMD160 c8a3ae2f2024b1c81c4b6ae27e766b74d9289323 SHA1 9404de4a8987213927b5ec95d2efeb8fbbb72619 SHA256 7a9617b14e4a45d5de6fcf1c79edffb34348be2adfc8646d226925084cb20c83
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIVCnuI1lqEGTUzyQRAtpwAKDaOryMjJOJknLLKtVQHQBy+hHIuACgsf1u
+zAj1dd3aR75Z6Q1U7pdMDDM=
+=8q5e
+-----END PGP SIGNATURE-----
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."