From: Stefan Schweizer <genstef@gentoo.org>
Date: Sun, 25 Feb 2007 09:33:32 +0000 (+0000)
Subject: use KV_DIR only after linux-mod_pkg_setup, bug 168051
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52491cb4833b0e489189c01c53840be4c875eef2;p=gentoo.git

use KV_DIR only after linux-mod_pkg_setup, bug 168051
Package-Manager: portage-2.1.2-r9
---

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 80720f9a0daa..193e3f21d559 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.2 2007/02/16 20:35:43 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.3 2007/02/25 09:33:32 genstef Exp $
+
+  25 Feb 2007; <genstef@gentoo.org> virtualbox-bin-1.3.4.ebuild:
+  use KV_DIR only after linux-mod_pkg_setup, bug 168051
 
   16 Feb 2007; Markus Ullmann <jokey@gentoo.org>
   virtualbox-bin-1.3.4.ebuild:
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.3.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.3.4.ebuild
index d6553100ccba..2b8420e4e896 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.3.4.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.3.4.ebuild
@@ -41,12 +41,12 @@ S=${WORKDIR}
 
 RESTRICT="primaryuri"
 
-BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 BUILD_TARGETS="all"
 MODULE_NAMES="vboxdrv(misc:${S}/src)"
 
 pkg_setup() {
 	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 	check_license
 }
 
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index ca5ed188ffeb..b5b6aeb47f23 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.9 2007/02/21 19:57:50 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.10 2007/02/25 09:30:56 genstef Exp $
+
+  25 Feb 2007; <genstef@gentoo.org> virtualbox-1.3.4-r1.ebuild,
+  virtualbox-9999.ebuild:
+  use KV_DIR only after linux-mod_pkg_setup, bug 168051
 
   21 Feb 2007; Simon Stelling <blubb@gentoo.org> virtualbox-9999.ebuild:
   re-keyword ~amd64 per bug 167001 comment #6
diff --git a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
index c92c35ab642a..6261f5a13e9a 100644
--- a/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.3.4-r1.ebuild
@@ -32,10 +32,14 @@ RDEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 BUILD_TARGETS="all"
 MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
 
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+}
+
 src_compile() {
 	cd "${S}"
 	./configure || die "configure failed"
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index a51f14c7d799..9d66566b6033 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -29,10 +29,14 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
 	additions? ( =app-emulation/virtualbox-additions-1.3.4 )"
 
-BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
 BUILD_TARGETS="all"
 MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
 
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+}
+
 src_compile() {
 	cd "${S}"
 	./configure || die "configure failed"