Look in /usr/$(get_libdir)/pbs/lib instead of /usr/lib/pbs.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 24 insertions, 20 deletions

diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog
index 031042833275..0c05d0a94b69 100644
--- a/sys-cluster/lam-mpi/ChangeLog
+++ b/sys-cluster/lam-mpi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/lam-mpi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.45 2006/09/25 08:24:22 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.46 2006/09/25 08:25:59 dberkholz Exp $
+
+  25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  lam-mpi-7.1.1-r3.ebuild, lam-mpi-7.1.2.ebuild:
+  Look in /usr/$(get_libdir)/pbs/lib instead of /usr/lib/pbs.
 
   25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; lam-mpi-7.1.2.ebuild:
   (#119480) Add USE=xmpi to build support for the external XMPI GUI utility.
diff --git a/sys-cluster/lam-mpi/Manifest b/sys-cluster/lam-mpi/Manifest
index ad322cd581ae..f10e2efb94c2 100644
--- a/sys-cluster/lam-mpi/Manifest
+++ b/sys-cluster/lam-mpi/Manifest
@@ -23,22 +23,22 @@ EBUILD lam-mpi-7.0.6.ebuild 1616 RMD160 bc379ddf52b8d80389fdb7a14c8bc7de836b0324
 MD5 861dcc1aa59b0e097079f547c7fe6b88 lam-mpi-7.0.6.ebuild 1616
 RMD160 bc379ddf52b8d80389fdb7a14c8bc7de836b0324 lam-mpi-7.0.6.ebuild 1616
 SHA256 7faba34cc10357a04bae3307c35b721b34bb682575ab448fa1d5125df6234fa2 lam-mpi-7.0.6.ebuild 1616
-EBUILD lam-mpi-7.1.1-r3.ebuild 2593 RMD160 611f25bfeffaacb19efee479950eca84cecf78c2 SHA1 5501a64fb8f4c1bab17197cf65e228634e5a1482 SHA256 3b7aaf3a5db9b334b893aa0dda6042614e096fd9a01d234a5edfe9790cd58087
-MD5 2e517695db5f7c5e7eeffe2aae8d447a lam-mpi-7.1.1-r3.ebuild 2593
-RMD160 611f25bfeffaacb19efee479950eca84cecf78c2 lam-mpi-7.1.1-r3.ebuild 2593
-SHA256 3b7aaf3a5db9b334b893aa0dda6042614e096fd9a01d234a5edfe9790cd58087 lam-mpi-7.1.1-r3.ebuild 2593
-EBUILD lam-mpi-7.1.2.ebuild 2570 RMD160 817b5e788b5985b9962b3e25a85ec517547a6d4f SHA1 5f95580f5900074cc6783259e148a19abd9e537d SHA256 e06d8984c025ffda0fb5f4f76edd6579100ee4ca9af3038ade3f48ab88102fbb
-MD5 ae7e88034e69d759a71e2bbd93f025de lam-mpi-7.1.2.ebuild 2570
-RMD160 817b5e788b5985b9962b3e25a85ec517547a6d4f lam-mpi-7.1.2.ebuild 2570
-SHA256 e06d8984c025ffda0fb5f4f76edd6579100ee4ca9af3038ade3f48ab88102fbb lam-mpi-7.1.2.ebuild 2570
+EBUILD lam-mpi-7.1.1-r3.ebuild 2618 RMD160 9abe548a713007cdbc6fea19c5ed8a43be6a1097 SHA1 9a801558910689dfc72ae869fbcdfd3fe941e063 SHA256 69c8efdfa81d8902eddcdc36ea46b860b6c35c2e9ce2ca05425658bdbb17df98
+MD5 29b6090d40bea091a494c79b014a6575 lam-mpi-7.1.1-r3.ebuild 2618
+RMD160 9abe548a713007cdbc6fea19c5ed8a43be6a1097 lam-mpi-7.1.1-r3.ebuild 2618
+SHA256 69c8efdfa81d8902eddcdc36ea46b860b6c35c2e9ce2ca05425658bdbb17df98 lam-mpi-7.1.1-r3.ebuild 2618
+EBUILD lam-mpi-7.1.2.ebuild 2593 RMD160 d6f5dae8a10f107c93f6b0f2e078e04c1667fecb SHA1 7d5a74ccc13009198d17fc3ec48b148fd89420ac SHA256 cbf8b5c663121e8e6ea83fc5431c298569161be283b62654e2b11587968e2572
+MD5 5ceb2a55213dccd6fa44ad461603ed42 lam-mpi-7.1.2.ebuild 2593
+RMD160 d6f5dae8a10f107c93f6b0f2e078e04c1667fecb lam-mpi-7.1.2.ebuild 2593
+SHA256 cbf8b5c663121e8e6ea83fc5431c298569161be283b62654e2b11587968e2572 lam-mpi-7.1.2.ebuild 2593
 EBUILD lam-mpi-7.1.ebuild 1619 RMD160 f3e62e4f0bf56cdb8962d8b00a518b03738601fc SHA1 a7b2c0a51866037088cd5715ae3ccc7a319460eb SHA256 8fb56c19d15f4cb2b477d8062a38eba0f3548deda7bfc321b85c70e7c4246c4c
 MD5 ae841b28d60b0120213eb738f4a05c73 lam-mpi-7.1.ebuild 1619
 RMD160 f3e62e4f0bf56cdb8962d8b00a518b03738601fc lam-mpi-7.1.ebuild 1619
 SHA256 8fb56c19d15f4cb2b477d8062a38eba0f3548deda7bfc321b85c70e7c4246c4c lam-mpi-7.1.ebuild 1619
-MISC ChangeLog 8361 RMD160 7949e7e1475b6ca76a6c6bef5cfea608ce2d8a47 SHA1 677aba9c849d62fe5ae0a2d58b5ca35ca36cda4e SHA256 4a5ec3994e3b7a5a0d91aede511d999afbf095d36f620614f265697230812e30
-MD5 e0287dfe6bfd48f34a3d069caada7107 ChangeLog 8361
-RMD160 7949e7e1475b6ca76a6c6bef5cfea608ce2d8a47 ChangeLog 8361
-SHA256 4a5ec3994e3b7a5a0d91aede511d999afbf095d36f620614f265697230812e30 ChangeLog 8361
+MISC ChangeLog 8528 RMD160 497e89ddc60a1a75a6ad25918ebf6515b1f2d96d SHA1 65aec5468576f7afb3c85b7dd1ab8f9efb02b791 SHA256 a8f2ec7057506125523a65d6744ab301829d87f8cc0c2f243b36614e329807b8
+MD5 1cbe41f3f5e5fc6e33c4baac4cbe2097 ChangeLog 8528
+RMD160 497e89ddc60a1a75a6ad25918ebf6515b1f2d96d ChangeLog 8528
+SHA256 a8f2ec7057506125523a65d6744ab301829d87f8cc0c2f243b36614e329807b8 ChangeLog 8528
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 metadata.xml 160
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild
index 377f6eb791f7..1f8ebecf7c1b 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild,v 1.2 2005/10/03 20:03:44 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.1-r3.ebuild,v 1.3 2006/09/25 08:25:59 dberkholz Exp $
 
-inherit fortran flag-o-matic portability
+inherit fortran flag-o-matic multilib portability
 
 # LAM is a PITA with PBS. If it's detected, there is NO way to turn it off!
 # Likewise for the other SSI boot modules (globus/slurm/tm are affected)
@@ -55,7 +55,7 @@ src_compile() {
 		myconf="${myconf} --with-rsh=rsh"
 	fi
 
-	use pbs && append-ldflags -L/usr/lib/pbs
+	use pbs && append-ldflags -L/usr/$(get_libdir)/pbs/lib
 
 	if use fortran; then
 		fortran_pkg_setup
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild
index 8cd042036c4c..956a15dda7d3 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild,v 1.2 2006/09/25 08:24:22 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.2.ebuild,v 1.3 2006/09/25 08:25:59 dberkholz Exp $
 
-inherit autotools eutils fortran flag-o-matic portability
+inherit autotools eutils fortran flag-o-matic multilib portability
 
 # LAM is a PITA with PBS. If it's detected, there is NO way to turn it off!
 # Likewise for the other SSI boot modules (globus/slurm/tm are affected)
@@ -58,7 +58,7 @@ src_compile() {
 		myconf="${myconf} --with-rsh=rsh"
 	fi
 
-	use pbs && append-ldflags -L/usr/lib/pbs
+	use pbs && append-ldflags -L/usr/$(get_libdir)/pbs/lib
 
 	if use fortran; then
 		fortran_pkg_setup