Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/
Date: Sat, 28 Nov 2015 18:59:22
Message-Id: 1448735911.5c62de27e3057bc7609ee7841efdfed532c28c35.jlec@gentoo
1 commit: 5c62de27e3057bc7609ee7841efdfed532c28c35
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 28 18:38:31 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 28 18:38:31 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5c62de27
7
8 sci-libs/lapacke-reference: Adopt to current HEAD
9
10 GitHub: resolves gentoo-science/sci#464
11
12 Package-Manager: portage-2.2.25
13 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
14
15 .../lapacke-reference-3.5.0.ebuild | 29 ++++++----------
16 .../lapacke-reference-9999.ebuild | 39 +++++++++-------------
17 2 files changed, 27 insertions(+), 41 deletions(-)
18
19 diff --git a/sci-libs/lapacke-reference/lapacke-reference-3.5.0.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.5.0.ebuild
20 index 2c53640..c227851 100644
21 --- a/sci-libs/lapacke-reference/lapacke-reference-3.5.0.ebuild
22 +++ b/sci-libs/lapacke-reference/lapacke-reference-3.5.0.ebuild
23 @@ -1,29 +1,22 @@
24 -# Copyright 1999-2014 Gentoo Foundation
25 +# Copyright 1999-2015 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 # $Id$
28
29 EAPI=5
30
31 -inherit alternatives-2 cmake-utils eutils fortran-2 toolchain-funcs
32 -
33 FORTRAN_NEEDED=test
34
35 -MYP=lapack-${PV}
36 +inherit alternatives-2 cmake-utils eutils fortran-2 toolchain-funcs
37
38 -if [[ ${PV} == "9999" ]] ; then
39 - ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
40 - inherit subversion
41 - KEYWORDS=""
42 -else
43 - SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
44 - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
45 -fi
46 +MYP=lapack-${PV}
47
48 DESCRIPTION="C Interface to LAPACK"
49 HOMEPAGE="http://www.netlib.org/lapack/"
50 +SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
51
52 LICENSE="BSD"
53 SLOT="0"
54 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
55 IUSE="static-libs test tmg xblas"
56
57 RDEPEND="
58 @@ -82,22 +75,22 @@ src_configure() {
59 src_compile() {
60 use test && cmake-utils_src_compile -C TESTING/MATGEN
61 cmake-utils_src_compile -C lapacke
62 - use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
63 - cmake-utils_src_compile -C lapacke
64 + use static-libs \
65 + && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile -C lapacke
66 }
67
68 src_test() {
69 - pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null
70 + pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null || die
71 local ctestargs
72 [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
73 ctest ${ctestargs} || die
74 - popd > /dev/null
75 + popd > /dev/null || die
76 }
77
78 src_install() {
79 cmake-utils_src_install -C lapacke
80 - use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
81 - cmake-utils_src_install -C lapacke
82 + use static-libs \
83 + && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install -C lapacke
84 alternatives_for lapacke reference 0 \
85 /usr/$(get_libdir)/pkgconfig/lapacke.pc reflapacke.pc
86 }
87
88 diff --git a/sci-libs/lapacke-reference/lapacke-reference-9999.ebuild b/sci-libs/lapacke-reference/lapacke-reference-9999.ebuild
89 index 2c53640..b7da70f 100644
90 --- a/sci-libs/lapacke-reference/lapacke-reference-9999.ebuild
91 +++ b/sci-libs/lapacke-reference/lapacke-reference-9999.ebuild
92 @@ -1,29 +1,22 @@
93 -# Copyright 1999-2014 Gentoo Foundation
94 +# Copyright 1999-2015 Gentoo Foundation
95 # Distributed under the terms of the GNU General Public License v2
96 # $Id$
97
98 EAPI=5
99
100 -inherit alternatives-2 cmake-utils eutils fortran-2 toolchain-funcs
101 -
102 FORTRAN_NEEDED=test
103
104 -MYP=lapack-${PV}
105 +inherit alternatives-2 cmake-utils eutils fortran-2 subversion toolchain-funcs
106
107 -if [[ ${PV} == "9999" ]] ; then
108 - ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
109 - inherit subversion
110 - KEYWORDS=""
111 -else
112 - SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
113 - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
114 -fi
115 +MYP=lapack-${PV}
116
117 DESCRIPTION="C Interface to LAPACK"
118 HOMEPAGE="http://www.netlib.org/lapack/"
119 +ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk"
120
121 LICENSE="BSD"
122 SLOT="0"
123 +KEYWORDS=""
124 IUSE="static-libs test tmg xblas"
125
126 RDEPEND="
127 @@ -46,14 +39,14 @@ src_prepare() {
128 CMakeLists.txt || die
129 sed -i \
130 -e '/librar/s:(lapacke:(reflapacke:g' \
131 - lapacke/CMakeLists.txt || die
132 + LAPACKE/CMakeLists.txt || die
133 sed -i \
134 -e '/librar/s:lapacke:reflapacke:g' \
135 - lapacke/example/CMakeLists.txt || die
136 + LAPACKE/example/CMakeLists.txt || die
137 local tmgpc; use tmg && tmgpc=" -ltmglib"
138 sed -i \
139 -e "s:-llapacke:-lreflapacke${tmgpc}:g" \
140 - lapacke/lapacke.pc.in || die
141 + LAPACKE/lapacke.pc.in || die
142 use static-libs && mkdir "${WORKDIR}/${PN}_static"
143 }
144
145 @@ -81,23 +74,23 @@ src_configure() {
146
147 src_compile() {
148 use test && cmake-utils_src_compile -C TESTING/MATGEN
149 - cmake-utils_src_compile -C lapacke
150 - use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
151 - cmake-utils_src_compile -C lapacke
152 + cmake-utils_src_compile -C LAPACKE
153 + use static-libs \
154 + && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile -C LAPACKE
155 }
156
157 src_test() {
158 - pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null
159 + pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null || die
160 local ctestargs
161 [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
162 ctest ${ctestargs} || die
163 - popd > /dev/null
164 + popd > /dev/null || die
165 }
166
167 src_install() {
168 - cmake-utils_src_install -C lapacke
169 - use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
170 - cmake-utils_src_install -C lapacke
171 + cmake-utils_src_install -C LAPACKE
172 + use static-libs \
173 + && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install -C LAPACKE
174 alternatives_for lapacke reference 0 \
175 /usr/$(get_libdir)/pkgconfig/lapacke.pc reflapacke.pc
176 }