Move SMP check from global scope to pkg_setup() (#48352).

4 files changed, 29 insertions, 20 deletions

diff --git a/sys-cluster/mpiexec/ChangeLog b/sys-cluster/mpiexec/ChangeLog
index 111addecc209..e0791fee48ad 100644
--- a/sys-cluster/mpiexec/ChangeLog
+++ b/sys-cluster/mpiexec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/mpiexec
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpiexec/ChangeLog,v 1.3 2004/03/25 13:02:41 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpiexec/ChangeLog,v 1.4 2004/04/19 19:28:14 spyderous Exp $
+
+  19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; mpiexec-0.74-r1.ebuild,
+  mpiexec-0.75.ebuild:
+  Move SMP check from global scope to pkg_setup() (#48352).
 
 *mpiexec-0.74-r1 (25 Mar 2004)
 
diff --git a/sys-cluster/mpiexec/Manifest b/sys-cluster/mpiexec/Manifest
index 05b91b685e7e..42abe948d7f2 100644
--- a/sys-cluster/mpiexec/Manifest
+++ b/sys-cluster/mpiexec/Manifest
@@ -1,6 +1,6 @@
+MD5 c3b1aef623ff1ba078d6abce436317cd ChangeLog 863
 MD5 e93126d617085052ec7688390d150fbe metadata.xml 205
-MD5 8a1ae6890bc148aba1dae6a83888034e mpiexec-0.75.ebuild 1376
-MD5 8b47b8aa7ec5fe265992ed5dbbcb21d5 mpiexec-0.74-r1.ebuild 1379
-MD5 ebfd86075432f078c26da658c1b35053 ChangeLog 698
+MD5 faf5476cf91a19702049c42e8bc8bc08 mpiexec-0.75.ebuild 1401
+MD5 4106bbc33c6831e73425ee41204928f3 mpiexec-0.74-r1.ebuild 1405
 MD5 198cb9770776b7a212c6c89bcf266e60 files/digest-mpiexec-0.74-r1 61
 MD5 88ea7f9716c435f83937243bca1b32d8 files/digest-mpiexec-0.75 61
diff --git a/sys-cluster/mpiexec/mpiexec-0.74-r1.ebuild b/sys-cluster/mpiexec/mpiexec-0.74-r1.ebuild
index b2cc7730a5be..844fe0fb0749 100644
--- a/sys-cluster/mpiexec/mpiexec-0.74-r1.ebuild
+++ b/sys-cluster/mpiexec/mpiexec-0.74-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpiexec/mpiexec-0.74-r1.ebuild,v 1.1 2004/03/25 13:02:41 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpiexec/mpiexec-0.74-r1.ebuild,v 1.2 2004/04/19 19:28:14 spyderous Exp $
 
 #S=${WORKDIR}/mpiexec-${PV}
 DESCRIPTION="replacement for mpirun, integrates MPI with PBS."
@@ -10,6 +10,7 @@ IUSE=""
 
 DEPEND="virtual/glibc
 	sys-cluster/openpbs
+
 	sys-cluster/mpich"
 RDEPEND="net-misc/openssh"
 
@@ -17,13 +18,15 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
-# Do we have a SMP enabled kernel?
-if [ ! -z "`uname -v | grep SMP`" ]
-then
-	export SMP=1
-else
-	export SMP=0
-fi
+pkg_setup() {
+	# Do we have a SMP enabled kernel?
+	if [ ! -z "`uname -v | grep SMP`" ]
+	then
+		export SMP=1
+	else
+		export SMP=0
+	fi
+}
 
 src_compile() {
 	#for SMP machines, disable the use of mpich/p4 shared memory
diff --git a/sys-cluster/mpiexec/mpiexec-0.75.ebuild b/sys-cluster/mpiexec/mpiexec-0.75.ebuild
index c15f73e7f145..f90370e4e7f2 100644
--- a/sys-cluster/mpiexec/mpiexec-0.75.ebuild
+++ b/sys-cluster/mpiexec/mpiexec-0.75.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpiexec/mpiexec-0.75.ebuild,v 1.1 2004/03/25 13:02:41 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpiexec/mpiexec-0.75.ebuild,v 1.2 2004/04/19 19:28:14 spyderous Exp $
 
 #S=${WORKDIR}/mpiexec-${PV}
 DESCRIPTION="replacement for mpirun, integrates MPI with PBS."
@@ -17,13 +17,15 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
-# Do we have a SMP enabled kernel?
-if [ ! -z "`uname -v | grep SMP`" ]
-then
-	export SMP=1
-else
-	export SMP=0
-fi
+pkg_setup() {
+	# Do we have a SMP enabled kernel?
+	if [ ! -z "`uname -v | grep SMP`" ]
+	then
+		export SMP=1
+	else
+		export SMP=0
+	fi
+}
 
 src_compile() {
 	#for SMP machines, disable the use of mpich/p4 shared memory