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

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

[Sebastien Fabbro]

commit:     cf67f948ad50d5a91aaff51daf5a1b0c4b28f54a
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Fri Mar 16 21:40:59 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 21:40:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cf67f948

sci-libs/openblas: Version bump

(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/openblas/ChangeLog                   |    6 +
 sci-libs/openblas/openblas-0.1_alpha25.ebuild |  126 +++++++++++++++++++++++++
 2 files changed, 132 insertions(+), 0 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 34d9ae2..bf190d3 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.1_alpha25 (16 Mar 2012)
+
+  16 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +openblas-0.1_alpha25.ebuild:
+  Version bump
+
   15 Mar 2012; François Bissey <francois.bissey@canterbury.ac.nz>
   openblas-0.1_alpha2.ebuild, openblas-9999.ebuild:
   correct typo

diff --git a/sci-libs/openblas/openblas-0.1_alpha25.ebuild b/sci-libs/openblas/openblas-0.1_alpha25.ebuild
new file mode 100644
index 0000000..c5a8dba
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.1_alpha25.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils toolchain-funcs alternatives-2 git-2 multilib
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+EGIT_REPO_URI="git://github.com/xianyi/OpenBLAS.git"
+EGIT_COMMIT="v0.1alpha2.5"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~ppc-macos ~x64-macos"
+
+IUSE="+incblas int64 dynamic openmp static-libs threads"
+
+RDEPEND="virtual/fortran"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYPN}"
+
+pkg_setup() {
+	ewarn "If the compilation fails, try setting the TARGET environment variable"
+	ewarn "to your CPU's codename and run emerge again."
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-{sharedlibs,aliasing}.patch
+	# respect LDFLAGS
+	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
+	# respect CFLAGS only if dynamic flag not enabled
+	if ! use dynamic; then
+		sed -i \
+			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
+			Makefile.rule || die
+	fi
+	# fix executable stacks
+	local i
+	for i in $(find . -name \*.S); do
+		cat >> ${i} <<-EOF
+			#if defined(__ELF__)
+			.section .note.GNU-stack,"",%progbits
+			#endif
+		EOF
+	done
+}
+
+src_configure() {
+	local use_openmp=$(use openmp && echo 1)
+	use threads && use openmp && use_openmp="" && \
+		einfo "openmp and threads enabled: using threads"
+	sed -i \
+		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
+		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
+		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
+		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
+		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
+		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
+		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
+		Makefile.rule || die
+}
+
+src_compile() {
+	mkdir solibs
+	emake libs shared && mv *$(get_libname) solibs/
+	use static-libs && emake clean && emake libs NEED_PIC=
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	local profname=${PN} threads
+	use int64 && profname=${profname}-int64
+	if use threads; then
+		threads="-pthread"
+		profname=${profname}-threads
+	elif use openmp; then
+		profname=${profname}-openmp
+	fi
+
+	dolib.so solibs/lib*$(get_libname)
+	use static-libs && dolib.a lib*.a
+
+	# create pkg-config file and associated eselect file
+	cat <<-EOF > ${profname}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lopenblas -lm ${threads}
+	EOF
+
+	alternatives_for blas ${profname} 0 \
+		"/usr/$(get_libdir)/pkgconfig/blas.pc" "${profname}.pc"
+
+	if use incblas; then
+		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
+		insinto /usr/include/${PN}
+		doins cblas.h common*.h config.h param.h
+		alternatives_for cblas ${profname} 0 \
+			"/usr/$(get_libdir)/pkgconfig/cblas.pc" "${profname}.pc" \
+			"/usr/include/cblas.h" "${PN}/cblas.h"
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${profname}.pc
+	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		cd "${ED}"/usr/$(get_libdir)
+		for d in *.dylib ; do
+			ebegin "correcting install_name of ${d}"
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
+			eend $?
+		done
+	fi
+}

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

[Benda XU]

commit:     0e143007295f7fe3fe1b5f9506817216d5eb80e2
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 07:37:03 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 07:37:03 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=0e143007

sci-libs/openblas: USE flags of single-threaded version.

  When neither openmp nor threads USE flag is set, OpenBLAS
  should build a single-threaded version with make option
  USE_THREAD=0.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.20.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild b/sci-libs/openblas/openblas-0.2.20.ebuild
index c15c6eb73..838c334d6 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -40,6 +40,8 @@ get_openblas_flags() {
 		openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
 	elif use openmp; then
 		openblas_flags+=( USE_OPENMP=1 )
+	else
+		openblas_flags+=( USE_THREAD=0 ) # single-threaded
 	fi
 	local profname=$(numeric-int64_get_module_name)
 	local libname="${profname//-/_}"

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

[Benda XU]

commit:     6538b395b3be07a04a76b3af9a7d6aa81df7f29d
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 06:28:30 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 06:28:30 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6538b395

sci-libs/openblas: fix DESTDIR and PREFIX for cmake directories.

Closes: https://github.com/gentoo/sci/pull/725

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.14-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.15-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.19-r1.ebuild | 6 +++---
 sci-libs/openblas/openblas-0.2.20.ebuild    | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.14-r1.ebuild b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
index 453be881f..ba7aa8298 100644
--- a/sci-libs/openblas/openblas-0.2.14-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14-r1.ebuild
@@ -143,9 +143,9 @@ src_install() {
 			-i config_last.h \
 			|| die "Could not ensure there is no definition of USE64BITINT in config_last.h"
 		emake install \
-			PREFIX="${ED}"usr ${openblas_flags} \
-			OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-			OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+			DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+			OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+			OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
 		if ! use static-libs; then
 			rm "${ED}"usr/$(get_libdir)/lib*.a || die
 		fi

diff --git a/sci-libs/openblas/openblas-0.2.15-r1.ebuild b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
index 64e2fb9c1..e4f0c89ed 100644
--- a/sci-libs/openblas/openblas-0.2.15-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15-r1.ebuild
@@ -144,9 +144,9 @@ src_install() {
 			-i config_last.h \
 			|| die "Could not ensure there is no definition of USE64BITINT in config_last.h"
 		emake install \
-			PREFIX="${ED}"usr ${openblas_flags} \
-			OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-			OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+			DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+			OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+			OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
 		if ! use static-libs; then
 			rm "${ED}"usr/$(get_libdir)/lib*.a || die
 		fi

diff --git a/sci-libs/openblas/openblas-0.2.19-r1.ebuild b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
index 81ed705fb..38378cecd 100644
--- a/sci-libs/openblas/openblas-0.2.19-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19-r1.ebuild
@@ -149,9 +149,9 @@ src_install() {
 			-i config_last.h \
 			|| die "Could not ensure there is no definition of USE64BITINT in config_last.h"
 		emake install \
-			PREFIX="${ED}"usr ${openblas_flags} \
-			OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-			OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+			DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+			OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+			OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
 		if ! use static-libs; then
 			rm "${ED}"usr/$(get_libdir)/lib*.a || die
 		fi

diff --git a/sci-libs/openblas/openblas-0.2.20.ebuild b/sci-libs/openblas/openblas-0.2.20.ebuild
index 4686f4890..c15c6eb73 100644
--- a/sci-libs/openblas/openblas-0.2.20.ebuild
+++ b/sci-libs/openblas/openblas-0.2.20.ebuild
@@ -146,9 +146,9 @@ src_install() {
 			-i config_last.h \
 			|| die "Could not ensure there is no definition of USE64BITINT in config_last.h"
 		emake install \
-			PREFIX="${ED}"usr ${openblas_flags} \
-			OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-			OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+			DESTDIR="${D}" PREFIX="${EPREFIX}" ${openblas_flags} \
+			OPENBLAS_INCLUDE_DIR='$(PREFIX)'/usr/include/${PN} \
+			OPENBLAS_LIBRARY_DIR='$(PREFIX)'/usr/$(get_libdir)
 		if ! use static-libs; then
 			rm "${ED}"usr/$(get_libdir)/lib*.a || die
 		fi

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

[Benda XU]

commit:     d5ac214327ad893643c77adf474305c8a12cb09a
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  6 04:06:32 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 04:11:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d5ac2143

sci-libs/openblas: remove redundant libdir from Libs in .pc

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild b/sci-libs/openblas/openblas-0.2.19.ebuild
index 1993df94a..c44cd74c9 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -168,7 +168,7 @@ src_install() {
 
 		create_pkgconfig \
 			--name "${profname}" \
-			--libs "-L\${libdir} -l${libname}" \
+			--libs "-l${libname}" \
 			--libs-private "-lm" \
 			--cflags "-I\${includedir}/${PN} ${openblas_abi_cflags}" \
 			${profname}

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

[Justin Lecher]

commit:     87bd5dfcf80bd28990815fc776575a4244b9c1aa
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 10:25:29 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 10:25:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=87bd5dfc

sci-libs/openblas: Drop ppc64 support

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/openblas/metadata.xml           | 2 +-
 sci-libs/openblas/openblas-0.2.19.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 1f64b9df9..2bf0b4229 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">

diff --git a/sci-libs/openblas/openblas-0.2.19.ebuild b/sci-libs/openblas/openblas-0.2.19.ebuild
index 3ff5f8502..49d011ead 100644
--- a/sci-libs/openblas/openblas-0.2.19.ebuild
+++ b/sci-libs/openblas/openblas-0.2.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc64 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="dynamic openmp static-libs threads"
 
 RDEPEND=""

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

[Benda XU]

commit:     d10535319c19d2e0e4fad56ebeed85ad874eb980
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  2 04:16:28 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 04:18:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d1053531

sci-libs/openblas: advise openmp cflags in pkg-config.

 sci-libs/openblas/openblas-0.2.15.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild b/sci-libs/openblas/openblas-0.2.15.ebuild
index 6dc5fd3c2..c419d8974 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -67,6 +67,7 @@ get_openblas_abi_cflags() {
 	fi
 	$(numeric-int64_is_int64_build) && \
 		openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+	use openmp && openblas_abi_cflags+=( -fopenmp )
 	echo "${openblas_abi_cflags[@]}"
 }
 

[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 \

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

[Justin Lecher]

commit:     b732e197ccd3fac26ad8fe3d74864688471b9128
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 09:53:04 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 09:53:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b732e197

sci-libs/openblas: Version Bump

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

 sci-libs/openblas/openblas-0.2.15.ebuild | 193 +++++++++++++++++++++++++++++++
 1 file changed, 193 insertions(+)

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild b/sci-libs/openblas/openblas-0.2.15.ebuild
new file mode 100644
index 0000000..3a92aef
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NUMERIC_MODULE_NAME="openblas"
+
+inherit alternatives-2 numeric numeric-int64-multibuild
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+SRC_URI="
+	http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz
+	http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
+IUSE="dynamic openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openblas/cblas.h
+	/usr/include/openblas/f77blas.h
+	/usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+	local openblas_flags=()
+	use dynamic && \
+		openblas_flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1 )
+	$(numeric-int64_is_int64_build) && \
+		openblas_flags+=( INTERFACE64=1 )
+	# choose posix threads over openmp when the two are set
+	# yet to see the need of having the two profiles simultaneously
+	if use threads; then
+		openblas_flags+=( USE_THREAD=1 USE_OPENMP=0 )
+	elif use openmp; then
+		openblas_flags+=( USE_OPENMP=1 )
+	fi
+	local profname=$(numeric-int64_get_module_name)
+	local libname="${profname//-/_}"
+	local underscoresuffix="${libname#${PN}}"
+	if [[ "${underscoresuffix}" != "_" ]]; then
+		local libnamesuffix="${underscoresuffix#_}"
+		openblas_flags+=( LIBNAMESUFFIX=${libnamesuffix} )
+	fi
+	echo "${openblas_flags[@]}"
+}
+
+get_openblas_abi_cflags() {
+	local openblas_abi_cflags=()
+	if [[ "${ABI}" == "x86" ]]; then
+		openblas_abi_cflags=( -DOPENBLAS_ARCH_X86=1 -DOPENBLAS___32BIT__=1 )
+	else
+		openblas_abi_cflags=( -DOPENBLAS_ARCH_X86_64=1 -DOPENBLAS___64BIT__=1 )
+	fi
+	$(numeric-int64_is_int64_build) && \
+		openblas_abi_cflags+=( -DOPENBLAS_USE64BITINT )
+	echo "${openblas_abi_cflags[@]}"
+}
+
+src_unpack() {
+	default
+	find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
+		mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+}
+
+src_prepare() {
+	epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+
+	# lapack and lapacke are not modified from upstream lapack
+	sed \
+		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+		-i Makefile.rule || die
+	numeric-int64-multibuild_copy_sources
+}
+
+src_configure() {
+	blas_configure() {
+		local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+		local internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+		sed \
+			-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) $(get_abi_CFLAGS):" \
+			-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) $(get_abi_CFLAGS):" \
+			-e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} ${internal_openblas_abi_cflags}:" \
+			-i Makefile.rule || die
+	}
+	numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir blas_configure
+}
+
+src_compile() {
+	# openblas already does multi-jobs
+	MAKEOPTS+=" -j1"
+	my_src_compile () {
+		local openblas_flags=$(get_openblas_flags)
+		# cflags already defined twice
+		unset CFLAGS || die
+		emake clean && emake libs shared ${openblas_flags}
+		mkdir -p libs && mv libopenblas* libs/ || die
+		# avoid pic when compiling static libraries, so re-compiling
+		if use static-libs; then
+			emake clean
+			emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
+			mv libopenblas* libs/ || die
+		fi
+		# Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler messages:
+		# ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')'
+		# The problem is applying this patch in src_prepare() causes build failures on
+		# assembler code as the assembler does not understand sizeof(float).  So
+		# delay applying the patch until after building the libraries.
+		epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
+		rm -f config.h config_last.h || die
+		# Note: prints this spurious warning: make: Nothing to be done for 'config.h'.
+		emake config.h
+		cp config.h config_last.h || die
+
+		mv libs/libopenblas* . || die
+	}
+	numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir my_src_compile
+}
+
+src_test() {
+	my_src_test () {
+		local openblas_flags=$(get_openblas_flags)
+		emake tests ${openblas_flags}
+	}
+	numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir my_src_test
+}
+
+src_install() {
+	my_src_install() {
+		local openblas_flags=$(get_openblas_flags)
+		local profname=$(numeric-int64_get_module_name)
+		local pcfile
+		# The file /usr/include/openblas/openblas_config.h is generated during the install.
+		# The sed on config_last.h removes the #define's OPENBLAS_USE64BITINT
+		# OPENBLASS__32BIT__ OPENBLASS__64BIT__ OPENBLAS__ARCH_X86 OPENBLAS__ARCH_X86_64
+		# from /usr/include/openblas/openblas_config.h.  We then specify it in Cflags in
+		# the /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
+		sed -e '/#define USE64BITINT/d' \
+			-e '/#define ARCH_X86/d' \
+			-e '/#define __\(32\|64\)BIT__/d' \
+			-i config_last.h \
+			|| die "Could not ensure there is no definition of USE64BITINT in config_last.h"
+		emake install \
+			PREFIX="${ED}"usr ${openblas_flags} \
+			OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
+			OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+		if ! use static-libs; then
+			rm "${ED}"usr/$(get_libdir)/lib*.a || die
+		fi
+
+		local openblas_abi_cflags=$(get_openblas_abi_cflags)
+		local openblas_abi_fflags=$(numeric-int64_get_fortran_int64_abi_fflags)
+		local libname="${profname//-/_}"
+
+		create_pkgconfig \
+			--name "${profname}" \
+			--libs "-L\${libdir} -l${libname}" \
+			--libs-private "-lm" \
+			--cflags "-I\${includedir}/${PN} ${openblas_abi_cflags}" \
+			${profname}
+
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			cd "${ED}"/usr/$(get_libdir) || die
+			local d
+			for d in *.dylib; do
+				ebegin "Correcting install_name of ${d}"
+				install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}" || die
+				eend $?
+			done
+		fi
+		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+			multilib_prepare_wrappers
+			multilib_check_headers
+		fi
+	}
+	numeric-int64-multibuild_foreach_all_abi_variants run_in_build_dir my_src_install
+
+	printf "/usr/include/cblas.h ${PN}/cblas.h" > "${T}"/alternative-cblas-generic.sh || die
+	numeric-int64-multibuild_install_alternative blas ${NUMERIC_MODULE_NAME}
+	numeric-int64-multibuild_install_alternative cblas ${NUMERIC_MODULE_NAME}
+
+	multilib_install_wrappers
+
+	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt *md Changelog.txt
+}

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

[Justin Lecher]

commit:     298eb745aa2dd2606616e821ae00cf0773d4d20d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 09:54:43 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 09:54:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=298eb745

sci-libs/openblas: Inherit from eutils and multilib eclasses

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

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

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild b/sci-libs/openblas/openblas-0.2.14.ebuild
index 3a92aef..61fbdc5 100644
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"

diff --git a/sci-libs/openblas/openblas-0.2.15.ebuild b/sci-libs/openblas/openblas-0.2.15.ebuild
index 3a92aef..61fbdc5 100644
--- a/sci-libs/openblas/openblas-0.2.15.ebuild
+++ b/sci-libs/openblas/openblas-0.2.15.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 25ccea3..2dba543 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 NUMERIC_MODULE_NAME="openblas"
 
-inherit alternatives-2 git-r3 numeric numeric-int64-multibuild
+inherit alternatives-2 eutils git-r3 multilib numeric numeric-int64-multibuild
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"

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

[Justin Lecher]

commit:     2f8ff7d4e563d23bafad5eccd2c18d6ec5a5a343
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 10:19:52 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 10:19:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=2f8ff7d4

sci-libs/openblas: Add github to remote-id in metadata.xml

Package-Manager: portage-2.2.20

 sci-libs/openblas/ChangeLog    | 3 +++
 sci-libs/openblas/metadata.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 0912ff1..9723819 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  sci-libs/openblas: Add github to remote-id in metadata.xml
+
   02 Apr 2015; Marius Brehler <marbre@linux.sungazer.de> openblas-9999.ebuild:
   Fix Bug 528974
 

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 32441d1..6ef9b54 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -10,4 +10,7 @@
     <flag name="int64">Build the 64 bits integer library</flag>
     <flag name="dynamic">Build dynamic architecture detection at run time (for multi targets)</flag>
   </use>
+  <upstream>
+    <remote-id type="github">xianyi/OpenBLAS</remote-id>
+  </upstream>
 </pkgmetadata>

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

[Justin Lecher]

commit:     e9bbf6fa193ac1498c45c8af44663f5c97beff15
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  6 10:21:32 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 10:21:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e9bbf6fa

sci-libs/openblas: Add missing eclass

Package-Manager: portage-2.2.20

 sci-libs/openblas/ChangeLog              | 4 ++++
 sci-libs/openblas/openblas-0.2.11.ebuild | 2 +-
 sci-libs/openblas/openblas-0.2.8.ebuild  | 4 ++--
 sci-libs/openblas/openblas-9999.ebuild   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9723819..e783b9d 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> openblas-0.2.11.ebuild,
+  openblas-0.2.8.ebuild, openblas-9999.ebuild:
+  sci-libs/openblas: Add missing eclass
+
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   sci-libs/openblas: Add github to remote-id in metadata.xml
 

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild b/sci-libs/openblas/openblas-0.2.11.ebuild
index 2b5f76d..c69932e 100644
--- a/sci-libs/openblas/openblas-0.2.11.ebuild
+++ b/sci-libs/openblas/openblas-0.2.11.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build toolchain-funcs fortran-int64
+inherit alternatives-2 eutils multilib fortran-2 multibuild multilib-build toolchain-funcs fortran-int64
 
 SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch"
 if [[ ${PV} == "9999" ]] ; then

diff --git a/sci-libs/openblas/openblas-0.2.8.ebuild b/sci-libs/openblas/openblas-0.2.8.ebuild
index 96ca05b..565215b 100644
--- a/sci-libs/openblas/openblas-0.2.8.ebuild
+++ b/sci-libs/openblas/openblas-0.2.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
-inherit eutils toolchain-funcs alternatives-2 multilib fortran-2
+inherit eutils multilib toolchain-funcs alternatives-2 multilib fortran-2
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index db150b0..c5166a3 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build toolchain-funcs fortran-int64
+inherit alternatives-2 eutils multilib fortran-2 multibuild multilib-build toolchain-funcs fortran-int64
 
 SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch"
 if [[ ${PV} == "9999" ]] ; then

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

[Justin Lecher]

commit:     22c50b8ff81041b6f864a15b29a37f318eb3ba20
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Apr  2 09:54:54 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 09:54:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=22c50b8f

sci-libs/openblas: Fix Bug 528974

Package-Manager: portage-2.2.14

 sci-libs/openblas/ChangeLog            | 3 +++
 sci-libs/openblas/openblas-9999.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1f27f12..0912ff1 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Apr 2015; Marius Brehler <marbre@linux.sungazer.de> openblas-9999.ebuild:
+  Fix Bug 528974
+
 *openblas-0.2.14 (27 Mar 2015)
 
   27 Mar 2015; Denis Dupeyron <calchan@gentoo.org> +openblas-0.2.14.ebuild:

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index a532fe8..db150b0 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.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: $
 
@@ -48,7 +48,7 @@ get_openblas_flags() {
 	if use threads; then
 		openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
 	elif use openmp; then
-		openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+		openblas_flags+=" USE_OPENMP=1"
 	fi
 	local profname=$(fortran-int64_get_profname)
 	local libname="${profname//-/_}"

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

[Justin Lecher]

commit:     471609fcab6425d25cb775092e422df83153b1b6
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Apr  2 09:56:27 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 09:56:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=471609fc

sci-libs/openblas: Cleanup symlinks and files

 sci-libs/openblas/openblas-0.2.11.ebuild | 228 ++++++++++++++++++++++++++++++-
 sci-libs/openblas/openblas-0.2.14.ebuild | 228 +------------------------------
 2 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild b/sci-libs/openblas/openblas-0.2.11.ebuild
deleted file mode 120000
index 2381753..0000000
--- a/sci-libs/openblas/openblas-0.2.11.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-openblas-9999.ebuild
\ No newline at end of file

diff --git a/sci-libs/openblas/openblas-0.2.11.ebuild b/sci-libs/openblas/openblas-0.2.11.ebuild
new file mode 100644
index 0000000..2b5f76d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.11.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBASE_PROFNAME="openblas"
+inherit alternatives-2 eutils fortran-2 multibuild multilib-build toolchain-funcs fortran-int64
+
+SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
+	EGIT_BRANCH="develop"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="dynamic int64 openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="
+	>=virtual/blas-2.1-r2[int64?]
+	>=virtual/cblas-2.0-r1[int64?]"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openblas/cblas.h
+	/usr/include/openblas/f77blas.h
+	/usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+	local openblas_flags=""
+	use dynamic && \
+		openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1"
+	$(fortran-int64_is_int64_build) && \
+		openblas_flags+=" INTERFACE64=1"
+	# choose posix threads over openmp when the two are set
+	# yet to see the need of having the two profiles simultaneously
+	if use threads; then
+		openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
+	elif use openmp; then
+		openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+	fi
+	local profname=$(fortran-int64_get_profname)
+	local libname="${profname//-/_}"
+	local underscoresuffix="${libname#${PN}}"
+	if [[ "${underscoresuffix}" != "_" ]]; then
+		local libnamesuffix="${underscoresuffix#_}"
+		openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+	fi
+	echo "${openblas_flags}"
+}
+
+get_openblas_abi_cflags() {
+	local openblas_abi_cflags=""
+	if [[ "${ABI}" == "x86" ]]; then
+		openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 -DOPENBLAS___32BIT__=1"
+	else
+		openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 -DOPENBLAS___64BIT__=1"
+	fi
+	$(fortran-int64_is_int64_build) && \
+		openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+	echo "${openblas_abi_cflags}"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default
+		if [[ ${PV} != "9999" ]] ; then
+			find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
+				mv "${WORKDIR}"/*OpenBLAS* "${S}"
+		fi
+	fi
+}
+
+src_prepare() {
+	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+	epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+	if [[ ${PV} == "0.2.11" ]] ; then
+		epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
+	fi
+	# lapack and lapacke are not modified from upstream lapack
+	sed \
+		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+		-i Makefile.rule || die
+	multibuild_copy_sources
+}
+
+src_configure() {
+	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+	my_configure() {
+		local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+		local internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+		sed \
+			-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) $(get_abi_CFLAGS):" \
+			-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) $(get_abi_CFLAGS):" \
+			-e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} ${internal_openblas_abi_cflags}:" \
+			-i Makefile.rule || die
+	}
+	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_configure
+}
+
+src_compile() {
+	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+	# openblas already does multi-jobs
+	MAKEOPTS+=" -j1"
+	my_src_compile () {
+		local openblas_flags=$(get_openblas_flags)
+		local profname=$(fortran-int64_get_profname)
+		local libname="${profname//-/_}"
+		einfo "Compiling profile ${profname}"
+		# cflags already defined twice
+		unset CFLAGS
+		emake clean
+		emake libs shared ${openblas_flags}
+		mkdir -p libs && mv libopenblas* libs/
+		# avoid pic when compiling static libraries, so re-compiling
+		if use static-libs; then
+			emake clean
+			emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
+			mv libopenblas* libs/
+		fi
+		# Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler messages:
+		# ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')'
+		# The problem is applying this patch in src_prepare() causes build failures on
+		# assembler code as the assembler does not understand sizeof(float).  So
+		# delay applying the patch until after building the libraries.
+		epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
+		rm -f config.h config_last.h
+		# Note: prints this spurious warning: make: Nothing to be done for 'config.h'.
+		emake config.h
+		cp config.h config_last.h || die
+		cat <<-EOF > ${profname}.pc
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ${profname}
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -l${libname}
+			Libs.private: -lm
+		EOF
+		local openblas_abi_cflags=$(get_openblas_abi_cflags)
+		local openblas_abi_fflags=$(fortran-int64_get_fortran_int64_abi_fflags)
+		cat <<-EOF >> ${profname}.pc
+			Cflags: -I\${includedir}/${PN} ${openblas_abi_cflags}
+			Fflags=${openblas_abi_fflags}
+		EOF
+		mv libs/libopenblas* . || die
+	}
+	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_src_compile
+}
+
+src_test() {
+	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+	my_src_test () {
+		local openblas_flags=$(get_openblas_flags)
+		emake tests ${openblas_flags}
+	}
+	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_src_test
+}
+
+src_install() {
+	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+	my_src_install() {
+		local openblas_flags=$(get_openblas_flags)
+		local profname=$(fortran-int64_get_profname)
+		local pcfile
+		for pcfile in *.pc; do
+			local profname=${pcfile%.pc}
+			# The file /usr/include/openblas/openblas_config.h is generated during the install.
+			# The sed on config_last.h removes the #define's OPENBLAS_USE64BITINT
+			# OPENBLASS__32BIT__ OPENBLASS__64BIT__ OPENBLAS__ARCH_X86 OPENBLAS__ARCH_X86_64
+			# from /usr/include/openblas/openblas_config.h.  We then specify it in Cflags in
+			# the /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
+			sed -e '/#define USE64BITINT/d' \
+				-e '/#define ARCH_X86/d' \
+				-e '/#define __\(32\|64\)BIT__/d' \
+				-i config_last.h \
+				|| die "Could not ensure there is no definition of USE64BITINT in config_last.h"
+			emake install \
+				PREFIX="${ED}"usr ${openblas_flags} \
+				OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
+				OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+			use static-libs || rm "${ED}"usr/$(get_libdir)/lib*.a
+			alternatives_for $(fortran-int64_get_blas_provider) ${profname} 0 \
+				/usr/$(get_libdir)/pkgconfig/$(fortran-int64_get_blas_provider).pc ${pcfile}
+			alternatives_for $(fortran-int64_get_cblas_provider) ${profname} 0 \
+				/usr/$(get_libdir)/pkgconfig/$(fortran-int64_get_cblas_provider).pc ${pcfile} \
+				/usr/include/cblas.h ${PN}/cblas.h
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins ${pcfile}
+		done
+
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			cd "${ED}"/usr/$(get_libdir)
+			local d
+			for d in *.dylib ; do
+				ebegin "Correcting install_name of ${d}"
+				install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
+				eend $?
+			done
+		fi
+		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+			multilib_prepare_wrappers
+			multilib_check_headers
+		fi
+	}
+	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_src_install
+	multilib_install_wrappers
+
+	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+	dodoc *md Changelog.txt
+}

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild b/sci-libs/openblas/openblas-0.2.14.ebuild
deleted file mode 100644
index 2b5f76d..0000000
--- a/sci-libs/openblas/openblas-0.2.14.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EBASE_PROFNAME="openblas"
-inherit alternatives-2 eutils fortran-2 multibuild multilib-build toolchain-funcs fortran-int64
-
-SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
-	EGIT_BRANCH="develop"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="dynamic int64 openmp static-libs threads"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="
-	>=virtual/blas-2.1-r2[int64?]
-	>=virtual/cblas-2.0-r1[int64?]"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/openblas/cblas.h
-	/usr/include/openblas/f77blas.h
-	/usr/include/openblas/openblas_config.h
-)
-
-get_openblas_flags() {
-	local openblas_flags=""
-	use dynamic && \
-		openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1"
-	$(fortran-int64_is_int64_build) && \
-		openblas_flags+=" INTERFACE64=1"
-	# choose posix threads over openmp when the two are set
-	# yet to see the need of having the two profiles simultaneously
-	if use threads; then
-		openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
-	elif use openmp; then
-		openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
-	fi
-	local profname=$(fortran-int64_get_profname)
-	local libname="${profname//-/_}"
-	local underscoresuffix="${libname#${PN}}"
-	if [[ "${underscoresuffix}" != "_" ]]; then
-		local libnamesuffix="${underscoresuffix#_}"
-		openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
-	fi
-	echo "${openblas_flags}"
-}
-
-get_openblas_abi_cflags() {
-	local openblas_abi_cflags=""
-	if [[ "${ABI}" == "x86" ]]; then
-		openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 -DOPENBLAS___32BIT__=1"
-	else
-		openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 -DOPENBLAS___64BIT__=1"
-	fi
-	$(fortran-int64_is_int64_build) && \
-		openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
-	echo "${openblas_abi_cflags}"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default
-		if [[ ${PV} != "9999" ]] ; then
-			find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
-				mv "${WORKDIR}"/*OpenBLAS* "${S}"
-		fi
-	fi
-}
-
-src_prepare() {
-	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
-	epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
-	if [[ ${PV} == "0.2.11" ]] ; then
-		epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
-	fi
-	# lapack and lapacke are not modified from upstream lapack
-	sed \
-		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-		-i Makefile.rule || die
-	multibuild_copy_sources
-}
-
-src_configure() {
-	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
-	my_configure() {
-		local openblas_abi_cflags="$(get_openblas_abi_cflags)"
-		local internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
-		sed \
-			-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) $(get_abi_CFLAGS):" \
-			-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) $(get_abi_CFLAGS):" \
-			-e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} ${internal_openblas_abi_cflags}:" \
-			-i Makefile.rule || die
-	}
-	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_configure
-}
-
-src_compile() {
-	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
-	# openblas already does multi-jobs
-	MAKEOPTS+=" -j1"
-	my_src_compile () {
-		local openblas_flags=$(get_openblas_flags)
-		local profname=$(fortran-int64_get_profname)
-		local libname="${profname//-/_}"
-		einfo "Compiling profile ${profname}"
-		# cflags already defined twice
-		unset CFLAGS
-		emake clean
-		emake libs shared ${openblas_flags}
-		mkdir -p libs && mv libopenblas* libs/
-		# avoid pic when compiling static libraries, so re-compiling
-		if use static-libs; then
-			emake clean
-			emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
-			mv libopenblas* libs/
-		fi
-		# Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler messages:
-		# ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')'
-		# The problem is applying this patch in src_prepare() causes build failures on
-		# assembler code as the assembler does not understand sizeof(float).  So
-		# delay applying the patch until after building the libraries.
-		epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
-		rm -f config.h config_last.h
-		# Note: prints this spurious warning: make: Nothing to be done for 'config.h'.
-		emake config.h
-		cp config.h config_last.h || die
-		cat <<-EOF > ${profname}.pc
-			prefix=${EPREFIX}/usr
-			libdir=\${prefix}/$(get_libdir)
-			includedir=\${prefix}/include
-			Name: ${profname}
-			Description: ${DESCRIPTION}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-			Libs: -L\${libdir} -l${libname}
-			Libs.private: -lm
-		EOF
-		local openblas_abi_cflags=$(get_openblas_abi_cflags)
-		local openblas_abi_fflags=$(fortran-int64_get_fortran_int64_abi_fflags)
-		cat <<-EOF >> ${profname}.pc
-			Cflags: -I\${includedir}/${PN} ${openblas_abi_cflags}
-			Fflags=${openblas_abi_fflags}
-		EOF
-		mv libs/libopenblas* . || die
-	}
-	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_src_compile
-}
-
-src_test() {
-	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
-	my_src_test () {
-		local openblas_flags=$(get_openblas_flags)
-		emake tests ${openblas_flags}
-	}
-	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_src_test
-}
-
-src_install() {
-	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
-	my_src_install() {
-		local openblas_flags=$(get_openblas_flags)
-		local profname=$(fortran-int64_get_profname)
-		local pcfile
-		for pcfile in *.pc; do
-			local profname=${pcfile%.pc}
-			# The file /usr/include/openblas/openblas_config.h is generated during the install.
-			# The sed on config_last.h removes the #define's OPENBLAS_USE64BITINT
-			# OPENBLASS__32BIT__ OPENBLASS__64BIT__ OPENBLAS__ARCH_X86 OPENBLAS__ARCH_X86_64
-			# from /usr/include/openblas/openblas_config.h.  We then specify it in Cflags in
-			# the /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
-			sed -e '/#define USE64BITINT/d' \
-				-e '/#define ARCH_X86/d' \
-				-e '/#define __\(32\|64\)BIT__/d' \
-				-i config_last.h \
-				|| die "Could not ensure there is no definition of USE64BITINT in config_last.h"
-			emake install \
-				PREFIX="${ED}"usr ${openblas_flags} \
-				OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-				OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
-			use static-libs || rm "${ED}"usr/$(get_libdir)/lib*.a
-			alternatives_for $(fortran-int64_get_blas_provider) ${profname} 0 \
-				/usr/$(get_libdir)/pkgconfig/$(fortran-int64_get_blas_provider).pc ${pcfile}
-			alternatives_for $(fortran-int64_get_cblas_provider) ${profname} 0 \
-				/usr/$(get_libdir)/pkgconfig/$(fortran-int64_get_cblas_provider).pc ${pcfile} \
-				/usr/include/cblas.h ${PN}/cblas.h
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins ${pcfile}
-		done
-
-		if [[ ${CHOST} == *-darwin* ]] ; then
-			cd "${ED}"/usr/$(get_libdir)
-			local d
-			for d in *.dylib ; do
-				ebegin "Correcting install_name of ${d}"
-				install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
-				eend $?
-			done
-		fi
-		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-			multilib_prepare_wrappers
-			multilib_check_headers
-		fi
-	}
-	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_src_install
-	multilib_install_wrappers
-
-	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-	dodoc *md Changelog.txt
-}

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild b/sci-libs/openblas/openblas-0.2.14.ebuild
new file mode 120000
index 0000000..2381753
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -0,0 +1 @@
+openblas-9999.ebuild
\ No newline at end of file

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

[Denis Dupeyron]

commit:     7fcc36e404a535776e7d53f1e0bcac3e36a33f38
Author:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 20:24:53 2015 +0000
Commit:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 20:24:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7fcc36e4

sci-libs/openblas: version bump

 sci-libs/openblas/ChangeLog              |   7 +-
 sci-libs/openblas/openblas-0.2.14.ebuild | 227 +++++++++++++++++++++++++++++++
 2 files changed, 233 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index fee0835..1f27f12 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-libs/openblas
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.14 (27 Mar 2015)
+
+  27 Mar 2015; Denis Dupeyron <calchan@gentoo.org> +openblas-0.2.14.ebuild:
+  Version bump.
+
   20 Oct 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
   Thanks to kiwifb for reporting
   https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy

diff --git a/sci-libs/openblas/openblas-0.2.14.ebuild b/sci-libs/openblas/openblas-0.2.14.ebuild
new file mode 100644
index 0000000..2b5f76d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.14.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EBASE_PROFNAME="openblas"
+inherit alternatives-2 eutils fortran-2 multibuild multilib-build toolchain-funcs fortran-int64
+
+SRC_URI+="http://dev.gentoo.org/~gienah/distfiles/${PN}-0.2.11-gentoo.patch"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
+	EGIT_BRANCH="develop"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI+=" http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="dynamic int64 openmp static-libs threads"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="
+	>=virtual/blas-2.1-r2[int64?]
+	>=virtual/cblas-2.0-r1[int64?]"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openblas/cblas.h
+	/usr/include/openblas/f77blas.h
+	/usr/include/openblas/openblas_config.h
+)
+
+get_openblas_flags() {
+	local openblas_flags=""
+	use dynamic && \
+		openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1"
+	$(fortran-int64_is_int64_build) && \
+		openblas_flags+=" INTERFACE64=1"
+	# choose posix threads over openmp when the two are set
+	# yet to see the need of having the two profiles simultaneously
+	if use threads; then
+		openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
+	elif use openmp; then
+		openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
+	fi
+	local profname=$(fortran-int64_get_profname)
+	local libname="${profname//-/_}"
+	local underscoresuffix="${libname#${PN}}"
+	if [[ "${underscoresuffix}" != "_" ]]; then
+		local libnamesuffix="${underscoresuffix#_}"
+		openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+	fi
+	echo "${openblas_flags}"
+}
+
+get_openblas_abi_cflags() {
+	local openblas_abi_cflags=""
+	if [[ "${ABI}" == "x86" ]]; then
+		openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 -DOPENBLAS___32BIT__=1"
+	else
+		openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 -DOPENBLAS___64BIT__=1"
+	fi
+	$(fortran-int64_is_int64_build) && \
+		openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+	echo "${openblas_abi_cflags}"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default
+		if [[ ${PV} != "9999" ]] ; then
+			find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \
+				mv "${WORKDIR}"/*OpenBLAS* "${S}"
+		fi
+	fi
+}
+
+src_prepare() {
+	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+	epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
+	if [[ ${PV} == "0.2.11" ]] ; then
+		epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
+	fi
+	# lapack and lapacke are not modified from upstream lapack
+	sed \
+		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+		-i Makefile.rule || die
+	multibuild_copy_sources
+}
+
+src_configure() {
+	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+	my_configure() {
+		local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+		local internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
+		sed \
+			-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) $(get_abi_CFLAGS):" \
+			-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) $(get_abi_CFLAGS):" \
+			-e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} ${internal_openblas_abi_cflags}:" \
+			-i Makefile.rule || die
+	}
+	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_configure
+}
+
+src_compile() {
+	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+	# openblas already does multi-jobs
+	MAKEOPTS+=" -j1"
+	my_src_compile () {
+		local openblas_flags=$(get_openblas_flags)
+		local profname=$(fortran-int64_get_profname)
+		local libname="${profname//-/_}"
+		einfo "Compiling profile ${profname}"
+		# cflags already defined twice
+		unset CFLAGS
+		emake clean
+		emake libs shared ${openblas_flags}
+		mkdir -p libs && mv libopenblas* libs/
+		# avoid pic when compiling static libraries, so re-compiling
+		if use static-libs; then
+			emake clean
+			emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
+			mv libopenblas* libs/
+		fi
+		# Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler messages:
+		# ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')'
+		# The problem is applying this patch in src_prepare() causes build failures on
+		# assembler code as the assembler does not understand sizeof(float).  So
+		# delay applying the patch until after building the libraries.
+		epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
+		rm -f config.h config_last.h
+		# Note: prints this spurious warning: make: Nothing to be done for 'config.h'.
+		emake config.h
+		cp config.h config_last.h || die
+		cat <<-EOF > ${profname}.pc
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ${profname}
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -l${libname}
+			Libs.private: -lm
+		EOF
+		local openblas_abi_cflags=$(get_openblas_abi_cflags)
+		local openblas_abi_fflags=$(fortran-int64_get_fortran_int64_abi_fflags)
+		cat <<-EOF >> ${profname}.pc
+			Cflags: -I\${includedir}/${PN} ${openblas_abi_cflags}
+			Fflags=${openblas_abi_fflags}
+		EOF
+		mv libs/libopenblas* . || die
+	}
+	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_src_compile
+}
+
+src_test() {
+	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+	my_src_test () {
+		local openblas_flags=$(get_openblas_flags)
+		emake tests ${openblas_flags}
+	}
+	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_src_test
+}
+
+src_install() {
+	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
+	my_src_install() {
+		local openblas_flags=$(get_openblas_flags)
+		local profname=$(fortran-int64_get_profname)
+		local pcfile
+		for pcfile in *.pc; do
+			local profname=${pcfile%.pc}
+			# The file /usr/include/openblas/openblas_config.h is generated during the install.
+			# The sed on config_last.h removes the #define's OPENBLAS_USE64BITINT
+			# OPENBLASS__32BIT__ OPENBLASS__64BIT__ OPENBLAS__ARCH_X86 OPENBLAS__ARCH_X86_64
+			# from /usr/include/openblas/openblas_config.h.  We then specify it in Cflags in
+			# the /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
+			sed -e '/#define USE64BITINT/d' \
+				-e '/#define ARCH_X86/d' \
+				-e '/#define __\(32\|64\)BIT__/d' \
+				-i config_last.h \
+				|| die "Could not ensure there is no definition of USE64BITINT in config_last.h"
+			emake install \
+				PREFIX="${ED}"usr ${openblas_flags} \
+				OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
+				OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+			use static-libs || rm "${ED}"usr/$(get_libdir)/lib*.a
+			alternatives_for $(fortran-int64_get_blas_provider) ${profname} 0 \
+				/usr/$(get_libdir)/pkgconfig/$(fortran-int64_get_blas_provider).pc ${pcfile}
+			alternatives_for $(fortran-int64_get_cblas_provider) ${profname} 0 \
+				/usr/$(get_libdir)/pkgconfig/$(fortran-int64_get_cblas_provider).pc ${pcfile} \
+				/usr/include/cblas.h ${PN}/cblas.h
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins ${pcfile}
+		done
+
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			cd "${ED}"/usr/$(get_libdir)
+			local d
+			for d in *.dylib ; do
+				ebegin "Correcting install_name of ${d}"
+				install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
+				eend $?
+			done
+		fi
+		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+			multilib_prepare_wrappers
+			multilib_check_headers
+		fi
+	}
+	multibuild_foreach_variant run_in_build_dir fortran-int64_multilib_multibuild_wrapper my_src_install
+	multilib_install_wrappers
+
+	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+	dodoc *md Changelog.txt
+}

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

[Justin Lecher]

commit:     beb6c45e8ef0cf87a89011e9ca1cd44d850a36e5
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 12:31:36 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 12:34:54 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=beb6c45e

Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy between installed libraries and .pc file.

---
 sci-libs/openblas/ChangeLog            | 5 +++++
 sci-libs/openblas/openblas-9999.ebuild | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index cc7349a..fee0835 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Oct 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
+  Thanks to kiwifb for reporting
+  https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy
+  between installed libraries and .pc file.
+
   19 Oct 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
   The fix for Bug 524612 failed in src_install building openblas from git. The
   fix is to move applying the patch to src_compile after building the library,

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 7c22ca6..a532fe8 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -42,7 +42,7 @@ get_openblas_flags() {
 	use dynamic && \
 		openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1"
 	$(fortran-int64_is_int64_build) && \
-		openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+		openblas_flags+=" INTERFACE64=1"
 	# choose posix threads over openmp when the two are set
 	# yet to see the need of having the two profiles simultaneously
 	if use threads; then
@@ -50,6 +50,13 @@ get_openblas_flags() {
 	elif use openmp; then
 		openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
 	fi
+	local profname=$(fortran-int64_get_profname)
+	local libname="${profname//-/_}"
+	local underscoresuffix="${libname#${PN}}"
+	if [[ "${underscoresuffix}" != "_" ]]; then
+		local libnamesuffix="${underscoresuffix#_}"
+		openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+	fi
 	echo "${openblas_flags}"
 }
 

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

[Mark Wright]

commit:     08e04d6e9d0357253d1ea001d7c957a74e537384
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 12:31:36 2014 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 12:31:36 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=08e04d6e

Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy between installed libraries and .pc file.

---
 sci-libs/openblas/ChangeLog            | 5 +++++
 sci-libs/openblas/openblas-9999.ebuild | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index cc7349a..fee0835 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Oct 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
+  Thanks to kiwifb for reporting
+  https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy
+  between installed libraries and .pc file.
+
   19 Oct 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
   The fix for Bug 524612 failed in src_install building openblas from git. The
   fix is to move applying the patch to src_compile after building the library,

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 7c22ca6..a532fe8 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -42,7 +42,7 @@ get_openblas_flags() {
 	use dynamic && \
 		openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1"
 	$(fortran-int64_is_int64_build) && \
-		openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+		openblas_flags+=" INTERFACE64=1"
 	# choose posix threads over openmp when the two are set
 	# yet to see the need of having the two profiles simultaneously
 	if use threads; then
@@ -50,6 +50,13 @@ get_openblas_flags() {
 	elif use openmp; then
 		openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
 	fi
+	local profname=$(fortran-int64_get_profname)
+	local libname="${profname//-/_}"
+	local underscoresuffix="${libname#${PN}}"
+	if [[ "${underscoresuffix}" != "_" ]]; then
+		local libnamesuffix="${underscoresuffix#_}"
+		openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}"
+	fi
 	echo "${openblas_flags}"
 }
 

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

[Mark Wright]

commit:     c035b265ecc77dbab84a3492829d7de9a0c217e3
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 19 10:20:52 2014 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sun Oct 19 10:20:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c035b265

The fix for Bug 524612 failed in src_install building openblas from git. The fix is to move applying the patch to src_compile after building the library, then remove config.h and config_last.h; make config.h - ignoring the spurious warning; then cp config.h to config_last.h.

---
 sci-libs/openblas/ChangeLog            |  6 ++++++
 sci-libs/openblas/openblas-9999.ebuild | 16 ++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1ad0bed..cc7349a 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Oct 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
+  The fix for Bug 524612 failed in src_install building openblas from git. The
+  fix is to move applying the patch to src_compile after building the library,
+  then remove config.h and config_last.h; make config.h - ignoring the spurious
+  warning; then cp config.h to config_last.h.
+
 *openblas-0.2.12 (19 Oct 2014)
 
   19 Oct 2014; Mark Wright <gienah@gentoo.org> +openblas-0.2.12.ebuild,

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 5843200..7c22ca6 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -125,6 +125,16 @@ src_compile() {
 			emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
 			mv libopenblas* libs/
 		fi
+		# Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler messages:
+		# ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')'
+		# The problem is applying this patch in src_prepare() causes build failures on
+		# assembler code as the assembler does not understand sizeof(float).  So
+		# delay applying the patch until after building the libraries.
+		epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
+		rm -f config.h config_last.h
+		# Note: prints this spurious warning: make: Nothing to be done for 'config.h'.
+		emake config.h
+		cp config.h config_last.h || die
 		cat <<-EOF > ${profname}.pc
 			prefix=${EPREFIX}/usr
 			libdir=\${prefix}/$(get_libdir)
@@ -159,12 +169,6 @@ src_test() {
 src_install() {
 	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
 	my_src_install() {
-		# Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler messages:
-		# ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')'
-		# The problem is applying this patch in src_prepare() causes build failures on
-		# assembler code as the assembler does not understand sizeof(float).  So
-		# delay applying the patch until src_install().
-		epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
 		local openblas_flags=$(get_openblas_flags)
 		local profname=$(fortran-int64_get_profname)
 		local pcfile

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

[Mark Wright]

commit:     800e8d3b47c5a01f7ff7e2ce6c7cd4a4b9d7a569
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 19 05:54:59 2014 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sun Oct 19 05:54:59 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=800e8d3b

Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')', thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for reporting. The problem was that applying the -0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare() causes build failures on assembler code as the assembler does not understand sizeof(float). So delay applying the patch until src_install(). Bump openblas to 0.2.12.

---
 sci-libs/openblas/ChangeLog              | 13 +++++++++++++
 sci-libs/openblas/openblas-0.2.12.ebuild |  1 +
 sci-libs/openblas/openblas-9999.ebuild   |  9 +++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 1af5fd9..1ad0bed 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,19 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.12 (19 Oct 2014)
+
+  19 Oct 2014; Mark Wright <gienah@gentoo.org> +openblas-0.2.12.ebuild,
+  openblas-9999.ebuild:
+  Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler
+  messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing
+  ')', thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for
+  reporting. The problem was that applying the
+  -0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare()
+  causes build failures on assembler code as the assembler does not understand
+  sizeof(float). So delay applying the patch until src_install(). Bump openblas
+  to 0.2.12.
+
   13 Oct 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
   Refactor openblas to use the fortran-int64.eclass. Move the virtuals from
   RDEPEND to PDEPEND to avoid circular dependencies. Specify the pkg-config

diff --git a/sci-libs/openblas/openblas-0.2.12.ebuild b/sci-libs/openblas/openblas-0.2.12.ebuild
new file mode 120000
index 0000000..2381753
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.12.ebuild
@@ -0,0 +1 @@
+openblas-9999.ebuild
\ No newline at end of file

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index a33e449..5843200 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -80,10 +80,9 @@ src_unpack() {
 src_prepare() {
 	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
 	epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch"
-	if [[ ${PV} != "9999" ]] ; then
+	if [[ ${PV} == "0.2.11" ]] ; then
 		epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch"
 	fi
-	epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
 	# lapack and lapacke are not modified from upstream lapack
 	sed \
 		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
@@ -160,6 +159,12 @@ src_test() {
 src_install() {
 	local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) )
 	my_src_install() {
+		# Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler messages:
+		# ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')'
+		# The problem is applying this patch in src_prepare() causes build failures on
+		# assembler code as the assembler does not understand sizeof(float).  So
+		# delay applying the patch until src_install().
+		epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch"
 		local openblas_flags=$(get_openblas_flags)
 		local profname=$(fortran-int64_get_profname)
 		local pcfile

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

[Justin Lecher]

commit:     78241785859c81d96e24e12dd36836b5c23df1fd
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 11:22:30 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:22:30 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=78241785

Fix rebase lapack-multibuild to master conflict 3 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9f9c82e..39d360f 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,7 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+<<<<<<< HEAD
   06 Sep 2014; Mark Wright <gienah@gentoo.org> +openblas-0.2.11.ebuild,
   openblas-9999.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -23,6 +24,8 @@
   19 Feb 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
+=======
+>>>>>>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Justin Lecher]

commit:     76559c8bbd22f9fa2093008c96a0948c95e2a7f3
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 13:44:08 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:10:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=76559c8b

openblas: Strip the _int64 suffix from the BUILD_VARIANT to calculate the ABI

---
 sci-libs/openblas/openblas-9999.ebuild | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 1c2b6c6..f012efd 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -74,11 +74,15 @@ int64_multilib_get_enabled_abis() {
 	# will be overwritten by the normal variant in the install, which removes the
 	# #define OPENBLAS_USE64BITINT for us.  We then specify it in Cflags in the
 	# /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
+	local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
 	local MULTIBUILD_VARIANTS=( )
-	use int64 && \
-		MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
-	MULTIBUILD_VARIANTS+=( $(multilib_get_enabled_abis) )
-	echo "${MULTIBUILD_VARIANTS[*]}"
+	for i in "${MULTILIB_VARIANTS[@]}"; do
+		if use int64 && [[ "${i}" =~ 64$ ]]; then
+			MULTIBUILD_VARIANTS+=( "${i}_${INT64_SUFFIX}" )
+		fi
+		MULTIBUILD_VARIANTS+=( "${i}" )
+	done
+	echo "${MULTIBUILD_VARIANTS[@]}"
 }
 
 # @FUNCTION: _int64_multilib_multibuild_wrapper
@@ -89,12 +93,10 @@ int64_multilib_get_enabled_abis() {
 _int64_multilib_multibuild_wrapper() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	if [[ ! "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-		local ABI=${MULTIBUILD_VARIANT}
-		multilib_toolchain_setup "${ABI}"
-		export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-		export F77="$(tc-getF77) $(get_abi_CFLAGS)"
-	fi
+	local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
+	multilib_toolchain_setup "${ABI}"
+	export FC="$(tc-getFC) $(get_abi_CFLAGS)"
+	export F77="$(tc-getF77) $(get_abi_CFLAGS)"
 	"${@}"
 }
 
@@ -191,7 +193,7 @@ src_test() {
 
 src_install() {
 	local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
-	my_src_install () {
+	my_src_install() {
 		local openblas_flags=$(get_openblas_flags)
 		local profname=$(get_profname)
 		local pcfile

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

[Justin Lecher]

commit:     f487803ec21a1ee723327b55fa10292146fe1d2c
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 11:28:21 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:28:21 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f487803e

Fix rebase lapack-multibuild to master conflict 5 on sci-libs/openblas

---
 sci-libs/openblas/ChangeLog | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 39d360f..9f9c82e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,7 +2,6 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-<<<<<<< HEAD
   06 Sep 2014; Mark Wright <gienah@gentoo.org> +openblas-0.2.11.ebuild,
   openblas-9999.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -24,8 +23,6 @@
   19 Feb 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
   Thanks to sfabbro: dodoc should be outside the function, they do not change
 
-=======
->>>>>>> multibuild openblas when USE=int64 is specified.
   18 Feb 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
   multibuild openblas when USE=int64 is specified.
 

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

[Justin Lecher]

commit:     fbdfad7d139533e2e0d3b6993685b75772823f07
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 13 01:02:57 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:40:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fbdfad7d

Remove the setting of the FC and F77 environment variables, instead sed the COMMON_OPT in Makefile.rule to include the $(get_abi_CFLAGS). Add get_openblas_abi_cflags and get_openblas_abi_fflags, call them to create the pkg-config ${profname}.pc files. Call get_openblas_abi_cflags to obtain the defines, then remove the OPENBLAS_ at the start, and sed these into COMMON_OPT in Makefile.rule, as USE64BITINT was removed by the patch openblas-0.2.11-openblas_config_header_same_between_ABIs.patch that is required to ensure the openblas_config.h header file is the same between ABIs.

---
 sci-libs/openblas/ChangeLog            | 11 ++++++++
 sci-libs/openblas/openblas-9999.ebuild | 50 ++++++++++++++++++++--------------
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 9f9c82e..bb794f4 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Sep 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
+  Remove the setting of the FC and F77 environment variables, instead sed the
+  COMMON_OPT in Makefile.rule to include the $(get_abi_CFLAGS). Add
+  get_openblas_abi_cflags and get_openblas_abi_fflags, call them to create the
+  pkg-config ${profname}.pc files. Call get_openblas_abi_cflags to obtain the
+  defines, then remove the OPENBLAS_ at the start, and sed these into
+  COMMON_OPT in Makefile.rule, as USE64BITINT was removed by the patch
+  openblas-0.2.11-openblas_config_header_same_between_ABIs.patch that is
+  required to ensure the openblas_config.h header file is the same between
+  ABIs.
+
   06 Sep 2014; Mark Wright <gienah@gentoo.org> +openblas-0.2.11.ebuild,
   openblas-9999.ebuild,
   +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index b3854fe..61ddcf0 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -55,6 +55,27 @@ get_openblas_flags() {
 	echo "${openblas_flags}"
 }
 
+get_openblas_abi_cflags() {
+	local openblas_abi_cflags=""
+	if [[ "${ABI}" == "x86" ]]; then
+		openblas_abi_cflags="-DOPENBLAS_ARCH_X86=1 -DOPENBLAS___32BIT__=1"
+	else
+		openblas_abi_cflags="-DOPENBLAS_ARCH_X86_64=1 -DOPENBLAS___64BIT__=1"
+	fi
+	if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+		openblas_abi_cflags+=" -DOPENBLAS_USE64BITINT"
+	fi
+	echo "${openblas_abi_cflags}"
+}
+
+get_openblas_abi_fflags() {
+	local openblas_abi_fflags=""
+	if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+		openblas_abi_fflags+="-fdefault-integer-8"
+	fi
+	echo "${openblas_abi_fflags}"
+}
+
 get_profname() {
 	local profname="${BASE_PROFNAME}"
 	use dynamic && \
@@ -118,8 +139,6 @@ _int64_multilib_multibuild_wrapper() {
 
 	local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
 	multilib_toolchain_setup "${ABI}"
-	export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-	export F77="$(tc-getF77) $(get_abi_CFLAGS)"
 	"${@}"
 }
 
@@ -167,10 +186,12 @@ src_prepare() {
 src_configure() {
 	local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
 	my_configure() {
+		local openblas_abi_cflags="$(get_openblas_abi_cflags)"
+		local internal_openblas_abi_cflags="${openblas_abi_cflags//OPENBLAS_}"
 		sed \
 			-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC) $(get_abi_CFLAGS):" \
 			-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC) $(get_abi_CFLAGS):" \
-			-e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
+			-e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS} ${internal_openblas_abi_cflags}:" \
 			-i Makefile.rule || die
 	}
 	multibuild_foreach_variant run_in_build_dir _int64_multilib_multibuild_wrapper my_configure
@@ -207,23 +228,12 @@ src_compile() {
 			Libs: -L\${libdir} -l${libname}
 			Libs.private: -lm
 		EOF
-		local openblas_abi_defs=""
-		if [[ "${ABI}" == "x86" ]]; then
-			openblas_abi_defs="-DOPENBLAS_ARCH_X86=1 -DOPENBLAS___32BIT__=1"
-		else
-			openblas_abi_defs="-DOPENBLAS_ARCH_X86_64=1 -DOPENBLAS___64BIT__=1"
-		fi
-		if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-			cat <<-EOF >> ${profname}.pc
-				Cflags: -DOPENBLAS_USE64BITINT ${openblas_abi_defs} -I\${includedir}/${PN}
-				Fflags=-fdefault-integer-8
-			EOF
-		else
-			cat <<-EOF >> ${profname}.pc
-				Cflags: -I\${includedir}/${PN} ${openblas_abi_defs}
-				Fflags=
-			EOF
-		fi
+		local openblas_abi_cflags=$(get_openblas_abi_cflags)
+		local openblas_abi_fflags=$(get_openblas_abi_fflags)
+		cat <<-EOF >> ${profname}.pc
+			Cflags: -I\${includedir}/${PN} ${openblas_abi_cflags}
+			Fflags=${openblas_abi_fflags}
+		EOF
 		mv libs/libopenblas* . || die
 	}
 	multibuild_foreach_variant run_in_build_dir _int64_multilib_multibuild_wrapper my_src_compile

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

[Justin Lecher]

commit:     0cc5ee5acce2af5afeacb555efb5f1aa3a64c379
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 10:16:43 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:10:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0cc5ee5a

Thanks to sfabbro: dodoc should be outside the function, they do not change

---
 sci-libs/openblas/ChangeLog            | 3 +++
 sci-libs/openblas/openblas-9999.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index b4f5886..68e0955 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
+  Thanks to sfabbro: dodoc should be outside the function, they do not change
+
   18 Feb 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
   multibuild openblas when USE=int64 is specified.
 

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 3bd158a..3e3cd52 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -158,9 +158,6 @@ src_install() {
 			doins ${pcfile}
 		done
 
-		dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-		dodoc *md Changelog.txt
-
 		if [[ ${CHOST} == *-darwin* ]] ; then
 			cd "${ED}"/usr/$(get_libdir)
 			local d
@@ -172,4 +169,7 @@ src_install() {
 		fi
 	}
 	multibuild_foreach_variant run_in_build_dir my_src_install
+
+	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+	dodoc *md Changelog.txt
 }

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

[Justin Lecher]

commit:     5b5e9e7d6c21a48ad35d3fc033902201a71a06d4
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 14:01:11 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:05:57 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b5e9e7d

multibuild openblas when USE=int64 is specified.

---
 sci-libs/openblas/ChangeLog            |   3 +
 sci-libs/openblas/openblas-9999.ebuild | 221 +++++++++++++++++++++------------
 2 files changed, 142 insertions(+), 82 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index caf34f2..b4f5886 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
+  multibuild openblas when USE=int64 is specified.
+
   06 Jan 2014; Justin Lecher <jlec@gentoo.org> openblas-9999.ebuild,
   metadata.xml:
   Switch from git-2 to git-r3

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 618c03b..3bd158a 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit alternatives-2 eutils fortran-2 git-r3 multilib toolchain-funcs
+inherit alternatives-2 eutils fortran-2 git-r3 multilib multibuild toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
@@ -14,105 +14,162 @@ EGIT_BRANCH="develop"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="int64 dynamic openmp static-libs threads"
+IUSE="dynamic int64 openmp static-libs threads"
 KEYWORDS=""
 
-src_configure() {
-	# lapack and lapacke are not modified from upstream lapack
-	sed \
-		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-		-e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
-		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-		-i Makefile.rule || die
-}
-
-openblas_compile() {
-	local profname=$1
-	einfo "Compiling profile ${profname}"
-	# cflags already defined twice
-	unset CFLAGS
-	emake clean
-	emake libs shared ${openblas_flags}
-	mkdir -p libs && mv libopenblas* libs/
-	# avoid pic when compiling static libraries, so re-compiling
-	if use static-libs; then
-		emake clean
-		emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
-		mv libopenblas* libs/
-	fi
-	cat <<-EOF > ${profname}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas
-		Libs.private: -lm
-		Cflags: -I\${includedir}/${PN}
-	EOF
-}
+INT64_SUFFIX="int64"
+BASE_PROFNAME="openblas"
 
-src_compile() {
-	# openblas already does multi-jobs
-	MAKEOPTS+=" -j1"
-	openblas_flags=""
-	local openblas_name=openblas
+get_openblas_flags() {
+	local openblas_flags=""
 	use dynamic && \
-		openblas_name+="-dynamic" && \
 		openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1"
-	use int64 && \
-		openblas_name+="-int64" && \
-		openblas_flags+=" INTERFACE64=1"
-
+	if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+		openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}"
+	fi
 	# choose posix threads over openmp when the two are set
 	# yet to see the need of having the two profiles simultaneously
 	if use threads; then
-		openblas_name+="-threads"
 		openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
 	elif use openmp; then
-		openblas_name+="-openmp"
 		openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
 	fi
-	openblas_compile ${openblas_name}
-	mv libs/libopenblas* . || die
+	echo "${openblas_flags}"
+}
+
+get_profname() {
+	local profname="${BASE_PROFNAME}"
+	use dynamic && \
+		profname+="-dynamic"
+	if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+		profname+="-${INT64_SUFFIX}"
+	fi
+	# choose posix threads over openmp when the two are set
+	# yet to see the need of having the two profiles simultaneously
+	if use threads; then
+		profname+="-threads"
+	elif use openmp; then
+		profname+="-openmp"
+	fi
+	echo "${profname}"
+}
+
+pkg_setup() {
+	# The file /usr/include/openblas/openblas_config.h is generated during the install.
+	# By listing the int64 variant first, the int64 variant /usr/include/openblas/openblas_config.h
+	# will be overwritten by the normal variant in the install, which removes the
+	# #define OPENBLAS_USE64BITINT for us.  We then specify it in Cflags in the
+	# /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
+	MULTIBUILD_VARIANTS=()
+	use int64 && \
+		MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
+	MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME} )
+}
+
+src_prepare() {
+	multibuild_copy_sources
+}
+
+src_configure() {
+	my_configure() {
+		# lapack and lapacke are not modified from upstream lapack
+		sed \
+			-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
+			-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
+			-e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
+			-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+			-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+			-i Makefile.rule || die
+	}
+	multibuild_foreach_variant run_in_build_dir my_configure
+}
+
+src_compile() {
+	# openblas already does multi-jobs
+	MAKEOPTS+=" -j1"
+	my_src_compile () {
+		local openblas_flags=$(get_openblas_flags)
+		local profname=$(get_profname)
+		einfo "Compiling profile ${profname}"
+		# cflags already defined twice
+		unset CFLAGS
+		emake clean
+		emake libs shared ${openblas_flags}
+		mkdir -p libs && mv libopenblas* libs/
+		# avoid pic when compiling static libraries, so re-compiling
+		if use static-libs; then
+			emake clean
+			emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
+			mv libopenblas* libs/
+		fi
+		cat <<-EOF > ${profname}.pc
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ${PN}
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -l${MULTIBUILD_ID}
+			Libs.private: -lm
+		EOF
+		if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+			cat <<-EOF >> ${profname}.pc
+				Cflags: -DOPENBLAS_USE64BITINT -I\${includedir}/${PN}
+				Fflags=-fdefault-integer-8
+			EOF
+		else
+			cat <<-EOF >> ${profname}.pc
+				Cflags: -I\${includedir}/${PN}
+				Fflags=
+			EOF
+		fi
+		mv libs/libopenblas* . || die
+	}
+	multibuild_foreach_variant run_in_build_dir my_src_compile
 }
 
 src_test() {
-	emake tests ${openblas_flags}
+	my_src_test () {
+		local openblas_flags=$(get_openblas_flags)
+		emake tests ${openblas_flags}
+	}
+	multibuild_foreach_variant run_in_build_dir my_src_test
 }
 
 src_install() {
-	local pcfile
-	for pcfile in *.pc; do
-		local profname=${pcfile%.pc}
-		emake install \
-			PREFIX="${ED}"usr ${openblas_flags} \
-			OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
-			OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
-		use static-libs || rm "${ED}"usr/$(get_libdir)/lib*.a
-		alternatives_for blas ${profname} 0 \
-			/usr/$(get_libdir)/pkgconfig/blas.pc ${pcfile}
-		alternatives_for cblas ${profname} 0 \
-			/usr/$(get_libdir)/pkgconfig/cblas.pc ${pcfile} \
-			/usr/include/cblas.h ${PN}/cblas.h
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins ${pcfile}
-	done
+	my_src_install () {
+		local openblas_flags=$(get_openblas_flags)
+		local profname=$(get_profname)
+		local pcfile
+		for pcfile in *.pc; do
+			local profname=${pcfile%.pc}
+			emake install \
+				PREFIX="${ED}"usr ${openblas_flags} \
+				OPENBLAS_INCLUDE_DIR="${ED}"usr/include/${PN} \
+				OPENBLAS_LIBRARY_DIR="${ED}"usr/$(get_libdir)
+			use static-libs || rm "${ED}"usr/$(get_libdir)/lib*.a
+			alternatives_for blas ${profname} 0 \
+				/usr/$(get_libdir)/pkgconfig/blas.pc ${pcfile}
+			alternatives_for cblas ${profname} 0 \
+				/usr/$(get_libdir)/pkgconfig/cblas.pc ${pcfile} \
+				/usr/include/cblas.h ${PN}/cblas.h
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins ${pcfile}
+		done
 
-	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-	dodoc *md Changelog.txt
+		dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+		dodoc *md Changelog.txt
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		cd "${ED}"/usr/$(get_libdir)
-		local d
-		for d in *.dylib ; do
-			ebegin "Correcting install_name of ${d}"
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
-			eend $?
-		done
-	fi
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			cd "${ED}"/usr/$(get_libdir)
+			local d
+			for d in *.dylib ; do
+				ebegin "Correcting install_name of ${d}"
+				install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
+				eend $?
+			done
+		fi
+	}
+	multibuild_foreach_variant run_in_build_dir my_src_install
 }

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

[Justin Lecher]

commit:     4741cee1357d2e44c99005edda0c8eaeb9c9dee8
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 18:20:50 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 18:20:50 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4741cee1

sci-libs/openblas: Switch from git-2 to git-r3

Package-Manager: portage-2.2.8

---
 sci-libs/openblas/ChangeLog            |  6 +++++-
 sci-libs/openblas/metadata.xml         | 12 ++++++------
 sci-libs/openblas/openblas-9999.ebuild | 19 +++++++------------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 031ef4e..caf34f2 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/openblas
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> openblas-9999.ebuild,
+  metadata.xml:
+  Switch from git-2 to git-r3
+
 *openblas-0.2.8 (06 Aug 2013)
 
   06 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org> +openblas-0.2.8.ebuild,

diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 67a10b4..32441d1 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD
   version. See <pkg>sci-libs/gotoblas2</pkg> for more on GotoBLAS2.
 </longdescription>
-<use>
-  <flag name='int64'>Build the 64 bits integer library</flag>
-  <flag name='dynamic'>Build dynamic architecture detection at run time (for multi targets)</flag>
-</use>
+  <use>
+    <flag name="int64">Build the 64 bits integer library</flag>
+    <flag name="dynamic">Build dynamic architecture detection at run time (for multi targets)</flag>
+  </use>
 </pkgmetadata>

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index de1ffd0..618c03b 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -1,36 +1,31 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
-EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
-EGIT_MASTER="develop"
-
-inherit eutils toolchain-funcs alternatives-2 multilib fortran-2 git-2
+inherit alternatives-2 eutils fortran-2 git-r3 multilib toolchain-funcs
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-KEYWORDS=""
 SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${PN}-gentoo.patch"
+EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
+EGIT_BRANCH="develop"
 
 LICENSE="BSD"
 SLOT="0"
-
 IUSE="int64 dynamic openmp static-libs threads"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
+KEYWORDS=""
 
 src_configure() {
 	# lapack and lapacke are not modified from upstream lapack
-	sed -i \
+	sed \
 		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
 		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
 		-e "s:^#\s*\(COMMON_OPT\)\s*=.*:\1=${CFLAGS}:" \
 		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
 		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-		Makefile.rule || die
+		-i Makefile.rule || die
 }
 
 openblas_compile() {

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

[Sebastien Fabbro]

commit:     ecc1556231e3b9dd4500b6a4cfd320b7d0ec9448
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 15:48:45 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 15:48:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ecc15562

sci-libs/openblas: Version bump

Package-Manager: portage-2.2.01.22124-prefix

---
 sci-libs/openblas/ChangeLog                        |  6 ++++++
 ...openblas-0.2.7.ebuild => openblas-0.2.8.ebuild} | 25 +++++++++++-----------
 sci-libs/openblas/openblas-9999.ebuild             | 22 +++++++++----------
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 80ed3d8..031ef4e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.8 (06 Aug 2013)
+
+  06 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org> +openblas-0.2.8.ebuild,
+  -openblas-0.2.7.ebuild, openblas-9999.ebuild:
+  sci-libs/openblas: Version bump
+
 *openblas-0.2.7 (24 Jul 2013)
 
   24 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +openblas-0.2.7.ebuild,

diff --git a/sci-libs/openblas/openblas-0.2.7.ebuild b/sci-libs/openblas/openblas-0.2.8.ebuild
similarity index 91%
rename from sci-libs/openblas/openblas-0.2.7.ebuild
rename to sci-libs/openblas/openblas-0.2.8.ebuild
index 30e5918..f201fe1 100644
--- a/sci-libs/openblas/openblas-0.2.7.ebuild
+++ b/sci-libs/openblas/openblas-0.2.8.ebuild
@@ -8,8 +8,7 @@ inherit eutils toolchain-funcs alternatives-2 multilib fortran-2
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz
-	http://dev.gentoo.org/~bicatali/distfiles/${PN}-gentoo.patch"
+SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
 
 LICENSE="BSD"
@@ -26,13 +25,6 @@ src_unpack() {
 		mv "${WORKDIR}"/*OpenBLAS* "${S}"
 }
 
-src_prepare() {
-	# openblas already does multi-jobs
-	MAKEOPTS+=" -j1"
-	cd "${S}"
-	epatch "${DISTDIR}"/${PN}-gentoo.patch
-}
-
 src_configure() {
 	# lapack and lapacke are not modified from upstream lapack
 	sed -i \
@@ -51,12 +43,12 @@ openblas_compile() {
 	unset CFLAGS
 	emake clean
 	emake libs shared ${openblas_flags}
-	mkdir -p libs && mv lib* libs/
+	mkdir -p libs && mv libopenblas* libs/
 	# avoid pic when compiling static libraries, so re-compiling
 	if use static-libs; then
 		emake clean
 		emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
-		mv lib* libs/
+		mv libopenblas* libs/
 	fi
 	cat <<-EOF > ${profname}.pc
 		prefix=${EPREFIX}/usr
@@ -73,21 +65,28 @@ openblas_compile() {
 }
 
 src_compile() {
+	# openblas already does multi-jobs
+	MAKEOPTS+=" -j1"
 	openblas_flags=""
+	local openblas_name=openblas
 	use dynamic && \
+		openblas_name+="-dynamic" && \
 		openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1"
 	use int64 && \
+		openblas_name+="-int64" && \
 		openblas_flags+=" INTERFACE64=1"
 
 	# choose posix threads over openmp when the two are set
 	# yet to see the need of having the two profiles simultaneously
 	if use threads; then
+		openblas_name+="-threads"
 		openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
 	elif use openmp; then
+		openblas_name+="-openmp"
 		openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
 	fi
-	openblas_compile openblas
-	mv libs/lib* . || die
+	openblas_compile ${openblas_name}
+	mv libs/libopenblas* . || die
 }
 
 src_test() {

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index f9834f6..de1ffd0 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -22,13 +22,6 @@ IUSE="int64 dynamic openmp static-libs threads"
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	# openblas already does multi-jobs
-	MAKEOPTS+=" -j1"
-	cd "${S}"
-	epatch "${DISTDIR}"/${PN}-gentoo.patch
-}
-
 src_configure() {
 	# lapack and lapacke are not modified from upstream lapack
 	sed -i \
@@ -47,12 +40,12 @@ openblas_compile() {
 	unset CFLAGS
 	emake clean
 	emake libs shared ${openblas_flags}
-	mkdir -p libs && mv lib* libs/
+	mkdir -p libs && mv libopenblas* libs/
 	# avoid pic when compiling static libraries, so re-compiling
 	if use static-libs; then
 		emake clean
 		emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC=
-		mv lib* libs/
+		mv libopenblas* libs/
 	fi
 	cat <<-EOF > ${profname}.pc
 		prefix=${EPREFIX}/usr
@@ -69,21 +62,28 @@ openblas_compile() {
 }
 
 src_compile() {
+	# openblas already does multi-jobs
+	MAKEOPTS+=" -j1"
 	openblas_flags=""
+	local openblas_name=openblas
 	use dynamic && \
+		openblas_name+="-dynamic" && \
 		openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1"
 	use int64 && \
+		openblas_name+="-int64" && \
 		openblas_flags+=" INTERFACE64=1"
 
 	# choose posix threads over openmp when the two are set
 	# yet to see the need of having the two profiles simultaneously
 	if use threads; then
+		openblas_name+="-threads"
 		openblas_flags+=" USE_THREAD=1 USE_OPENMP=0"
 	elif use openmp; then
+		openblas_name+="-openmp"
 		openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
 	fi
-	openblas_compile openblas-int64
-	mv libs/lib* . || die
+	openblas_compile ${openblas_name}
+	mv libs/libopenblas* . || die
 }
 
 src_test() {

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

[Sebastien Fabbro]

commit:     5815664442946fa502585c4eaccacb11a09b3062
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 23:09:16 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 23:09:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=58156644

fixed profile syntax

---
 sci-libs/openblas/openblas-0.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/openblas/openblas-0.2.7.ebuild b/sci-libs/openblas/openblas-0.2.7.ebuild
index f2c690e..30e5918 100644
--- a/sci-libs/openblas/openblas-0.2.7.ebuild
+++ b/sci-libs/openblas/openblas-0.2.7.ebuild
@@ -86,7 +86,7 @@ src_compile() {
 	elif use openmp; then
 		openblas_flags+=" USE_THREAD=0 USE_OPENMP=1"
 	fi
-	openblas_compile openblas-int64
+	openblas_compile openblas
 	mv libs/lib* . || die
 }
 

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

[Sebastien Fabbro]

commit:     10d67515c157ff2329e2b7d68d5aa09ad8518e62
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 18:13:34 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 18:13:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=10d67515

sci-libs/openblas: Version bump

Package-Manager: portage-2.2.01.21688-prefix

---
 sci-libs/openblas/ChangeLog                        |    6 ++++++
 ...openblas-0.2.5.ebuild => openblas-0.2.6.ebuild} |    0
 sci-libs/openblas/openblas-9999.ebuild             |    2 +-
 3 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 83e767e..73db9ea 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.6 (03 Mar 2013)
+
+  03 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org> +openblas-0.2.6.ebuild,
+  -openblas-0.2.5.ebuild, openblas-9999.ebuild:
+  sci-libs/openblas: Version bump
+
   25 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org> openblas-9999.ebuild:
   sci-libs/openblas: Move threads to Libs.private in pc file
 

diff --git a/sci-libs/openblas/openblas-0.2.5.ebuild b/sci-libs/openblas/openblas-0.2.6.ebuild
similarity index 100%
rename from sci-libs/openblas/openblas-0.2.5.ebuild
rename to sci-libs/openblas/openblas-0.2.6.ebuild

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index bfbd146..008e107 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
 	_SCM=git-2

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

[Sebastien Fabbro]

commit:     4f7d746ed55dde2ac4aea0fb840c360ec9b54816
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 17:30:54 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 17:30:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4f7d746e

sci-libs/openblas: Move threads to Libs.private in pc file

Package-Manager: portage-2.2.01.21688-prefix

---
 sci-libs/openblas/ChangeLog            |    5 ++++-
 sci-libs/openblas/openblas-9999.ebuild |   10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 879560b..83e767e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-libs/openblas
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org> openblas-9999.ebuild:
+  sci-libs/openblas: Move threads to Libs.private in pc file
+
 *openblas-0.2.5 (12 Dec 2012)
 
   12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +openblas-0.2.5.ebuild,

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 5011871..bfbd146 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
 fi
 
-inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
+inherit eutils toolchain-funcs alternatives-2 multilib fortran-2 ${_SCM}
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
@@ -24,7 +24,7 @@ SLOT="0"
 
 IUSE="+incblas int64 dynamic openmp static-libs threads"
 
-RDEPEND="virtual/fortran"
+RDEPEND=""
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -102,8 +102,8 @@ src_install() {
 		Description: ${DESCRIPTION}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas ${threads}
-		Libs.private: -lm
+		Libs: -L\${libdir} -lopenblas
+		Libs.private: -lm ${threads}
 	EOF
 
 	alternatives_for blas ${profname} 0 \

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

[Sebastien Fabbro]

commit:     a01282d0107acf25637e0fff53dfa34cf2ef204b
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 12 19:27:53 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Dec 12 19:27:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a01282d0

sci-libs/openblas: Version bump. Link latest version to live one

Package-Manager: portage-2.2.01.21418-prefix

---
 sci-libs/openblas/ChangeLog                        |    8 +-
 sci-libs/openblas/openblas-0.2.3.ebuild            |  131 --------------------
 sci-libs/openblas/openblas-0.2.4-r1.ebuild         |  131 --------------------
 sci-libs/openblas/openblas-0.2.4.ebuild            |  131 --------------------
 ...openblas-0.2.2.ebuild => openblas-0.2.5.ebuild} |    0
 sci-libs/openblas/openblas-9999.ebuild             |    6 +-
 6 files changed, 11 insertions(+), 396 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index bcfe190..879560b 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.5 (12 Dec 2012)
+
+  12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +openblas-0.2.5.ebuild,
+  -openblas-0.2.2.ebuild, -openblas-0.2.3.ebuild, -openblas-0.2.4-r1.ebuild,
+  -openblas-0.2.4.ebuild, openblas-9999.ebuild:
+  sci-libs/openblas: Version bump. Link latest version to live one
+
 *openblas-0.2.4-r1 (15 Oct 2012)
 
   15 Oct 2012; Andrea Arteaga <spiros@gentoo.com> +openblas-0.2.4-r1.ebuild:
@@ -95,4 +102,3 @@
   23 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> +openblas-9999.ebuild,
   +files/openblas-sharedlibs.patch, +metadata.xml:
   Initial import
-

diff --git a/sci-libs/openblas/openblas-0.2.3.ebuild b/sci-libs/openblas/openblas-0.2.3.ebuild
deleted file mode 100644
index 27d5bb6..0000000
--- a/sci-libs/openblas/openblas-0.2.3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	_SCM=git-2
-	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
-	CID="e552452" # commit ID
-fi
-
-inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="+incblas int64 dynamic openmp static-libs threads"
-
-RDEPEND="virtual/fortran"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
-	# respect LDFLAGS
-	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
-	# respect CFLAGS only if dynamic flag not enabled
-	if ! use dynamic; then
-		sed -i \
-			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
-			Makefile.rule || die
-	fi
-	# fix executable stacks
-	local i
-	for i in $(find . -name \*.S); do
-		cat >> ${i} <<-EOF
-			#if defined(__ELF__)
-			.section .note.GNU-stack,"",%progbits
-			#endif
-		EOF
-	done
-}
-
-src_configure() {
-	local use_openmp=$(use openmp && echo 1)
-	use threads && use openmp && use_openmp="" && \
-		einfo "openmp and threads enabled: using threads"
-	sed -i \
-		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
-		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
-		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
-		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
-		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
-		Makefile.rule || die
-}
-
-src_compile() {
-	mkdir solibs
-	emake libs shared && mv *$(get_libname) solibs/
-	use static-libs && emake clean && emake libs NEED_PIC=
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	local profname=${PN} threads
-	use int64 && profname=${profname}-int64
-	if use threads; then
-		threads="-pthread"
-		profname=${profname}-threads
-	elif use openmp; then
-		profname=${profname}-openmp
-	fi
-
-	dolib.so solibs/lib*$(get_libname)
-	use static-libs && dolib.a lib*.a
-
-	# create pkg-config file and associated eselect file
-	cat <<-EOF > ${profname}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas ${threads}
-		Libs.private: -lm
-	EOF
-
-	alternatives_for blas ${profname} 0 \
-		/usr/$(get_libdir)/pkgconfig/blas.pc ${profname}.pc
-
-	if use incblas; then
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
-		insinto /usr/include/${PN}
-		doins cblas.h common*.h config.h param.h
-		alternatives_for cblas ${profname} 0 \
-			/usr/$(get_libdir)/pkgconfig/cblas.pc ${profname}.pc \
-			/usr/include/cblas.h ${PN}/cblas.h
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
-	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		cd "${ED}"/usr/$(get_libdir)
-		for d in *.dylib ; do
-			ebegin "Correcting install_name of ${d}"
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
-			eend $?
-		done
-	fi
-}

diff --git a/sci-libs/openblas/openblas-0.2.4-r1.ebuild b/sci-libs/openblas/openblas-0.2.4-r1.ebuild
deleted file mode 100644
index 759c758..0000000
--- a/sci-libs/openblas/openblas-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	_SCM=git-2
-	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
-	CID="ea9a46c" # commit ID
-fi
-
-inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="+incblas int64 dynamic openmp static-libs threads"
-
-RDEPEND="virtual/fortran"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
-	# respect LDFLAGS
-	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
-	# respect CFLAGS only if dynamic flag not enabled
-	if ! use dynamic; then
-		sed -i \
-			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
-			Makefile.rule || die
-	fi
-	# fix executable stacks
-	local i
-	for i in $(find . -name \*.S); do
-		cat >> ${i} <<-EOF
-			#if defined(__ELF__)
-			.section .note.GNU-stack,"",%progbits
-			#endif
-		EOF
-	done
-}
-
-src_configure() {
-	local use_openmp=$(use openmp && echo 1)
-	use threads && use openmp && use_openmp="" && \
-		einfo "openmp and threads enabled: using threads"
-	sed -i \
-		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
-		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
-		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
-		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
-		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
-		Makefile.rule || die
-}
-
-src_compile() {
-	mkdir solibs
-	emake libs shared && mv *$(get_libname) solibs/
-	use static-libs && emake clean && emake libs NEED_PIC=
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	local profname=${PN} threads
-	use int64 && profname=${profname}-int64
-	if use threads; then
-		threads="-pthread"
-		profname=${profname}-threads
-	elif use openmp; then
-		profname=${profname}-openmp
-	fi
-
-	dolib.so solibs/lib*$(get_libname)
-	use static-libs && dolib.a lib*.a
-
-	# create pkg-config file and associated eselect file
-	cat <<-EOF > ${profname}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas ${threads}
-		Libs.private: -lm
-	EOF
-
-	alternatives_for blas ${profname} 0 \
-		/usr/$(get_libdir)/pkgconfig/blas.pc ${profname}.pc
-
-	if use incblas; then
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
-		insinto /usr/include/${PN}
-		doins cblas.h common*.h config.h param.h
-		alternatives_for cblas ${profname} 0 \
-			/usr/$(get_libdir)/pkgconfig/cblas.pc ${profname}.pc \
-			/usr/include/cblas.h ${PN}/cblas.h
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
-	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		cd "${ED}"/usr/$(get_libdir)
-		for d in *.dylib ; do
-			ebegin "Correcting install_name of ${d}"
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
-			eend $?
-		done
-	fi
-}

diff --git a/sci-libs/openblas/openblas-0.2.4.ebuild b/sci-libs/openblas/openblas-0.2.4.ebuild
deleted file mode 100644
index 4197eda..0000000
--- a/sci-libs/openblas/openblas-0.2.4.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ ${PV} == "9999" ]] ; then
-	_SCM=git-2
-	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
-	CID="be853da" # commit ID
-fi
-
-inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="+incblas int64 dynamic openmp static-libs threads"
-
-RDEPEND="virtual/fortran"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
-	# respect LDFLAGS
-	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
-	# respect CFLAGS only if dynamic flag not enabled
-	if ! use dynamic; then
-		sed -i \
-			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
-			Makefile.rule || die
-	fi
-	# fix executable stacks
-	local i
-	for i in $(find . -name \*.S); do
-		cat >> ${i} <<-EOF
-			#if defined(__ELF__)
-			.section .note.GNU-stack,"",%progbits
-			#endif
-		EOF
-	done
-}
-
-src_configure() {
-	local use_openmp=$(use openmp && echo 1)
-	use threads && use openmp && use_openmp="" && \
-		einfo "openmp and threads enabled: using threads"
-	sed -i \
-		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
-		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
-		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
-		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
-		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
-		Makefile.rule || die
-}
-
-src_compile() {
-	mkdir solibs
-	emake libs shared && mv *$(get_libname) solibs/
-	use static-libs && emake clean && emake libs NEED_PIC=
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	local profname=${PN} threads
-	use int64 && profname=${profname}-int64
-	if use threads; then
-		threads="-pthread"
-		profname=${profname}-threads
-	elif use openmp; then
-		profname=${profname}-openmp
-	fi
-
-	dolib.so solibs/lib*$(get_libname)
-	use static-libs && dolib.a lib*.a
-
-	# create pkg-config file and associated eselect file
-	cat <<-EOF > ${profname}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas ${threads}
-		Libs.private: -lm
-	EOF
-
-	alternatives_for blas ${profname} 0 \
-		/usr/$(get_libdir)/pkgconfig/blas.pc ${profname}.pc
-
-	if use incblas; then
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
-		insinto /usr/include/${PN}
-		doins cblas.h common*.h config.h param.h
-		alternatives_for cblas ${profname} 0 \
-			/usr/$(get_libdir)/pkgconfig/cblas.pc ${profname}.pc \
-			/usr/include/cblas.h ${PN}/cblas.h
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
-	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		cd "${ED}"/usr/$(get_libdir)
-		for d in *.dylib ; do
-			ebegin "Correcting install_name of ${d}"
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
-			eend $?
-		done
-	fi
-}

diff --git a/sci-libs/openblas/openblas-0.2.2.ebuild b/sci-libs/openblas/openblas-0.2.5.ebuild
similarity index 100%
rename from sci-libs/openblas/openblas-0.2.2.ebuild
rename to sci-libs/openblas/openblas-0.2.5.ebuild

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 092af35..5011871 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -12,7 +12,6 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
-	CID="4933d61" # commit ID
 fi
 
 inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
@@ -28,7 +27,10 @@ IUSE="+incblas int64 dynamic openmp static-libs threads"
 RDEPEND="virtual/fortran"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
+src_unpack() {
+	unpack ${A}
+	mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch

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

[Andrea Arteaga]

commit:     4011832304797351550c9a51e702b821098d649d
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Mon Oct 15 20:14:58 2012 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Mon Oct 15 20:14:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=40118323

[sci-libs/openblas] Solved problem with fetching

---
 sci-libs/openblas/ChangeLog                |    6 ++
 sci-libs/openblas/openblas-0.2.4-r1.ebuild |  131 ++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+), 0 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 22dd3fa..bcfe190 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.4-r1 (15 Oct 2012)
+
+  15 Oct 2012; Andrea Arteaga <spiros@gentoo.com> +openblas-0.2.4-r1.ebuild:
+  Solved problem with fetching
+
+
 *openblas-0.2.4 (08 Oct 2012)
 
   08 Oct 2012; Andrea Arteaga <andyspiros@gmail.com> +openblas-0.2.4.ebuild:

diff --git a/sci-libs/openblas/openblas-0.2.4-r1.ebuild b/sci-libs/openblas/openblas-0.2.4-r1.ebuild
new file mode 100644
index 0000000..759c758
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.4-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+if [[ ${PV} == "9999" ]] ; then
+	_SCM=git-2
+	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
+	CID="ea9a46c" # commit ID
+fi
+
+inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="+incblas int64 dynamic openmp static-libs threads"
+
+RDEPEND="virtual/fortran"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
+	# respect LDFLAGS
+	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
+	# respect CFLAGS only if dynamic flag not enabled
+	if ! use dynamic; then
+		sed -i \
+			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
+			Makefile.rule || die
+	fi
+	# fix executable stacks
+	local i
+	for i in $(find . -name \*.S); do
+		cat >> ${i} <<-EOF
+			#if defined(__ELF__)
+			.section .note.GNU-stack,"",%progbits
+			#endif
+		EOF
+	done
+}
+
+src_configure() {
+	local use_openmp=$(use openmp && echo 1)
+	use threads && use openmp && use_openmp="" && \
+		einfo "openmp and threads enabled: using threads"
+	sed -i \
+		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
+		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
+		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
+		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
+		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
+		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
+		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
+		Makefile.rule || die
+}
+
+src_compile() {
+	mkdir solibs
+	emake libs shared && mv *$(get_libname) solibs/
+	use static-libs && emake clean && emake libs NEED_PIC=
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	local profname=${PN} threads
+	use int64 && profname=${profname}-int64
+	if use threads; then
+		threads="-pthread"
+		profname=${profname}-threads
+	elif use openmp; then
+		profname=${profname}-openmp
+	fi
+
+	dolib.so solibs/lib*$(get_libname)
+	use static-libs && dolib.a lib*.a
+
+	# create pkg-config file and associated eselect file
+	cat <<-EOF > ${profname}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lopenblas ${threads}
+		Libs.private: -lm
+	EOF
+
+	alternatives_for blas ${profname} 0 \
+		/usr/$(get_libdir)/pkgconfig/blas.pc ${profname}.pc
+
+	if use incblas; then
+		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
+		insinto /usr/include/${PN}
+		doins cblas.h common*.h config.h param.h
+		alternatives_for cblas ${profname} 0 \
+			/usr/$(get_libdir)/pkgconfig/cblas.pc ${profname}.pc \
+			/usr/include/cblas.h ${PN}/cblas.h
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${profname}.pc
+	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		cd "${ED}"/usr/$(get_libdir)
+		for d in *.dylib ; do
+			ebegin "Correcting install_name of ${d}"
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
+			eend $?
+		done
+	fi
+}

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

[Andrea Arteaga]

commit:     b1c3878561921e6db816be3574faec8d9fb185d2
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Mon Oct  8 17:35:15 2012 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Mon Oct  8 17:35:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b1c38785

[sci-libs/openblas] Version bump

---
 sci-libs/openblas/ChangeLog             |    5 +
 sci-libs/openblas/openblas-0.2.4.ebuild |  131 +++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+), 0 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 43e11f4..22dd3fa 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.4 (08 Oct 2012)
+
+  08 Oct 2012; Andrea Arteaga <andyspiros@gmail.com> +openblas-0.2.4.ebuild:
+  Version bump
+
 *openblas-0.2.3 (20 Aug 2012)
 
   20 Aug 2012; Andrea Arteaga <andyspiros@gmail.com> +openblas-0.2.3.ebuild:

diff --git a/sci-libs/openblas/openblas-0.2.4.ebuild b/sci-libs/openblas/openblas-0.2.4.ebuild
new file mode 100644
index 0000000..4197eda
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.4.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+if [[ ${PV} == "9999" ]] ; then
+	_SCM=git-2
+	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
+	CID="be853da" # commit ID
+fi
+
+inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="+incblas int64 dynamic openmp static-libs threads"
+
+RDEPEND="virtual/fortran"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
+	# respect LDFLAGS
+	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
+	# respect CFLAGS only if dynamic flag not enabled
+	if ! use dynamic; then
+		sed -i \
+			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
+			Makefile.rule || die
+	fi
+	# fix executable stacks
+	local i
+	for i in $(find . -name \*.S); do
+		cat >> ${i} <<-EOF
+			#if defined(__ELF__)
+			.section .note.GNU-stack,"",%progbits
+			#endif
+		EOF
+	done
+}
+
+src_configure() {
+	local use_openmp=$(use openmp && echo 1)
+	use threads && use openmp && use_openmp="" && \
+		einfo "openmp and threads enabled: using threads"
+	sed -i \
+		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
+		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
+		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
+		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
+		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
+		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
+		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
+		Makefile.rule || die
+}
+
+src_compile() {
+	mkdir solibs
+	emake libs shared && mv *$(get_libname) solibs/
+	use static-libs && emake clean && emake libs NEED_PIC=
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	local profname=${PN} threads
+	use int64 && profname=${profname}-int64
+	if use threads; then
+		threads="-pthread"
+		profname=${profname}-threads
+	elif use openmp; then
+		profname=${profname}-openmp
+	fi
+
+	dolib.so solibs/lib*$(get_libname)
+	use static-libs && dolib.a lib*.a
+
+	# create pkg-config file and associated eselect file
+	cat <<-EOF > ${profname}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lopenblas ${threads}
+		Libs.private: -lm
+	EOF
+
+	alternatives_for blas ${profname} 0 \
+		/usr/$(get_libdir)/pkgconfig/blas.pc ${profname}.pc
+
+	if use incblas; then
+		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
+		insinto /usr/include/${PN}
+		doins cblas.h common*.h config.h param.h
+		alternatives_for cblas ${profname} 0 \
+			/usr/$(get_libdir)/pkgconfig/cblas.pc ${profname}.pc \
+			/usr/include/cblas.h ${PN}/cblas.h
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${profname}.pc
+	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		cd "${ED}"/usr/$(get_libdir)
+		for d in *.dylib ; do
+			ebegin "Correcting install_name of ${d}"
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
+			eend $?
+		done
+	fi
+}

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

[Andrea Arteaga]

commit:     d0833606ef86a2763e1c83a1199952aad2432ca5
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Mon Aug 20 09:20:04 2012 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Mon Aug 20 09:20:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d0833606

[sci-libs/openblas] Version bump

---
 sci-libs/openblas/ChangeLog             |    6 ++
 sci-libs/openblas/openblas-0.2.3.ebuild |  131 +++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+), 0 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 198533a..43e11f4 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.2.3 (20 Aug 2012)
+
+  20 Aug 2012; Andrea Arteaga <andyspiros@gmail.com> +openblas-0.2.3.ebuild:
+  Version bump
+
+ 
 *openblas-0.2.2 (09 Jul 2012)
 
   09 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> -openblas-0.1.1.ebuild,

diff --git a/sci-libs/openblas/openblas-0.2.3.ebuild b/sci-libs/openblas/openblas-0.2.3.ebuild
new file mode 100644
index 0000000..27d5bb6
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.2.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+if [[ ${PV} == "9999" ]] ; then
+	_SCM=git-2
+	EGIT_REPO_URI="https://github.com/xianyi/OpenBLAS.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
+	CID="e552452" # commit ID
+fi
+
+inherit eutils toolchain-funcs alternatives-2 multilib ${_SCM}
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="+incblas int64 dynamic openmp static-libs threads"
+
+RDEPEND="virtual/fortran"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/xianyi-OpenBLAS-${CID}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.2,aliasing}.patch
+	# respect LDFLAGS
+	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
+	# respect CFLAGS only if dynamic flag not enabled
+	if ! use dynamic; then
+		sed -i \
+			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
+			Makefile.rule || die
+	fi
+	# fix executable stacks
+	local i
+	for i in $(find . -name \*.S); do
+		cat >> ${i} <<-EOF
+			#if defined(__ELF__)
+			.section .note.GNU-stack,"",%progbits
+			#endif
+		EOF
+	done
+}
+
+src_configure() {
+	local use_openmp=$(use openmp && echo 1)
+	use threads && use openmp && use_openmp="" && \
+		einfo "openmp and threads enabled: using threads"
+	sed -i \
+		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(NO_LAPACKE\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
+		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
+		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
+		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
+		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
+		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
+		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
+		Makefile.rule || die
+}
+
+src_compile() {
+	mkdir solibs
+	emake libs shared && mv *$(get_libname) solibs/
+	use static-libs && emake clean && emake libs NEED_PIC=
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	local profname=${PN} threads
+	use int64 && profname=${profname}-int64
+	if use threads; then
+		threads="-pthread"
+		profname=${profname}-threads
+	elif use openmp; then
+		profname=${profname}-openmp
+	fi
+
+	dolib.so solibs/lib*$(get_libname)
+	use static-libs && dolib.a lib*.a
+
+	# create pkg-config file and associated eselect file
+	cat <<-EOF > ${profname}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lopenblas ${threads}
+		Libs.private: -lm
+	EOF
+
+	alternatives_for blas ${profname} 0 \
+		/usr/$(get_libdir)/pkgconfig/blas.pc ${profname}.pc
+
+	if use incblas; then
+		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
+		insinto /usr/include/${PN}
+		doins cblas.h common*.h config.h param.h
+		alternatives_for cblas ${profname} 0 \
+			/usr/$(get_libdir)/pkgconfig/cblas.pc ${profname}.pc \
+			/usr/include/cblas.h ${PN}/cblas.h
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${profname}.pc
+	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		cd "${ED}"/usr/$(get_libdir)
+		for d in *.dylib ; do
+			ebegin "Correcting install_name of ${d}"
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
+			eend $?
+		done
+	fi
+}

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

[Sebastien Fabbro]

commit:     83c129d6e7c032061eca4bc7ba0bfba86d85e232
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Tue Jun 26 17:57:03 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 17:57:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=83c129d6

sci-libs/openblas: remove test flag

---
 sci-libs/openblas/openblas-0.2.0.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.2.0.ebuild b/sci-libs/openblas/openblas-0.2.0.ebuild
index 70a1ca0..61b59d4 100644
--- a/sci-libs/openblas/openblas-0.2.0.ebuild
+++ b/sci-libs/openblas/openblas-0.2.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~ppc-macos ~x64-macos"
 
-IUSE="+incblas int64 dynamic openmp static-libs test threads"
+IUSE="+incblas int64 dynamic openmp static-libs threads"
 
 RDEPEND="virtual/fortran"
 DEPEND="${RDEPEND}"

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

[Andrea Arteaga]

commit:     5372d43547cd32ae78428ee8ba0738a193c3b59d
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Mon May  7 14:56:08 2012 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Mon May  7 14:56:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5372d435

[sci-libs/openblas] Removed old alpha versions.

---
 sci-libs/openblas/ChangeLog                   |    4 +
 sci-libs/openblas/openblas-0.1_alpha2.ebuild  |  126 -------------------------
 sci-libs/openblas/openblas-0.1_alpha25.ebuild |  126 -------------------------
 3 files changed, 4 insertions(+), 252 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 2aa6214..0cb3791 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 May 2012; Andrea Arteaga <andyspiros@gmail.com>
+  -openblas-0.1_alpha2.ebuild -openblas-0.1_alpha25.ebuild:
+  Cleaned up old versions.
+
 *openblas-0.1.1 (07 May 2012)
   07 May 2012; Andrea Arteaga <andyspiros@gmail.com>
   +openblas-0.1.1.ebuild:

diff --git a/sci-libs/openblas/openblas-0.1_alpha2.ebuild b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
deleted file mode 100644
index 3ac72d4..0000000
--- a/sci-libs/openblas/openblas-0.1_alpha2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils toolchain-funcs alternatives-2 git-2 multilib
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-EGIT_REPO_URI="git://github.com/xianyi/OpenBLAS.git"
-EGIT_COMMIT="v0.1alpha2.2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos ~ppc-macos ~x64-macos"
-
-IUSE="+incblas int64 dynamic openmp static-libs threads"
-
-RDEPEND="virtual/fortran"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}"
-
-pkg_setup() {
-	ewarn "If the compilation fails, try setting the TARGET environment variable"
-	ewarn "to your CPU's codename and run emerge again."
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs,aliasing}.patch
-	# respect LDFLAGS
-	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
-	# respect CFLAGS only if dynamic flag not enabled
-	if ! use dynamic; then
-		sed -i \
-			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
-			Makefile.rule || die
-	fi
-	# fix executable stacks
-	local i
-	for i in $(find . -name \*.S); do
-		cat >> ${i} <<-EOF
-			#if defined(__ELF__)
-			.section .note.GNU-stack,"",%progbits
-			#endif
-		EOF
-	done
-}
-
-src_configure() {
-	local use_openmp=$(use openmp && echo 1)
-	use threads && use openmp && use_openmp="" && \
-		einfo "openmp and threads enabled: using threads"
-	sed -i \
-		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
-		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
-		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
-		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
-		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
-		Makefile.rule || die
-}
-
-src_compile() {
-	mkdir solibs
-	emake libs shared && mv *$(get_libname) solibs/
-	use static-libs && emake clean && emake libs NEED_PIC=
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	local profname=${PN} threads
-	use int64 && profname=${profname}-int64
-	if use threads; then
-		threads="-pthread"
-		profname=${profname}-threads
-	elif use openmp; then
-		profname=${profname}-openmp
-	fi
-
-	dolib.so solibs/lib*$(get_libname)
-	use static-libs && dolib.a lib*.a
-
-	# create pkg-config file and associated eselect file
-	cat <<-EOF > ${profname}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas -lm ${threads}
-	EOF
-
-	alternatives_for blas ${profname} 0 \
-		"/usr/$(get_libdir)/pkgconfig/blas.pc" "${profname}.pc"
-
-	if use incblas; then
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
-		insinto /usr/include/${PN}
-		doins cblas.h common*.h config.h param.h
-		alternatives_for cblas ${profname} 0 \
-			"/usr/$(get_libdir)/pkgconfig/cblas.pc" "${profname}.pc" \
-			"/usr/include/cblas.h" "${PN}/cblas.h"
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
-	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		cd "${ED}"/usr/$(get_libdir)
-		for d in *.dylib ; do
-			ebegin "correcting install_name of ${d}"
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
-			eend $?
-		done
-	fi
-}

diff --git a/sci-libs/openblas/openblas-0.1_alpha25.ebuild b/sci-libs/openblas/openblas-0.1_alpha25.ebuild
deleted file mode 100644
index c5a8dba..0000000
--- a/sci-libs/openblas/openblas-0.1_alpha25.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils toolchain-funcs alternatives-2 git-2 multilib
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-EGIT_REPO_URI="git://github.com/xianyi/OpenBLAS.git"
-EGIT_COMMIT="v0.1alpha2.5"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos ~ppc-macos ~x64-macos"
-
-IUSE="+incblas int64 dynamic openmp static-libs threads"
-
-RDEPEND="virtual/fortran"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}"
-
-pkg_setup() {
-	ewarn "If the compilation fails, try setting the TARGET environment variable"
-	ewarn "to your CPU's codename and run emerge again."
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs,aliasing}.patch
-	# respect LDFLAGS
-	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
-	# respect CFLAGS only if dynamic flag not enabled
-	if ! use dynamic; then
-		sed -i \
-			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
-			Makefile.rule || die
-	fi
-	# fix executable stacks
-	local i
-	for i in $(find . -name \*.S); do
-		cat >> ${i} <<-EOF
-			#if defined(__ELF__)
-			.section .note.GNU-stack,"",%progbits
-			#endif
-		EOF
-	done
-}
-
-src_configure() {
-	local use_openmp=$(use openmp && echo 1)
-	use threads && use openmp && use_openmp="" && \
-		einfo "openmp and threads enabled: using threads"
-	sed -i \
-		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
-		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
-		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
-		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
-		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
-		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
-		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
-		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
-		Makefile.rule || die
-}
-
-src_compile() {
-	mkdir solibs
-	emake libs shared && mv *$(get_libname) solibs/
-	use static-libs && emake clean && emake libs NEED_PIC=
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	local profname=${PN} threads
-	use int64 && profname=${profname}-int64
-	if use threads; then
-		threads="-pthread"
-		profname=${profname}-threads
-	elif use openmp; then
-		profname=${profname}-openmp
-	fi
-
-	dolib.so solibs/lib*$(get_libname)
-	use static-libs && dolib.a lib*.a
-
-	# create pkg-config file and associated eselect file
-	cat <<-EOF > ${profname}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lopenblas -lm ${threads}
-	EOF
-
-	alternatives_for blas ${profname} 0 \
-		"/usr/$(get_libdir)/pkgconfig/blas.pc" "${profname}.pc"
-
-	if use incblas; then
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
-		insinto /usr/include/${PN}
-		doins cblas.h common*.h config.h param.h
-		alternatives_for cblas ${profname} 0 \
-			"/usr/$(get_libdir)/pkgconfig/cblas.pc" "${profname}.pc" \
-			"/usr/include/cblas.h" "${PN}/cblas.h"
-	fi
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
-	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		cd "${ED}"/usr/$(get_libdir)
-		for d in *.dylib ; do
-			ebegin "correcting install_name of ${d}"
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
-			eend $?
-		done
-	fi
-}

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

[Andrea Arteaga]

commit:     0f442720e6c4ddbb83bb36ff05159aaf9d43325a
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Mon May  7 14:50:00 2012 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Mon May  7 14:50:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0f442720

[sci-libs/openblas] Version bump.

---
 sci-libs/openblas/ChangeLog             |    5 ++
 sci-libs/openblas/openblas-0.1.1.ebuild |  120 +++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+), 0 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 6c0b9a9..2aa6214 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.1.1 (07 May 2012)
+  07 May 2012; Andrea Arteaga <andyspiros@gmail.com>
+  +openblas-0.1.1.ebuild:
+  Version bump
+
 *openblas-0.1 (23 Mar 2012)
   23 Mar 2012; Andrea Arteaga <andyspiros@gmail.com>
   +openblas-0.1.ebuild:

diff --git a/sci-libs/openblas/openblas-0.1.1.ebuild b/sci-libs/openblas/openblas-0.1.1.ebuild
new file mode 100644
index 0000000..09b6092
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.1.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils toolchain-funcs alternatives-2 multilib
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+SRC_URI="http://soc.dev.gentoo.org/~spiros/repository/${P}.tbz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~ppc-macos ~x64-macos"
+
+IUSE="+incblas int64 dynamic openmp static-libs threads"
+
+RDEPEND="virtual/fortran"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.1,aliasing}.patch
+	# respect LDFLAGS
+	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
+	# respect CFLAGS only if dynamic flag not enabled
+	if ! use dynamic; then
+		sed -i \
+			-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \
+			Makefile.rule || die
+	fi
+	# fix executable stacks
+	local i
+	for i in $(find . -name \*.S); do
+		cat >> ${i} <<-EOF
+			#if defined(__ELF__)
+			.section .note.GNU-stack,"",%progbits
+			#endif
+		EOF
+	done
+}
+
+src_configure() {
+	local use_openmp=$(use openmp && echo 1)
+	use threads && use openmp && use_openmp="" && \
+		einfo "openmp and threads enabled: using threads"
+	sed -i \
+		-e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \
+		-e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \
+		-e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \
+		-e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \
+		-e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \
+		-e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \
+		-e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \
+		-e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \
+		Makefile.rule || die
+}
+
+src_compile() {
+	mkdir solibs
+	emake libs shared && mv *$(get_libname) solibs/
+	use static-libs && emake clean && emake libs NEED_PIC=
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	local profname=${PN} threads
+	use int64 && profname=${profname}-int64
+	if use threads; then
+		threads="-pthread"
+		profname=${profname}-threads
+	elif use openmp; then
+		profname=${profname}-openmp
+	fi
+
+	dolib.so solibs/lib*$(get_libname)
+	use static-libs && dolib.a lib*.a
+
+	# create pkg-config file and associated eselect file
+	cat <<-EOF > ${profname}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lopenblas -lm ${threads}
+	EOF
+
+	alternatives_for blas ${profname} 0 \
+		"/usr/$(get_libdir)/pkgconfig/blas.pc" "${profname}.pc"
+
+	if use incblas; then
+		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
+		insinto /usr/include/${PN}
+		doins cblas.h common*.h config.h param.h
+		alternatives_for cblas ${profname} 0 \
+			"/usr/$(get_libdir)/pkgconfig/cblas.pc" "${profname}.pc" \
+			"/usr/include/cblas.h" "${PN}/cblas.h"
+	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${profname}.pc
+	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		cd "${ED}"/usr/$(get_libdir)
+		for d in *.dylib ; do
+			ebegin "correcting install_name of ${d}"
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
+			eend $?
+		done
+	fi
+}

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

[Andrea Arteaga]

commit:     86f3da5124f2d4134ca3f55c3fdb24cff7608847
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Fri Mar 23 20:42:50 2012 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Fri Mar 23 20:42:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=86f3da51

[sci-libs/openblas] Updated patch and removed useless and unclear ewarn.

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

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index bf190d3..6c0b9a9 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openblas-0.1 (23 Mar 2012)
+  23 Mar 2012; Andrea Arteaga <andyspiros@gmail.com>
+  +openblas-0.1.ebuild:
+  Version bump
+
 *openblas-0.1_alpha25 (16 Mar 2012)
 
   16 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/sci-libs/openblas/openblas-0.1.ebuild b/sci-libs/openblas/openblas-0.1.ebuild
index d705f85..09b6092 100644
--- a/sci-libs/openblas/openblas-0.1.ebuild
+++ b/sci-libs/openblas/openblas-0.1.ebuild
@@ -21,13 +21,8 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}"
 
-pkg_setup() {
-	ewarn "If the compilation fails, try setting the TARGET environment variable"
-	ewarn "to your CPU's codename and run emerge again."
-}
-
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-{sharedlibs,aliasing}.patch
+	epatch "${FILESDIR}"/${PN}-{sharedlibs-0.1,aliasing}.patch
 	# respect LDFLAGS
 	sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die
 	# respect CFLAGS only if dynamic flag not enabled

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

[Francois Bissey]

commit:     319b20dadeccb857c18801c835e5739bc64cf19b
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Thu Mar 15 22:08:05 2012 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Thu Mar 15 22:08:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=319b20da

correct small error

---
 sci-libs/openblas/ChangeLog                  |    4 ++++
 sci-libs/openblas/openblas-0.1_alpha2.ebuild |    4 ++--
 sci-libs/openblas/openblas-9999.ebuild       |    4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index db34a8d..34d9ae2 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -4,6 +4,10 @@
 
   15 Mar 2012; François Bissey <francois.bissey@canterbury.ac.nz>
   openblas-0.1_alpha2.ebuild, openblas-9999.ebuild:
+  correct typo
+
+  15 Mar 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+  openblas-0.1_alpha2.ebuild, openblas-9999.ebuild:
   use multilib eclass
 
   15 Mar 2012; François Bissey <francois.bissey@canterbury.ac.nz>

diff --git a/sci-libs/openblas/openblas-0.1_alpha2.ebuild b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
index 1290d45..3ac72d4 100644
--- a/sci-libs/openblas/openblas-0.1_alpha2.ebuild
+++ b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
@@ -66,7 +66,7 @@ src_configure() {
 
 src_compile() {
 	mkdir solibs
-	emake libs shared && mv *.$(get_libname) solibs/
+	emake libs shared && mv *$(get_libname) solibs/
 	use static-libs && emake clean && emake libs NEED_PIC=
 }
 
@@ -84,7 +84,7 @@ src_install() {
 		profname=${profname}-openmp
 	fi
 
-	dolib.so solibs/lib*.$(get_libname)
+	dolib.so solibs/lib*$(get_libname)
 	use static-libs && dolib.a lib*.a
 
 	# create pkg-config file and associated eselect file

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 11de912..6484a1e 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -60,7 +60,7 @@ src_configure() {
 
 src_compile() {
 	mkdir solibs
-	emake libs shared && mv *.$(get_libname) solibs/
+	emake libs shared && mv *$(get_libname) solibs/
 	use static-libs && emake clean && emake libs NEED_PIC=
 }
 
@@ -78,7 +78,7 @@ src_install() {
 		profname=${profname}-openmp
 	fi
 
-	dolib.so solibs/lib*.$(get_libname)
+	dolib.so solibs/lib*$(get_libname)
 	use static-libs && dolib.a lib*.a
 
 	# create pkg-config file and associated eselect file

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

[Francois Bissey]

commit:     ac4b72bcd78bf018322cf27d4e354289f37f4adb
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Thu Mar 15 22:00:41 2012 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Thu Mar 15 22:00:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ac4b72bc

switch to multilib in openblas, gotoblas2 will come later as it needs another fix

---
 sci-libs/openblas/ChangeLog                  |    4 ++++
 sci-libs/openblas/openblas-0.1_alpha2.ebuild |   11 +++--------
 sci-libs/openblas/openblas-9999.ebuild       |   13 +++----------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 6c76032..db34a8d 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -4,6 +4,10 @@
 
   15 Mar 2012; François Bissey <francois.bissey@canterbury.ac.nz>
   openblas-0.1_alpha2.ebuild, openblas-9999.ebuild:
+  use multilib eclass
+
+  15 Mar 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+  openblas-0.1_alpha2.ebuild, openblas-9999.ebuild:
   Add *-macos prefix support
 
   16 Aug 2011; François Bissey <francois.bissey@canterbury.ac.nz>

diff --git a/sci-libs/openblas/openblas-0.1_alpha2.ebuild b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
index a5bdbbd..1290d45 100644
--- a/sci-libs/openblas/openblas-0.1_alpha2.ebuild
+++ b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils toolchain-funcs alternatives-2 git-2
+inherit eutils toolchain-funcs alternatives-2 git-2 multilib
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
@@ -25,11 +25,6 @@ S="${WORKDIR}/${MYPN}"
 pkg_setup() {
 	ewarn "If the compilation fails, try setting the TARGET environment variable"
 	ewarn "to your CPU's codename and run emerge again."
-
-	SHLIB=so
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		SHLIB=dylib
-	fi
 }
 
 src_prepare() {
@@ -71,7 +66,7 @@ src_configure() {
 
 src_compile() {
 	mkdir solibs
-	emake libs shared && mv *."${SHLIB}" solibs/
+	emake libs shared && mv *.$(get_libname) solibs/
 	use static-libs && emake clean && emake libs NEED_PIC=
 }
 
@@ -89,7 +84,7 @@ src_install() {
 		profname=${profname}-openmp
 	fi
 
-	dolib.so solibs/lib*."${SHLIB}"
+	dolib.so solibs/lib*.$(get_libname)
 	use static-libs && dolib.a lib*.a
 
 	# create pkg-config file and associated eselect file

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 2849c8e..11de912 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils toolchain-funcs alternatives-2 git-2
+inherit eutils toolchain-funcs alternatives-2 git-2 multilib
 
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
@@ -21,13 +21,6 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYPN}"
 
-pkg_setup() {
-	SHLIB=so
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		SHLIB=dylib
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-{sharedlibs,aliasing}.patch
 	# respect LDFLAGS
@@ -67,7 +60,7 @@ src_configure() {
 
 src_compile() {
 	mkdir solibs
-	emake libs shared && mv *."${SHLIB}" solibs/
+	emake libs shared && mv *.$(get_libname) solibs/
 	use static-libs && emake clean && emake libs NEED_PIC=
 }
 
@@ -85,7 +78,7 @@ src_install() {
 		profname=${profname}-openmp
 	fi
 
-	dolib.so solibs/lib*."$SHLIB"
+	dolib.so solibs/lib*.$(get_libname)
 	use static-libs && dolib.a lib*.a
 
 	# create pkg-config file and associated eselect file

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

[Francois Bissey]

commit:     1c84ded1f77ff80428f7d4c4c4575ed563b4dab6
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Thu Mar 15 02:26:03 2012 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Thu Mar 15 02:26:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1c84ded1

Add *-macos prefix support to openblas

---
 sci-libs/openblas/ChangeLog                  |    6 +++++-
 sci-libs/openblas/openblas-0.1_alpha2.ebuild |   22 ++++++++++++++++++----
 sci-libs/openblas/openblas-9999.ebuild       |   22 +++++++++++++++++++---
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 8c45990..6c76032 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/openblas
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Mar 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+  openblas-0.1_alpha2.ebuild, openblas-9999.ebuild:
+  Add *-macos prefix support
+
   16 Aug 2011; François Bissey <francois.bissey@canterbury.ac.nz>
   openblas-0.1_alpha2.ebuild, openblas-9999.ebuild:
   Include extra line in pkgconfig for incblas before installing it - not after.

diff --git a/sci-libs/openblas/openblas-0.1_alpha2.ebuild b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
index d727f93..a5bdbbd 100644
--- a/sci-libs/openblas/openblas-0.1_alpha2.ebuild
+++ b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -13,7 +13,7 @@ EGIT_COMMIT="v0.1alpha2.2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~ppc-macos ~x64-macos"
 
 IUSE="+incblas int64 dynamic openmp static-libs threads"
 
@@ -25,6 +25,11 @@ S="${WORKDIR}/${MYPN}"
 pkg_setup() {
 	ewarn "If the compilation fails, try setting the TARGET environment variable"
 	ewarn "to your CPU's codename and run emerge again."
+
+	SHLIB=so
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		SHLIB=dylib
+	fi
 }
 
 src_prepare() {
@@ -66,7 +71,7 @@ src_configure() {
 
 src_compile() {
 	mkdir solibs
-	emake libs shared && mv *.so solibs/
+	emake libs shared && mv *."${SHLIB}" solibs/
 	use static-libs && emake clean && emake libs NEED_PIC=
 }
 
@@ -84,7 +89,7 @@ src_install() {
 		profname=${profname}-openmp
 	fi
 
-	dolib.so solibs/lib*.so
+	dolib.so solibs/lib*."${SHLIB}"
 	use static-libs && dolib.a lib*.a
 
 	# create pkg-config file and associated eselect file
@@ -114,4 +119,13 @@ src_install() {
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins ${profname}.pc
 	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		cd "${ED}"/usr/$(get_libdir)
+		for d in *.dylib ; do
+			ebegin "correcting install_name of ${d}"
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
+			eend $?
+		done
+	fi
 }

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 5fd74db..2849c8e 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -21,6 +21,13 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYPN}"
 
+pkg_setup() {
+	SHLIB=so
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		SHLIB=dylib
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-{sharedlibs,aliasing}.patch
 	# respect LDFLAGS
@@ -60,7 +67,7 @@ src_configure() {
 
 src_compile() {
 	mkdir solibs
-	emake libs shared && mv *.so solibs/
+	emake libs shared && mv *."${SHLIB}" solibs/
 	use static-libs && emake clean && emake libs NEED_PIC=
 }
 
@@ -78,7 +85,7 @@ src_install() {
 		profname=${profname}-openmp
 	fi
 
-	dolib.so solibs/lib*.so
+	dolib.so solibs/lib*."$SHLIB"
 	use static-libs && dolib.a lib*.a
 
 	# create pkg-config file and associated eselect file
@@ -109,4 +116,13 @@ src_install() {
 			"/usr/include/cblas.h" "${PN}/cblas.h"
 	fi
 	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		cd "${ED}"/usr/$(get_libdir)
+		for d in *.dylib ; do
+			ebegin "correcting install_name of ${d}"
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${d}" "${d}"
+			eend $?
+		done
+	fi
 }

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

[Alexey Shvetsov]

commit:     7c9e74bfd3c8efd309a3a9d66ad05a3fe48dfb91
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 17:21:03 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 17:21:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7c9e74bf

Fix manifest

(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sci-libs/openblas/openblas-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 274d4ef..5fd74db 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="git://github.com/xianyi/OpenBLAS.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 
 IUSE="+incblas int64 dynamic openmp static-libs threads"
 

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

[Sebastien Fabbro]

commit:     5f5e12d2eb6fb914d964070a2172f79e0c387280
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Wed Aug 17 15:45:23 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 15:45:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5f5e12d2

fixed pkgconfig cflags

---
 sci-libs/openblas/openblas-0.1_alpha2.ebuild |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sci-libs/openblas/openblas-0.1_alpha2.ebuild b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
index fd1cc76..d727f93 100644
--- a/sci-libs/openblas/openblas-0.1_alpha2.ebuild
+++ b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
@@ -98,21 +98,20 @@ src_install() {
 		URL: ${HOMEPAGE}
 		Libs: -L\${libdir} -lopenblas -lm ${threads}
 	EOF
-	if use incblas; then
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
-	fi
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
 
 	alternatives_for blas ${profname} 0 \
 		"/usr/$(get_libdir)/pkgconfig/blas.pc" "${profname}.pc"
 
 	if use incblas; then
+		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
 		insinto /usr/include/${PN}
 		doins cblas.h common*.h config.h param.h
 		alternatives_for cblas ${profname} 0 \
 			"/usr/$(get_libdir)/pkgconfig/cblas.pc" "${profname}.pc" \
 			"/usr/include/cblas.h" "${PN}/cblas.h"
 	fi
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${profname}.pc
 	dodoc GotoBLAS_{01Readme,03FAQ,04FAQ,05LargePage,06WeirdPerformance}.txt
 }

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

[Francois Bissey]

commit:     86c5875f1c6340827c961f568e0ae22dcbfd4c0d
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Tue Aug 16 23:48:33 2011 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Tue Aug 16 23:50:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=86c5875f

correct pkgconfig in openblas

(Portage version: 2.2.0_alpha51/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/openblas/ChangeLog                  |    4 ++++
 sci-libs/openblas/openblas-0.1_alpha2.ebuild |    4 +++-
 sci-libs/openblas/openblas-9999.ebuild       |    4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index d04e0a9..8c45990 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Aug 2011; François Bissey <francois.bissey@canterbury.ac.nz>
+  openblas-0.1_alpha2.ebuild, openblas-9999.ebuild:
+  Include extra line in pkgconfig for incblas before installing it - not after.
+
 *openblas-0.1_alpha2 (03 Aug 2011)
 
   03 Aug 2011 Andrea Arteaga <andyspiros@gmail.com> openblas-0.1_alpha2.ebuild

diff --git a/sci-libs/openblas/openblas-0.1_alpha2.ebuild b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
index ef417e6..fd1cc76 100644
--- a/sci-libs/openblas/openblas-0.1_alpha2.ebuild
+++ b/sci-libs/openblas/openblas-0.1_alpha2.ebuild
@@ -98,6 +98,9 @@ src_install() {
 		URL: ${HOMEPAGE}
 		Libs: -L\${libdir} -lopenblas -lm ${threads}
 	EOF
+	if use incblas; then
+		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
+	fi
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins ${profname}.pc
 
@@ -107,7 +110,6 @@ src_install() {
 	if use incblas; then
 		insinto /usr/include/${PN}
 		doins cblas.h common*.h config.h param.h
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
 		alternatives_for cblas ${profname} 0 \
 			"/usr/$(get_libdir)/pkgconfig/cblas.pc" "${profname}.pc" \
 			"/usr/include/cblas.h" "${PN}/cblas.h"

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 143c24e..274d4ef 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -92,6 +92,9 @@ src_install() {
 		URL: ${HOMEPAGE}
 		Libs: -L\${libdir} -lopenblas -lm ${threads}
 	EOF
+	if use incblas; then
+		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
+	fi
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins ${profname}.pc
 
@@ -101,7 +104,6 @@ src_install() {
 	if use incblas; then
 		insinto /usr/include/${PN}
 		doins cblas.h common*.h config.h param.h
-		echo >> ${profname}.pc "Cflags: -I\${includedir}/${PN}"
 		alternatives_for cblas ${profname} 0 \
 			"/usr/$(get_libdir)/pkgconfig/cblas.pc" "${profname}.pc" \
 			"/usr/include/cblas.h" "${PN}/cblas.h"