public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/
@ 2015-11-28 18:59 99% Justin Lecher
  0 siblings, 0 replies; 1+ results
From: Justin Lecher @ 2015-11-28 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     5c62de27e3057bc7609ee7841efdfed532c28c35
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 18:38:31 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 18:38:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5c62de27

sci-libs/lapacke-reference: Adopt to current HEAD

GitHub: resolves gentoo-science/sci#464

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

 .../lapacke-reference-3.5.0.ebuild                 | 29 ++++++----------
 .../lapacke-reference-9999.ebuild                  | 39 +++++++++-------------
 2 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/sci-libs/lapacke-reference/lapacke-reference-3.5.0.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.5.0.ebuild
index 2c53640..c227851 100644
--- a/sci-libs/lapacke-reference/lapacke-reference-3.5.0.ebuild
+++ b/sci-libs/lapacke-reference/lapacke-reference-3.5.0.ebuild
@@ -1,29 +1,22 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit alternatives-2 cmake-utils eutils fortran-2 toolchain-funcs
-
 FORTRAN_NEEDED=test
 
-MYP=lapack-${PV}
+inherit alternatives-2 cmake-utils eutils fortran-2 toolchain-funcs
 
-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
+MYP=lapack-${PV}
 
 DESCRIPTION="C Interface to LAPACK"
 HOMEPAGE="http://www.netlib.org/lapack/"
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test tmg xblas"
 
 RDEPEND="
@@ -82,22 +75,22 @@ src_configure() {
 src_compile() {
 	use test && cmake-utils_src_compile -C TESTING/MATGEN
 	cmake-utils_src_compile -C lapacke
-	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
-			cmake-utils_src_compile -C lapacke
+	use static-libs \
+		&& CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile -C lapacke
 }
 
 src_test() {
-	pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null
+	pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null || die
 	local ctestargs
 	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
 	ctest ${ctestargs} || die
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 src_install() {
 	cmake-utils_src_install -C lapacke
-	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
-		cmake-utils_src_install -C lapacke
+	use static-libs \
+		&& CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install -C lapacke
 	alternatives_for lapacke reference 0 \
 		/usr/$(get_libdir)/pkgconfig/lapacke.pc reflapacke.pc
 }

diff --git a/sci-libs/lapacke-reference/lapacke-reference-9999.ebuild b/sci-libs/lapacke-reference/lapacke-reference-9999.ebuild
index 2c53640..b7da70f 100644
--- a/sci-libs/lapacke-reference/lapacke-reference-9999.ebuild
+++ b/sci-libs/lapacke-reference/lapacke-reference-9999.ebuild
@@ -1,29 +1,22 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit alternatives-2 cmake-utils eutils fortran-2 toolchain-funcs
-
 FORTRAN_NEEDED=test
 
-MYP=lapack-${PV}
+inherit alternatives-2 cmake-utils eutils fortran-2 subversion toolchain-funcs
 
-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
+MYP=lapack-${PV}
 
 DESCRIPTION="C Interface to 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"
 
 RDEPEND="
@@ -46,14 +39,14 @@ src_prepare() {
 		CMakeLists.txt || die
 	sed -i \
 		-e '/librar/s:(lapacke:(reflapacke:g' \
-		lapacke/CMakeLists.txt || die
+		LAPACKE/CMakeLists.txt || die
 	sed -i \
 		-e '/librar/s:lapacke:reflapacke:g' \
-		lapacke/example/CMakeLists.txt || die
+		LAPACKE/example/CMakeLists.txt || die
 	local tmgpc; use tmg && tmgpc=" -ltmglib"
 	sed -i \
 		-e "s:-llapacke:-lreflapacke${tmgpc}:g" \
-		lapacke/lapacke.pc.in || die
+		LAPACKE/lapacke.pc.in || die
 	use static-libs && mkdir "${WORKDIR}/${PN}_static"
 }
 
@@ -81,23 +74,23 @@ src_configure() {
 
 src_compile() {
 	use test && cmake-utils_src_compile -C TESTING/MATGEN
-	cmake-utils_src_compile -C lapacke
-	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
-			cmake-utils_src_compile -C lapacke
+	cmake-utils_src_compile -C LAPACKE
+	use static-libs \
+		&& CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile -C LAPACKE
 }
 
 src_test() {
-	pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null
+	pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null || die
 	local ctestargs
 	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
 	ctest ${ctestargs} || die
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 src_install() {
-	cmake-utils_src_install -C lapacke
-	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
-		cmake-utils_src_install -C lapacke
+	cmake-utils_src_install -C LAPACKE
+	use static-libs \
+		&& CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install -C LAPACKE
 	alternatives_for lapacke reference 0 \
 		/usr/$(get_libdir)/pkgconfig/lapacke.pc reflapacke.pc
 }


^ permalink raw reply related	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-11-28 18:59 99% [gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/ Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox