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-chemistry/votca-csg/, sci-libs/tmglib/, dev-libs/simclist/, ...
Date: Mon, 30 Nov 2015 18:34:16
Message-Id: 1448895241.4b1645fe18182c7a4311be24baffc31ad0947f7d.jlec@gentoo
1 commit: 4b1645fe18182c7a4311be24baffc31ad0947f7d
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 30 14:54:01 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 30 14:54:01 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4b1645fe
7
8 Update to new cmake-utils API
9
10 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
11
12 dev-libs/simclist/simclist-1.6.ebuild | 2 +-
13 media-libs/OpenMOIV/OpenMOIV-1.0.3a.ebuild | 2 +-
14 sci-chemistry/openbabel-perl/openbabel-perl-9999.ebuild | 8 ++++----
15 sci-chemistry/votca-csg/votca-csg-9999.ebuild | 4 ++--
16 sci-libs/gmsh/gmsh-2.8.5.ebuild | 2 +-
17 sci-libs/parmetis/parmetis-4.0.3.ebuild | 6 +++---
18 sci-libs/scalapack/scalapack-2.0.2-r1.ebuild | 6 +++---
19 sci-libs/tmglib/tmglib-3.5.0.ebuild | 6 +++---
20 sci-libs/tmglib/tmglib-3.6.0.ebuild | 6 +++---
21 sci-libs/votca-tools/votca-tools-9999.ebuild | 2 +-
22 10 files changed, 22 insertions(+), 22 deletions(-)
23
24 diff --git a/dev-libs/simclist/simclist-1.6.ebuild b/dev-libs/simclist/simclist-1.6.ebuild
25 index 058dbd7..bea18ba 100644
26 --- a/dev-libs/simclist/simclist-1.6.ebuild
27 +++ b/dev-libs/simclist/simclist-1.6.ebuild
28 @@ -30,7 +30,7 @@ src_compile(){
29 src_install() {
30 mkdir -p "${D}"/usr/include
31 cp simclist.h "${D}"/usr/include/
32 - cd "${CMAKE_BUILD_DIR}"
33 + cd "${BUILD_DIR}"
34 dolib libsimclist.so
35 cd "${S}"
36 if use doc; then
37
38 diff --git a/media-libs/OpenMOIV/OpenMOIV-1.0.3a.ebuild b/media-libs/OpenMOIV/OpenMOIV-1.0.3a.ebuild
39 index af43459..e543bfe 100644
40 --- a/media-libs/OpenMOIV/OpenMOIV-1.0.3a.ebuild
41 +++ b/media-libs/OpenMOIV/OpenMOIV-1.0.3a.ebuild
42 @@ -31,7 +31,7 @@ src_configure() {
43
44 src_install() {
45 insinto "/usr/$(get_libdir)"
46 - doins "${CMAKE_BUILD_DIR}/libChemKit2.so"
47 + doins "${BUILD_DIR}/libChemKit2.so"
48
49 insinto "/usr/include"
50 doins -r "${S}/include/ChemKit2"
51
52 diff --git a/sci-chemistry/openbabel-perl/openbabel-perl-9999.ebuild b/sci-chemistry/openbabel-perl/openbabel-perl-9999.ebuild
53 index 0a0fee0..e61d472 100644
54 --- a/sci-chemistry/openbabel-perl/openbabel-perl-9999.ebuild
55 +++ b/sci-chemistry/openbabel-perl/openbabel-perl-9999.ebuild
56 @@ -46,18 +46,18 @@ src_compile() {
57 }
58
59 src_test() {
60 - mkdir "${CMAKE_BUILD_DIR}/$(get_libdir)/Chemistry"
61 + mkdir "${BUILD_DIR}/$(get_libdir)/Chemistry"
62 cp \
63 "${CMAKE_USE_DIR}/scripts/perl/OpenBabel.pm" \
64 - "${CMAKE_BUILD_DIR}/$(get_libdir)/Chemistry/"
65 + "${BUILD_DIR}/$(get_libdir)/Chemistry/"
66 for i in "${CMAKE_USE_DIR}"/scripts/perl/t/*
67 do
68 einfo "Running test: ${i}"
69 - perl -I"${CMAKE_BUILD_DIR}/$(get_libdir)" "${i}" || die
70 + perl -I"${BUILD_DIR}/$(get_libdir)" "${i}" || die
71 done
72 }
73
74 src_install() {
75 - cd "${CMAKE_BUILD_DIR}"
76 + cd "${BUILD_DIR}"
77 cmake -DCOMPONENT=bindings_perl -P cmake_install.cmake
78 }
79
80 diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
81 index 0a099b4..25892d7 100644
82 --- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
83 +++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
84 @@ -94,8 +94,8 @@ src_install() {
85 else
86 dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
87 fi
88 - cmake-utils_src_make -C "${CMAKE_BUILD_DIR}" html
89 - dohtml -r "${CMAKE_BUILD_DIR}"/share/doc/html/*
90 + cmake-utils_src_make -C "${BUILD_DIR}" html
91 + dohtml -r "${BUILD_DIR}"/share/doc/html/*
92 fi
93 if use examples; then
94 insinto "/usr/share/doc/${PF}/tutorials"
95
96 diff --git a/sci-libs/gmsh/gmsh-2.8.5.ebuild b/sci-libs/gmsh/gmsh-2.8.5.ebuild
97 index 368a4e8..879a687 100644
98 --- a/sci-libs/gmsh/gmsh-2.8.5.ebuild
99 +++ b/sci-libs/gmsh/gmsh-2.8.5.ebuild
100 @@ -78,7 +78,7 @@ src_install() {
101
102 # TODO: tutorials get installed twice ATM
103 if use doc ; then
104 - cd "${CMAKE_BUILD_DIR}" || die
105 + cd "${BUILD_DIR}" || die
106 emake pdf
107 cd "${S}" || die
108 dodoc doc/texinfo/gmsh.pdf
109
110 diff --git a/sci-libs/parmetis/parmetis-4.0.3.ebuild b/sci-libs/parmetis/parmetis-4.0.3.ebuild
111 index b9bc9d2..60c2186 100644
112 --- a/sci-libs/parmetis/parmetis-4.0.3.ebuild
113 +++ b/sci-libs/parmetis/parmetis-4.0.3.ebuild
114 @@ -83,19 +83,19 @@ src_configure() {
115 parmetis_configure -DSHARED=ON
116 use static-libs && \
117 sed -i -e '/fPIC/d' metis/GKlib/GKlibSystem.cmake && \
118 - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" parmetis_configure
119 + BUILD_DIR="${WORKDIR}/${PN}_static" parmetis_configure
120 }
121
122 src_compile() {
123 cmake-utils_src_compile
124 use static-libs && \
125 - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
126 + BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
127 }
128
129 src_install() {
130 cmake-utils_src_install
131 use static-libs && \
132 - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
133 + BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
134 insinto /usr/include
135 doins metis/include/metis.h
136
137
138 diff --git a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
139 index 711975e..283176b 100644
140 --- a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
141 +++ b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
142 @@ -46,20 +46,20 @@ src_configure() {
143
144 scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
145 use static-libs && \
146 - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \
147 + BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \
148 -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
149 }
150
151 src_compile() {
152 cmake-utils_src_compile
153 use static-libs && \
154 - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
155 + BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
156 }
157
158 src_install() {
159 cmake-utils_src_install
160 use static-libs && \
161 - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
162 + BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
163
164 insinto /usr/include/blacs
165 doins BLACS/SRC/*.h
166
167 diff --git a/sci-libs/tmglib/tmglib-3.5.0.ebuild b/sci-libs/tmglib/tmglib-3.5.0.ebuild
168 index 36512bd..3548eb7 100644
169 --- a/sci-libs/tmglib/tmglib-3.5.0.ebuild
170 +++ b/sci-libs/tmglib/tmglib-3.5.0.ebuild
171 @@ -49,18 +49,18 @@ src_configure() {
172
173 tmg_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
174 use static-libs && \
175 - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" tmg_configure \
176 + BUILD_DIR="${WORKDIR}/${PN}_static" tmg_configure \
177 -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
178 }
179
180 src_compile() {
181 cmake-utils_src_compile -C TESTING/MATGEN
182 - use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
183 + use static-libs && BUILD_DIR="${WORKDIR}/${PN}_static" \
184 cmake-utils_src_compile -C TESTING/MATGEN
185 }
186
187 src_install() {
188 cmake-utils_src_install -C TESTING/MATGEN
189 - use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
190 + use static-libs && BUILD_DIR="${WORKDIR}/${PN}_static" \
191 cmake-utils_src_install -C TESTING/MATGEN
192 }
193
194 diff --git a/sci-libs/tmglib/tmglib-3.6.0.ebuild b/sci-libs/tmglib/tmglib-3.6.0.ebuild
195 index 4f66f45..f403c53 100644
196 --- a/sci-libs/tmglib/tmglib-3.6.0.ebuild
197 +++ b/sci-libs/tmglib/tmglib-3.6.0.ebuild
198 @@ -49,18 +49,18 @@ src_configure() {
199
200 tmg_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
201 use static-libs && \
202 - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" tmg_configure \
203 + BUILD_DIR="${WORKDIR}/${PN}_static" tmg_configure \
204 -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
205 }
206
207 src_compile() {
208 cmake-utils_src_compile -C TESTING/MATGEN
209 - use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
210 + use static-libs && BUILD_DIR="${WORKDIR}/${PN}_static" \
211 cmake-utils_src_compile -C TESTING/MATGEN
212 }
213
214 src_install() {
215 cmake-utils_src_install -C TESTING/MATGEN
216 use static-libs \
217 - && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install -C TESTING/MATGEN
218 + && BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install -C TESTING/MATGEN
219 }
220
221 diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
222 index 4dae0bf..6a9b5be 100644
223 --- a/sci-libs/votca-tools/votca-tools-9999.ebuild
224 +++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
225 @@ -53,7 +53,7 @@ src_configure() {
226 src_install() {
227 cmake-utils_src_install
228 if use doc; then
229 - cd "${CMAKE_BUILD_DIR}"
230 + cd "${BUILD_DIR}"
231 cmake-utils_src_make html
232 dohtml -r share/doc/html/*
233 fi