Gentoo Archives: gentoo-commits

From: Sebastien Fabbro <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/bicatali:master commit in: sci-libs/mpiblacs/, sci-libs/atlas/, sci-libs/acml/, sci-libs/gsl/, ...
Date: Wed, 23 Feb 2011 05:40:30
Message-Id: dc82c3f21686411ba0b3620b123fc169283984b8.bicatali@gentoo
1 commit: dc82c3f21686411ba0b3620b123fc169283984b8
2 Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 23 05:32:35 2011 +0000
4 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 23 05:32:35 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=dc82c3f2
7
8 massive switch to alternatives-2
9
10 ---
11 sci-libs/acml/Manifest | 4 +-
12 sci-libs/acml/acml-4.4.0.ebuild | 36 ++++-----
13 sci-libs/atlas/Manifest | 6 +-
14 sci-libs/atlas/atlas-3.8.3.ebuild | 20 ++---
15 sci-libs/atlas/atlas-3.9.37.ebuild | 20 ++---
16 sci-libs/blas-reference/ChangeLog | 6 +-
17 sci-libs/blas-reference/Manifest | 4 +-
18 .../blas-reference/blas-reference-3.3.0.ebuild | 15 ++--
19 sci-libs/cblas-reference/ChangeLog | 6 +-
20 sci-libs/cblas-reference/Manifest | 6 +-
21 .../cblas-reference-20110218.ebuild | 86 ++++++++++++++++----
22 sci-libs/gotoblas2/ChangeLog | 5 +-
23 sci-libs/gotoblas2/Manifest | 6 +-
24 sci-libs/gotoblas2/gotoblas2-1.13.ebuild | 29 +++----
25 sci-libs/gsl/ChangeLog | 5 +-
26 sci-libs/gsl/Manifest | 4 +-
27 sci-libs/gsl/gsl-1.14-r2.ebuild | 25 +++---
28 sci-libs/ipp/ChangeLog | 5 +-
29 sci-libs/ipp/Manifest | 10 +-
30 sci-libs/ipp/ipp-7.0.2.137.ebuild | 6 +-
31 sci-libs/lapack-reference/ChangeLog | 8 ++-
32 sci-libs/lapack-reference/Manifest | 4 +-
33 .../lapack-reference/lapack-reference-3.3.0.ebuild | 10 +--
34 sci-libs/lapacke-reference/ChangeLog | 8 ++-
35 sci-libs/lapacke-reference/Manifest | 4 +-
36 .../lapacke-reference-1.0.0.009.ebuild | 16 ++--
37 sci-libs/mkl/ChangeLog | 5 +-
38 sci-libs/mkl/Manifest | 10 +-
39 sci-libs/mkl/mkl-10.3.2.137.ebuild | 26 ++----
40 sci-libs/mpiblacs/ChangeLog | 5 +-
41 sci-libs/mpiblacs/Manifest | 4 +-
42 sci-libs/mpiblacs/mpiblacs-1.1.ebuild | 12 +--
43 sci-libs/scalapack/ChangeLog | 5 +-
44 sci-libs/scalapack/Manifest | 4 +-
45 sci-libs/scalapack/scalapack-1.8.0.ebuild | 11 +--
46 35 files changed, 246 insertions(+), 190 deletions(-)
47
48 diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
49 index 86e366e..49ce50d 100644
50 --- a/sci-libs/acml/Manifest
51 +++ b/sci-libs/acml/Manifest
52 @@ -12,6 +12,6 @@ DIST acml-4-4-0-open64-64bit.tgz 42812747 RMD160 aa29a615cf2b3294294162ccb89e9ad
53 DIST acml-4-4-0-pgi-32bit.tgz 24562671 RMD160 78677d7f178e725ebe086d9690c8ee72026929ba SHA1 cc0ceff8e8f5cb4a15175e2256c8708a8a7d2fb6 SHA256 f956b3fdd3e825c4b993a16179a8df2f772eda851aa4dd7f4a16fffb20c10580
54 DIST acml-4-4-0-pgi-64bit-int64.tgz 78664596 RMD160 2a0e9af1eef74009dce2a256d4da8382baf39133 SHA1 6648385c614d367bd18e29eb60be3f99df07ae1e SHA256 f1290edb9c5a91b667139ae4e8eec2486e7ccd3f2aa19f7f65667eef0d85eca0
55 DIST acml-4-4-0-pgi-64bit.tgz 77842523 RMD160 e4c6770837f9eb511999872d280715e6827b5f65 SHA1 2087b20359d72b2e7886b12356d4da0d2d563503 SHA256 9c07dc0b90e9e491a0ddcf7849690338f21011aa4aa197ff3408f32a0b3fd6cf
56 -EBUILD acml-4.4.0.ebuild 3804 RMD160 dc00b5b3d4c1e4f127e7f32818980edfa9b1f308 SHA1 0c612267c05ed2e6d9a0cddc14d3c03b364f1260 SHA256 71337f132876f73bed71a937b12b36197569e6dd24d96aabd562fcbff476a9d0
57 -MISC ChangeLog 8246 RMD160 752819660123f7c4041f196257620abc8b569e68 SHA1 0bc41c84f1297c10b36106df3532cec3de48c294 SHA256 d43e9f2c191e4ffd3ae6491b68ba42ca84512e6a2d0cb60e51cc686b7e0b7d86
58 +EBUILD acml-4.4.0.ebuild 3518 RMD160 d8fd9e54163b7cd017d3d5f57eed8eb058135b46 SHA1 7fa4bf6cd5262f72ecde49f18198ee3440529ae8 SHA256 73ec1e91299543c17b12411f9b5467fafc593f1e9bf0c094bb94a5581fb98928
59 +MISC ChangeLog 8360 RMD160 9ba66449beb8a1e69a85350af6aa19f0b6a75282 SHA1 3f9a99bd9338d885b78be8d6fa7dc571c45705f0 SHA256 0c5e6390e9db8d9564078133f3b4d49300782dff4f1c474f420a61213dc78b9d
60 MISC metadata.xml 1346 RMD160 df635430c989552278e7e2d262fbb32ffd11f99e SHA1 e1432a7d071c4f1ae567c7d0fe6708e46ceac4df SHA256 5e41050f4380164e761f836c29c818176cf23d239dc1e5aa29e4702cbbe85042
61
62 diff --git a/sci-libs/acml/acml-4.4.0.ebuild b/sci-libs/acml/acml-4.4.0.ebuild
63 index e2f86e8..e48694d 100644
64 --- a/sci-libs/acml/acml-4.4.0.ebuild
65 +++ b/sci-libs/acml/acml-4.4.0.ebuild
66 @@ -1,15 +1,13 @@
67 -# Copyright 1999-2010 Gentoo Foundation
68 +# Copyright 1999-2011 Gentoo Foundation
69 # Distributed under the terms of the GNU General Public License v2
70 # $Header: $
71
72 EAPI="3"
73
74 -inherit eutils multilib toolchain-funcs versionator alternatives
75 +inherit eutils multilib toolchain-funcs versionator alternatives-2
76
77 -QA_TEXTRELS_amd64="opt/${PN}${PV}/*/lib/*"
78 -QA_EXECSTACK_amd64="opt/${PN}${PV}/*/lib/*"
79 -QA_TEXTRELS_x86="opt/${PN}${PV}/*32*/lib/*"
80 -QA_EXECSTACK_x86="opt/${PN}${PV}/*32*/lib/*"
81 +ACML_INST_DIR="opt/${PN}${PV}"
82 +QA_PREBUILT="${ACML_INST_DIR}/*/lib/*"
83
84 MYP=${PN}-$(replace_all_version_separators -)
85
86 @@ -39,14 +37,11 @@ KEYWORDS="-* ~amd64 ~x86"
87 IUSE="doc examples int64 multilib static-libs test gfortran ifort nag open64 pgi"
88 RESTRICT="strip mirror"
89
90 -DEPEND="app-admin/eselect-blas
91 - app-admin/eselect-lapack"
92 +DEPEND=""
93 RDEPEND=""
94
95 S="${WORKDIR}"
96
97 -ACML_INST_DIR="/opt/${PN}${PV}"
98 -
99 src_unpack() {
100 unpack ${A}
101 unpack ./contents-acml-*.tgz
102 @@ -74,7 +69,7 @@ src_install() {
103 local fdir=${lib%/*}
104 use examples || rm -rf ${fdir}/examples
105 use static-libs || rm -f ${fdir}/lib/*.a
106 - insinto ${ACML_INST_DIR}
107 + insinto /${ACML_INST_DIR}
108 doins -r ${fdir} || die "install ${fdir} failed"
109 local acml_libs=
110 for alib in ${fdir}/lib/*.so; do
111 @@ -99,22 +94,21 @@ src_install() {
112 insinto /usr/${libdir}/pkgconfig
113 doins ${PN}-${fdir}.pc
114 for x in blas lapack; do
115 - echo > eselect.${x}.${PN}-${fdir} \
116 - "${PN}-${fdir}.pc ${EPREFIX}/usr/${libdir}/pkgconfig/${x}.pc"
117 - echo >> eselect.${x}.${PN}-${fdir} \
118 - "${fdir}/lib ${EPREFIX}/${ACML_INST_DIR}/${libdir}"
119 - eselect ${x} add ${libdir} eselect.${x}.${PN}-${fdir} ${PN}-${fdir}
120 + alternatives_for ${x} ${PN}-${fdir} 0 \
121 + "/usr/${libdir}/pkgconfig/${x}.pc" "${PN}-${fdir}.pc" \
122 + "/${ACML_INST_DIR}/${libdir}" "${fdir}/lib"
123 done
124 done
125 - echo > 35acml "LDPATH=${EPREFIX}/${ACML_INST_DIR}/$(get_libdir)"
126 - dosym ${fdef}/lib ${ACML_INST_DIR}/$(get_libdir)
127 + echo -n > 35acml "LDPATH=${EPREFIX}/${ACML_INST_DIR}/$(get_libdir)"
128 + dosym ${fdef}/lib /${ACML_INST_DIR}/$(get_libdir)
129 if use multilib; then
130 - dosym ${fdef/64/32}/lib ${ACML_INST_DIR}/lib32
131 - echo >> 35acml "LDPATH=${EPREFIX}/${ACML_INST_DIR}/lib32"
132 + dosym ${fdef/64/32}/lib /${ACML_INST_DIR}/lib32
133 + echo -n >> 35acml ":${EPREFIX}/${ACML_INST_DIR}/lib32"
134 fi
135 + echo >> 35acml
136 doenvd 35acml || die
137
138 - insinto ${ACML_INST_DIR}
139 + insinto /${ACML_INST_DIR}
140 doins ReleaseNotes*
141 # info files go to standard /usr/share/info to avoid more env variables
142 doinfo Doc/*info* || die "info install failed"
143
144 diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
145 index e8c829e..f88ae73 100644
146 --- a/sci-libs/atlas/Manifest
147 +++ b/sci-libs/atlas/Manifest
148 @@ -1,7 +1,7 @@
149 DIST atlas3.8.3.tar.bz2 2527756 RMD160 0425e630d9d0c5b7aae81427a41b7eaa18447e90 SHA1 c7546210df4796457d9e96a00444adc4c0f2e77f SHA256 e537168f2022db98b9029c8064815b5581620c12d782016138b1bf0bbb01f473
150 -DIST atlas3.9.32.tar.bz2 5079409 RMD160 a6f7dbd1ee13c9b3e3b4e9e28b706d037f19fe99 SHA1 77a448ebe779745ee916dcd22922255c7dc340db SHA256 8aa87f1d72802de691d4366c3b579644c2073a2ace81959d6dff6d6717b1c8a9
151 +DIST atlas3.9.37.tar.bz2 5449672 RMD160 87bb689e7a956df74ea4091552ac3cfd30430093 SHA1 71dd254dad1fc9ad3dec123a561706c9a1a5d7d1 SHA256 9f4380dfd5b024a52f5c8419d487c85b1c160eb06ac702a3c52350ef18e29cff
152 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
153 -EBUILD atlas-3.8.3.ebuild 6114 RMD160 9418ed1ff693a46614aa1b80d79279ac9f84ccd7 SHA1 66c8d633124db4cb9521851fe9105d14639e38c0 SHA256 c80cb45fd453852dc40bacde75fa871960fbc2e62c9b768f01e101280133e5fe
154 -EBUILD atlas-3.9.32.ebuild 6004 RMD160 31aa15493f190c89ddf20b3f549cec9d83c8d76b SHA1 909619f74a5461de568f03068bc7eb929617c0a2 SHA256 b20ecb7f59cb5a3e879b98ed95f69a94d0aaa3aa92b7ad0d70736cfe9bf31619
155 +EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
156 +EBUILD atlas-3.9.37.ebuild 5910 RMD160 19b1474617f773c18046062ab52d2b41dcdbc8a0 SHA1 f2526da1e7c19c27d7f43177c4e81033e497842a SHA256 61f22142e56bad5c2a10775dd7432efc1cecfbefe8bc2220b35a569940b5b529
157 MISC ChangeLog 431 RMD160 5029ae5bb2dbcffadeb2485dc2d661e16c4bb7c8 SHA1 48b805b587c2d16f4994ab0a94f1199c9ca74528 SHA256 27c95c5cd6c008e15c7e0dae1b3c6acee327c2b17de8646cee33d3efd66331bc
158 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd
159
160 diff --git a/sci-libs/atlas/atlas-3.8.3.ebuild b/sci-libs/atlas/atlas-3.8.3.ebuild
161 index c36196a..047a6d5 100644
162 --- a/sci-libs/atlas/atlas-3.8.3.ebuild
163 +++ b/sci-libs/atlas/atlas-3.8.3.ebuild
164 @@ -1,9 +1,9 @@
165 -# Copyright 1999-2010 Gentoo Foundation
166 +# Copyright 1999-2011 Gentoo Foundation
167 # Distributed under the terms of the GNU General Public License v2
168 # $Header: $
169
170 EAPI=3
171 -inherit eutils toolchain-funcs multilib
172 +inherit eutils toolchain-funcs multilib alternatives-2
173
174 LAPACKP=lapack-3.3.0
175
176 @@ -18,10 +18,7 @@ KEYWORDS="~amd64 ~x86"
177 IUSE="fortran doc lapack static-libs xblas"
178
179 RDEPEND="lapack? ( xblas? ( sci-libs/xblas ) )"
180 -DEPEND="${RDEPEND}
181 - app-admin/eselect-cblas
182 - fortran? ( app-admin/eselect-blas
183 - lapack? ( app-admin/eselect-lapack ) )"
184 +DEPEND="${RDEPEND}"
185
186 S="${WORKDIR}/ATLAS"
187
188 @@ -184,13 +181,14 @@ atlas_install() {
189 EOF
190 insinto /usr/$(get_libdir)/pkgconfig
191 doins ${prof}.pc || die
192 - echo > eselect.${iname}.${prof} \
193 - "${prof}.pc ${EPREFIX}/usr/$(get_libdir)/pkgconfig/${iname}.pc"
194 if [[ ${iname} == cblas ]]; then
195 - echo >> eselect.${iname}.${prof} \
196 - "${PN}/cblas.h ${EPREFIX}/usr/include/cblas.h"
197 + alternatives_for ${iname} ${prof} 0 \
198 + "/usr/$(get_libdir)/pkgconfig/${iname}.pc" "${prof}.pc" \
199 + "/usr/include/cblas.h" "${PN}/cblas.h"
200 + else
201 + alternatives_for ${iname} ${prof} 0 \
202 + "/usr/$(get_libdir)/pkgconfig/${iname}.pc" "${prof}.pc"
203 fi
204 - eselect ${iname} add $(get_libdir) eselect.${iname}.${prof} ${prof}
205 }
206
207 src_install() {
208
209 diff --git a/sci-libs/atlas/atlas-3.9.37.ebuild b/sci-libs/atlas/atlas-3.9.37.ebuild
210 index 07f97ce..861c26b 100644
211 --- a/sci-libs/atlas/atlas-3.9.37.ebuild
212 +++ b/sci-libs/atlas/atlas-3.9.37.ebuild
213 @@ -1,9 +1,9 @@
214 -# Copyright 1999-2010 Gentoo Foundation
215 +# Copyright 1999-2011 Gentoo Foundation
216 # Distributed under the terms of the GNU General Public License v2
217 # $Header: $
218
219 EAPI=3
220 -inherit eutils toolchain-funcs multilib versionator
221 +inherit eutils toolchain-funcs multilib versionator alternatives-2
222
223 LAPACKP=lapack-3.3.0
224
225 @@ -18,10 +18,7 @@ KEYWORDS="~amd64 ~x86"
226 IUSE="fortran doc lapack openmp static-libs"
227
228 RDEPEND=""
229 -DEPEND="${RDEPEND}
230 - app-admin/eselect-cblas
231 - fortran? ( app-admin/eselect-blas
232 - lapack? ( app-admin/eselect-lapack ) )"
233 +DEPEND="${RDEPEND}"
234
235 S="${WORKDIR}/ATLAS"
236
237 @@ -170,13 +167,14 @@ atlas_make_profile() {
238 EOF
239 insinto /usr/$(get_libdir)/pkgconfig
240 doins ${prof}.pc || die
241 - echo > eselect.${name}.${prof} \
242 - "${prof}.pc ${EPREFIX}/usr/$(get_libdir)/pkgconfig/${name}.pc"
243 if [[ ${name} == cblas ]]; then
244 - echo >> eselect.${name}.${prof} \
245 - "${PN}/cblas.h ${EPREFIX}/usr/include/cblas.h"
246 + alternatives_for ${name} ${prof} 0 \
247 + "/usr/$(get_libdir)/pkgconfig/${name}.pc" "${prof}.pc" \
248 + "/usr/include/cblas.h" "${PN}/cblas.h"
249 + else
250 + alternatives_for ${name} ${prof} 0 \
251 + "/usr/$(get_libdir)/pkgconfig/${name}.pc" "${prof}.pc"
252 fi
253 - eselect ${name} add $(get_libdir) eselect.${name}.${prof} ${prof}
254 }
255
256 src_install() {
257
258 diff --git a/sci-libs/blas-reference/ChangeLog b/sci-libs/blas-reference/ChangeLog
259 index 1b4bf9b..23b69a9 100644
260 --- a/sci-libs/blas-reference/ChangeLog
261 +++ b/sci-libs/blas-reference/ChangeLog
262 @@ -1,7 +1,11 @@
263 # ChangeLog for sci-libs/blas-reference
264 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
265 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
266 # $Header: $
267
268 + 23 Feb 2011; Sébastien Fabbro <bicatali@g.o>
269 + blas-reference-3.3.0.ebuild:
270 + Switched to alternatives-2 framework
271 +
272 *blas-reference-3.3.0 (13 Dec 2010)
273
274 13 Dec 2010; Sébastien Fabbro <bicatali@g.o>
275
276 diff --git a/sci-libs/blas-reference/Manifest b/sci-libs/blas-reference/Manifest
277 index 280c7a4..766a7ca 100644
278 --- a/sci-libs/blas-reference/Manifest
279 +++ b/sci-libs/blas-reference/Manifest
280 @@ -1,5 +1,5 @@
281 AUX 3.3.0-cmake-install.patch 4705 RMD160 5fea9c961f434311e4ab2700141153b757bf4477 SHA1 700330197ceea3468a6beb73adf0cb12ee177d69 SHA256 4d32eebc33cf57f9bec72c3651b18a330139abc8a8de4670a594c8f102ffa55f
282 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
283 -EBUILD blas-reference-3.3.0.ebuild 2217 RMD160 785325a2b520862bc501869d7cee0d9199a4aff8 SHA1 e99f6fd2c0281496d163875273cbcd63be7405fc SHA256 9dda8cbd3d09f076ac1294f5546cddb7010528f759b329b89a6ca9e43e1afa07
284 -MISC ChangeLog 349 RMD160 b28f1dd33bf580f342e212a21801e2a4877e9b81 SHA1 3adcfb69626a8ca1cef3d2e2375ba404dcf24080 SHA256 7e2f02618d7038a967f73d221eec8ed1429a1dead1a71938976be238aae44366
285 +EBUILD blas-reference-3.3.0.ebuild 2320 RMD160 5906e9da368bb50eee1cab73818dc493a918b1e8 SHA1 f0cbc2c753f501713ad86096b4fe9b8a7bb0a1f7 SHA256 2fc98d06aa3b224ce6fce287e9b26fc8c20519720947a511a62d6e485146962e
286 +MISC ChangeLog 475 RMD160 c750b7a7e0d17dfcd18fd205f2d7aede13b389ca SHA1 aa00dd4c7d4df7b593ef13b7cbfc64f89777e5c5 SHA256 c10554512e3ef9348c0a7f5f617728a64d27d5ac9510a476c35b5d323e60b5e8
287 MISC metadata.xml 710 RMD160 6aa878cc87922b654b257b0eb206ad396f9f1ada SHA1 d1ff141d6ed81b3d857bb4d0a9a898338b921a70 SHA256 cbca20da50d2838e9d252bfb06fe53f44e24a935d7601b24f7928fd8951e5350
288
289 diff --git a/sci-libs/blas-reference/blas-reference-3.3.0.ebuild b/sci-libs/blas-reference/blas-reference-3.3.0.ebuild
290 index acaf4dc..b917d6e 100644
291 --- a/sci-libs/blas-reference/blas-reference-3.3.0.ebuild
292 +++ b/sci-libs/blas-reference/blas-reference-3.3.0.ebuild
293 @@ -1,9 +1,9 @@
294 -# Copyright 1999-2010 Gentoo Foundation
295 +# Copyright 1999-2011 Gentoo Foundation
296 # Distributed under the terms of the GNU General Public License v2
297 # $Header: $
298
299 EAPI="3"
300 -inherit eutils toolchain-funcs cmake-utils
301 +inherit eutils toolchain-funcs cmake-utils alternatives-2
302
303 MYP=lapack-${PV}
304
305 @@ -18,7 +18,6 @@ IUSE="static-libs test"
306
307 RDEPEND=""
308 DEPEND="${RDEPEND}
309 - app-admin/eselect-blas
310 dev-util/pkgconfig"
311
312 DOCS=( README )
313 @@ -51,7 +50,8 @@ src_configure() {
314 src_compile() {
315 cmake-utils_src_compile -C BLAS
316 if use static-libs; then
317 - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile -C BLAS
318 + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
319 + cmake-utils_src_compile -C BLAS
320 fi
321 }
322
323 @@ -77,13 +77,16 @@ lapack_prof() {
324 "${ED}"/usr/$(get_libdir)/pkgconfig/ref${1}.pc || die
325 echo > eselect.${1}.reference \
326 "ref${1}.pc ${EPREFIX}/usr/$(get_libdir)/pkgconfig/${1}.pc"
327 - eselect ${1} add $(get_libdir) eselect.${1}.reference reference
328 + #eselect ${1} add $(get_libdir) eselect.${1}.reference reference
329 + alternatives_for ${1} reference \
330 + 0 "/usr/$(get_libdir)/pkgconfig/${1}.pc" "ref${1}.pc"
331 }
332
333 src_install() {
334 cmake-utils_src_install -C BLAS
335 if use static-libs; then
336 - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
337 + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
338 + cmake-utils_src_install -C BLAS
339 fi
340 lapack_prof blas
341 }
342
343 diff --git a/sci-libs/cblas-reference/ChangeLog b/sci-libs/cblas-reference/ChangeLog
344 index 12f0eb5..c257f8a 100644
345 --- a/sci-libs/cblas-reference/ChangeLog
346 +++ b/sci-libs/cblas-reference/ChangeLog
347 @@ -1,7 +1,11 @@
348 # ChangeLog for sci-libs/cblas-reference
349 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
350 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
351 # $Header: /var/cvsroot/gentoo-x86/sci-libs/cblas-reference/ChangeLog,v 1.33 2010/03/07 19:14:51 jlec Exp $
352
353 + 23 Feb 2011; Sébastien Fabbro <bicatali@g.o>
354 + cblas-reference-20110218.ebuild:
355 + Switched to alternatives-2 framework
356 +
357 24 Nov 2010; Sébastien Fabbro <bicatali@g.o>
358 cblas-reference-20030223-r6.ebuild,
359 files/cblas-reference-20030223-autotools.patch:
360
361 diff --git a/sci-libs/cblas-reference/Manifest b/sci-libs/cblas-reference/Manifest
362 index 2d1c73d..614ecb2 100644
363 --- a/sci-libs/cblas-reference/Manifest
364 +++ b/sci-libs/cblas-reference/Manifest
365 @@ -1,5 +1,5 @@
366 AUX cblas-reference-20030223-autotools.patch 14229 RMD160 6c94879acfbba988017b10717d206035e34d539a SHA1 09cd85576e0fae230308de1f872cef93327fd821 SHA256 4ed00d94b7121aef553a218d25ac35b07d18fa8f9cc81aa2758cb7ba9d99d2be
367 -DIST cblas-reference-20030223.tgz 197694 RMD160 77bd5111659f55540c72f9fcd9277d97bd1ea33b SHA1 a8a765ebb8d753c7ad161ccd9191be42d3dc8bd9 SHA256 9b49d7177fda62b6141bf2ca29e475e86f0b12d8f72e0b944058d02b439dd52a
368 -EBUILD cblas-reference-20030223-r6.ebuild 1263 RMD160 6bd2d2ecaf63fa54170d2edb5473803607e0bf1e SHA1 26fa6f1d0da23c9575f869a37cb02ace99ab75ed SHA256 339d7fd089867694bab312441b1e89c430d4b305f65f85c7d1ce18384783e76f
369 -MISC ChangeLog 6306 RMD160 3da98bd5995c70f49d3ecb00b1c2bfe64884bda0 SHA1 271edb412c0bd431e46a065b42910dca538b4335 SHA256 65109ce221394103d51297be17ab2be271cd407d2c321ff7c02725deb6433daa
370 +DIST cblas-reference-20110218.tgz 197468 RMD160 ab908605311ad5dfe280c5fb0e6a1e94156b7a04 SHA1 d6970cf52592ef67674a61c78bbd055a4e9d4680 SHA256 0f6354fd67fabd909baf57ced2ef84e962db58fae126e4f41b21dd4fec60a2a3
371 +EBUILD cblas-reference-20110218.ebuild 2448 RMD160 ce6fb20febcb5512c5e735c957fe67db14a27aeb SHA1 253c38d83d461b5d530841b610764eae917961cd SHA256 465d3e925e36a6e610d939e38bdfce9a0d147dfcc8b805e808057dc96cf5b696
372 +MISC ChangeLog 6436 RMD160 e093223d5a45ad6bd0087b2e0377f111dacb04fd SHA1 c0d4f834bd2bb72a62c6e561adfa09eb81c45ded SHA256 9473bdf26734302268059b94e6ab4a7f4d328683124b86548965b33b7661d851
373 MISC metadata.xml 747 RMD160 93e7287d9fb76504fcffa359adca454d42518e33 SHA1 b4fb783c4233b29cf30a9576905d9943f6d6ed0c SHA256 d184bbc83e471aa894863f9350d4c13a096d22c513e2a4de53d9075c5e4d9fa8
374
375 diff --git a/sci-libs/cblas-reference/cblas-reference-20110218.ebuild b/sci-libs/cblas-reference/cblas-reference-20110218.ebuild
376 index a85177d..c4cec54 100644
377 --- a/sci-libs/cblas-reference/cblas-reference-20110218.ebuild
378 +++ b/sci-libs/cblas-reference/cblas-reference-20110218.ebuild
379 @@ -1,10 +1,10 @@
380 -# Copyright 1999-2010 Gentoo Foundation
381 +# Copyright 1999-2011 Gentoo Foundation
382 # Distributed under the terms of the GNU General Public License v2
383 # $Header: $
384
385 EAPI="3"
386
387 -inherit autotools eutils
388 +inherit eutils alternatives-2 flag-o-matic toolchain-funcs
389
390 MYPN="${PN/-reference/}"
391
392 @@ -19,31 +19,83 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-lin
393
394 RDEPEND="virtual/blas"
395 DEPEND="${RDEPEND}
396 - app-admin/eselect-cblas
397 dev-util/pkgconfig"
398
399 S="${WORKDIR}/CBLAS"
400
401 +LIBNAME=refcblas
402 +LIBVERS=3
403 +
404 +make_shared_lib() {
405 + local soname=$(basename "${1%.a}").so.${LIBVERS}
406 + einfo "Making ${soname}"
407 + ${2:-$(tc-getCC)} ${LDFLAGS} \
408 + -shared -Wl,-soname="${soname}" \
409 + -Wl,--whole-archive "${1}" -Wl,--no-whole-archive \
410 + -o $(dirname "${1}")/"${soname}" || return 1
411 +}
412 +
413 src_prepare() {
414 - epatch "${FILESDIR}"/${P}-autotools.patch
415 - eautoreconf
416 + find . -name Makefile -exec sed -i \
417 + -e 's:make:$(MAKE):g' '{}' \;
418 + append-cflags -DADD_
419 + cat > Makefile.in <<-EOF
420 + BLLIB=$(pkg-config --libs blas)
421 + FC=$(tc-getFC)
422 + CBLIB=../lib/lib${LIBNAME}.a
423 + LOADER=\$(FC)
424 + ARCH=$(tc-getAR)
425 + ARCHFLAGS=cr
426 + RANLIB=$(tc-getRANLIB)
427 + EOF
428 }
429
430 -src_configure() {
431 - econf \
432 - --includedir="${EPREFIX}"/usr/include/cblas \
433 - --with-blas="$(pkg-config --libs blas)" \
434 - $(use_enable static-libs static)
435 +src_compile() {
436 + emake \
437 + FFLAGS="${FFLAGS} -fPIC" \
438 + CFLAGS="${CFLAGS} -fPIC" \
439 + CBLIB=../lib/lib${LIBNAME}.a \
440 + alllib || die "shared libs failed"
441 + cd lib
442 + make_shared_lib lib${LIBNAME}.a || die
443 + cd "${S}"
444 + if use static-libs; then
445 + emake clean
446 + emake alllib || die "static libs failed"
447 + fi
448 +}
449 +
450 +src_test() {
451 + cd testing
452 + emake || die "compile test failed"
453 + emake run || die "test failed"
454 }
455
456 src_install() {
457 - emake DESTDIR="${D}" install || die "emake install failed"
458 + dolib.so lib/lib${LIBNAME}.so.${LIBVERS} || die
459 + dosym lib${LIBNAME}.so.${LIBVERS} /usr/$(get_libdir)/lib${LIBNAME}.so
460 + if use static-libs; then
461 + dolib.a lib/lib${LIBNAME}.a || die
462 + fi
463 + cat <<-EOF > ${LIBNAME}.pc
464 + prefix=${EPREFIX}/usr
465 + libdir=\${prefix}/$(get_libdir)
466 + includedir=\${prefix}/include
467 + Name: ${LIBNAME}
468 + Description: ${DESCRIPTION}
469 + Version: ${PV}
470 + URL: ${HOMEPAGE}
471 + Libs: -L\${libdir} -l${LIBNAME}
472 + Private: -lm
473 + Cflags: -I\${includedir}/cblas
474 + Requires: blas
475 + EOF
476 + insinto /usr/$(get_libdir)/pkgconfig
477 + doins ${LIBNAME}.pc || die
478 dodoc README
479 insinto /usr/share/doc/${PF}
480 - doins cblas_example*c || die "install examples failed"
481 - cat <<-EOF > eselect.cblas.reference
482 - refcblas.pc "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/cblas.pc
483 - cblas/cblas.h "${EPREFIX}"/usr/include/cblas.h
484 - EOF
485 - eselect cblas add $(get_libdir) eselect.cblas.reference reference
486 + doins examples/*.c || die "install examples failed"
487 + alternatives_for cblas reference 0 \
488 + "/usr/$(get_libdir)/pkgconfig/cblas.pc" "${LIBNAME}.pc" \
489 + "/usr/include/cblas.h" "cblas/cblas.h"
490 }
491
492 diff --git a/sci-libs/gotoblas2/ChangeLog b/sci-libs/gotoblas2/ChangeLog
493 index ac658dc..9b4bbcb 100644
494 --- a/sci-libs/gotoblas2/ChangeLog
495 +++ b/sci-libs/gotoblas2/ChangeLog
496 @@ -1,7 +1,10 @@
497 # ChangeLog for sci-libs/gotoblas2
498 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
499 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
500 # $Header: $
501
502 + 23 Feb 2011; Sébastien Fabbro <bicatali@g.o> gotoblas2-1.13.ebuild:
503 + Switched to alternatives-2 framework
504 +
505 22 Nov 2010; Sébastien Fabbro <bicatali@g.o> gotoblas2-1.13.ebuild,
506 metadata.xml:
507 Renamed cblas use flag to gotocblas (reserve cblas for external cblas)
508
509 diff --git a/sci-libs/gotoblas2/Manifest b/sci-libs/gotoblas2/Manifest
510 index c886e0e..1d108ed 100644
511 --- a/sci-libs/gotoblas2/Manifest
512 +++ b/sci-libs/gotoblas2/Manifest
513 @@ -1,6 +1,6 @@
514 AUX gotoblas2-1.13-dynamic.patch 608 RMD160 37947ee4aeeec6db1f32132adf97e802369bdaf0 SHA1 f96cb1d7856b4647857b8dc77aa68ceba1d51107 SHA256 7ff5d3179c3051f41fd2963e90734bd6997dd4d6d955ea4c613ff241f49875c4
515 AUX gotoblas2-1.13-sharedlibs.patch 1926 RMD160 2922ebe6e0e05b8844ea89feaea8ff30a0caacb9 SHA1 66ce3c97c91c70b5cb733e02219c2179dd8279f2 SHA256 0802a87e8f5c90ad99a78f1b82f3d85ed474b53b7adcb204c3bc934a9239a64d
516 -DIST GotoBLAS2-1.13.tar.gz 3179300 RMD160 8a7eec19adc37418b8b9c061d35c22caa1a08344 SHA1 84256329345b834dcfc823da41cf9b3c84726fa4 SHA256 6c30d60a701dacc2e638bb68ac912756f2286af834bf41ebe841310d9258e7cb
517 -EBUILD gotoblas2-1.13.ebuild 3014 RMD160 aace85c869c58d1006c6385a177f7f8c75ea9522 SHA1 f17a8135ab9dae6b478d809baf28347740313b92 SHA256 4b7d4f8b5d36fdac3102f3df4b3838a7a4e8ed2dc545738e653daf3dbc60065e
518 -MISC ChangeLog 511 RMD160 c343ca23b227d879c5ce5a03c5109975bc704dce SHA1 7e4e6a06b2a2dea109698d0bc83327b6bad61460 SHA256 c1ffe164ba8b9269dc451da0bc7c238b99a9234eb33d028f7b0234929633f21a
519 +DIST GotoBLAS2-1.13_bsd.tar.gz 3165294 RMD160 64a416b506b45ec4df33d9d7e9ec893585b794b2 SHA1 0e1a046bb51e50cf8cff5d1732157a083a620e64 SHA256 7c3eab57ef5ad5c42f73adade833a531591e78967bbe9fc6db31310d73fa2d86
520 +EBUILD gotoblas2-1.13.ebuild 2755 RMD160 0ea02ac29de5ab167b9072dcfda1b856f1c14e28 SHA1 14dee78d6da88fb82f5690af78b9a6e27d2dae1c SHA256 5ffd0fbf9d2526fcec938a6e1a1986ebbc85ebe931eda88aa48159f5e35b9ffa
521 +MISC ChangeLog 629 RMD160 39e2e30d6bbee7034b0ffa3de131ce3e72ecc2c9 SHA1 4f0f050ec447ea9319a3a5d8586e7b73650cb3c9 SHA256 dd6fd4fad60c1d718a3e9ea5535d39a51bb1ca2902e30b1b6057edee103c19b3
522 MISC metadata.xml 856 RMD160 250635ac290516ed28e932e55ec87626d97b228e SHA1 9bdb2a1cb537025e5460141522746f3b07cea92f SHA256 4c5ea594bc1d07713211d39171d628b2cba8b3aeccef73309e816cecc79bd8c9
523
524 diff --git a/sci-libs/gotoblas2/gotoblas2-1.13.ebuild b/sci-libs/gotoblas2/gotoblas2-1.13.ebuild
525 index 4734971..2140cea 100644
526 --- a/sci-libs/gotoblas2/gotoblas2-1.13.ebuild
527 +++ b/sci-libs/gotoblas2/gotoblas2-1.13.ebuild
528 @@ -1,30 +1,26 @@
529 -# Copyright 1999-2010 Gentoo Foundation
530 +# Copyright 1999-2011 Gentoo Foundation
531 # Distributed under the terms of the GNU General Public License v2
532 # $Header: $
533
534 EAPI=3
535
536 -inherit eutils toolchain-funcs
537 +inherit eutils toolchain-funcs alternatives-2
538
539 MYPN="GotoBLAS2"
540 -MYP="${MYPN}-${PV}"
541 +MYP="${MYPN}-${PV}_bsd"
542
543 DESCRIPTION="Fast implementations of the Basic Linear Algebra Subroutines"
544 HOMEPAGE="http://www.tacc.utexas.edu/tacc-projects/gotoblas2/"
545 SRC_URI="${MYP}.tar.gz"
546
547 -LICENSE="tacc"
548 +LICENSE="BSD"
549 SLOT="0"
550 KEYWORDS="~amd64 ~x86"
551
552 -IUSE="incblas int64 dynamic openmp static-libs threads"
553 -
554 -RESTRICT="fetch mirror"
555 -DOWNLOAD_URL="${HOMEPAGE}"
556 +IUSE="+incblas int64 dynamic openmp static-libs threads"
557
558 RDEPEND=""
559 -DEPEND="app-admin/eselect-blas
560 - incblas? ( app-admin/eselect-cblas )"
561 +DEPEND=""
562
563 S="${WORKDIR}/${MYPN}"
564
565 @@ -98,19 +94,16 @@ src_install() {
566 Libs: -L\${libdir} -l${libname}
567 Libs.private: -lm
568 EOF
569 - echo > eselect.blas.${libname} \
570 - "${libname}.pc ${EPREFIX}/usr/$(get_libdir)/pkgconfig/blas.pc"
571 - eselect blas add $(get_libdir) eselect.blas.${libname} ${libname}
572 + alternatives_for blas goto2 0 \
573 + "/usr/$(get_libdir)/pkgconfig/blas.pc" "${libname}.pc"
574
575 if use incblas; then
576 insinto /usr/include/${PN}
577 doins cblas.h || die
578 echo >> ${libname}.pc "Cflags: -I\${includedir}/${PN}"
579 - cat <<-EOF > eselect.cblas.${libname}
580 - ${PN}.pc "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/cblas.pc
581 - ${PN}/cblas.h "${EPREFIX}"/usr/include/cblas.h
582 - EOF
583 - eselect cblas add $(get_libdir) eselect.cblas.${libname} ${libname}
584 + alternatives_for cblas goto2 0 \
585 + "/usr/$(get_libdir)/pkgconfig/cblas.pc" "${libname}.pc" \
586 + "/usr/include/cblas.h" "${PN}/cblas.h"
587 fi
588 insinto /usr/$(get_libdir)/pkgconfig
589 doins ${libname}.pc
590
591 diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
592 index c4d9ce7..0af61f1 100644
593 --- a/sci-libs/gsl/ChangeLog
594 +++ b/sci-libs/gsl/ChangeLog
595 @@ -1,7 +1,10 @@
596 # ChangeLog for sci-libs/gsl
597 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
598 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
599 # $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
600
601 + 23 Feb 2011; Sébastien Fabbro <bicatali@g.o> gsl-1.14-r2.ebuild:
602 + Switched to alternatives-2 framework
603 +
604 *gsl-1.14-r2 (09 Nov 2010)
605
606 09 Nov 2010; Sébastien Fabbro <bicatali@g.o> +gsl-1.14-r2.ebuild,
607
608 diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
609 index 301ea6c..737cd9a 100644
610 --- a/sci-libs/gsl/Manifest
611 +++ b/sci-libs/gsl/Manifest
612 @@ -1,5 +1,5 @@
613 AUX gsl-1.14-pkgconfig.patch 290 RMD160 16c8eb1e808b2909028eaf2bfd393715db130a36 SHA1 97c2caaaba6d8d46e362c59a0642d678cd66c3dc SHA256 aaab80cc9e6d9f161a6197d365dde41caa072fc5f78dde2e0a04bc6a934f15f6
614 DIST gsl-1.14.tar.gz 3128269 RMD160 c89a30a0b38a0c83d73ded19180d52acd56e6a52 SHA1 e1a600e4fe359692e6f0e28b7e12a96681efbe52 SHA256 3d4a47afd9a1e7c73b97791b4180d8cc4d5f0e5db6027fe06437f1f3f957fafb
615 -EBUILD gsl-1.14-r2.ebuild 1259 RMD160 f29fbe657dd6b81fbcd99818b93699f4da736388 SHA1 b89f05771a07b33f5c82c6b43431c64b04773c25 SHA256 9108363be9f66e39ef8789dee30b23c2bc3f57e2cfb1d67b5c0e6166b92a8e2d
616 -MISC ChangeLog 12194 RMD160 d438eeb618a91b4237684460c51d2aa8ad5e0609 SHA1 5f0ae18ba7377f1f0df4b5d75e3305889df8b9ef SHA256 63be2c1815f20f127c87ade709072a3e12a686e6c35f84c2a8021e3a0456cc2e
617 +EBUILD gsl-1.14-r2.ebuild 1208 RMD160 0832e65ba5dbaf3ba13d356e0ab3d872b269d42d SHA1 7311a9b0d38d7837de6a034345f29129ab20867e SHA256 d5a77563aa451880b38a8069b18c99e07edbcdf873ac1f8e072d2677381aa8a8
618 +MISC ChangeLog 12309 RMD160 5e71ea3e48c14d50bab00dd4cc910d5ab20b6bf8 SHA1 999be490e97c31db3009c7dd89fd5428cd10fbee SHA256 593832b0ca8eb44a324c858b7912c37d3eebbe349a542c2e824af9c9299da9ef
619 MISC metadata.xml 858 RMD160 aa5fcc2297d721a8e585bba28cfbe797c91f00a4 SHA1 4aacae953b1c804f9b123c5934093ab8faeac628 SHA256 17013b384e9d03536d612c4b5daef4e5ce6b7990bfe5265bf0303101dec748ed
620
621 diff --git a/sci-libs/gsl/gsl-1.14-r2.ebuild b/sci-libs/gsl/gsl-1.14-r2.ebuild
622 index 66e1167..92d478e 100644
623 --- a/sci-libs/gsl/gsl-1.14-r2.ebuild
624 +++ b/sci-libs/gsl/gsl-1.14-r2.ebuild
625 @@ -1,9 +1,9 @@
626 -# Copyright 1999-2010 Gentoo Foundation
627 +# Copyright 1999-2011 Gentoo Foundation
628 # Distributed under the terms of the GNU General Public License v2
629 # $Header: $
630
631 EAPI="3"
632 -inherit eutils autotools-utils
633 +inherit eutils autotools-utils alternatives-2
634
635 DESCRIPTION="The GNU Scientific Library"
636 HOMEPAGE="http://www.gnu.org/software/gsl/"
637 @@ -15,31 +15,30 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
638 IUSE="static-libs"
639
640 RDEPEND=""
641 -DEPEND="${RDEPEND}
642 - app-admin/eselect-cblas"
643 +DEPEND="${RDEPEND}"
644
645 DOCS=(AUTHORS BUGS ChangeLog NEWS README THANKS TODO)
646 PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" )
647
648 src_install() {
649 autotools-utils_src_install
650 - cat <<-EOF > ${PN}cblas.pc
651 + local libname=gslcblas
652 +
653 + cat <<-EOF > ${libname}.pc
654 prefix=${EPREFIX}/usr
655 libdir=\${prefix}/$(get_libdir)
656 includedir=\${prefix}/include
657
658 - Name: ${PN}cblas
659 + Name: ${libname}
660 Description: ${DESCRIPTION} CBLAS implementation
661 Version: ${PV}
662 URL: ${HOMEPAGE}
663 - Libs: -L\${libdir} -lgslcblas
664 + Libs: -L\${libdir} -l${libname}
665 Cflags: -I\${includedir}
666 EOF
667 insinto /usr/$(get_libdir)/pkgconfig
668 - doins ${PN}cblas.pc
669 - cat <<-EOF > eselect.cblas.gsl
670 - gslcblas.pc ${EPREFIX}/usr/$(get_libdir)/pkgconfig/cblas.pc
671 - gsl/gsl_cblas.h ${EPREFIX}/usr/include/cblas.h
672 - EOF
673 - eselect cblas add $(get_libdir) eselect.cblas.gsl gsl
674 + doins ${libname}.pc
675 + alternatives_for cblas gsl 0 \
676 + "/usr/$(get_libdir)/pkgconfig/cblas.pc" "${libname}.pc" \
677 + "/usr/include/cblas.h" "gsl/gsl_cblas.h"
678 }
679
680 diff --git a/sci-libs/ipp/ChangeLog b/sci-libs/ipp/ChangeLog
681 index 62ff8c1..804df25 100644
682 --- a/sci-libs/ipp/ChangeLog
683 +++ b/sci-libs/ipp/ChangeLog
684 @@ -1,7 +1,10 @@
685 # ChangeLog for sci-libs/ipp
686 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
687 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
688 # $Header: $
689
690 + 23 Feb 2011; Sébastien Fabbro <bicatali@g.o> ipp-7.0.2.137.ebuild:
691 + Bump
692 +
693 *ipp-7.0.1.084 (03 Dec 2010)
694
695 03 Dec 2010; Sébastien Fabbro <bicatali@g.o> +ipp-7.0.1.084.ebuild,
696
697 diff --git a/sci-libs/ipp/Manifest b/sci-libs/ipp/Manifest
698 index 05ad91f..ddc7bc7 100644
699 --- a/sci-libs/ipp/Manifest
700 +++ b/sci-libs/ipp/Manifest
701 @@ -1,6 +1,6 @@
702 -DIST parallel_studio_xe_2011.tgz 1502101332 RMD160 079e96f3c1341e4da2848ee0658ad0a203bbc890 SHA1 b77548d93c3b2166461d556d09abf22685eb5283 SHA256 dbeff52dc05b7e80e33fb396c0cefa4a41ce2c70f30f8523c96b5043f8656d15
703 -DIST parallel_studio_xe_2011_ia32.tgz 779989888 RMD160 0edfa5fea2493bb3cb86418c0a507c0936fbc83f SHA1 a9e2078cae6b818a7ae60536bbddcb7bac27fe89 SHA256 9fb93a65c7c52f724c9f60f09ac190a8700dfbabbf36b6df1775c63e004108e2
704 -DIST parallel_studio_xe_2011_intel64.tgz 928536522 RMD160 23cb09d9516a4af7392b5e6dcfeda6bef09ce5d6 SHA1 7656e282f6078686e26610cea6cb31d06a7b709b SHA256 09639859930632e3df7093cdf7b9c1820958e96fdf83ab27f5bed8e3437f5519
705 -EBUILD ipp-7.0.1.084.ebuild 570 RMD160 b95011d88fbd80c3bd437f7b0778283d402b0e6a SHA1 ad684b0413fc83d352caa43efef99dfcdf14abe1 SHA256 2dcc8c1e2ea62d000340c48d4ed084ac3515c7d985a04a9281d0fac2745560a5
706 -MISC ChangeLog 276 RMD160 53f528364eefcecad2539ef28a957278a176cbff SHA1 cce16115bdf94e10e5a0d774914b40273d72d6d6 SHA256 2b24b00118c86bb443e671d9d2932769fe2e65b1a6a750a4a765e0e9aba8c33a
707 +DIST parallel_studio_xe_2011_update1.tgz 1560496278 RMD160 95e074e63c803a4a325edefeca6b03e8aff4ec42 SHA1 b5da44dd6d4ee7eba606b724f2350855facf27ad SHA256 ac6f29355881ab61ff9fbdb72923934a331a2bdd8a7856f6f3c207df8c4fa608
708 +DIST parallel_studio_xe_2011_update1_ia32.tgz 809416643 RMD160 2d22c4448b1bd6087b911aa7033401aa98693a59 SHA1 f0e2d17d818ff5cacb088d8df9eba986651aaeac SHA256 c14962999408913f4d9c614153047315b3f645fb340c98af7bc30c8b35ef85ec
709 +DIST parallel_studio_xe_2011_update1_intel64.tgz 958969597 RMD160 1b8839ead6abe50b30b59a2e57ef7b24bf3dcb66 SHA1 3bdf92e4e818390b41dda3962338481409dd4002 SHA256 2a76006134cb622e2d80bbd17a79454100c3a066228b82b4d27971252eea49a7
710 +EBUILD ipp-7.0.2.137.ebuild 578 RMD160 7a1a7abb5e25bfac9aebcd3543837d51ce263e1f SHA1 af9ed2fc18bfb55341e4690b481edfc3fe3f5e47 SHA256 d15883e2e498dad721b7b74d416fdd8eb797a992a672014417beec88d013b59a
711 +MISC ChangeLog 361 RMD160 82d9cf4650783b8b506cd0c91ab8657b08d1f7cf SHA1 00569406313138ce5d97f96f817c10593cd26a82 SHA256 221c8bd67c98ae1a13fbb63c7a94f383db24a6dd95d2625f3a379a8fffc8322f
712 MISC metadata.xml 520 RMD160 8401034c5dd64612bf62b59f58efe9ea363dc22d SHA1 ab5679525696f3d8afc90207ed7c6cd7f2479cd6 SHA256 25db8cf63c0266c53f3832480ad846c0d5b71cf53643739e7d1442f55eec1b8f
713
714 diff --git a/sci-libs/ipp/ipp-7.0.2.137.ebuild b/sci-libs/ipp/ipp-7.0.2.137.ebuild
715 index 1508eac..717396c 100644
716 --- a/sci-libs/ipp/ipp-7.0.2.137.ebuild
717 +++ b/sci-libs/ipp/ipp-7.0.2.137.ebuild
718 @@ -1,10 +1,10 @@
719 -# Copyright 1999-2010 Gentoo Foundation
720 +# Copyright 1999-2011 Gentoo Foundation
721 # Distributed under the terms of the GNU General Public License v2
722 # $Header: $
723
724 INTEL_DPN=parallel_studio_xe
725 -INTEL_DID=1951
726 -INTEL_DPV=2011
727 +INTEL_DID=2065
728 +INTEL_DPV=2011_update1
729 INTEL_SUBDIR=composerxe
730
731 inherit intel-sdp
732
733 diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
734 index 0d0771d..dee0376 100644
735 --- a/sci-libs/lapack-reference/ChangeLog
736 +++ b/sci-libs/lapack-reference/ChangeLog
737 @@ -1,7 +1,11 @@
738 -# ChangeLog for sci-libs/lapack
739 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
740 +# ChangeLog for sci-libs/lapack-reference
741 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
742 # $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
743
744 + 23 Feb 2011; Sébastien Fabbro <bicatali@g.o>
745 + lapack-reference-3.3.0.ebuild:
746 + Switched to alternatives-2 framework
747 +
748 *lapack-reference-3.3.0 (20 Nov 2010)
749
750 20 Nov 2010; Sébastien Fabbro <bicatali@g.o> -lapack-reference-3.2.2.ebuild,
751
752 diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
753 index 6c4237f..3a825bc 100644
754 --- a/sci-libs/lapack-reference/Manifest
755 +++ b/sci-libs/lapack-reference/Manifest
756 @@ -1,5 +1,5 @@
757 AUX 3.3.0-cmake-install.patch 4705 RMD160 5fea9c961f434311e4ab2700141153b757bf4477 SHA1 700330197ceea3468a6beb73adf0cb12ee177d69 SHA256 4d32eebc33cf57f9bec72c3651b18a330139abc8a8de4670a594c8f102ffa55f
758 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
759 -EBUILD lapack-reference-3.3.0.ebuild 2106 RMD160 470f3903010459150da5765a71d01ddb0902fec9 SHA1 c202f0a5caff47d36be42b411694ba4c02dfac2f SHA256 bd2363d96b143908546227858beff187d4abdea8b9d6f4ac0d2bfdd83fec7f0c
760 -MISC ChangeLog 9571 RMD160 00fa87f815cded86a3ae2f78ad307092e64c4015 SHA1 332fd18e8dfa548584a16921e20420d41b197120 SHA256 8b396c49443008bd4d8d532be0ec54687bbecea1668f77d699ca5bce86c4bf16
761 +EBUILD lapack-reference-3.3.0.ebuild 2028 RMD160 057ebe1c137842a265bdde37f0c528981136151c SHA1 08777f6d9930d45d097a599dce0b54f9460e34d7 SHA256 6a48fb55c1d218a98f4c339082ac42dd3bb444e703f3fae134968503d44ce6da
762 +MISC ChangeLog 9709 RMD160 01bd2e925d73d3a2027b80782ce895a163b8729f SHA1 0aa28a4e00bdbcd2c49af776fb97972194a10890 SHA256 544e50f96f8296c4f6cf5eebe5d12106739054401fd0781e4ee5cafa9a134de0
763 MISC metadata.xml 830 RMD160 a5533b2d94515312541e767895d6732e42aa49c3 SHA1 1392cdaf12cd4dcc3f64522af679460df968415f SHA256 9e83bfab904611e89bdbe5571dd571c43461a4eb8adae2e69381fddf819416a0
764
765 diff --git a/sci-libs/lapack-reference/lapack-reference-3.3.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.3.0.ebuild
766 index 2e3eb76..8bbe977 100644
767 --- a/sci-libs/lapack-reference/lapack-reference-3.3.0.ebuild
768 +++ b/sci-libs/lapack-reference/lapack-reference-3.3.0.ebuild
769 @@ -1,9 +1,9 @@
770 -# Copyright 1999-2010 Gentoo Foundation
771 +# Copyright 1999-2011 Gentoo Foundation
772 # Distributed under the terms of the GNU General Public License v2
773 # $Header: $
774
775 EAPI="3"
776 -inherit eutils toolchain-funcs cmake-utils
777 +inherit eutils toolchain-funcs cmake-utils alternatives-2
778
779 MYP=lapack-${PV}
780
781 @@ -19,7 +19,6 @@ IUSE="static-libs test xblas"
782 RDEPEND="virtual/blas
783 xblas? ( sci-libs/xblas )"
784 DEPEND="${RDEPEND}
785 - app-admin/eselect-lapack
786 dev-util/pkgconfig"
787
788 DOCS=( README )
789 @@ -70,9 +69,8 @@ lapack_prof() {
790 sed -i \
791 -e "/Libs/s/${1}/ref${1}/" \
792 "${ED}"/usr/$(get_libdir)/pkgconfig/ref${1}.pc || die
793 - echo > eselect.${1}.reference \
794 - "ref${1}.pc ${EPREFIX}/usr/$(get_libdir)/pkgconfig/${1}.pc"
795 - eselect ${1} add $(get_libdir) eselect.${1}.reference reference
796 + alternatives_for lapack reference 0 \
797 + "/usr/$(get_libdir)/pkgconfig/${1}.pc" "ref${1}.pc"
798 }
799
800 src_install() {
801
802 diff --git a/sci-libs/lapacke-reference/ChangeLog b/sci-libs/lapacke-reference/ChangeLog
803 index a33ccde..08d38db 100644
804 --- a/sci-libs/lapacke-reference/ChangeLog
805 +++ b/sci-libs/lapacke-reference/ChangeLog
806 @@ -1,7 +1,11 @@
807 -# ChangeLog for sci-libs/lapacke
808 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
809 +# ChangeLog for sci-libs/lapacke-reference
810 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
811 # $Header: $
812
813 + 23 Feb 2011; Sébastien Fabbro <bicatali@g.o>
814 + lapacke-reference-1.0.0.009.ebuild:
815 + Switched to alternatives-2 framework
816 +
817 05 Dec 2010; Sébastien Fabbro <bicatali@g.o>
818 lapacke-1.0.0.009.ebuild, +metadata.xml:
819 Initial import
820
821 diff --git a/sci-libs/lapacke-reference/Manifest b/sci-libs/lapacke-reference/Manifest
822 index 9cc5602..4f7d58f 100644
823 --- a/sci-libs/lapacke-reference/Manifest
824 +++ b/sci-libs/lapacke-reference/Manifest
825 @@ -1,4 +1,4 @@
826 DIST lapacke-1.0.0.009.tar.gz 840233 RMD160 1ac906ef61e616465f1860b0266640fe65e669ee SHA1 793c388cbd910cf6018be78749ad37e77fb8ac25 SHA256 7f992bd1f143251ddd03b99ef935942c17caf43652ae94a251601e00dce258e3
827 -EBUILD lapacke-reference-1.0.0.009.ebuild 2159 RMD160 48e405333b1f4ce3d65db482bbdf95bd129dff17 SHA1 02e3c5f6eef3ee1458bcfefd10212264b25c82ea SHA256 0331c664d154ee6062c0c4e6ca9f226b247b303389fe301633ef7d6dec782538
828 -MISC ChangeLog 233 RMD160 0f6ae30e07c2f26c350e403b11f19b48ccd413b3 SHA1 780518ec72cef25d96270c27ec75a8b7c272355d SHA256 ffa132d99c9b49d26831c5c3b07a28a856b05866beae8fb1a22984d16b0fc64d
829 +EBUILD lapacke-reference-1.0.0.009.ebuild 2090 RMD160 acc36145e58de678408f8e31ba16874e7f28badc SHA1 2a2c0caba1bc225440fd4fb62baff6cb12b7021a SHA256 b87b432e65a20402ac1aded202906e87e85047ba06b63710c07f9a6df013685c
830 +MISC ChangeLog 376 RMD160 3d95012b6e49971c03e92b3617fc326f01e834df SHA1 46daeab40a3b7420011abc6c5a6707b23eb3f3b7 SHA256 7cb4fa2a79d3846593dddb0627f30d6bcfb865e747252c455ba3c85932d59910
831 MISC metadata.xml 377 RMD160 62313cf71b4be5f9f894cbe1862f95a4d54f87fa SHA1 4cdbfee582155e16492694941f6d0e76426e8bf6 SHA256 7cd127f29286171d875b418a27378bf47ad9e87b405f1c6379ec747725e8a7ca
832
833 diff --git a/sci-libs/lapacke-reference/lapacke-reference-1.0.0.009.ebuild b/sci-libs/lapacke-reference/lapacke-reference-1.0.0.009.ebuild
834 index 8302379..f762355 100644
835 --- a/sci-libs/lapacke-reference/lapacke-reference-1.0.0.009.ebuild
836 +++ b/sci-libs/lapacke-reference/lapacke-reference-1.0.0.009.ebuild
837 @@ -1,15 +1,15 @@
838 -# Copyright 1999-2010 Gentoo Foundation
839 +# Copyright 1999-2011 Gentoo Foundation
840 # Distributed under the terms of the GNU General Public License v2
841 # $Header: $
842
843 EAPI="3"
844 -inherit eutils toolchain-funcs versionator
845 +inherit eutils toolchain-funcs versionator alternatives-2
846
847 MYP=lapacke-${PV}
848
849 DESCRIPTION="C Interface to LAPACK"
850 HOMEPAGE="http://www.netlib.org/lapack/"
851 -SRC_URI="http://www.netlib.org/lapack/${PN}.tgz -> ${MYP}.tar.gz"
852 +SRC_URI="http://www.netlib.org/lapack/lapacke.tgz -> ${MYP}.tar.gz"
853
854 LICENSE="BSD"
855 SLOT="0"
856 @@ -17,8 +17,7 @@ KEYWORDS="~amd64 ~x86"
857 IUSE="static-libs"
858
859 RDEPEND=""
860 -DEPEND="app-admin/eselect-lapacke
861 - test? ( virtual/lapack dev-util/pkgconfig )"
862 +DEPEND="test? ( virtual/lapack dev-util/pkgconfig )"
863
864 LIBNAME=reflapacke
865
866 @@ -83,8 +82,7 @@ src_install() {
867 EOF
868 insinto /usr/$(get_libdir)/pkgconfig
869 doins ${LIBNAME}.pc || die
870 - cat <<-EOF > eselect.${PN}
871 - ${LIBNAME}.pc "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/lapacke.pc
872 - EOF
873 - eselect lapacke add $(get_libdir) eselect.${PN} reference
874 + alternatives_for lapacke reference 0 \
875 + "/usr/$(get_libdir)/pkgconfig/lapacke.pc" "${LIBNAME}.pc"
876 +
877 }
878
879 diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
880 index 9795371..24950d2 100644
881 --- a/sci-libs/mkl/ChangeLog
882 +++ b/sci-libs/mkl/ChangeLog
883 @@ -1,7 +1,10 @@
884 # ChangeLog for sci-libs/mkl
885 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
886 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
887 # $Header: $
888
889 + 23 Feb 2011; Sébastien Fabbro <bicatali@g.o> mkl-10.3.2.137.ebuild:
890 + Bump and switched to alternatives-2 framework
891 +
892 03 Dec 2010; Sébastien Fabbro <bicatali@g.o> mkl-10.3.0.084.ebuild:
893 Version bump. refactored ebuilds
894
895
896 diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
897 index c9902c7..6485658 100644
898 --- a/sci-libs/mkl/Manifest
899 +++ b/sci-libs/mkl/Manifest
900 @@ -1,6 +1,6 @@
901 -DIST parallel_studio_xe_2011.tgz 1502101332 RMD160 079e96f3c1341e4da2848ee0658ad0a203bbc890 SHA1 b77548d93c3b2166461d556d09abf22685eb5283 SHA256 dbeff52dc05b7e80e33fb396c0cefa4a41ce2c70f30f8523c96b5043f8656d15
902 -DIST parallel_studio_xe_2011_ia32.tgz 779989888 RMD160 0edfa5fea2493bb3cb86418c0a507c0936fbc83f SHA1 a9e2078cae6b818a7ae60536bbddcb7bac27fe89 SHA256 9fb93a65c7c52f724c9f60f09ac190a8700dfbabbf36b6df1775c63e004108e2
903 -DIST parallel_studio_xe_2011_intel64.tgz 928536522 RMD160 23cb09d9516a4af7392b5e6dcfeda6bef09ce5d6 SHA1 7656e282f6078686e26610cea6cb31d06a7b709b SHA256 09639859930632e3df7093cdf7b9c1820958e96fdf83ab27f5bed8e3437f5519
904 -EBUILD mkl-10.3.0.084.ebuild 3114 RMD160 ef6c32e49845193c7e7d0cc802013b85cbfe731c SHA1 54b7d7ff3a8b84c15a42a9d6a84b6a91b8794704 SHA256 c9778b4bf0437fff5597ff658474aadf43dd43292b307de98d733a4bd82445b1
905 -MISC ChangeLog 227 RMD160 2effdd134470774d2daf731de19372dfd2294ae9 SHA1 f4d31cd7a8df8f342160f4962218778be0d8cbf1 SHA256 38e42b23912fa07ebe693c1ed405e819cb1ae57ba5ecf6c63aa94683db6aff0d
906 +DIST parallel_studio_xe_2011_update1.tgz 1560496278 RMD160 95e074e63c803a4a325edefeca6b03e8aff4ec42 SHA1 b5da44dd6d4ee7eba606b724f2350855facf27ad SHA256 ac6f29355881ab61ff9fbdb72923934a331a2bdd8a7856f6f3c207df8c4fa608
907 +DIST parallel_studio_xe_2011_update1_ia32.tgz 809416643 RMD160 2d22c4448b1bd6087b911aa7033401aa98693a59 SHA1 f0e2d17d818ff5cacb088d8df9eba986651aaeac SHA256 c14962999408913f4d9c614153047315b3f645fb340c98af7bc30c8b35ef85ec
908 +DIST parallel_studio_xe_2011_update1_intel64.tgz 958969597 RMD160 1b8839ead6abe50b30b59a2e57ef7b24bf3dcb66 SHA1 3bdf92e4e818390b41dda3962338481409dd4002 SHA256 2a76006134cb622e2d80bbd17a79454100c3a066228b82b4d27971252eea49a7
909 +EBUILD mkl-10.3.2.137.ebuild 2892 RMD160 748fa680a6c3bed30b46dc3588ba71cbfb24aa6f SHA1 90bca22da230c79964026e427b209960391474fe SHA256 475dc3d85f8be7ff35160957ec0991521784afedffdc10b5d3f6e678c7a7d7fe
910 +MISC ChangeLog 354 RMD160 d616535e9e55579ba1e384e49c27bad1a316b00b SHA1 cd1b51310398b3e7d0e8917fd7b0b225af5c401c SHA256 555ff1fa016257586528cef8403329c11411fbbf9ed7d5ea531197a6445a3e1c
911 MISC metadata.xml 617 RMD160 9066d97c2d34843270db78a9b31b8d6f8b32497e SHA1 6d9842a03eb3367d4fc85458f1e65e52490e98b2 SHA256 2b482d847f4ae464b31e582f412ffa59c97c59b75309d6392edfcbd9f16b2ae5
912
913 diff --git a/sci-libs/mkl/mkl-10.3.2.137.ebuild b/sci-libs/mkl/mkl-10.3.2.137.ebuild
914 index 7f52e34..fe3533e 100644
915 --- a/sci-libs/mkl/mkl-10.3.2.137.ebuild
916 +++ b/sci-libs/mkl/mkl-10.3.2.137.ebuild
917 @@ -1,26 +1,20 @@
918 -# Copyright 1999-2010 Gentoo Foundation
919 +# Copyright 1999-2011 Gentoo Foundation
920 # Distributed under the terms of the GNU General Public License v2
921 # $Header: $
922
923 INTEL_DPN=parallel_studio_xe
924 -INTEL_DID=1951
925 -INTEL_DPV=2011
926 +INTEL_DID=2065
927 +INTEL_DPV=2011_update1
928 INTEL_SUBDIR=composerxe
929
930 -inherit intel-sdp multilib
931 +inherit intel-sdp multilib alternatives-2
932
933 DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
934 HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
935
936 IUSE=""
937
938 -DEPEND="
939 - app-admin/eselect-blas
940 - app-admin/eselect-cblas
941 - app-admin/eselect-lapack
942 - app-admin/eselect-lapacke
943 - app-admin/eselect-blacs
944 - app-admin/eselect-scalapack"
945 +DEPEND=""
946 RDEPEND=">=dev-libs/intel-common-12"
947
948 QA_PREBUILT="
949 @@ -77,9 +71,8 @@ mkl_add_prof() {
950 local x pkgs="blas lapack"
951 [[ ${1} != gf* ]] && pkgs="blas lapack cblas lapacke"
952 for x in ${pkgs}; do
953 - echo > eselect.${x} \
954 - "${prof}.pc ${EPREFIX}/usr/${libdir}/pkgconfig/${x}.pc"
955 - eselect ${x} add ${libdir} eselect.${x} ${prof}
956 + alternatives_for ${x} ${prof} 0 \
957 + "/usr/$(get_libdir)/pkgconfig/${x}.pc" "${prof}.pc"
958 done
959 local ext=
960 [[ ${1} == *lp64 ]] && ext=_${1#*_}
961 @@ -91,9 +84,8 @@ mkl_add_prof() {
962 -e "s/-Wl,--start-group/-lmkl_scalapack${ext}/" \
963 ${prof}-blacs.pc > ${prof}-scalapack.pc
964 for x in blacs scalapack; do
965 - echo > eselect.${x} \
966 - "${prof}-${x}.pc ${EPREFIX}/usr/${libdir}/pkgconfig/${x}.pc"
967 - eselect ${x} add ${libdir} eselect.${x} ${prof}
968 + alternatives_for ${x} ${prof} 0 \
969 + "/usr/$(get_libdir)/pkgconfig/${x}.pc" "${prof}.pc"
970 done
971 }
972
973
974 diff --git a/sci-libs/mpiblacs/ChangeLog b/sci-libs/mpiblacs/ChangeLog
975 index 65190aa..21e8600 100644
976 --- a/sci-libs/mpiblacs/ChangeLog
977 +++ b/sci-libs/mpiblacs/ChangeLog
978 @@ -1,7 +1,10 @@
979 # ChangeLog for sci-libs/mpiblacs
980 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
981 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
982 # $Header: $
983
984 + 23 Feb 2011; Sébastien Fabbro <bicatali@g.o> mpiblacs-1.1.ebuild:
985 + Switched to alternatives-2 framework
986 +
987 *mpiblacs-1.1 (06 Dec 2010)
988
989 06 Dec 2010; Sébastien Fabbro <bicatali@g.o> +mpiblacs-1.1.ebuild,
990
991 diff --git a/sci-libs/mpiblacs/Manifest b/sci-libs/mpiblacs/Manifest
992 index a1c7908..c1e77b8 100644
993 --- a/sci-libs/mpiblacs/Manifest
994 +++ b/sci-libs/mpiblacs/Manifest
995 @@ -1,6 +1,6 @@
996 DIST blacstester.tgz 81937 RMD160 bfee4918d04f6577ea021bc466cd16d6d007ac1d SHA1 d85ebb1cb2bad051242609504d27773e54c4ae00 SHA256 7e5a67b703f74f05435055dd314a7196007d9a273e6bb46058a19be71d3ba197
997 DIST mpiblacs-patch03.tgz 30505 RMD160 582cd4d13bda97edefedc0e67b1ab5d00c7024f2 SHA1 d3f136b07df2b208a11c96fa55e39030e4702b39 SHA256 92dfba8a462a2f23102000a10532c00a9a5203b79ccad5a87f44ce83eb6bc7ed
998 DIST mpiblacs.tgz 152823 RMD160 bac03b82dc7f1daef632ca6869f077f64c18ad8e SHA1 b9503a2fddd4136a2b7ce3f5a9cd97dd5ec0d6b6 SHA256 88dd7265d412022948debb7a2737226cd53a3bf73b0b62fc55ceb3ccc8a598f7
999 -EBUILD mpiblacs-1.1.ebuild 3055 RMD160 f56d4ced972f0becdc438d10c76c52924eaed297 SHA1 3b6d73ccbfa8c4cc285cac3211a1a0ec4b879e27 SHA256 039aa72fcf4dc24b2fde623aef0ad579846dc26628f331cd376e929aff36913d
1000 -MISC ChangeLog 259 RMD160 4034aeee8ea5acad4be8cc351e3b5f31b077fd04 SHA1 8cbe18c231d33471758936dd93bff1924eeee6ce SHA256 0923159e59d005066c10b110cf15664f3cb6138c7389e80433ab69c6cb3d1654
1001 +EBUILD mpiblacs-1.1.ebuild 2995 RMD160 e07c5798c4c7e015ebf2a34e28147a46583db004 SHA1 6e7ac4320072d05ac5ebb68e01788e058aea4415 SHA256 fb7403b136e5dc3836241b3a90e64c76fd59a9447873cea719c271810c2d201a
1002 +MISC ChangeLog 375 RMD160 16f36586c81cf539e99c809387a1fb5fe5614b23 SHA1 6397b7813ac1564ff429db00d85f268e9909c4bd SHA256 9fdab740424fa27b493f2ee804764c7af18dde2bc3673d50357447988a4d46c2
1003 MISC metadata.xml 491 RMD160 642fdba0aaec7ab2f26183b0b2c3a9a86dbc826c SHA1 6012e8c37ec9f077437f9dcebc0841e19a2746e6 SHA256 92e3b64a3520d1adfdc948c5fb823c1c5e2d1d8af5b6fce6ab05535de52bbf49
1004
1005 diff --git a/sci-libs/mpiblacs/mpiblacs-1.1.ebuild b/sci-libs/mpiblacs/mpiblacs-1.1.ebuild
1006 index c744140..e68a2f3 100644
1007 --- a/sci-libs/mpiblacs/mpiblacs-1.1.ebuild
1008 +++ b/sci-libs/mpiblacs/mpiblacs-1.1.ebuild
1009 @@ -1,9 +1,9 @@
1010 -# Copyright 1999-2010 Gentoo Foundation
1011 +# Copyright 1999-2011 Gentoo Foundation
1012 # Distributed under the terms of the GNU General Public License v2
1013 # $Header: $
1014
1015 EAPI="3"
1016 -inherit eutils toolchain-funcs versionator
1017 +inherit eutils toolchain-funcs versionator alternatives-2
1018
1019 DESCRIPTION="Basic Linear Algebra Communication Subprograms with MPI"
1020 HOMEPAGE="http://www.netlib.org/blacs/"
1021 @@ -19,7 +19,6 @@ IUSE="static-libs test"
1022 RDEPEND="virtual/mpi
1023 virtual/blas"
1024 DEPEND="${RDEPEND}
1025 - app-admin/eselect-blacs
1026 dev-util/pkgconfig"
1027
1028 S="${WORKDIR}/BLACS"
1029 @@ -83,7 +82,7 @@ src_compile() {
1030 }
1031
1032 src_test() {
1033 - emake "${MAKEFLAGS[@]}" tester || die "shared libs failed"
1034 + emake "${MAKEFLAGS[@]}" tester || die "test compile failed"
1035 cd TESTING/EXE
1036 local x
1037 # do not die because we are expecting an abort
1038 @@ -117,7 +116,6 @@ src_install() {
1039 EOF
1040 insinto /usr/$(get_libdir)/pkgconfig
1041 doins ${PN}.pc || die
1042 - echo > eselect.${PN} \
1043 - ${PN}.pc "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/blacs.pc
1044 - eselect blacs add $(get_libdir) eselect.${PN} ${PN}
1045 + alternatives_for blacs ${PN} 0 \
1046 + "/usr/$(get_libdir)/pkgconfig/blacs.pc" "${PN}.pc"
1047 }
1048
1049 diff --git a/sci-libs/scalapack/ChangeLog b/sci-libs/scalapack/ChangeLog
1050 index 1abb6f6..3e621fe 100644
1051 --- a/sci-libs/scalapack/ChangeLog
1052 +++ b/sci-libs/scalapack/ChangeLog
1053 @@ -1,7 +1,10 @@
1054 # ChangeLog for sci-libs/scalapack
1055 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
1056 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
1057 # $Header: $
1058
1059 + 23 Feb 2011; Sébastien Fabbro <bicatali@g.o> scalapack-1.8.0.ebuild:
1060 + Switched to alternatives-2 framework
1061 +
1062 *scalapack-1.8.0 (08 Dec 2010)
1063
1064 08 Dec 2010; Sébastien Fabbro <bicatali@g.o> +scalapack-1.8.0.ebuild,
1065
1066 diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
1067 index 01302eb..c611d3f 100644
1068 --- a/sci-libs/scalapack/Manifest
1069 +++ b/sci-libs/scalapack/Manifest
1070 @@ -1,4 +1,4 @@
1071 DIST scalapack-1.8.0.tgz 5006143 RMD160 4b0f607d18faa6b64415537124e89c4cb33bd06a SHA1 c185f71dda528e809e514dc02a3497817ce3af40 SHA256 e378dbedf67102cb7cc1a7991bb02bbe163aa91710dbeae2868ec781d3fc7a05
1072 -EBUILD scalapack-1.8.0.ebuild 2597 RMD160 69dca7ed9d79fac7d0b4655999350abdfe546d1a SHA1 303348cee9faecba7e1c54e8be5b65d9af432ca0 SHA256 fd60d78031dae507f73a474ca1dbcf3aa8f492d6a5b3447893bfa706fc43ade1
1073 -MISC ChangeLog 266 RMD160 72c01095d05e326ef33ed73f854a9c5eb2de211b SHA1 979784a35b1326051c1a7f46764acf12043231fb SHA256 f50adb490dd28e071b94c5003f285d52111c5826a16f41051f44b05abd1d7d21
1074 +EBUILD scalapack-1.8.0.ebuild 2533 RMD160 8bd4635336c56c89791e8061232addbc52c758a5 SHA1 2f95495037e41ebf1087e2f1ee9270a4e6184199 SHA256 0f1b2dee825b752d083e1bcb5707242172f473663eb1c575dd715f6a5f01600e
1075 +MISC ChangeLog 385 RMD160 0b11683799e82701061101d65e484a845d15b88c SHA1 7646afff6226d595a1b34d9a75f27bb376b2d041 SHA256 f14c196af54d1f100ea96fbbff72af4ed7496d0c0a78350e04c99eef2f2b8041
1076 MISC metadata.xml 563 RMD160 d29391f1abe76c1663278ae6d35fe4128a9f511c SHA1 f794c3d2f48a908e306a05999b7264eccbb18da1 SHA256 1ee2c99e8e8d4f57ba1dce11797c19545734eb262725095909dcf3c80752fb3c
1077
1078 diff --git a/sci-libs/scalapack/scalapack-1.8.0.ebuild b/sci-libs/scalapack/scalapack-1.8.0.ebuild
1079 index 4a3bdcf..3bb962d 100644
1080 --- a/sci-libs/scalapack/scalapack-1.8.0.ebuild
1081 +++ b/sci-libs/scalapack/scalapack-1.8.0.ebuild
1082 @@ -1,9 +1,9 @@
1083 -# Copyright 1999-2010 Gentoo Foundation
1084 +# Copyright 1999-2011 Gentoo Foundation
1085 # Distributed under the terms of the GNU General Public License v2
1086 # $Header: $
1087
1088 EAPI="3"
1089 -inherit eutils toolchain-funcs versionator
1090 +inherit eutils toolchain-funcs versionator alternatives-2
1091
1092 DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous computing"
1093 HOMEPAGE="http://www.netlib.org/scalapack/"
1094 @@ -17,7 +17,6 @@ IUSE="static-libs test"
1095 RDEPEND="virtual/blacs
1096 virtual/lapack"
1097 DEPEND="${RDEPEND}
1098 - app-admin/eselect-scalapack
1099 dev-util/pkgconfig"
1100
1101 make_shared_lib() {
1102 @@ -105,7 +104,7 @@ src_install() {
1103 EOF
1104 insinto /usr/$(get_libdir)/pkgconfig
1105 doins ${pcfile} || die
1106 - echo > eselect.${PN} \
1107 - "${pcfile} ${EPREFIX}/usr/$(get_libdir)/pkgconfig/scalapack.pc"
1108 - eselect scalapack add $(get_libdir) eselect.${PN} reference
1109 + alternatives_for scalapack reference \
1110 + 0 "/usr/$(get_libdir)/pkgconfig/scalapack.pc" "${pcfile}"
1111 +
1112 }