From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q5MLc-0003Mx-EP for garchives@archives.gentoo.org; Thu, 31 Mar 2011 18:11:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 468321C11D; Thu, 31 Mar 2011 18:11:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 059601C11D for ; Thu, 31 Mar 2011 18:11:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A8F71B41E0 for ; Thu, 31 Mar 2011 18:11:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 932DB80074 for ; Thu, 31 Mar 2011 18:11:12 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <31670d27197789c8fe9ec8327a92ef8a3e42df74.bicatali@gentoo> Subject: [gentoo-commits] dev/bicatali:master commit in: sci-libs/acml/ X-VCS-Repository: dev/bicatali X-VCS-Files: sci-libs/acml/Manifest sci-libs/acml/acml-4.4.0.ebuild X-VCS-Directories: sci-libs/acml/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 31670d27197789c8fe9ec8327a92ef8a3e42df74 Date: Thu, 31 Mar 2011 18:11:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 235ae987b321da3b97631225ef3e4684 commit: 31670d27197789c8fe9ec8327a92ef8a3e42df74 Author: S=C3=A9bastien Fabbro gentoo org> AuthorDate: Thu Mar 31 18:05:44 2011 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Thu Mar 31 18:05:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/bicatali.git;a= =3Dcommit;h=3D31670d27 switch to eapi4 + cleaning --- sci-libs/acml/Manifest | 2 +- sci-libs/acml/acml-4.4.0.ebuild | 29 ++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest index 49ce50d..a09e233 100644 --- a/sci-libs/acml/Manifest +++ b/sci-libs/acml/Manifest @@ -12,6 +12,6 @@ DIST acml-4-4-0-open64-64bit.tgz 42812747 RMD160 aa29a6= 15cf2b3294294162ccb89e9ad DIST acml-4-4-0-pgi-32bit.tgz 24562671 RMD160 78677d7f178e725ebe086d9690= c8ee72026929ba SHA1 cc0ceff8e8f5cb4a15175e2256c8708a8a7d2fb6 SHA256 f956b= 3fdd3e825c4b993a16179a8df2f772eda851aa4dd7f4a16fffb20c10580 DIST acml-4-4-0-pgi-64bit-int64.tgz 78664596 RMD160 2a0e9af1eef74009dce2= a256d4da8382baf39133 SHA1 6648385c614d367bd18e29eb60be3f99df07ae1e SHA256= f1290edb9c5a91b667139ae4e8eec2486e7ccd3f2aa19f7f65667eef0d85eca0 DIST acml-4-4-0-pgi-64bit.tgz 77842523 RMD160 e4c6770837f9eb511999872d28= 0715e6827b5f65 SHA1 2087b20359d72b2e7886b12356d4da0d2d563503 SHA256 9c07d= c0b90e9e491a0ddcf7849690338f21011aa4aa197ff3408f32a0b3fd6cf -EBUILD acml-4.4.0.ebuild 3518 RMD160 d8fd9e54163b7cd017d3d5f57eed8eb0581= 35b46 SHA1 7fa4bf6cd5262f72ecde49f18198ee3440529ae8 SHA256 73ec1e91299543= c17b12411f9b5467fafc593f1e9bf0c094bb94a5581fb98928 +EBUILD acml-4.4.0.ebuild 3384 RMD160 04293bd6cafda5b0d45bcfcd18c7c572c03= f9008 SHA1 cc72743e39266d806adabe0a45868551b997b634 SHA256 aedfaf68159f0a= 9f4f0a52d0be3649d36ffbcd88f7027c2252712d3369b117b1 MISC ChangeLog 8360 RMD160 9ba66449beb8a1e69a85350af6aa19f0b6a75282 SHA1= 3f9a99bd9338d885b78be8d6fa7dc571c45705f0 SHA256 0c5e6390e9db8d9564078133= f3b4d49300782dff4f1c474f420a61213dc78b9d MISC metadata.xml 1346 RMD160 df635430c989552278e7e2d262fbb32ffd11f99e S= HA1 e1432a7d071c4f1ae567c7d0fe6708e46ceac4df SHA256 5e41050f4380164e761f8= 36c29c818176cf23d239dc1e5aa29e4702cbbe85042 diff --git a/sci-libs/acml/acml-4.4.0.ebuild b/sci-libs/acml/acml-4.4.0.e= build index e48694d..3e9be5b 100644 --- a/sci-libs/acml/acml-4.4.0.ebuild +++ b/sci-libs/acml/acml-4.4.0.ebuild @@ -2,11 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D"3" +EAPI=3D4 =20 inherit eutils multilib toolchain-funcs versionator alternatives-2 =20 -ACML_INST_DIR=3D"opt/${PN}${PV}" +ACML_INST_DIR=3Dopt/${PN}${PV} QA_PREBUILT=3D"${ACML_INST_DIR}/*/lib/*" =20 MYP=3D${PN}-$(replace_all_version_separators -) @@ -48,13 +48,12 @@ src_unpack() { } =20 src_test() { + local fdir d for fdir in */examples; do einfo "Testing acml in ${fdir}" for d in . acml_mv; do - pushd ${fdir} > /dev/null - emake \ - ACMLDIR=3D"${S}/${fdir%/examples}" \ - || die "emake test in ${fdir}/${d} failed" + pushd ${fdir}/${d} > /dev/null + emake ACMLDIR=3D"${S}/${fdir%/examples}" emake clean popd > /dev/null done @@ -64,14 +63,14 @@ src_test() { src_install() { # install libraries, pkgconfig file and eselect files for each profile # fdef will be the default (gfortran if available) to be in path - local fdef + local fdef lib for lib in */lib; do local fdir=3D${lib%/*} use examples || rm -rf ${fdir}/examples use static-libs || rm -f ${fdir}/lib/*.a insinto /${ACML_INST_DIR} - doins -r ${fdir} || die "install ${fdir} failed" - local acml_libs=3D + doins -r ${fdir} + local alib acml_libs for alib in ${fdir}/lib/*.so; do alib=3D$(basename ${alib} .so) acml_libs=3D"${acml_libs} -l${alib#lib}" @@ -88,15 +87,15 @@ src_install() { Libs: -L\${libdir} ${acml_libs} Cflags: -I\${includedir} EOF - local libdir=3D$(get_libdir) + local libdir=3D$(get_libdir) x [[ ${fdef} =3D=3D gfortran${libdir#lib} ]] || fdef=3D${fdir} use multilib && [[ ${fdir} =3D=3D *32* ]] && libdir=3Dlib32 insinto /usr/${libdir}/pkgconfig doins ${PN}-${fdir}.pc for x in blas lapack; do alternatives_for ${x} ${PN}-${fdir} 0 \ - "/usr/${libdir}/pkgconfig/${x}.pc" "${PN}-${fdir}.pc" \ - "/${ACML_INST_DIR}/${libdir}" "${fdir}/lib" + /usr/${libdir}/pkgconfig/${x}.pc ${PN}-${fdir}.pc \ + /${ACML_INST_DIR}/${libdir} ${fdir}/lib done done echo -n > 35acml "LDPATH=3D${EPREFIX}/${ACML_INST_DIR}/$(get_libdir)" @@ -106,13 +105,13 @@ src_install() { echo -n >> 35acml ":${EPREFIX}/${ACML_INST_DIR}/lib32" fi echo >> 35acml - doenvd 35acml || die + doenvd 35acml =20 insinto /${ACML_INST_DIR} doins ReleaseNotes* # info files go to standard /usr/share/info to avoid more env variables - doinfo Doc/*info* || die "info install failed" + doinfo Doc/*info* rm Doc/*EULA* Doc/*info* use doc || rm -rf Doc/*.pdf Doc/acml.html Doc/html - doins -r Doc || die "install Doc failed" + doins -r Doc }