Resolve bug 86650 by setting S in every ebuild stage, also change KV_DIR to KV_OUT_DIR thanks to johnm

Package-Manager: portage-1.585-cvs

4 files changed, 19 insertions, 23 deletions

diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index 3beec238e428..502b57a00834 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1c796d226c1c1d78bdcf4a609469ba6a ChangeLog 7604
+MD5 eba5bc824df9432fa85ab99aee7ec8cd ChangeLog 7681
 MD5 6f3337a11ad0aaa0602e5c120248c7ec evms-1.2.1-r1.ebuild 1953
-MD5 1fb28eb388c20345d70a6597d9bbd890 evms-2.3.4-r1.ebuild 2246
-MD5 70a649592947d0d5410e712e2936e704 evms-2.5.2.ebuild 2160
 MD5 eab25fc0bfde7fd3c7fdf3c937fa52f6 metadata.xml 450
+MD5 1fb28eb388c20345d70a6597d9bbd890 evms-2.3.4-r1.ebuild 2246
+MD5 cc073f839a78a15108a784b378e0f741 evms-2.5.2.ebuild 2154
 MD5 cd670e457535a10c1c329aea559f7696 files/digest-evms-1.2.1-r1 63
-MD5 634b1de02d7c1f3df88366c87f655a96 files/digest-evms-2.3.4-r1 63
-MD5 996ea6d43e86cc65954540da80e56061 files/digest-evms-2.5.2 63
 MD5 8f95e61903246ea287b1025913864ad9 files/evms-init 1000
 MD5 bef1ae81a93d9fe33c78e7883409a889 files/evms2-init 379
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCNRlpArHZZzCEUG0RAtYjAJ9Wmme+DfVIXpGiNqO2UuTg5TgJ0gCfVoAV
-2xDxDSePpDdtdmVPXK+V/RI=
-=HZKE
------END PGP SIGNATURE-----
+MD5 634b1de02d7c1f3df88366c87f655a96 files/digest-evms-2.3.4-r1 63
+MD5 996ea6d43e86cc65954540da80e56061 files/digest-evms-2.5.2 63
diff --git a/sys-fs/submount/ChangeLog b/sys-fs/submount/ChangeLog
index d42dba214a5c..1c06a3d4e51f 100644
--- a/sys-fs/submount/ChangeLog
+++ b/sys-fs/submount/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/submount
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/submount/ChangeLog,v 1.15 2005/02/17 19:39:23 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/submount/ChangeLog,v 1.16 2005/03/28 11:48:13 genstef Exp $
+
+  28 Mar 2005; Stefan Schweizer <genstef@gentoo.org> submount-0.9-r2.ebuild:
+  Resolve bug 86650 by setting S in every ebuild stage, also change KV_DIR to
+  KV_OUT_DIR thanks to johnm
 
   17 Feb 2005; Stefan Schweizer <genstef@gentoo.org>
   -submount-0.9-r1.ebuild:
diff --git a/sys-fs/submount/Manifest b/sys-fs/submount/Manifest
index f52b4fe2e6d2..bfe1ad9842fc 100644
--- a/sys-fs/submount/Manifest
+++ b/sys-fs/submount/Manifest
@@ -1,4 +1,4 @@
-MD5 7873d16296afe4c5d5e2f18da6efdbe8 submount-0.9-r2.ebuild 1354
-MD5 c94d4611aca954a11188ec8b3f3e48f2 ChangeLog 2019
+MD5 7127543325cbf86996fedd297eff43fc submount-0.9-r2.ebuild 1427
+MD5 5aaf4acc0c263751d7763cf99a415f9c ChangeLog 2204
 MD5 c3aedbfe00ee1a825a9d5760b4b4271e metadata.xml 316
 MD5 f8a7a9ce45e2bebda73720c85f3307be files/digest-submount-0.9-r2 130
diff --git a/sys-fs/submount/submount-0.9-r2.ebuild b/sys-fs/submount/submount-0.9-r2.ebuild
index 7204afdf6969..913b228310db 100644
--- a/sys-fs/submount/submount-0.9-r2.ebuild
+++ b/sys-fs/submount/submount-0.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/submount/submount-0.9-r2.ebuild,v 1.3 2005/02/17 19:12:12 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/submount/submount-0.9-r2.ebuild,v 1.4 2005/03/28 11:48:13 genstef Exp $
 
 inherit linux-mod
 
@@ -12,10 +12,6 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~alpha ppc ~sparc ~amd64"
 IUSE=""
 
-MODULE_NAMES="subfs(fs:${S}/subfs-${MY_PV})"
-BUILD_PARAMS="KDIR=${KV_DIR}"
-BUILD_TARGETS="default"
-
 pkg_setup() {
 	linux-mod_pkg_setup
 	if kernel_is 2 4
@@ -31,15 +27,20 @@ pkg_setup() {
 
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
+	MODULE_NAMES="subfs(fs:${S}/subfs-${MY_PV})"
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+	BUILD_TARGETS="default"
 }
 
 src_unpack() {
+	S=${WORKDIR}/${MY_P}
 	unpack ${A}
 	cd ${S}
 	convert_to_m ${S}/subfs-${MY_PV}/Makefile
 }
 
 src_compile() {
+	S=${WORKDIR}/${MY_P}
 	cd ${S}/submountd-${MY_PV}
 	econf --sbindir=/sbin || die "econf failed"
 	emake || die "emake failed"
@@ -48,6 +49,7 @@ src_compile() {
 }
 
 src_install() {
+	S=${WORKDIR}/${MY_P}
 	cd ${S}/submountd-${MY_PV}
 	make install DESTDIR=${D} mandir=/usr/share/man || die "make install failed"