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

["Francois Bissey" <f.r.bissey@massey.ac.nz>]

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