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

2018-06-21 Thread Justin Lecher
commit: d5dd592716fd81b3d93d57bf5c7b415b055d647f
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Jun 21 19:06:01 2018 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Jun 21 19:06:01 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d5dd5927

sci-libs/lapack-reference: Run cmake-utils_src_prepare

Signed-off-by: Justin Lecher  gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild | 2 +-
 sci-libs/lapack-reference/lapack-reference-.ebuild   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild
index e5adb3ced..32b0cd5db 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild
@@ -35,7 +35,7 @@ S="${WORKDIR}/${MYP}"
 src_prepare() {
numeric-int64_ensure_blas_int_support
 
-   default
+   cmake-utils_src_prepare
 
# rename library to avoid collision with other lapack implementations
# ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, 
they

diff --git a/sci-libs/lapack-reference/lapack-reference-.ebuild 
b/sci-libs/lapack-reference/lapack-reference-.ebuild
index 9404e65c3..a22d2d722 100644
--- a/sci-libs/lapack-reference/lapack-reference-.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-.ebuild
@@ -40,6 +40,8 @@ S="${WORKDIR}/${MYP}"
 src_prepare() {
numeric-int64_ensure_blas_int_support
 
+   cmake-utils_src_prepare
+
# rename library to avoid collision with other lapack implementations
# ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, 
they
# are in single quotes in the following seds.  They are set later by



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

2018-06-21 Thread Justin Lecher
commit: 9a8650d9abf6246ed47f13f79cc125754f038f2d
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Jun 21 18:39:24 2018 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Jun 21 18:39:24 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9a8650d9

sci-libs/lapack-reference: Bump EAPI

Signed-off-by: Justin Lecher  gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/sci-libs/lapack-reference/lapack-reference-.ebuild 
b/sci-libs/lapack-reference/lapack-reference-.ebuild
index b9742cce2..9404e65c3 100644
--- a/sci-libs/lapack-reference/lapack-reference-.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 



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

2018-06-21 Thread Justin Lecher
commit: 2a6f2f23e7e8acd665cf02df87d3b6063d94d9fb
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Jun 21 18:36:51 2018 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Jun 21 18:36:51 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2a6f2f23

sci-libs/lapack-reference: Clean old

Signed-off-by: Justin Lecher  gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../lapack-reference-3.5.0-r100.ebuild | 117 ---
 .../lapack-reference-3.6.0-r100.ebuild | 124 -
 .../lapack-reference-3.6.1-r100.ebuild | 124 -
 3 files changed, 365 deletions(-)

diff --git a/sci-libs/lapack-reference/lapack-reference-3.5.0-r100.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.5.0-r100.ebuild
deleted file mode 100644
index e41622ff5..0
--- a/sci-libs/lapack-reference/lapack-reference-3.5.0-r100.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-NUMERIC_MODULE_NAME="reflapack"
-
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild 
python-any-r1
-
-MY_PN=lapack
-MYP=${MY_PN}-${PV}
-
-DESCRIPTION="Reference implementation of LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/;
-SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz;
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test xblas"
-
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-   >=virtual/blas-2.1-r3[int64?,${MULTILIB_USEDEP}]
-   xblas? ( sci-libs/xblas[fortran,int64?] )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   test? ( ${PYTHON_DEPS} )"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-   numeric-int64_ensure_blas_int_support
-
-   # rename library to avoid collision with other lapack implementations
-   # ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, 
they
-   # are in single quotes in the following seds.  They are set later by
-   # defining a cmake variables with -DPROFNAME etc in src_configure.
-   sed -i \
-   -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
-   -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
-   -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
-   CMakeLists.txt || die
-   sed -i \
-   -e 's:(lapack:(${LIBNAME}:g' \
-   SRC/CMakeLists.txt || die
-   sed -i \
-   -e '/Name: /s:lapack:${PROFNAME}:' \
-   -e 's:-llapack:-l${LIBNAME}:g' \
-   -e '/Requires: 
/s:blas:${BLAS_REQUIRES}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}:' \
-   lapack.pc.in || die
-   # some string does not get passed properly
-   sed -i \
-   -e '/lapack_testing.py/d' \
-   CTestCustom.cmake.in || die
-   # separate ebuild to tmglib
-   sed -i \
-   -e '/lapack_install_library(tmglib)/d' \
-   TESTING/MATGEN/CMakeLists.txt || die
-}
-
-src_configure() {
-   lapack_configure() {
-   local profname=$(numeric-int64_get_module_name)
-   local libname="${profname//-/_}"
-   local blas_profname=$(numeric-int64_get_blas_alternative)
-   local xblas_profname=$(numeric-int64_get_xblas_alternative)
-   local xblas_libname="${xblas_profname//-/_}"
-   local blas_requires="${blas_profname}"
-   use xblas && \
-   blas_requires+=" ${xblas_profname}"
-   local mycmakeargs=(
-   -DPROFNAME="${profname}"
-   -DBLAS_REQUIRES="${blas_requires}"
-   -DLIBNAME="${libname}"
-   -DUSE_OPTIMIZED_BLAS=ON
-   -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs 
${blas_profname})"
-   $(cmake-utils_use_build test TESTING)
-   $(cmake-utils_use_use xblas XBLAS)
-   -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CFLAGS}"
-   -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CXXFLAGS}"
-   -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) $(get_abi_CFLAGS) 
$(numeric-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"
-   
-DLAPACK_PKGCONFIG_FFLAGS="$(numeric-int64_get_fortran_int64_abi_fflags)"
-   )
-   use xblas && \
-   mycmakeargs+=( 
-DXBLAS_LIBRARY:FILEPATH="${EROOT}usr/$(get_libdir)/lib${xblas_libname}.so" )
-   if $(numeric-int64_is_static_build); then
-   mycmakeargs+=(
-   -DBUILD_SHARED_LIBS=OFF
-   -DBUILD_STATIC_LIBS=ON
-   )
- 

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

2018-06-21 Thread Justin Lecher
commit: c4d9ac48f18eab5d44da15e8e8b36eca9d1353de
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Jun 21 18:36:01 2018 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Jun 21 18:36:01 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c4d9ac48

sci-libs/lapack-reference: Version Bump

Signed-off-by: Justin Lecher  gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../lapack-reference-3.8.0-r100.ebuild | 120 +
 1 file changed, 120 insertions(+)

diff --git a/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild
new file mode 100644
index 0..e5adb3ced
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.8.0-r100.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+NUMERIC_MODULE_NAME="reflapack"
+
+inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild 
python-any-r1
+
+MY_PN=lapack
+MYP=${MY_PN}-${PV}
+
+DESCRIPTION="Reference implementation of LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/;
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+deprecated static-libs test xblas"
+
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   >=virtual/blas-2.1-r3[int64?,${MULTILIB_USEDEP}]
+   xblas? ( sci-libs/xblas[fortran,int64?] )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( ${PYTHON_DEPS} )"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+   numeric-int64_ensure_blas_int_support
+
+   default
+
+   # rename library to avoid collision with other lapack implementations
+   # ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, 
they
+   # are in single quotes in the following seds.  They are set later by
+   # defining a cmake variables with -DPROFNAME etc in src_configure.
+   sed \
+   -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
+   -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
+   -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
+   -i CMakeLists.txt || die
+   sed -i \
+   -e 's:(lapack:(${LIBNAME}:g' \
+   -e '/PROPERTIES/s:lapack:${LIBNAME}:g' \
+   SRC/CMakeLists.txt || die
+   sed -i \
+   -e '/Name: /s:lapack:@PROFNAME@:' \
+   -e 's:-llapack:-l@LIBNAME@:g' \
+   -e '/Requires: /s:blas:@BLAS_REQUIRES@\nFflags\: 
${LAPACK_PKGCONFIG_FFLAGS}:' \
+   lapack.pc.in || die
+   # some string does not get passed properly
+   sed -i \
+   -e '/lapack_testing.py/d' \
+   CTestCustom.cmake.in || die
+   # separate ebuild to tmglib
+   sed -i \
+   -e '/lapack_install_library(tmglib)/d' \
+   TESTING/MATGEN/CMakeLists.txt || die
+}
+
+src_configure() {
+   lapack_configure() {
+   local profname=$(numeric-int64_get_module_name)
+   local libname="${profname//-/_}"
+   local blas_profname=$(numeric-int64_get_blas_alternative)
+   local xblas_profname=$(numeric-int64_get_xblas_alternative)
+   local xblas_libname="${xblas_profname//-/_}"
+   local blas_requires="${blas_profname}"
+   use xblas && \
+   blas_requires+=" ${xblas_profname}"
+   local mycmakeargs=(
+   -DPROFNAME="${profname}"
+   -DBLAS_REQUIRES="${blas_requires}"
+   -DLIBNAME="${libname}"
+   -DUSE_OPTIMIZED_BLAS=ON
+   -DBUILD_TESTING="$(usex test)"
+   -DUSE_XBLAS="$(usex xblas)"
+   -DBUILD_DEPRECATED="$(usex deprecated)"
+   -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CFLAGS}"
+   -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CXXFLAGS}"
+   -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) $(get_abi_CFLAGS) 
$(numeric-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"
+   
-DLAPACK_PKGCONFIG_FFLAGS="$(numeric-int64_get_fortran_int64_abi_fflags)"
+   )
+   use xblas && \
+   mycmakeargs+=( 
-DXBLAS_LIBRARY:FILEPATH="${EROOT}usr/$(get_libdir)/lib${xblas_libname}.so" )
+   if $(numeric-int64_is_static_build); then
+   mycmakeargs+=(
+   -DBUILD_SHARED_LIBS=OFF
+   -DBUILD_STATIC_LIBS=ON
+   )
+   else
+   mycmakeargs+=(
+   

[gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/, sci-libs/lapack-reference/files/

2017-02-03 Thread Marius Brehler
commit: 483501fb94fe08de97627f08d04854cc9ae04e6e
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri Feb  3 02:44:37 2017 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Fri Feb  3 02:44:37 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=483501fb

sci-libs/lapack-reference: version bump to 3.7.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../lapack-reference-3.7.0-fix-build-system.patch  |  56 ++
 .../lapack-reference-3.7.0-r100.ebuild | 123 +
 2 files changed, 179 insertions(+)

diff --git 
a/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch 
b/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch
new file mode 100644
index 000..70f7cb0
--- /dev/null
+++ 
b/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch
@@ -0,0 +1,56 @@
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+index 7fd6f1e..e52f3ad 100644
+--- a/BLAS/blas.pc.in
 b/BLAS/blas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: BLAS
+ Description: FORTRAN reference implementation of BLAS Basic Linear Algebra 
Subprograms
+diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
+index 4a938fe..311aed9 100644
+--- a/CBLAS/cblas.pc.in
 b/CBLAS/cblas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: CBLAS
+ Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
+diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
+index 028f8da..dc092b1 100644
+--- a/LAPACKE/lapacke.pc.in
 b/LAPACKE/lapacke.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: LAPACKE
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage
+diff --git a/lapack.pc.in b/lapack.pc.in
+index 878efc2..2cca4c2 100644
+--- a/lapack.pc.in
 b/lapack.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: LAPACK
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage

diff --git a/sci-libs/lapack-reference/lapack-reference-3.7.0-r100.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.7.0-r100.ebuild
new file mode 100644
index 000..d3194a4
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.7.0-r100.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+NUMERIC_MODULE_NAME="reflapack"
+
+inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild 
python-any-r1
+
+MY_PN=lapack
+MYP=${MY_PN}-${PV}
+
+DESCRIPTION="Reference implementation of LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/;
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+deprecated static-libs test xblas"
+
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   >=virtual/blas-2.1-r3[int64?,${MULTILIB_USEDEP}]
+   xblas? ( sci-libs/xblas[fortran,int64?] )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( ${PYTHON_DEPS} )"
+
+S="${WORKDIR}/${MYP}"
+PATCHES=( "${FILESDIR}/lapack-reference-${PV}-fix-build-system.patch" )
+
+src_prepare() {
+   numeric-int64_ensure_blas_int_support
+
+   default
+
+   # rename library to avoid collision with other lapack implementations
+   # ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, 
they
+   # are in single quotes in the following seds.  They are set later by
+   # defining a cmake variables with -DPROFNAME etc in src_configure.
+   sed \
+   -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
+   -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
+   -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
+   -i CMakeLists.txt || die
+   sed -i \
+   -e 's:(lapack:(${LIBNAME}:g' \
+   -e '/PROPERTIES/s:lapack:${LIBNAME}:g' \
+   SRC/CMakeLists.txt || die
+   sed -i \
+   -e '/Name: /s:lapack:@PROFNAME@:' \
+   -e 's:-llapack:-l@LIBNAME@:g' \
+   -e '/Requires: /s:blas:@BLAS_REQUIRES@\nFflags\: 
${LAPACK_PKGCONFIG_FFLAGS}:' \
+   lapack.pc.in || die
+   # some string does not get passed properly
+   sed -i \
+   -e '/lapack_testing.py/d' \
+   

[gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/files/, sci-libs/lapack-reference/

2016-11-22 Thread Marius Brehler
commit: f9a757b36cddd8bc5802b097a2fd4ccea8024c69
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Nov 22 10:23:07 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Tue Nov 22 10:23:07 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f9a757b3

sci-libs/lapack-reference: Version bump to 3.6.1

Package-Manager: portage-2.3.0

 .../files/lapack-3.6.1-fix-build-system.patch  |  88 +++
 .../lapack-reference-3.6.1-r100.ebuild | 125 +
 2 files changed, 213 insertions(+)

diff --git 
a/sci-libs/lapack-reference/files/lapack-3.6.1-fix-build-system.patch 
b/sci-libs/lapack-reference/files/lapack-3.6.1-fix-build-system.patch
new file mode 100644
index 000..b16cb3e
--- /dev/null
+++ b/sci-libs/lapack-reference/files/lapack-3.6.1-fix-build-system.patch
@@ -0,0 +1,88 @@
+--- lapack-3.6.1/BLAS/blas.pc.in
 lapack-3.6.1/BLAS/blas.pc.in
+@@ -1,5 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
+ libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: blas
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+--- lapack-3.6.1/BLAS/CMakeLists.txt
 lapack-3.6.1/BLAS/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(BUILD_TESTING)
+ add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
+ install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.1/CBLAS/cblas.pc.in
 lapack-3.6.1/CBLAS/cblas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapacke
+ Description: C Standard Interface to BLAS Linear Algebra PACKage
+--- lapack-3.6.1/CBLAS/CMakeLists.txt
 lapack-3.6.1/CBLAS/CMakeLists.txt
+@@ -71,7 +71,7 @@
+   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.1/CMakeLists.txt
 lapack-3.6.1/CMakeLists.txt
+@@ -333,7 +333,7 @@
+   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.1/LAPACKE/CMakeLists.txt
 lapack-3.6.1/LAPACKE/CMakeLists.txt
+@@ -65,7 +65,7 @@
+ endif(BUILD_TESTING)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
+  install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.1/LAPACKE/lapacke.pc.in
 lapack-3.6.1/LAPACKE/lapacke.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapacke
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage
+--- lapack-3.6.1/lapack.pc.in
 lapack-3.6.1/lapack.pc.in
+@@ -1,5 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
+ libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapack
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage

diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.1-r100.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.6.1-r100.ebuild
new file mode 100644
index 000..850dde9
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.1-r100.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+NUMERIC_MODULE_NAME="reflapack"
+
+inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild 
python-any-r1
+
+MY_PN=lapack
+MYP=${MY_PN}-${PV}
+
+DESCRIPTION="Reference implementation of LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/;
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+deprecated static-libs test xblas"
+
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   >=virtual/blas-2.1-r3[int64?,${MULTILIB_USEDEP}]
+   

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

2016-10-12 Thread Marius Brehler
commit: 0a61dacbb33957629374023397bee4ab13980ed9
Author: Matthias Maier  gentoo  org>
AuthorDate: Sat Sep 24 19:56:36 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Sat Sep 24 20:10:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0a61dacb

sci-libs/lapack-reference: revision bump to -r100

This ensures that blas-reference versions from ::science are preferred over
versions from ::gentoo.

Package-Manager: portage-2.2.28

 .../{lapack-reference-3.5.0.ebuild => lapack-reference-3.5.0-r100.ebuild} | 0
 ...apack-reference-3.6.0-r1.ebuild => lapack-reference-3.6.0-r100.ebuild} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.5.0-r100.ebuild
similarity index 100%
rename from sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild
rename to sci-libs/lapack-reference/lapack-reference-3.5.0-r100.ebuild

diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.6.0-r100.ebuild
similarity index 100%
rename from sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
rename to sci-libs/lapack-reference/lapack-reference-3.6.0-r100.ebuild



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

2015-12-03 Thread Justin Lecher
commit: 78eb73445aa8fea78e969d6ce4a6431e757fe0f7
Author: Ted Tanberry  gmail  com>
AuthorDate: Thu Dec  3 08:38:45 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Dec  3 08:38:45 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=78eb7344

sci-libs/lapack-reference: revbump

 .../{lapack-reference-3.6.0.ebuild => lapack-reference-3.6.0-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
similarity index 97%
rename from sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
rename to sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
index c06fe42..bec6ed9 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 NUMERIC_MODULE_NAME="reflapack"
 
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild 
python-any-r1 eutils
+inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild 
python-any-r1
 
 MY_PN=lapack
 MYP=${MY_PN}-${PV}



[gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/, sci-libs/lapack-reference/files/

2015-12-03 Thread Justin Lecher
commit: 97a8f7c1c9948ef28eb5a5c2466f0fd0f521d0dd
Author: Ted Tanberry  gmail  com>
AuthorDate: Wed Dec  2 19:29:37 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Dec  2 19:29:37 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=97a8f7c1

sci-libs/lapack-reference: update pkg-config handling

 .../files/lapack-fix-build-system.patch| 92 ++
 .../lapack-reference/lapack-reference-3.6.0.ebuild | 13 ++-
 2 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/sci-libs/lapack-reference/files/lapack-fix-build-system.patch 
b/sci-libs/lapack-reference/files/lapack-fix-build-system.patch
new file mode 100644
index 000..8661709
--- /dev/null
+++ b/sci-libs/lapack-reference/files/lapack-fix-build-system.patch
@@ -0,0 +1,92 @@
+--- lapack-3.6.0/BLAS/blas.pc.in
 lapack-3.6.0/BLAS/blas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: blas
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+--- lapack-3.6.0/BLAS/CMakeLists.txt
 lapack-3.6.0/BLAS/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(BUILD_TESTING)
+ add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
+ install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CBLAS/cblas.pc.in
 lapack-3.6.0/CBLAS/cblas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapacke
+ Description: C Standard Interface to BLAS Linear Algebra PACKage
+--- lapack-3.6.0/CBLAS/CMakeLists.txt
 lapack-3.6.0/CBLAS/CMakeLists.txt
+@@ -71,7 +71,7 @@
+   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CMakeLists.txt
 lapack-3.6.0/CMakeLists.txt
+@@ -333,7 +333,7 @@
+   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/CMakeLists.txt
 lapack-3.6.0/LAPACKE/CMakeLists.txt
+@@ -65,7 +65,7 @@
+ endif(BUILD_TESTING)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
+  install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/lapacke.pc.in
 lapack-3.6.0/LAPACKE/lapacke.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapacke
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage
+--- lapack-3.6.0/lapack.pc.in
 lapack-3.6.0/lapack.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapack
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage

diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
index ac88f98..c06fe42 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 NUMERIC_MODULE_NAME="reflapack"
 
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild 
python-any-r1
+inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild 
python-any-r1 eutils
 
 MY_PN=lapack
 MYP=${MY_PN}-${PV}
@@ -32,10 +32,15 @@ DEPEND="${RDEPEND}
test? ( ${PYTHON_DEPS} )"
 
 S="${WORKDIR}/${MYP}"
+PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
 
 src_prepare() {
numeric-int64_ensure_blas_int_support
 
+   # the lapack(e)/(c)blas build system is somewhat broken
+   # with respect to its pkg-config files.
+   epatch "${PATCHES[@]}"
+
# rename library to avoid collision with other lapack 

[gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/files/, sci-libs/lapack-reference/

2015-12-03 Thread Justin Lecher
commit: 29e777ee0b73abb981c61de56e6138226e0843d2
Author: Ted Tanberry  gmail  com>
AuthorDate: Wed Dec  2 19:29:37 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Dec  3 09:42:20 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=29e777ee

sci-libs/lapack-reference: update pkg-config handling

 .../files/lapack-fix-build-system.patch| 92 ++
 .../lapack-reference/lapack-reference-3.6.0.ebuild | 13 ++-
 2 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/sci-libs/lapack-reference/files/lapack-fix-build-system.patch 
b/sci-libs/lapack-reference/files/lapack-fix-build-system.patch
new file mode 100644
index 000..8661709
--- /dev/null
+++ b/sci-libs/lapack-reference/files/lapack-fix-build-system.patch
@@ -0,0 +1,92 @@
+--- lapack-3.6.0/BLAS/blas.pc.in
 lapack-3.6.0/BLAS/blas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: blas
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+--- lapack-3.6.0/BLAS/CMakeLists.txt
 lapack-3.6.0/BLAS/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(BUILD_TESTING)
+ add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
+ install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CBLAS/cblas.pc.in
 lapack-3.6.0/CBLAS/cblas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapacke
+ Description: C Standard Interface to BLAS Linear Algebra PACKage
+--- lapack-3.6.0/CBLAS/CMakeLists.txt
 lapack-3.6.0/CBLAS/CMakeLists.txt
+@@ -71,7 +71,7 @@
+   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CMakeLists.txt
 lapack-3.6.0/CMakeLists.txt
+@@ -333,7 +333,7 @@
+   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+   install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/CMakeLists.txt
 lapack-3.6.0/LAPACKE/CMakeLists.txt
+@@ -65,7 +65,7 @@
+ endif(BUILD_TESTING)
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
+  install(FILES
+   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+   DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/lapacke.pc.in
 lapack-3.6.0/LAPACKE/lapacke.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapacke
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage
+--- lapack-3.6.0/lapack.pc.in
 lapack-3.6.0/lapack.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: lapack
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage

diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
index ac88f98..c06fe42 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 NUMERIC_MODULE_NAME="reflapack"
 
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild 
python-any-r1
+inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild 
python-any-r1 eutils
 
 MY_PN=lapack
 MYP=${MY_PN}-${PV}
@@ -32,10 +32,15 @@ DEPEND="${RDEPEND}
test? ( ${PYTHON_DEPS} )"
 
 S="${WORKDIR}/${MYP}"
+PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
 
 src_prepare() {
numeric-int64_ensure_blas_int_support
 
+   # the lapack(e)/(c)blas build system is somewhat broken
+   # with respect to its pkg-config files.
+   epatch "${PATCHES[@]}"
+
# rename library to avoid collision with other lapack 

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

2015-12-03 Thread Justin Lecher
commit: 11f24ae828fb53590884c6813c93ba98bbb1ee50
Author: Ted Tanberry  gmail  com>
AuthorDate: Thu Dec  3 08:38:45 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Dec  3 09:42:20 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=11f24ae8

sci-libs/lapack-reference: revbump

 .../{lapack-reference-3.6.0.ebuild => lapack-reference-3.6.0-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
similarity index 97%
rename from sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
rename to sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
index c06fe42..bec6ed9 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 NUMERIC_MODULE_NAME="reflapack"
 
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild 
python-any-r1 eutils
+inherit alternatives-2 cmake-utils eutils fortran-2 numeric-int64-multibuild 
python-any-r1
 
 MY_PN=lapack
 MYP=${MY_PN}-${PV}



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

2015-11-30 Thread Justin Lecher
commit: b98f9a007215d0a6819db2e4583eb8b70c0cadc6
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 30 14:47:45 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 30 14:47:45 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b98f9a00

sci-libs/lapack-reference: Set subslots

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild | 2 +-
 sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild | 2 +-
 sci-libs/lapack-reference/lapack-reference-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild
index 30458b5..84b5292 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.5.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.netlib.org/lapack/;
 SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz;
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test xblas"
 

diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
index 5e3cb88..8623bef 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.netlib.org/lapack/;
 SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz;
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test xblas"
 

diff --git a/sci-libs/lapack-reference/lapack-reference-.ebuild 
b/sci-libs/lapack-reference/lapack-reference-.ebuild
index 466c762..8d46590 100644
--- a/sci-libs/lapack-reference/lapack-reference-.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.netlib.org/lapack/;
 EGIT_REPO_URI="https://github.com/nschloe/lapack.git;
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="static-libs test xblas"
 



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

2015-11-30 Thread Justin Lecher
commit: 6d88f2276ab3a1c256b3fb98482c6381f4ee030d
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 30 13:20:46 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 30 13:20:46 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6d88f227

sci-libs/lapack-reference: Version Bump

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 .../lapack-reference/lapack-reference-3.6.0.ebuild | 119 +
 1 file changed, 119 insertions(+)

diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
new file mode 100644
index 000..5e3cb88
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+NUMERIC_MODULE_NAME="reflapack"
+
+inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild 
python-any-r1
+
+MY_PN=lapack
+MYP=${MY_PN}-${PV}
+
+DESCRIPTION="Reference implementation of LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/;
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test xblas"
+
+REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   >=virtual/blas-2.1-r3[int64?,${MULTILIB_USEDEP}]
+   xblas? ( sci-libs/xblas[fortran,int64?] )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( ${PYTHON_DEPS} )"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+   numeric-int64_ensure_blas_int_support
+
+   # rename library to avoid collision with other lapack implementations
+   # ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, 
they
+   # are in single quotes in the following seds.  They are set later by
+   # defining a cmake variables with -DPROFNAME etc in src_configure.
+   sed \
+   -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
+   -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
+   -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
+   -i CMakeLists.txt || die
+   sed -i \
+   -e 's:(lapack:(${LIBNAME}:g' \
+   -e '/PROPERTIES/s:lapack:${LIBNAME}:g' \
+   SRC/CMakeLists.txt || die
+   sed -i \
+   -e '/Name: /s:lapack:${PROFNAME}:' \
+   -e 's:-llapack:-l${LIBNAME}:g' \
+   -e '/Requires: 
/s:blas:${BLAS_REQUIRES}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}:' \
+   lapack.pc.in || die
+   # some string does not get passed properly
+   sed -i \
+   -e '/lapack_testing.py/d' \
+   CTestCustom.cmake.in || die
+   # separate ebuild to tmglib
+   sed -i \
+   -e '/lapack_install_library(tmglib)/d' \
+   TESTING/MATGEN/CMakeLists.txt || die
+}
+
+src_configure() {
+   lapack_configure() {
+   local profname=$(numeric-int64_get_module_name)
+   local libname="${profname//-/_}"
+   local blas_profname=$(numeric-int64_get_blas_alternative)
+   local xblas_profname=$(numeric-int64_get_xblas_alternative)
+   local xblas_libname="${xblas_profname//-/_}"
+   local blas_requires="${blas_profname}"
+   use xblas && \
+   blas_requires+=" ${xblas_profname}"
+   local mycmakeargs=(
+   -DPROFNAME="${profname}"
+   -DBLAS_REQUIRES="${blas_requires}"
+   -DLIBNAME="${libname}"
+   -DUSE_OPTIMIZED_BLAS=ON
+   -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs 
${blas_profname})"
+   $(cmake-utils_use_build test TESTING)
+   $(cmake-utils_use_use xblas XBLAS)
+   -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CFLAGS}"
+   -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CXXFLAGS}"
+   -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) $(get_abi_CFLAGS) 
$(numeric-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"
+   
-DLAPACK_PKGCONFIG_FFLAGS="$(numeric-int64_get_fortran_int64_abi_fflags)"
+   )
+   use xblas && \
+   mycmakeargs+=( 
-DXBLAS_LIBRARY:FILEPATH="${EROOT}usr/$(get_libdir)/lib${xblas_libname}.so" )
+   if $(numeric-int64_is_static_build); then
+   mycmakeargs+=(
+   -DBUILD_SHARED_LIBS=OFF
+   -DBUILD_STATIC_LIBS=ON
+   )
+   else
+   mycmakeargs+=(
+   -DBUILD_SHARED_LIBS=ON
+

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

2015-11-30 Thread Justin Lecher
commit: 5cc6855b8f846521f1c354e79c943fa3120bea34
Author: Justin Lecher  gentoo  org>
AuthorDate: Tue Dec  1 06:51:57 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Dec  1 06:51:57 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5cc6855b

sci-libs/lapack-reference: Add USE to build deprecated routines

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild | 3 ++-
 sci-libs/lapack-reference/metadata.xml  | 6 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild 
b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
index 8623bef..ac88f98 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz;
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test xblas"
+IUSE="+deprecated static-libs test xblas"
 
 REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -82,6 +82,7 @@ src_configure() {
-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs 
${blas_profname})"
$(cmake-utils_use_build test TESTING)
$(cmake-utils_use_use xblas XBLAS)
+   $(cmake-utils_use_build deprecated DEPRECATED)
-DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CFLAGS}"
-DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CXXFLAGS}"
-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) $(get_abi_CFLAGS) 
$(numeric-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"

diff --git a/sci-libs/lapack-reference/metadata.xml 
b/sci-libs/lapack-reference/metadata.xml
index f9de0d5..520530d 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -13,8 +13,10 @@
   Algebra Subprogram (BLAS).
 
   
+Build deprecated routines
 Build the 64 bits integer library
-Build LAPACK with extra precision (needs
-  sci-libs/xblas)
+
+   Build LAPACK with extra precision (needs sci-libs/xblas)
+
   
 



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

2014-10-13 Thread Francois Bissey
commit: 016ec1d0bdaa14b88e3556dffc692ba1de7969f5
Author: François Bissey francois.bissey AT canterbury DOT ac DOT nz
AuthorDate: Mon Oct 13 09:17:07 2014 +
Commit: Francois Bissey f.r.bissey AT massey DOT ac DOT nz
CommitDate: Mon Oct 13 09:17:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=016ec1d0

Fix support for xblas, it is only available for 32bit integers.

---
 sci-libs/lapack-reference/lapack-reference-.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-libs/lapack-reference/lapack-reference-.ebuild 
b/sci-libs/lapack-reference/lapack-reference-.ebuild
index 02e8871..18e5e7c 100644
--- a/sci-libs/lapack-reference/lapack-reference-.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-.ebuild
@@ -136,7 +136,7 @@ src_prepare() {
SRC/CMakeLists.txt || die
sed -i \
-e 's:-llapack:-l${LIBNAME}:g' \
-   -e 's/Requires: blas/Requires: 
${BLAS_PROFNAME}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}/' \
+   -e 's/Requires: blas/Requires: ${BLAS_PROFNAME} 
${XBLASPC}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}/' \
lapack.pc.in || die
# some string does not get passed properly
sed -i \
@@ -146,12 +146,6 @@ src_prepare() {
sed -i \
-e '/lapack_install_library(tmglib)/d' \
TESTING/MATGEN/CMakeLists.txt || die
-   # if xblas is used add it in the .pc file
-   if use xblas ; then
-   sed -i \
-   -e '/Requires/s:blas:blas xblas:' \
-   lapack.pc.in || die
-   fi
 }
 
 src_configure() {
@@ -160,6 +154,7 @@ src_configure() {
local profname=$(get_profname)
local libname=${profname//-/_}
local blas_profname=$(get_blas_profname)
+   local xblaspc=
local mycmakeargs=(
-DPROFNAME=${profname}
-DBLAS_PROFNAME=${blas_profname}
@@ -167,18 +162,23 @@ src_configure() {
-DUSE_OPTIMIZED_BLAS=ON
-DBLAS_LIBRARIES=$($(tc-getPKG_CONFIG) --libs 
${blas_profname})
$(cmake-utils_use_build test TESTING)
-   $(cmake-utils_use_use xblas XBLAS)
$@
)
+   # xblas is only available for 32bit integers
if [[ ${MULTIBUILD_ID} =~ _${INT64_SUFFIX} ]]; then
mycmakeargs+=(
-DCMAKE_Fortran_FLAGS=$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8 ${FCFLAGS}
-DLAPACK_PKGCONFIG_FFLAGS=-fdefault-integer-8
+   -DXBLASPC=
+   -DUSE_XBLAS=OFF
)
else
+   use xblas  xblaspc=xblas
mycmakeargs+=(
-DCMAKE_Fortran_FLAGS=$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS) ${FCFLAGS}
-DLAPACK_PKGCONFIG_FFLAGS=
+   -DXBLASPC=${xblaspc}
+   $(cmake-utils_use_use xblas XBLAS)
)
fi
if [[ ${MULTIBUILD_ID} =~ _${STATIC_SUFFIX} ]]; then



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

2014-10-08 Thread Honza Macháček
commit: 7a5a33e07e3983825e34ca10acc17554252bb6c2
Author: Honza Macháček Hloupy.Honza AT centrum DOT cz
AuthorDate: Wed Oct  8 13:56:09 2014 +
Commit: Honza Macháček Hloupy.Honza AT centrum DOT cz
CommitDate: Wed Oct  8 13:56:09 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7a5a33e0

The circular dependency of sci-libs/lapack-reference-3.5.0 on virtual/lapack 
removed.

Package-Manager: portage-2.2.14_rc1

---
 sci-libs/lapack-reference/ChangeLog| 4 
 sci-libs/lapack-reference/lapack-reference-.ebuild | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-libs/lapack-reference/ChangeLog 
b/sci-libs/lapack-reference/ChangeLog
index f8e700c..d50e3cc 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 
2010/10/02 20:49:51 grobian Exp $
 
+  08 Oct 2014; Honza Macháček hloupy.ho...@centrum.cz
+  lapack-reference-.ebuild:
+  The circular dependency on virtual/lapack removed.
+
   06 Oct 2014; Justin Lecher j...@gentoo.org lapack-reference-.ebuild,
   metadata.xml:
   respect flags

diff --git a/sci-libs/lapack-reference/lapack-reference-.ebuild 
b/sci-libs/lapack-reference/lapack-reference-.ebuild
index 050c477..02e8871 100644
--- a/sci-libs/lapack-reference/lapack-reference-.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-.ebuild
@@ -32,7 +32,6 @@ IUSE=int64 static-libs test xblas
 
 RDEPEND=
=virtual/blas-2.1-r1[int64?]
-   =virtual/lapack-3.5-r2[int64?]
xblas? ( sci-libs/xblas[fortran] )
 
 DEPEND=${RDEPEND}



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

2014-10-06 Thread Justin Lecher
commit: c64c5fec8b39f174a8064223b8e5d0311e238cd7
Author: Justin Lecher jlec AT gentoo DOT org
AuthorDate: Mon Oct  6 06:53:28 2014 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Mon Oct  6 06:53:28 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c64c5fec

sci-libs/lapack-reference: respect flags

Package-Manager: portage-2.2.14_rc1

---
 sci-libs/lapack-reference/ChangeLog|  4 
 sci-libs/lapack-reference/lapack-reference-.ebuild |  4 ++--
 sci-libs/lapack-reference/metadata.xml | 12 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sci-libs/lapack-reference/ChangeLog 
b/sci-libs/lapack-reference/ChangeLog
index 85c2139..f8e700c 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 
2010/10/02 20:49:51 grobian Exp $
 
+  06 Oct 2014; Justin Lecher j...@gentoo.org lapack-reference-.ebuild,
+  metadata.xml:
+  respect flags
+
   25 Sep 2014; François Bissey francois.bis...@canterbury.ac.nz
   lapack-reference-.ebuild:
   The dependency needs to be on xblas[fortran] otherwise libxblas won't have 
the

diff --git a/sci-libs/lapack-reference/lapack-reference-.ebuild 
b/sci-libs/lapack-reference/lapack-reference-.ebuild
index e2ef959..050c477 100644
--- a/sci-libs/lapack-reference/lapack-reference-.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-.ebuild
@@ -173,12 +173,12 @@ src_configure() {
)
if [[ ${MULTIBUILD_ID} =~ _${INT64_SUFFIX} ]]; then
mycmakeargs+=(
-   -DCMAKE_Fortran_FLAGS=$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8
+   -DCMAKE_Fortran_FLAGS=$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8 ${FCFLAGS}
-DLAPACK_PKGCONFIG_FFLAGS=-fdefault-integer-8
)
else
mycmakeargs+=(
-   -DCMAKE_Fortran_FLAGS=$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS)
+   -DCMAKE_Fortran_FLAGS=$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS) ${FCFLAGS}
-DLAPACK_PKGCONFIG_FFLAGS=
)
fi

diff --git a/sci-libs/lapack-reference/metadata.xml 
b/sci-libs/lapack-reference/metadata.xml
index 9b618ae..f9de0d5 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -1,8 +1,8 @@
 ?xml version=1.0 encoding=UTF-8?
 !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
 pkgmetadata
-herdsci/herd
-longdescription lang=en
+  herdsci/herd
+  longdescription lang=en
   The Linear Algebra PACKage (LAPACK) is a comprehensive library that
   does linear algebra operations including matrix inversions, least
   squared solutions to linear sets of equations, eigenvector analysis,
@@ -12,9 +12,9 @@
   Netlib for LAPACK and optionnally the one for the Basic Linear
   Algebra Subprogram (BLAS).
 /longdescription
-use
-  flag name=int64Build the 64 bits integer library/flag
-  flag name=xblasBuild LAPACK with extra precision (needs
+  use
+flag name=int64Build the 64 bits integer library/flag
+flag name=xblasBuild LAPACK with extra precision (needs
   pkgsci-libs/xblas/pkg)/flag
-/use
+  /use
 /pkgmetadata



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

2014-10-05 Thread Justin Lecher
commit: 2d1a9cc85292ef5eabe106a9f00625092ba007b9
Author: gienah gienah AT gentoo DOT org
AuthorDate: Sat Sep 27 11:12:03 2014 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sat Sep 27 11:12:03 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2d1a9cc8

Fix rebase lapack-multibuild to master conflict 2 on sci-libs/lapack-reference

---
 sci-libs/lapack-reference/ChangeLog|  4 +++
 .../lapack-reference/lapack-reference-.ebuild  | 30 ++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/sci-libs/lapack-reference/ChangeLog 
b/sci-libs/lapack-reference/ChangeLog
index 4df9585..6fbd2ea 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -11,6 +11,10 @@
   lapack-reference-.ebuild:
   Add xblas to the .pc file when it is in use see bug#523388
 
+  26 Apr 2014; Mark Wright gie...@gentoo.org lapack-reference-.ebuild:
+  Add =virtual/blas-2.1-r2[int64?] and =virtual/lapack-3.5-r2[int64?] to
+  RDEPEND. Use separate eselect modules for lapack and lapack-int64.
+
   18 Feb 2014; Mark Wright gie...@gentoo.org lapack-reference-.ebuild,
   metadata.xml:
   multibuild lapack-reference when USE=int64 and/or USE=static is specified.

diff --git a/sci-libs/lapack-reference/lapack-reference-.ebuild 
b/sci-libs/lapack-reference/lapack-reference-.ebuild
index 57d64e5..17f3a04 100644
--- a/sci-libs/lapack-reference/lapack-reference-.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-.ebuild
@@ -31,8 +31,10 @@ SLOT=0
 IUSE=int64 static-libs test xblas
 
 RDEPEND=
-   virtual/blas
+   =virtual/blas-2.1-r1[int64?]
+   =virtual/lapack-3.5-r2[int64?]
xblas? ( sci-libs/xblas[fortran] )
+
 DEPEND=${RDEPEND}
virtual/pkgconfig
 
@@ -56,10 +58,18 @@ get_variant_suffix() {
echo ${variant_suffix}
 }
 
+get_blas_module() {
+   local module_name=blas
+   if [[ ${MULTIBUILD_ID} =~ _${INT64_SUFFIX} ]]; then
+   module_name+=-${INT64_SUFFIX}
+   fi
+   echo ${module_name}
+}
+
 get_blas_profname() {
local profname=${1:-$(get_profname)}
local variant_suffix=$(get_variant_suffix ${profname})
-   local blas_profile=$(eselect blas show)
+   local blas_profile=$(eselect $(get_blas_module) show)
local selected_blas_profile=${blas_profile}
local blas_no_int64=${selected_blas_profile/-int64/}
local blas_base=${blas_no_int64%-*}
@@ -67,9 +77,18 @@ get_blas_profname() {
echo ${blas_name}
 }
 
+get_lapack_module() {
+   local module_name=lapack
+   if [[ ${MULTIBUILD_ID} =~ _${INT64_SUFFIX} ]]; then
+   module_name+=-${INT64_SUFFIX}
+   fi
+   echo ${module_name}
+}
+
 int64_multilib_get_enabled_abis() {
local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
local MULTILIB_INT64_VARIANTS=()
+   local i
for i in ${MULTILIB_VARIANTS[@]}; do
if use int64  [[ ${i} =~ 64$ ]]; then
MULTILIB_INT64_VARIANTS+=( ${i}_${INT64_SUFFIX} )
@@ -77,6 +96,7 @@ int64_multilib_get_enabled_abis() {
MULTILIB_INT64_VARIANTS+=( ${i} )
done
local MULTIBUILD_VARIANTS=()
+   local j
for j in ${MULTILIB_INT64_VARIANTS[@]}; do
use static-libs  MULTIBUILD_VARIANTS+=( 
${j}_${STATIC_SUFFIX} )
MULTIBUILD_VARIANTS+=( ${j} )
@@ -103,7 +123,7 @@ src_prepare() {
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
if use int64; then
local blas_int64_profname=$(get_blas_profname 
${BASE_PROFNAME}-${INT64_SUFFIX})
-   pkg-config --exists ${blas_int64_profname} || die Use int64 
requires ${blas_int64_profname}
+   $(tc-getPKG_CONFIG) --exists ${blas_int64_profname} || die 
Use int64 requires ${blas_int64_profname}
fi
 
# rename library to avoid collision with other lapack implementations
@@ -200,8 +220,8 @@ src_install() {
cmake-utils_src_install
if [[ ! ${MULTIBUILD_ID} =~ _${STATIC_SUFFIX} ]]; then
local profname=$(get_profname)
-   alternatives_for lapack $(get_profname reference) 0 \
-   /usr/$(get_libdir)/pkgconfig/lapack.pc 
${profname}.pc
+   alternatives_for $(get_lapack_module) $(get_profname 
reference) 0 \
+   
/usr/$(get_libdir)/pkgconfig/$(get_lapack_module).pc ${profname}.pc
fi
}
multibuild_foreach_variant _int64_multilib_multibuild_wrapper 
my_src_install



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

2014-10-05 Thread Justin Lecher
commit: 272370d6abb3eb6975e2a9fc5ba4a4a0767440b7
Author: gienah gienah AT gentoo DOT org
AuthorDate: Sat Sep 27 11:09:18 2014 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sat Sep 27 11:09:18 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=272370d6

Fix rebase lapack-multibuild to master conflict 1 on sci-libs/lapack-reference

---
 sci-libs/lapack-reference/ChangeLog|   4 +
 .../lapack-reference/lapack-reference-.ebuild  | 142 +
 sci-libs/lapack-reference/metadata.xml |   1 +
 3 files changed, 119 insertions(+), 28 deletions(-)

diff --git a/sci-libs/lapack-reference/ChangeLog 
b/sci-libs/lapack-reference/ChangeLog
index 3c1104e..4df9585 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -11,6 +11,10 @@
   lapack-reference-.ebuild:
   Add xblas to the .pc file when it is in use see bug#523388
 
+  18 Feb 2014; Mark Wright gie...@gentoo.org lapack-reference-.ebuild,
+  metadata.xml:
+  multibuild lapack-reference when USE=int64 and/or USE=static is specified.
+
 *lapack-reference-3.5.0 (08 Dec 2013)
 
   08 Dec 2013; Sébastien Fabbro bicat...@gentoo.org

diff --git a/sci-libs/lapack-reference/lapack-reference-.ebuild 
b/sci-libs/lapack-reference/lapack-reference-.ebuild
index aca6ba0..9b14bf0 100644
--- a/sci-libs/lapack-reference/lapack-reference-.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-.ebuild
@@ -3,15 +3,21 @@
 # $Header: $
 
 EAPI=5
-inherit fortran-2 cmake-utils alternatives-2 toolchain-funcs
-
-MYP=lapack-${PV}
+inherit fortran-2 cmake-utils multibuild alternatives-2 toolchain-funcs
 
 if [[ ${PV} ==  ]] ; then
-   ESVN_REPO_URI=https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk;
-   inherit subversion
+   # The master ESVN_REPO_URI is difficult to access, the git mirror is 
easier
+   # ESVN_REPO_URI=https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk;
+   # MY_PN=lapack
+   # inherit subversion
+   EGIT_REPO_URI=https://github.com/nschloe/lapack.git;
+   MY_PN=lapack-reference
+   MYP=${MY_PN}-${PV}
+   inherit git-r3
KEYWORDS=
 else
+   MY_PN=lapack
+   MYP=${MY_PN}-${PV}
SRC_URI=http://www.netlib.org/lapack/${MYP}.tgz;
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 fi
@@ -22,7 +28,7 @@ HOMEPAGE=http://www.netlib.org/lapack/;
 LICENSE=BSD
 SLOT=0
 
-IUSE=static-libs test xblas
+IUSE=int64 static-libs test xblas
 
 RDEPEND=
virtual/blas
@@ -32,21 +38,66 @@ DEPEND=${RDEPEND}
 
 S=${WORKDIR}/${MYP}
 
+INT64_SUFFIX=int64
+STATIC_SUFFIX=static
+BASE_PROFNAME=reflapack
+
+get_profname() {
+   local profname=${1:-${BASE_PROFNAME}}
+   if [[ ${MULTIBUILD_ID} =~ _${INT64_SUFFIX} ]]; then
+   profname+=-${INT64_SUFFIX}
+   fi
+   echo ${profname}
+}
+
+get_variant_suffix() {
+   local profname=${1:-$(get_profname)}
+   local variant_suffix=${profname//${BASE_PROFNAME}/}
+   echo ${variant_suffix}
+}
+
+get_blas_profname() {
+   local profname=${1:-$(get_profname)}
+   local variant_suffix=$(get_variant_suffix ${profname})
+   local selected_blas_profile=${blas_profile}
+   local blas_no_int64=${selected_blas_profile/-int64/}
+   local blas_base=${blas_no_int64%-*}
+   local 
blas_name=${blas_no_int64/${blas_base}/${blas_base}${variant_suffix}}
+   echo ${blas_name}
+}
+
+pkg_setup() {
+   blas_profile=$(eselect blas show)
+   MULTIBUILD_VARIANTS=( )
+   use static-libs  MULTIBUILD_VARIANTS+=( 
${BASE_PROFNAME}_${STATIC_SUFFIX} )
+   if use int64; then
+   MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
+   use static-libs  MULTIBUILD_VARIANTS+=( 
${BASE_PROFNAME}_${INT64_SUFFIX}_${STATIC_SUFFIX} )
+   fi
+   MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME} )
+}
+
 src_prepare() {
+   if use int64; then
+   local blas_int64_profname=$(get_blas_profname 
${BASE_PROFNAME}-${INT64_SUFFIX})
+   pkg-config --exists ${blas_int64_profname} || die Use int64 
requires ${blas_int64_profname}
+   fi
+
# rename library to avoid collision with other lapack implementations
+   local LIBNAME=${PROFNAME//-/_}
sed -i \
-   -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \
-   -e '/export/s:lapack:reflapack:g' \
-   -e '/ALL_TARGETS/s:lapack):reflapack):' \
-   -e '/LAPACK_LIBRARIES/s:lapack:reflapack:g' \
+   -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/${PROFNAME}.pc:' \
+   -e '/export/s:lapack:${LIBNAME}:g' \
+   -e '/ALL_TARGETS/s:lapack):${LIBNAME}):' \
+   -e '/LAPACK_LIBRARIES/s:lapack:${LIBNAME}:g' \
CMakeLists.txt || die
sed -i \
-   -e 's:(lapack:(reflapack:g' \
+   -e 's:(lapack:(${LIBNAME}:g' \

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

2014-10-05 Thread Justin Lecher
commit: cbbbed04e53145c0b018be3b16b495c682537b23
Author: gienah gienah AT gentoo DOT org
AuthorDate: Sat Sep 27 11:40:30 2014 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sat Sep 27 11:40:30 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cbbbed04

Fix rebase lapack-multibuild to master conflict 11 on sci-libs/lapack-reference

---
 sci-libs/lapack-reference/ChangeLog| 5 +
 sci-libs/lapack-reference/lapack-reference-.ebuild | 6 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sci-libs/lapack-reference/ChangeLog 
b/sci-libs/lapack-reference/ChangeLog
index 6fbd2ea..85c2139 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -11,6 +11,11 @@
   lapack-reference-.ebuild:
   Add xblas to the .pc file when it is in use see bug#523388
 
+  07 Sep 2014; Mark Wright gie...@gentoo.org lapack-reference-.ebuild:
+  Remove the lines changing the setting of the FC and F77 environment
+  variables, instead pass the $(get_abi_CFLAGS) to cmake in the setting of the
+  -DCMAKE_Fortran_FLAGS variable.
+
   26 Apr 2014; Mark Wright gie...@gentoo.org lapack-reference-.ebuild:
   Add =virtual/blas-2.1-r2[int64?] and =virtual/lapack-3.5-r2[int64?] to
   RDEPEND. Use separate eselect modules for lapack and lapack-int64.

diff --git a/sci-libs/lapack-reference/lapack-reference-.ebuild 
b/sci-libs/lapack-reference/lapack-reference-.ebuild
index 17f3a04..e2ef959 100644
--- a/sci-libs/lapack-reference/lapack-reference-.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-.ebuild
@@ -114,8 +114,6 @@ _int64_multilib_multibuild_wrapper() {
local v=${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}
local ABI=${v/_${STATIC_SUFFIX}/}
multilib_toolchain_setup ${ABI}
-   export FC=$(tc-getFC) $(get_abi_CFLAGS)
-   export F77=$(tc-getF77) $(get_abi_CFLAGS)
${@}
 }
 
@@ -175,12 +173,12 @@ src_configure() {
)
if [[ ${MULTIBUILD_ID} =~ _${INT64_SUFFIX} ]]; then
mycmakeargs+=(
-   -DCMAKE_Fortran_FLAGS=$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) -fdefault-integer-8
+   -DCMAKE_Fortran_FLAGS=$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8
-DLAPACK_PKGCONFIG_FFLAGS=-fdefault-integer-8
)
else
mycmakeargs+=(
-   -DCMAKE_Fortran_FLAGS=$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname})
+   -DCMAKE_Fortran_FLAGS=$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS)
-DLAPACK_PKGCONFIG_FFLAGS=
)
fi



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

2014-10-05 Thread Justin Lecher
commit: 96347461e8152e8fbb26ba0b43c72646ad3e2c6a
Author: gienah gienah AT gentoo DOT org
AuthorDate: Tue Feb 25 13:45:45 2014 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sat Sep 27 11:10:07 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=96347461

multilib as well for lapack-reference

---
 .../lapack-reference/lapack-reference-.ebuild  | 64 +++---
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/sci-libs/lapack-reference/lapack-reference-.ebuild 
b/sci-libs/lapack-reference/lapack-reference-.ebuild
index 9b14bf0..57d64e5 100644
--- a/sci-libs/lapack-reference/lapack-reference-.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-inherit fortran-2 cmake-utils multibuild alternatives-2 toolchain-funcs
+inherit fortran-2 cmake-utils multibuild alternatives-2 multilib-build 
toolchain-funcs
 
 if [[ ${PV} ==  ]] ; then
# The master ESVN_REPO_URI is difficult to access, the git mirror is 
easier
@@ -59,6 +59,7 @@ get_variant_suffix() {
 get_blas_profname() {
local profname=${1:-$(get_profname)}
local variant_suffix=$(get_variant_suffix ${profname})
+   local blas_profile=$(eselect blas show)
local selected_blas_profile=${blas_profile}
local blas_no_int64=${selected_blas_profile/-int64/}
local blas_base=${blas_no_int64%-*}
@@ -66,18 +67,40 @@ get_blas_profname() {
echo ${blas_name}
 }
 
-pkg_setup() {
-   blas_profile=$(eselect blas show)
-   MULTIBUILD_VARIANTS=( )
-   use static-libs  MULTIBUILD_VARIANTS+=( 
${BASE_PROFNAME}_${STATIC_SUFFIX} )
-   if use int64; then
-   MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
-   use static-libs  MULTIBUILD_VARIANTS+=( 
${BASE_PROFNAME}_${INT64_SUFFIX}_${STATIC_SUFFIX} )
-   fi
-   MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME} )
+int64_multilib_get_enabled_abis() {
+   local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
+   local MULTILIB_INT64_VARIANTS=()
+   for i in ${MULTILIB_VARIANTS[@]}; do
+   if use int64  [[ ${i} =~ 64$ ]]; then
+   MULTILIB_INT64_VARIANTS+=( ${i}_${INT64_SUFFIX} )
+   fi
+   MULTILIB_INT64_VARIANTS+=( ${i} )
+   done
+   local MULTIBUILD_VARIANTS=()
+   for j in ${MULTILIB_INT64_VARIANTS[@]}; do
+   use static-libs  MULTIBUILD_VARIANTS+=( 
${j}_${STATIC_SUFFIX} )
+   MULTIBUILD_VARIANTS+=( ${j} )
+   done
+   echo ${MULTIBUILD_VARIANTS[@]}
+}
+
+# @FUNCTION: _int64_multilib_multibuild_wrapper
+# @USAGE: argv...
+# @INTERNAL
+# @DESCRIPTION:
+# Initialize the environment for ABI selected for multibuild.
+_int64_multilib_multibuild_wrapper() {
+   debug-print-function ${FUNCNAME} ${@}
+   local v=${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}
+   local ABI=${v/_${STATIC_SUFFIX}/}
+   multilib_toolchain_setup ${ABI}
+   export FC=$(tc-getFC) $(get_abi_CFLAGS)
+   export F77=$(tc-getF77) $(get_abi_CFLAGS)
+   ${@}
 }
 
 src_prepare() {
+   local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
if use int64; then
local blas_int64_profname=$(get_blas_profname 
${BASE_PROFNAME}-${INT64_SUFFIX})
pkg-config --exists ${blas_int64_profname} || die Use int64 
requires ${blas_int64_profname}
@@ -115,11 +138,11 @@ src_prepare() {
 }
 
 src_configure() {
+   local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
my_src_configure() {
local profname=$(get_profname)
local libname=${profname//-/_}
local blas_profname=$(get_blas_profname)
-   echo profname: ${profname}, blas_profname: ${blas_profname}
local mycmakeargs=(
-DPROFNAME=${profname}
-DBLAS_PROFNAME=${blas_profname}
@@ -141,10 +164,6 @@ src_configure() {
-DLAPACK_PKGCONFIG_FFLAGS=
)
fi
-   mycmakeargs+=(
-   -DCMAKE_C_FLAGS=$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CFLAGS}
-   -DCMAKE_CXX_FLAGS=$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CXXFLAGS}
-   )
if [[ ${MULTIBUILD_ID} =~ _${STATIC_SUFFIX} ]]; then
mycmakeargs+=(
-DBUILD_SHARED_LIBS=OFF
@@ -156,20 +175,27 @@ src_configure() {
-DBUILD_STATIC_LIBS=OFF
)
fi
+   mycmakeargs+=(
+   -DCMAKE_C_FLAGS=$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CFLAGS}
+   -DCMAKE_CXX_FLAGS=$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CXXFLAGS}
+   )