1 |
abcd 10/05/02 23:14:10 |
2 |
|
3 |
Modified: ChangeLog lam-mpi-7.1.4-r1.ebuild |
4 |
Log: |
5 |
Bump to EAPI-3, add prefix support & keywords |
6 |
(Portage version: v2.2_rc67-82-g87d689d/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.83 sys-cluster/lam-mpi/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/ChangeLog?rev=1.83&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/ChangeLog?rev=1.83&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/ChangeLog?r1=1.82&r2=1.83 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v |
18 |
retrieving revision 1.82 |
19 |
retrieving revision 1.83 |
20 |
diff -u -r1.82 -r1.83 |
21 |
--- ChangeLog 6 Dec 2009 03:50:14 -0000 1.82 |
22 |
+++ ChangeLog 2 May 2010 23:14:10 -0000 1.83 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for sys-cluster/lam-mpi |
25 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.82 2009/12/06 03:50:14 jsbronder Exp $ |
27 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.83 2010/05/02 23:14:10 abcd Exp $ |
29 |
+ |
30 |
+ 02 May 2010; Jonathan Callen <abcd@g.o> lam-mpi-7.1.4-r1.ebuild: |
31 |
+ Bump to EAPI-3, add prefix support & keywords |
32 |
|
33 |
06 Dec 2009; Justin Bronder <jsbronder@g.o> |
34 |
lam-mpi-7.1.4-r1.ebuild: |
35 |
|
36 |
|
37 |
|
38 |
1.12 sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild?rev=1.12&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild?rev=1.12&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild?r1=1.11&r2=1.12 |
43 |
|
44 |
Index: lam-mpi-7.1.4-r1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild,v |
47 |
retrieving revision 1.11 |
48 |
retrieving revision 1.12 |
49 |
diff -u -r1.11 -r1.12 |
50 |
--- lam-mpi-7.1.4-r1.ebuild 6 Dec 2009 03:50:14 -0000 1.11 |
51 |
+++ lam-mpi-7.1.4-r1.ebuild 2 May 2010 23:14:10 -0000 1.12 |
52 |
@@ -1,6 +1,8 @@ |
53 |
-# Copyright 1999-2009 Gentoo Foundation |
54 |
+# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild,v 1.11 2009/12/06 03:50:14 jsbronder Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild,v 1.12 2010/05/02 23:14:10 abcd Exp $ |
58 |
+ |
59 |
+EAPI="3" |
60 |
|
61 |
inherit autotools eutils fortran flag-o-matic multilib portability |
62 |
|
63 |
@@ -23,20 +25,16 @@ |
64 |
!crypt? ( net-misc/netkit-rsh )" |
65 |
|
66 |
SLOT="6" |
67 |
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86" |
68 |
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" |
69 |
LICENSE="lam-mpi" |
70 |
|
71 |
-src_unpack() { |
72 |
- unpack ${A} |
73 |
- |
74 |
- cd "${S}"/romio/util/ |
75 |
- sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${D}/usr/share/doc/${PF}\"|" romioinstall.in |
76 |
+src_prepare() { |
77 |
+ sed -i "s|docdir=\"\$datadir/lam/doc\"|docdir=\"${ED}/usr/share/doc/${PF}\"|" romio/util/romioinstall.in |
78 |
|
79 |
- for i in "${S}"/share/memory/{ptmalloc,ptmalloc2,darwin7}/Makefile.in; do |
80 |
- sed -i -e 's@^\(docdir = \)\$(datadir)/lam/doc@\1'/usr/share/doc/${PF}'@' ${i} |
81 |
+ for i in share/memory/{ptmalloc,ptmalloc2,darwin7}/Makefile.in; do |
82 |
+ sed -i -e 's@^\(docdir = \)\$(datadir)/lam/doc@\1'"${EPREFIX}"/usr/share/doc/${PF}'@' ${i} |
83 |
done |
84 |
|
85 |
- cd "${S}" |
86 |
epatch "${FILESDIR}"/7.1.2-lam_prog_f77.m4.patch |
87 |
epatch "${FILESDIR}"/7.1.2-liblam-use-extra-libs.patch |
88 |
epatch "${FILESDIR}"/7.1.4-as-needed.patch |
89 |
@@ -77,7 +75,7 @@ |
90 |
# fortran_pkg_setup should -not- be run here. |
91 |
} |
92 |
|
93 |
-src_compile() { |
94 |
+src_configure() { |
95 |
local myconf |
96 |
|
97 |
if use crypt; then |
98 |
@@ -104,24 +102,21 @@ |
99 |
fortran_pkg_setup |
100 |
# this is NOT in pkg_setup as it is NOT needed for RDEPEND right away it |
101 |
# can be installed after merging from binary, and still have things fine |
102 |
- myconf="${myconf} --with-fc=${FORTRANC}" |
103 |
- else |
104 |
- myconf="${myconf} --without-fc" |
105 |
fi |
106 |
|
107 |
# Disable totalview, see #245439 and #276194 |
108 |
econf \ |
109 |
- --with-ltdl-include=/usr/include \ |
110 |
- --with-ltdl-lib=/usr/$(get_libdir) \ |
111 |
+ --with-ltdl-include="${EPREFIX}"/usr/include \ |
112 |
+ --with-ltdl-lib="${EPREFIX}"/usr/$(get_libdir) \ |
113 |
--disable-ltdl-install \ |
114 |
$(use_with xmpi trillium) \ |
115 |
- --sysconfdir=/etc/lam-mpi \ |
116 |
+ --sysconfdir="${EPREFIX}"/etc/lam-mpi \ |
117 |
--enable-shared \ |
118 |
--with-threads=posix \ |
119 |
--disable-tv \ |
120 |
$(use_with romio) \ |
121 |
- ${myconf} || die "econf failed." |
122 |
- emake || die "emake failed." |
123 |
+ $(use_with fortran fc "${FORTRANC}") \ |
124 |
+ ${myconf} |
125 |
} |
126 |
|
127 |
src_install () { |
128 |
@@ -130,8 +125,8 @@ |
129 |
# With USE=xmpi /usr/bin/sweep is installed. However it's just |
130 |
# a bash script to call bfctl -R and it causes file collisions |
131 |
# with media-sound/sweep. Hence, we remove it, see man bfcfl. |
132 |
- if [ -f "${D}"/usr/bin/sweep ]; then |
133 |
- rm -f "${D}"/usr/bin/sweep || die |
134 |
+ if [ -f "${ED}"/usr/bin/sweep ]; then |
135 |
+ rm -f "${ED}"/usr/bin/sweep || die |
136 |
fi |
137 |
|
138 |
# There are a bunch more tex docs we could make and install too, |
139 |
@@ -142,8 +137,8 @@ |
140 |
# With USE=xmpi /usr/bin/sweep is installed. However it's just |
141 |
# a bash script to call bfctl -R and it causes file collisions |
142 |
# with media-sound/sweep. Hence, we remove it, see man bfcfl. |
143 |
- if [ -f "${D}"/usr/bin/sweep ]; then |
144 |
- rm -f "${D}"/usr/bin/sweep || die |
145 |
+ if [ -f "${ED}"/usr/bin/sweep ]; then |
146 |
+ rm -f "${ED}"/usr/bin/sweep || die |
147 |
fi |
148 |
|
149 |
if use examples; then |
150 |
@@ -151,7 +146,7 @@ |
151 |
dodir /usr/share/${P}/examples |
152 |
find -name README -or -iregex '.*\.[chf][c]?$' >"${T}"/testlist |
153 |
while read p; do |
154 |
- treecopy $p "${D}"/usr/share/${P}/examples ; |
155 |
+ treecopy $p "${ED}"/usr/share/${P}/examples ; |
156 |
done < "${T}"/testlist |
157 |
fi |
158 |
} |