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

[Sebastien Fabbro]

commit:     96bda977a1b5fc1f7ab8d33c21be7994c7447c41
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 16:39:51 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed May 22 16:39:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=96bda977

sci-libs/lapack-reference: Switch to EAPI5, merge live ebuild

Package-Manager: portage-2.2.01.21938-prefix

---
 sci-libs/lapack-reference/ChangeLog                |    4 ++
 .../lapack-reference/lapack-reference-9999.ebuild  |   36 +++++++++++++------
 sci-libs/lapack-reference/metadata.xml             |   13 +++----
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 4838b92..22b1f9e 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $
 
+  22 May 2013; Sébastien Fabbro <bicatali@g.o>
+  lapack-reference-9999.ebuild, metadata.xml:
+  sci-libs/lapack-reference: Switch to EAPI5, merge live ebuild
+
   03 Mar 2013; Justin Lecher <jlec@g.o> metadata.xml:
   Add unocumented USE to metadata.xml
 

diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 2dcc485..2fb8a3a 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -1,20 +1,28 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
-inherit eutils fortran-2 cmake-utils alternatives-2 toolchain-funcs subversion
+EAPI=5
+inherit fortran-2 cmake-utils alternatives-2 toolchain-funcs
 
 MYP=lapack-${PV}
 
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
+	inherit subversion
+	KEYWORDS=""
+else
+	SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
 DESCRIPTION="Reference implementation of LAPACK"
 HOMEPAGE="http://www.netlib.org/lapack/"
-ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="static-libs test tmg xblas"
+
+IUSE="static-libs test xblas"
 
 RDEPEND="
 	virtual/blas
@@ -25,7 +33,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	# avoid collision with other lapack
+	# rename library to avoid collision with other lapack implementations
 	sed -i \
 		-e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \
 		-e '/export/s:lapack:reflapack:g' \
@@ -39,9 +47,14 @@ src_prepare() {
 		-e 's:-llapack:-lreflapack:g' \
 		lapack.pc.in || die
 	use static-libs && mkdir "${WORKDIR}/${PN}_static"
-	# some string does not get pass properly
-	sed -i -e '/lapack_testing.py/d' CTestCustom.cmake.in || die
-	use tmg || sed -i -e '/lapack_install_library(tmglib)/d' TESTING/MATGEN/CMakeLists.txt
+	# some string does not get passed properly
+	sed -i \
+		-e '/lapack_testing.py/d' \
+		CTestCustom.cmake.in || die
+	# separate ebuild to tmglib
+	sed -i \
+		-e '/lapack_install_library(tmglib)/d' \
+		TESTING/MATGEN/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -50,7 +63,6 @@ src_configure() {
 			-DUSE_OPTIMIZED_BLAS=ON
 			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
 			$(cmake-utils_use_build test TESTING)
-			$(cmake-utils_use_build tmg TESTING)
 			$(cmake-utils_use_use xblas XBLAS)
 			$@
 		)
@@ -74,5 +86,5 @@ src_install() {
 	use static-libs && \
 		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
 	alternatives_for lapack reference 0 \
-		"/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc"
+		/usr/$(get_libdir)/pkgconfig/lapack.pc reflapack.pc
 }

diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
index 5413ad1..d769a14 100644
--- a/sci-libs/lapack-reference/metadata.xml
+++ b/sci-libs/lapack-reference/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   The Linear Algebra PACKage (LAPACK) is a comprehensive library that
   does linear algebra operations including matrix inversions, least
   squared solutions to linear sets of equations, eigenvector analysis,
@@ -12,11 +12,8 @@
   Netlib for LAPACK and optionnally the one for the Basic Linear
   Algebra Subprogram (BLAS).
 </longdescription>
-  <use>
-    <flag name="xblas">Build LAPACK with extra precision (needs
+<use>
+  <flag name="xblas">Build LAPACK with extra precision (needs
   <pkg>sci-libs/xblas</pkg>)</flag>
-  </use>
-  <use>
-    <flag name="tmg">Undocumented USE</flag>
-  </use>
+</use>
 </pkgmetadata>