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/acml/
Date: Thu, 31 Mar 2011 18:11:57
Message-Id: 31670d27197789c8fe9ec8327a92ef8a3e42df74.bicatali@gentoo
1 commit: 31670d27197789c8fe9ec8327a92ef8a3e42df74
2 Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 31 18:05:44 2011 +0000
4 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 31 18:05:44 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=31670d27
7
8 switch to eapi4 + cleaning
9
10 ---
11 sci-libs/acml/Manifest | 2 +-
12 sci-libs/acml/acml-4.4.0.ebuild | 29 ++++++++++++++---------------
13 2 files changed, 15 insertions(+), 16 deletions(-)
14
15 diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
16 index 49ce50d..a09e233 100644
17 --- a/sci-libs/acml/Manifest
18 +++ b/sci-libs/acml/Manifest
19 @@ -12,6 +12,6 @@ DIST acml-4-4-0-open64-64bit.tgz 42812747 RMD160 aa29a615cf2b3294294162ccb89e9ad
20 DIST acml-4-4-0-pgi-32bit.tgz 24562671 RMD160 78677d7f178e725ebe086d9690c8ee72026929ba SHA1 cc0ceff8e8f5cb4a15175e2256c8708a8a7d2fb6 SHA256 f956b3fdd3e825c4b993a16179a8df2f772eda851aa4dd7f4a16fffb20c10580
21 DIST acml-4-4-0-pgi-64bit-int64.tgz 78664596 RMD160 2a0e9af1eef74009dce2a256d4da8382baf39133 SHA1 6648385c614d367bd18e29eb60be3f99df07ae1e SHA256 f1290edb9c5a91b667139ae4e8eec2486e7ccd3f2aa19f7f65667eef0d85eca0
22 DIST acml-4-4-0-pgi-64bit.tgz 77842523 RMD160 e4c6770837f9eb511999872d280715e6827b5f65 SHA1 2087b20359d72b2e7886b12356d4da0d2d563503 SHA256 9c07dc0b90e9e491a0ddcf7849690338f21011aa4aa197ff3408f32a0b3fd6cf
23 -EBUILD acml-4.4.0.ebuild 3518 RMD160 d8fd9e54163b7cd017d3d5f57eed8eb058135b46 SHA1 7fa4bf6cd5262f72ecde49f18198ee3440529ae8 SHA256 73ec1e91299543c17b12411f9b5467fafc593f1e9bf0c094bb94a5581fb98928
24 +EBUILD acml-4.4.0.ebuild 3384 RMD160 04293bd6cafda5b0d45bcfcd18c7c572c03f9008 SHA1 cc72743e39266d806adabe0a45868551b997b634 SHA256 aedfaf68159f0a9f4f0a52d0be3649d36ffbcd88f7027c2252712d3369b117b1
25 MISC ChangeLog 8360 RMD160 9ba66449beb8a1e69a85350af6aa19f0b6a75282 SHA1 3f9a99bd9338d885b78be8d6fa7dc571c45705f0 SHA256 0c5e6390e9db8d9564078133f3b4d49300782dff4f1c474f420a61213dc78b9d
26 MISC metadata.xml 1346 RMD160 df635430c989552278e7e2d262fbb32ffd11f99e SHA1 e1432a7d071c4f1ae567c7d0fe6708e46ceac4df SHA256 5e41050f4380164e761f836c29c818176cf23d239dc1e5aa29e4702cbbe85042
27
28 diff --git a/sci-libs/acml/acml-4.4.0.ebuild b/sci-libs/acml/acml-4.4.0.ebuild
29 index e48694d..3e9be5b 100644
30 --- a/sci-libs/acml/acml-4.4.0.ebuild
31 +++ b/sci-libs/acml/acml-4.4.0.ebuild
32 @@ -2,11 +2,11 @@
33 # Distributed under the terms of the GNU General Public License v2
34 # $Header: $
35
36 -EAPI="3"
37 +EAPI=4
38
39 inherit eutils multilib toolchain-funcs versionator alternatives-2
40
41 -ACML_INST_DIR="opt/${PN}${PV}"
42 +ACML_INST_DIR=opt/${PN}${PV}
43 QA_PREBUILT="${ACML_INST_DIR}/*/lib/*"
44
45 MYP=${PN}-$(replace_all_version_separators -)
46 @@ -48,13 +48,12 @@ src_unpack() {
47 }
48
49 src_test() {
50 + local fdir d
51 for fdir in */examples; do
52 einfo "Testing acml in ${fdir}"
53 for d in . acml_mv; do
54 - pushd ${fdir} > /dev/null
55 - emake \
56 - ACMLDIR="${S}/${fdir%/examples}" \
57 - || die "emake test in ${fdir}/${d} failed"
58 + pushd ${fdir}/${d} > /dev/null
59 + emake ACMLDIR="${S}/${fdir%/examples}"
60 emake clean
61 popd > /dev/null
62 done
63 @@ -64,14 +63,14 @@ src_test() {
64 src_install() {
65 # install libraries, pkgconfig file and eselect files for each profile
66 # fdef will be the default (gfortran if available) to be in path
67 - local fdef
68 + local fdef lib
69 for lib in */lib; do
70 local fdir=${lib%/*}
71 use examples || rm -rf ${fdir}/examples
72 use static-libs || rm -f ${fdir}/lib/*.a
73 insinto /${ACML_INST_DIR}
74 - doins -r ${fdir} || die "install ${fdir} failed"
75 - local acml_libs=
76 + doins -r ${fdir}
77 + local alib acml_libs
78 for alib in ${fdir}/lib/*.so; do
79 alib=$(basename ${alib} .so)
80 acml_libs="${acml_libs} -l${alib#lib}"
81 @@ -88,15 +87,15 @@ src_install() {
82 Libs: -L\${libdir} ${acml_libs}
83 Cflags: -I\${includedir}
84 EOF
85 - local libdir=$(get_libdir)
86 + local libdir=$(get_libdir) x
87 [[ ${fdef} == gfortran${libdir#lib} ]] || fdef=${fdir}
88 use multilib && [[ ${fdir} == *32* ]] && libdir=lib32
89 insinto /usr/${libdir}/pkgconfig
90 doins ${PN}-${fdir}.pc
91 for x in blas lapack; do
92 alternatives_for ${x} ${PN}-${fdir} 0 \
93 - "/usr/${libdir}/pkgconfig/${x}.pc" "${PN}-${fdir}.pc" \
94 - "/${ACML_INST_DIR}/${libdir}" "${fdir}/lib"
95 + /usr/${libdir}/pkgconfig/${x}.pc ${PN}-${fdir}.pc \
96 + /${ACML_INST_DIR}/${libdir} ${fdir}/lib
97 done
98 done
99 echo -n > 35acml "LDPATH=${EPREFIX}/${ACML_INST_DIR}/$(get_libdir)"
100 @@ -106,13 +105,13 @@ src_install() {
101 echo -n >> 35acml ":${EPREFIX}/${ACML_INST_DIR}/lib32"
102 fi
103 echo >> 35acml
104 - doenvd 35acml || die
105 + doenvd 35acml
106
107 insinto /${ACML_INST_DIR}
108 doins ReleaseNotes*
109 # info files go to standard /usr/share/info to avoid more env variables
110 - doinfo Doc/*info* || die "info install failed"
111 + doinfo Doc/*info*
112 rm Doc/*EULA* Doc/*info*
113 use doc || rm -rf Doc/*.pdf Doc/acml.html Doc/html
114 - doins -r Doc || die "install Doc failed"
115 + doins -r Doc
116 }