[gentoo-commits] proj/sci:master commit in: sci-libs/acml/

2017-09-02 Thread David Seifert
commit: 67d5b721e228dc4f42274cc4326897717a96f887
Author: David Seifert  gentoo  org>
AuthorDate: Sat Sep  2 11:38:36 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep  2 11:38:36 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=67d5b721

sci-libs/acml: Already removed from main tree

 sci-libs/acml/acml-5.3.1.ebuild   | 112 --
 sci-libs/acml/acml-6.1.0.31-r1.ebuild |  98 -
 sci-libs/acml/acml-6.1.0.31.ebuild|  98 -
 sci-libs/acml/metadata.xml|  27 
 4 files changed, 335 deletions(-)

diff --git a/sci-libs/acml/acml-5.3.1.ebuild b/sci-libs/acml/acml-5.3.1.ebuild
deleted file mode 100644
index 62f103ff4..0
--- a/sci-libs/acml/acml-5.3.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator alternatives-2 fortran-2
-
-ACML_INST_DIR=opt/${PN}${PV}
-QA_PREBUILT="${ACML_INST_DIR}/*/lib/*"
-
-MYP=${PN}-$(replace_all_version_separators -)
-
-DESCRIPTION="AMD Core Math Library for amd64 CPUs"
-HOMEPAGE="http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/acml-downloads-resources/";
-
-# here we go for the url mess
-FCOMP64=""
-URI="http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/acml-downloads-resources/";
-for fcomp in gfortran ifort open64 pgi; do
-   FCOMP64="${FCOMP64} ${fcomp}? ( ${URI}/${MYP}-${fcomp}-64bit.tgz
-   int64? ( ${URI}/${MYP}-${fcomp}-64bit-int64.tgz ) )"
-done
-SRC_URI="
-   amd64? ( ${FCOMP64}
-   !gfortran? ( !ifort? ( !open64? ( !pgi? (
-   ${URI}/${MYP}-gfortran-64bit.tgz
-   int64? ( ${URI}/${MYP}-gfortran-64bit-int64.tgz 
) ) ) ) ) )"
-
-LICENSE="ACML-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="doc examples cpu_flags_x86_fma4 gfortran ifort int64 open64 openmp pgi 
static-libs test"
-RESTRICT="fetch strip mirror"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-   unpack ${A}
-   unpack ./contents-acml-*.tgz
-   use openmp || rm -rf *_mp*
-   use cpu_flags_x86_fma4 || rm -rf *_fma*
-}
-
-src_test() {
-   local fdir d
-   for fdir in */examples; do
-   einfo "Testing acml in ${fdir}"
-   pushd ${fdir} > /dev/null
-   emake ACMLDIR="${S}/${fdir%/examples}"
-   emake clean
-   popd > /dev/null
-   done
-}
-
-src_install() {
-   # install libraries, pkgconfig file and eselect files for each profile
-   local prof libs fdir libdir=$(get_libdir)  x
-   for fdir in */lib; do
-   fdir=$(dirname ${fdir})
-   prof=acml-$(echo ${fdir} | sed \
-   -e 's:mp:openmp:' \
-   -e 's:_:-:g')
-   use examples || rm -r ${fdir}/examples
-   use static-libs || rm ${fdir}/lib/*.a
-   dodir /${ACML_INST_DIR}
-   cp -pPR ${fdir} "${ED}"/${ACML_INST_DIR} || die
-   libs="$(find ${fdir} -name \*.so -printf '%f ' | sed -e 
's:lib:-l:g' -e 's:\.so::g')"
-   cat <<-EOF > ${prof}.pc
-   prefix=${EROOT}/${ACML_INST_DIR}/${fdir}
-   libdir=\${prefix}/lib
-   includedir=\${prefix}/include
-   Name: ${prof}
-   Description: ${DESCRIPTION}
-   Version: ${PV}
-   URL: ${HOMEPAGE}
-   Libs: -L\${libdir} ${libs}
-   Libs.private: -lm -lrt ${threads}
-   Cflags: -I\${includedir}
-   EOF
-   insinto /usr/${libdir}/pkgconfig
-   doins ${prof}.pc
-   for x in blas lapack; do
-   alternatives_for ${x} ${prof} 0 \
-   /usr/${libdir}/pkgconfig/${x}.pc ${prof}.pc \
-   /${ACML_INST_DIR}/${libdir} ${fdir}/lib
-   done
-   done
-
-   echo > 35acml "LDPATH=${EROOT}/${ACML_INST_DIR}/${libdir}"
-   doenvd 35acml
-
-   # default profile: first one matching use flags
-   local opts=gfortran
-   for fdir in ifort open64 pgi; do
-   use ${fdir} && opts=${fdir}
-   done
-   opts+="64"
-   use cpu_flags_x86_fma4 && opts+="_fma4"
-   use openmp && opts+="_mp"
-   use int64 && opts+="_int64"
-   dosym $(ls -1d */lib | grep ${opts}) /${ACML_INST_DIR}/${libdir}
-
-   insinto /${ACML_INST_DIR}
-   # info files go to standard /usr/share/info to avoid more env variables
-   doinfo Doc/*info*
-   rm Doc/*EULA* Doc/*info* || die
-   use doc || rm -r Doc/*.pdf Doc/acml.html Doc/html
-   doins -r Doc 

[gentoo-commits] proj/sci:master commit in: sci-libs/acml/

2017-06-10 Thread Andrew Savchenko
commit: 4e3e3f13a4145928385253449fa295db3d11e8df
Author: Andrew Savchenko  gmail  com>
AuthorDate: Sat Jun 10 18:47:18 2017 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jun 10 18:47:18 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4e3e3f13

sci-libs/acml: fix missed opencl dep

1) acml is linked with opencl support:

libclFFT.so.2.3.1, libclBLAS.so.2.3.0, libacml_bridge.so.1.1.28:
libOpenCL.so.1 => not found

2) update to EAPI 6.

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-libs/acml/acml-6.1.0.31-r1.ebuild | 98 +++
 1 file changed, 98 insertions(+)

diff --git a/sci-libs/acml/acml-6.1.0.31-r1.ebuild 
b/sci-libs/acml/acml-6.1.0.31-r1.ebuild
new file mode 100644
index 0..e68935e1a
--- /dev/null
+++ b/sci-libs/acml/acml-6.1.0.31-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib toolchain-funcs versionator alternatives-2 fortran-2
+
+ACML_INST_DIR=opt/${PN}${PV}
+QA_PREBUILT="${ACML_INST_DIR}/*/lib/*"
+
+MYP=${PN}-$(replace_all_version_separators -)
+
+DESCRIPTION="AMD Core Math Library for amd64 CPUs"
+HOMEPAGE="http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/";
+CURI="http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/acml-downloads-resources/#download";
+SRC_URI="${P}-gfortran64.tgz"
+
+LICENSE="ACML-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="doc examples  test"
+RESTRICT="strip mirror fetch"
+
+DEPEND=""
+RDEPEND="virtual/opencl"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+   einfo "Please download"
+   einfo "$SRC_URI"
+   einfo " ${CURI} and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+   unpack ${A}
+   use openmp || rm -rf *_mp*
+}
+
+src_test() {
+   local fdir d
+   for fdir in */examples; do
+   einfo "Testing acml in ${fdir}"
+   pushd ${fdir} > /dev/null
+   emake ACMLDIR="${S}/${fdir%/examples}"
+   emake clean
+   popd > /dev/null
+   done
+}
+
+src_install() {
+   # install libraries, pkgconfig file and eselect files for each profile
+   local prof libs fdir libdir=$(get_libdir)  x
+   for fdir in */lib; do
+   fdir=$(dirname ${fdir})
+   prof=acml-$(echo ${fdir} | sed \
+   -e 's:mp:openmp:' \
+   -e 's:_:-:g')
+   use examples || rm -r ${fdir}/examples
+   dodir /${ACML_INST_DIR}
+   cp -pPR ${fdir} "${ED}"/${ACML_INST_DIR} || die
+   libs="$(find ${fdir} -name \*.so -printf '%f ' | sed -e 
's:lib:-l:g' -e 's:\.so::g')"
+   cat <<-EOF > ${prof}.pc
+   prefix=${EROOT}/${ACML_INST_DIR}/${fdir}
+   libdir=\${prefix}/lib
+   includedir=\${prefix}/include
+   Name: ${prof}
+   Description: ${DESCRIPTION}
+   Version: ${PV}
+   URL: ${HOMEPAGE}
+   Libs: -L\${libdir} ${libs}
+   Libs.private: -lm -lrt ${threads}
+   Cflags: -I\${includedir}
+   EOF
+   insinto /usr/${libdir}/pkgconfig
+   doins ${prof}.pc
+   for x in blas lapack; do
+   alternatives_for ${x} ${prof} 0 \
+   /usr/${libdir}/pkgconfig/${x}.pc ${prof}.pc \
+   /${ACML_INST_DIR}/${libdir} ${fdir}/lib
+   done
+   done
+
+   echo > 35acml "LDPATH=${EROOT}/${ACML_INST_DIR}/${libdir}"
+   doenvd 35acml
+
+   # default profile: first one matching use flags
+   local opts=gfortran64
+   use openmp && opts+="_mp"
+   dosym $(ls -1d */lib | grep ${opts}) /${ACML_INST_DIR}/${libdir}
+
+   insinto /${ACML_INST_DIR}
+   # info files go to standard /usr/share/info to avoid more env variables
+   doinfo Doc/*info*
+   rm Doc/*EULA* Doc/*info* || die
+   use doc || rm -r Doc/*.pdf Doc/acml.html Doc/html
+   doins -r Doc ReleaseNotes*
+}



[gentoo-commits] proj/sci:master commit in: sci-libs/acml/

2017-04-21 Thread Christoph Junghans
commit: f496d9f5b91eaea1e0541f7a1eb14a077e41231c
Author: Christoph Junghans  gentoo  org>
AuthorDate: Fri Apr 21 20:21:52 2017 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Fri Apr 21 20:21:52 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f496d9f5

sci-libs/acml: fix license

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/acml/acml-5.3.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/acml/acml-5.3.1.ebuild b/sci-libs/acml/acml-5.3.1.ebuild
index 10a0de008..62f103ff4 100644
--- a/sci-libs/acml/acml-5.3.1.ebuild
+++ b/sci-libs/acml/acml-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ SRC_URI="
${URI}/${MYP}-gfortran-64bit.tgz
int64? ( ${URI}/${MYP}-gfortran-64bit-int64.tgz 
) ) ) ) ) )"
 
-LICENSE="ACML"
+LICENSE="ACML-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~amd64-linux"
 IUSE="doc examples cpu_flags_x86_fma4 gfortran ifort int64 open64 openmp pgi 
static-libs test"



[gentoo-commits] proj/sci:master commit in: sci-libs/acml/

2016-08-31 Thread Marius Brehler
commit: 3681063c6709b7797b7246de8cdc4fc8c5c0a388
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Wed Aug 31 06:59:18 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Wed Aug 31 06:59:18 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3681063c

sci-libs/acml: Remove gfortran useflag, add fetch restriction; Fixes #667

Package-Manager: portage-2.2.28

 sci-libs/acml/acml-6.1.0.31.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/acml/acml-6.1.0.31.ebuild 
b/sci-libs/acml/acml-6.1.0.31.ebuild
index 9889e6c..380a630 100644
--- a/sci-libs/acml/acml-6.1.0.31.ebuild
+++ b/sci-libs/acml/acml-6.1.0.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,13 +14,13 @@ MYP=${PN}-$(replace_all_version_separators -)
 DESCRIPTION="AMD Core Math Library for amd64 CPUs"
 
HOMEPAGE="http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/";
 
CURI="http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/acml-downloads-resources/#download";
-SRC_URI="gfortran? ( ${P}-gfortran64.tgz )"
+SRC_URI="${P}-gfortran64.tgz"
 
 LICENSE="ACML-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="doc examples +gfortran openmp test"
-RESTRICT="strip mirror"
+IUSE="doc examples  test"
+RESTRICT="strip mirror fetch"
 
 DEPEND=""
 RDEPEND=""



[gentoo-commits] proj/sci:master commit in: sci-libs/acml/

2015-03-23 Thread Justin Lecher
commit: ba7f57d82b2562577f0fac114ee08abd6f79865b
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Mon Mar 23 07:50:34 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Mar 23 07:50:34 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ba7f57d8

sci-libs/acml: Fix #543740 (drop fma4)

Package-Manager: portage-2.2.14

 sci-libs/acml/ChangeLog| 3 +++
 sci-libs/acml/acml-6.1.0.31.ebuild | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 97bf101..f590973 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Mar 2015; Marius Brehler  acml-6.1.0.31.ebuild:
+  Fix #543740 (drop fma4)
+
 *acml-6.1.0.31 (02 Feb 2015)
 
   02 Feb 2015; Marius Brehler 

diff --git a/sci-libs/acml/acml-6.1.0.31.ebuild 
b/sci-libs/acml/acml-6.1.0.31.ebuild
index 02dd4fa..a64b8d0 100644
--- a/sci-libs/acml/acml-6.1.0.31.ebuild
+++ b/sci-libs/acml/acml-6.1.0.31.ebuild
@@ -19,7 +19,7 @@ SRC_URI="gfortran? ( ${P}-gfortran64.tgz )"
 LICENSE="ACML-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="doc examples cpu_flags_x86_fma4 +gfortran openmp test"
+IUSE="doc examples +gfortran openmp test"
 RESTRICT="strip mirror"
 
 DEPEND=""
@@ -87,7 +87,6 @@ src_install() {
 
# default profile: first one matching use flags
local opts=gfortran64
-   use cpu_flags_x86_fma4 && opts+="_fma4"
use openmp && opts+="_mp"
dosym $(ls -1d */lib | grep ${opts}) /${ACML_INST_DIR}/${libdir}
 



[gentoo-commits] proj/sci:master commit in: sci-libs/acml/

2015-02-02 Thread Justin Lecher
commit: 0407caed51ca5202fa34c41e712849ea8a41556c
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Mon Feb  2 08:44:29 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb  2 08:44:29 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0407caed

sci-libs/acml: Remove fma from metadata

---
 sci-libs/acml/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-libs/acml/metadata.xml b/sci-libs/acml/metadata.xml
index ca7fb2c..3d96729 100644
--- a/sci-libs/acml/metadata.xml
+++ b/sci-libs/acml/metadata.xml
@@ -15,7 +15,6 @@
   Alle Routinen sind hoch optimiert für AMD(R) x86 und amd64 CPUs.
 
 
-  Use the Fused Multiply Add instruction set
   Fetch and install acml compiled with GNU FORTRAN 
compiler
   Fetch and install acml compiled with the Intel FORTRAN 
compiler
   Install the 64 bits integer library



[gentoo-commits] proj/sci:master commit in: sci-libs/acml/

2015-02-02 Thread Justin Lecher
commit: f66fc758203a922959b415a3a4e0814aeba74b9f
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Mon Feb  2 08:51:43 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb  2 08:51:43 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f66fc758

 sci-libs/acml/acml-6.1.0.3: Version bump

---
 sci-libs/acml/ChangeLog|   6 +++
 sci-libs/acml/acml-6.1.0.31.ebuild | 100 +
 2 files changed, 106 insertions(+)

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 4c6ae9a..97bf101 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*acml-6.1.0.31 (02 Feb 2015)
+
+  02 Feb 2015; Marius Brehler 
+  +acml-6.1.0.21.ebuild:
+  Version bump
+
   02 Feb 2015; Marius Brehler 
   acml-5.3.0.ebuild:
   Convert fma to cpu_flags_x86_fma4

diff --git a/sci-libs/acml/acml-6.1.0.31.ebuild 
b/sci-libs/acml/acml-6.1.0.31.ebuild
new file mode 100644
index 000..02dd4fa
--- /dev/null
+++ b/sci-libs/acml/acml-6.1.0.31.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs versionator alternatives-2 fortran-2
+
+ACML_INST_DIR=opt/${PN}${PV}
+QA_PREBUILT="${ACML_INST_DIR}/*/lib/*"
+
+MYP=${PN}-$(replace_all_version_separators -)
+
+DESCRIPTION="AMD Core Math Library for amd64 CPUs"
+HOMEPAGE="http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/";
+CURI="http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/acml-downloads-resources/#download";
+SRC_URI="gfortran? ( ${P}-gfortran64.tgz )"
+
+LICENSE="ACML-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="doc examples cpu_flags_x86_fma4 +gfortran openmp test"
+RESTRICT="strip mirror"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+   einfo "Please download"
+   einfo "$SRC_URI"
+   einfo " ${CURI} and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+   unpack ${A}
+   use openmp || rm -rf *_mp*
+}
+
+src_test() {
+   local fdir d
+   for fdir in */examples; do
+   einfo "Testing acml in ${fdir}"
+   pushd ${fdir} > /dev/null
+   emake ACMLDIR="${S}/${fdir%/examples}"
+   emake clean
+   popd > /dev/null
+   done
+}
+
+src_install() {
+   # install libraries, pkgconfig file and eselect files for each profile
+   local prof libs fdir libdir=$(get_libdir)  x
+   for fdir in */lib; do
+   fdir=$(dirname ${fdir})
+   prof=acml-$(echo ${fdir} | sed \
+   -e 's:mp:openmp:' \
+   -e 's:_:-:g')
+   use examples || rm -r ${fdir}/examples
+   dodir /${ACML_INST_DIR}
+   cp -pPR ${fdir} "${ED}"/${ACML_INST_DIR} || die
+   libs="$(find ${fdir} -name \*.so -printf '%f ' | sed -e 
's:lib:-l:g' -e 's:\.so::g')"
+   cat <<-EOF > ${prof}.pc
+   prefix=${EROOT}/${ACML_INST_DIR}/${fdir}
+   libdir=\${prefix}/lib
+   includedir=\${prefix}/include
+   Name: ${prof}
+   Description: ${DESCRIPTION}
+   Version: ${PV}
+   URL: ${HOMEPAGE}
+   Libs: -L\${libdir} ${libs}
+   Libs.private: -lm -lrt ${threads}
+   Cflags: -I\${includedir}
+   EOF
+   insinto /usr/${libdir}/pkgconfig
+   doins ${prof}.pc
+   for x in blas lapack; do
+   alternatives_for ${x} ${prof} 0 \
+   /usr/${libdir}/pkgconfig/${x}.pc ${prof}.pc \
+   /${ACML_INST_DIR}/${libdir} ${fdir}/lib
+   done
+   done
+
+   echo > 35acml "LDPATH=${EROOT}/${ACML_INST_DIR}/${libdir}"
+   doenvd 35acml
+
+   # default profile: first one matching use flags
+   local opts=gfortran64
+   use cpu_flags_x86_fma4 && opts+="_fma4"
+   use openmp && opts+="_mp"
+   dosym $(ls -1d */lib | grep ${opts}) /${ACML_INST_DIR}/${libdir}
+
+   insinto /${ACML_INST_DIR}
+   # info files go to standard /usr/share/info to avoid more env variables
+   doinfo Doc/*info*
+   rm Doc/*EULA* Doc/*info* || die
+   use doc || rm -r Doc/*.pdf Doc/acml.html Doc/html
+   doins -r Doc ReleaseNotes*
+}



[gentoo-commits] proj/sci:master commit in: sci-libs/acml/

2015-02-02 Thread Justin Lecher
commit: 12912c9a61a031535208d92c31e25979cfdd7b4d
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Mon Feb  2 08:33:31 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb  2 08:33:31 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=12912c9a

sci-libs/acml-5.3.1: Convert fma to cpu_flags_x86_fma4

---
 sci-libs/acml/ChangeLog | 4 
 sci-libs/acml/acml-5.3.1.ebuild | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 35c47e8..4c6ae9a 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Feb 2015; Marius Brehler 
+  acml-5.3.0.ebuild:
+  Convert fma to cpu_flags_x86_fma4
+
   20 Jan 2015; Marius Brehler 
   acml-5.3.0.ebuild:
   Fix HOMEPAGE and URI

diff --git a/sci-libs/acml/acml-5.3.1.ebuild b/sci-libs/acml/acml-5.3.1.ebuild
index ea6ca80..0070173 100644
--- a/sci-libs/acml/acml-5.3.1.ebuild
+++ b/sci-libs/acml/acml-5.3.1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 LICENSE="ACML"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="doc examples fma gfortran ifort int64 open64 openmp pgi static-libs test"
+IUSE="doc examples cpu_flags_x86_fma4 gfortran ifort int64 open64 openmp pgi 
static-libs test"
 RESTRICT="fetch strip mirror"
 
 DEPEND=""
@@ -42,7 +42,7 @@ src_unpack() {
unpack ${A}
unpack ./contents-acml-*.tgz
use openmp || rm -rf *_mp*
-   use fma || rm -rf *_fma*
+   use cpu_flags_x86_fma4 || rm -rf *_fma*
 }
 
 src_test() {
@@ -99,7 +99,7 @@ src_install() {
use ${fdir} && opts=${fdir}
done
opts+="64"
-   use fma && opts+="_fma4"
+   use cpu_flags_x86_fma4 && opts+="_fma4"
use openmp && opts+="_mp"
use int64 && opts+="_int64"
dosym $(ls -1d */lib | grep ${opts}) /${ACML_INST_DIR}/${libdir}



[gentoo-commits] proj/sci:master commit in: sci-libs/acml/

2015-01-21 Thread Christoph Junghans
commit: 3688f2382826b1d8f07e59835cc98a20f9cb1c03
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Jan 20 23:05:22 2015 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Tue Jan 20 23:05:49 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3688f238

sci-libs/acml: Fix HOMEPAGE and URI

---
 sci-libs/acml/ChangeLog | 8 ++--
 sci-libs/acml/acml-5.3.1.ebuild | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index afa30a8..35c47e8 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/acml
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.40 2009/07/07 
23:27:59 flameeyes Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  20 Jan 2015; Marius Brehler 
+  acml-5.3.0.ebuild:
+  Fix HOMEPAGE and URI
 
   25 Feb 2013; Sébastien Fabbro  acml-5.3.0.ebuild:
   sci-libs/acml: Add -lm -lrt for static linking on pc file

diff --git a/sci-libs/acml/acml-5.3.1.ebuild b/sci-libs/acml/acml-5.3.1.ebuild
index f61d92c..ea6ca80 100644
--- a/sci-libs/acml/acml-5.3.1.ebuild
+++ b/sci-libs/acml/acml-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,11 +12,11 @@ QA_PREBUILT="${ACML_INST_DIR}/*/lib/*"
 MYP=${PN}-$(replace_all_version_separators -)
 
 DESCRIPTION="AMD Core Math Library for amd64 CPUs"
-HOMEPAGE="http://developer.amd.com/tools/cpu-development/amd-core-math-library-acml/";
+HOMEPAGE="http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/acml-downloads-resources/";
 
 # here we go for the url mess
 FCOMP64=""
-URI="http://developer.amd.com/tools/cpu-development/amd-core-math-library-acml/acml-downloads-resources/";
+URI="http://developer.amd.com/tools-and-sdks/cpu-development/amd-core-math-library-acml/acml-downloads-resources/";
 for fcomp in gfortran ifort open64 pgi; do
FCOMP64="${FCOMP64} ${fcomp}? ( ${URI}/${MYP}-${fcomp}-64bit.tgz
int64? ( ${URI}/${MYP}-${fcomp}-64bit-int64.tgz ) )"