From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9D9251388B6 for ; Sat, 28 Nov 2015 18:59:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC6D621C115; Sat, 28 Nov 2015 18:59:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4E40F21C115 for ; Sat, 28 Nov 2015 18:59:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 180D03408FF for ; Sat, 28 Nov 2015 18:59:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D31E7A4B for ; Sat, 28 Nov 2015 18:59:15 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1448735911.5c62de27e3057bc7609ee7841efdfed532c28c35.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/lapacke-reference/lapacke-reference-3.5.0.ebuild sci-libs/lapacke-reference/lapacke-reference-9999.ebuild X-VCS-Directories: sci-libs/lapacke-reference/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 5c62de27e3057bc7609ee7841efdfed532c28c35 X-VCS-Branch: master Date: Sat, 28 Nov 2015 18:59:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e2eececa-419e-4000-9988-87f5c2c7ac2c X-Archives-Hash: 893301fab629895228217420187284e0 commit: 5c62de27e3057bc7609ee7841efdfed532c28c35 Author: Justin Lecher gentoo org> AuthorDate: Sat Nov 28 18:38:31 2015 +0000 Commit: Justin Lecher gentoo 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 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 }