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

[Justin Lecher]

commit:     27ed0382803df0e13f89838353309dfd81f509a1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 15:15:57 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 15:15:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=27ed0382

sci-libs/openblas: Build 32bit binaries using BINARY=32 as suggested by upstream

* Bump to EAPI=6

Github: Closes gentoo-science/sci#591

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/openblas/openblas-0.2.14.ebuild | 13 ++++++++++---
 sci-libs/openblas/openblas-0.2.15.ebuild | 13 ++++++++++---
 sci-libs/openblas/openblas-9999.ebuild   | 13 ++++++++++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild 
b/sci-libs/openblas/openblas-0.2.14.ebuild
index 61fbdc5..592bec4 100644
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
        /usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+       "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
        local openblas_flags=()
        use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
                local libnamesuffix="${underscoresuffix#_}"
                openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
        fi
+
+       [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
        echo "${openblas_flags[@]}"
 }
 
@@ -71,7 +78,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+       default
 
        # lapack and lapacke are not modified from upstream lapack
        sed \

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild 
b/sci-libs/openblas/openblas-0.2.15.ebuild
index 61fbdc5..592bec4 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
        /usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+       "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
        local openblas_flags=()
        use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
                local libnamesuffix="${underscoresuffix#_}"
                openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
        fi
+
+       [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
        echo "${openblas_flags[@]}"
 }
 
@@ -71,7 +78,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+       default
 
        # lapack and lapacke are not modified from upstream lapack
        sed \

diff --git a/sci-libs/openblas/openblas-9999.ebuild 
b/sci-libs/openblas/openblas-9999.ebuild
index 2dba543..b7bf4a2 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 NUMERIC_MODULE_NAME="openblas"
 
@@ -29,6 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
        /usr/include/openblas/openblas_config.h
 )
 
+PATCHES=(
+       "${DISTDIR}"/${PN}-0.2.11-gentoo.patch
+)
+
 get_openblas_flags() {
        local openblas_flags=()
        use dynamic && \
@@ -49,6 +53,9 @@ get_openblas_flags() {
                local libnamesuffix="${underscoresuffix#_}"
                openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
        fi
+
+       [[ "${ABI}" == "x86" ]] && openblas_flags+=( BINARY=32 )
+
        echo "${openblas_flags[@]}"
 }
 
@@ -65,7 +72,7 @@ get_openblas_abi_cflags() {
 }
 
 src_prepare() {
-       epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+       default
 
        # lapack and lapacke are not modified from upstream lapack
        sed \