Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/clhep/files/, sci-physics/clhep/
Date: Tue, 31 May 2022 06:53:55
Message-Id: 1653980012.47428f3d5faaf674d8da12366bbaea692b6d5d90.amadio@gentoo
1 commit: 47428f3d5faaf674d8da12366bbaea692b6d5d90
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 30 12:50:41 2022 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Tue May 31 06:53:32 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47428f3d
7
8 sci-physics/clhep: drop old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
12
13 sci-physics/clhep/Manifest | 3 -
14 sci-physics/clhep/clhep-2.4.1.3-r2.ebuild | 57 --------------
15 sci-physics/clhep/clhep-2.4.4.0.ebuild | 60 ---------------
16 sci-physics/clhep/clhep-2.4.4.2.ebuild | 55 -------------
17 .../clhep/files/clhep-fix-testThreaded.patch | 90 ----------------------
18 sci-physics/clhep/files/clhep-modulemap.patch | 24 ------
19 6 files changed, 289 deletions(-)
20
21 diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
22 index 303f3a4541cd..56e400e6853a 100644
23 --- a/sci-physics/clhep/Manifest
24 +++ b/sci-physics/clhep/Manifest
25 @@ -1,4 +1 @@
26 -DIST clhep-2.4.1.3.tgz 1537908 BLAKE2B 92fd1fcc415b01d8efa44be67c3bf9e58af2b4d18b6e7ee2161fbc20312428a6f17eacc09150ccff7fefb1686161518042f5c2f7558ff00b4d5696d002432ece SHA512 f7a52b353dc2c6d30cb7d307af71a028838ec674af2a50fe0199335d0b0f7fb4b84489ccfd12f21ecb7b1327acbc87065e7e87363308fd0caad5748a657aac13
27 -DIST clhep-2.4.4.0.tgz 1541722 BLAKE2B 077048ea3ce94de88f08a1ae51ab9af892385d6747ed9f875e13b5aacc725e85f723031d42f526ca53050c07dad621053008c71d0f255f32893724f3e8189e52 SHA512 3ae88c8f31877c6e2cac7f7612946e9989186876c66015e6bfeab19260814c8a8bfb21fa28dd251cd2c43e4e3f63f336249c430c984f84810441603e949ecb5d
28 -DIST clhep-2.4.4.2.tgz 1541867 BLAKE2B 69f23c298db57fbd23a505facd993725f4f21b410463069570e98826dc96d54f309b010df27a5fe910c756bfb1dcdffdb9b47452ef5ddadd5a91ed81a1d9566e SHA512 c267e113111c139f4048db774c81167e53a70d4911f8106c3fabf5980935dfc9b451108385e9d8b8dccace99b4732a21ec0ea2fb86004bb85d04c02cfa54a619
29 DIST clhep-2.4.5.1.tgz 1551358 BLAKE2B e428946163dd525291643e9cdb4921dea64feacf4281aaa4b1466bed021e123ac29fa654e115efa3bb1d154869b4c04196f562850b5e6e162e98001a3d901727 SHA512 68612004a92c6dc036471f440bc00605b611a6f2f9f46ab7343c1f83357498bb7518c4dd2e44d0aef754188d5efbc3ac9187c2371bc6bd46ca076ab4ff13afae
30
31 diff --git a/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild b/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild
32 deleted file mode 100644
33 index ea1591ede033..000000000000
34 --- a/sci-physics/clhep/clhep-2.4.1.3-r2.ebuild
35 +++ /dev/null
36 @@ -1,57 +0,0 @@
37 -# Copyright 1999-2021 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=7
41 -
42 -inherit cmake
43 -
44 -DESCRIPTION="High Energy Physics C++ library"
45 -HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
46 -SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
47 -LICENSE="GPL-3 LGPL-3"
48 -SLOT="2/${PV}"
49 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
50 -
51 -IUSE="doc test threads"
52 -RESTRICT="!test? ( test )"
53 -
54 -BDEPEND="
55 - doc? (
56 - app-doc/doxygen
57 - dev-texlive/texlive-bibtexextra
58 - dev-texlive/texlive-fontsextra
59 - dev-texlive/texlive-fontutils
60 - dev-texlive/texlive-latex
61 - dev-texlive/texlive-latexextra
62 - )
63 -"
64 -
65 -PATCHES=( "${FILESDIR}"/clhep-fix-testThreaded.patch )
66 -
67 -S="${WORKDIR}/${PV}/CLHEP"
68 -
69 -src_prepare() {
70 - cmake_src_prepare
71 -
72 - # respect flags
73 - sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
74 - # dont build test if not asked
75 - if ! use test; then
76 - cmake_comment_add_subdirectory test
77 - fi
78 - # gentoo doc directory
79 - if use doc; then
80 - grep -rl 'share/doc/CLHEP' |
81 - xargs sed -i \
82 - -e "s:share/doc/CLHEP:share/doc/${PF}:" \
83 - {.,*}/CMakeLists.txt || die
84 - fi
85 -}
86 -
87 -src_configure() {
88 - local mycmakeargs=(
89 - -DCLHEP_BUILD_DOCS=$(usex doc)
90 - -DCLHEP_SINGLE_THREAD=$(usex threads no yes)
91 - )
92 - cmake_src_configure
93 -}
94
95 diff --git a/sci-physics/clhep/clhep-2.4.4.0.ebuild b/sci-physics/clhep/clhep-2.4.4.0.ebuild
96 deleted file mode 100644
97 index 770db67ea689..000000000000
98 --- a/sci-physics/clhep/clhep-2.4.4.0.ebuild
99 +++ /dev/null
100 @@ -1,60 +0,0 @@
101 -# Copyright 1999-2021 Gentoo Authors
102 -# Distributed under the terms of the GNU General Public License v2
103 -
104 -EAPI=7
105 -
106 -inherit cmake
107 -
108 -DESCRIPTION="High Energy Physics C++ library"
109 -HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
110 -SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
111 -LICENSE="GPL-3 LGPL-3"
112 -SLOT="2/${PV}"
113 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
114 -
115 -IUSE="doc test threads"
116 -RESTRICT="!test? ( test )"
117 -
118 -BDEPEND="
119 - doc? (
120 - app-doc/doxygen
121 - dev-texlive/texlive-bibtexextra
122 - dev-texlive/texlive-fontsextra
123 - dev-texlive/texlive-fontutils
124 - dev-texlive/texlive-latex
125 - dev-texlive/texlive-latexextra
126 - )
127 -"
128 -
129 -PATCHES=(
130 - "${FILESDIR}"/clhep-fix-testThreaded.patch
131 - "${FILESDIR}"/clhep-modulemap.patch
132 -)
133 -
134 -S="${WORKDIR}/${PV}/CLHEP"
135 -
136 -src_prepare() {
137 - cmake_src_prepare
138 -
139 - # respect flags
140 - sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
141 - # dont build test if not asked
142 - if ! use test; then
143 - cmake_comment_add_subdirectory test
144 - fi
145 - # gentoo doc directory
146 - if use doc; then
147 - grep -rl 'share/doc/CLHEP' |
148 - xargs sed -i \
149 - -e "s:share/doc/CLHEP:share/doc/${PF}:" \
150 - {.,*}/CMakeLists.txt || die
151 - fi
152 -}
153 -
154 -src_configure() {
155 - local mycmakeargs=(
156 - -DCLHEP_BUILD_DOCS=$(usex doc)
157 - -DCLHEP_SINGLE_THREAD=$(usex threads no yes)
158 - )
159 - cmake_src_configure
160 -}
161
162 diff --git a/sci-physics/clhep/clhep-2.4.4.2.ebuild b/sci-physics/clhep/clhep-2.4.4.2.ebuild
163 deleted file mode 100644
164 index ab61250e0377..000000000000
165 --- a/sci-physics/clhep/clhep-2.4.4.2.ebuild
166 +++ /dev/null
167 @@ -1,55 +0,0 @@
168 -# Copyright 1999-2021 Gentoo Authors
169 -# Distributed under the terms of the GNU General Public License v2
170 -
171 -EAPI=7
172 -
173 -inherit cmake
174 -
175 -DESCRIPTION="High Energy Physics C++ library"
176 -HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
177 -SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
178 -LICENSE="GPL-3 LGPL-3"
179 -SLOT="2/${PV}"
180 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
181 -
182 -IUSE="doc test threads"
183 -RESTRICT="!test? ( test )"
184 -
185 -BDEPEND="
186 - doc? (
187 - app-doc/doxygen
188 - dev-texlive/texlive-bibtexextra
189 - dev-texlive/texlive-fontsextra
190 - dev-texlive/texlive-fontutils
191 - dev-texlive/texlive-latex
192 - dev-texlive/texlive-latexextra
193 - )
194 -"
195 -
196 -S="${WORKDIR}/${PV}/CLHEP"
197 -
198 -src_prepare() {
199 - cmake_src_prepare
200 -
201 - # respect flags
202 - sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
203 - # dont build test if not asked
204 - if ! use test; then
205 - cmake_comment_add_subdirectory test
206 - fi
207 - # gentoo doc directory
208 - if use doc; then
209 - grep -rl 'share/doc/CLHEP' |
210 - xargs sed -i \
211 - -e "s:share/doc/CLHEP:share/doc/${PF}:" \
212 - {.,*}/CMakeLists.txt || die
213 - fi
214 -}
215 -
216 -src_configure() {
217 - local mycmakeargs=(
218 - -DCLHEP_BUILD_DOCS=$(usex doc)
219 - -DCLHEP_SINGLE_THREAD=$(usex threads no yes)
220 - )
221 - cmake_src_configure
222 -}
223
224 diff --git a/sci-physics/clhep/files/clhep-fix-testThreaded.patch b/sci-physics/clhep/files/clhep-fix-testThreaded.patch
225 deleted file mode 100644
226 index 58010dc726da..000000000000
227 --- a/sci-physics/clhep/files/clhep-fix-testThreaded.patch
228 +++ /dev/null
229 @@ -1,90 +0,0 @@
230 -From 849f0250076ac3cce672e925c232bd6b96a018e0 Mon Sep 17 00:00:00 2001
231 -From: Guilherme Amadio <amadio@××××.ch>
232 -Date: Wed, 18 Nov 2020 17:33:17 +0100
233 -Subject: [PATCH] Fix testThreaded on x86
234 -
235 ----
236 - Random/test/testThreaded.cc | 53 ++++++++++++++++++++++++++-----------
237 - 1 file changed, 38 insertions(+), 15 deletions(-)
238 -
239 -diff --git a/Random/test/testThreaded.cc b/Random/test/testThreaded.cc
240 -index a835ce19..0a6352c3 100644
241 ---- a/Random/test/testThreaded.cc
242 -+++ b/Random/test/testThreaded.cc
243 -@@ -65,23 +65,38 @@ void testRandGauss(std::vector<double> const& reference, bool& result) {
244 -
245 - result = true;
246 -
247 -+ std::vector<double> v;
248 -+ v.push_back(dist.fire());
249 -+ v.push_back(dist.fire());
250 -+ v.push_back(dist.fire());
251 -+ v.push_back(dist.fire());
252 -+ v.push_back(dist.fire());
253 -+
254 - // Just a sanity check first. The fire method reproduces
255 - // itself.
256 -- if (reference[0] != dist.fire() ||
257 -- reference[1] != dist.fire() ||
258 -- reference[2] != dist.fire() ||
259 -- reference[3] != dist.fire() ||
260 -- reference[4] != dist.fire()) {
261 -+ if (reference[0] != v[0] ||
262 -+ reference[1] != v[1] ||
263 -+ reference[2] != v[2] ||
264 -+ reference[3] != v[3] ||
265 -+ reference[4] != v[4]) {
266 - result = false;
267 - }
268 -
269 - // check the shoot method where we pass in an engine
270 - CLHEP::HepJamesRandom engine1(seedL1);
271 -- if (reference[0] != CLHEP::RandGauss::shoot(&engine1) ||
272 -- reference[1] != CLHEP::RandGauss::shoot(&engine1) ||
273 -- reference[2] != CLHEP::RandGauss::shoot(&engine1) ||
274 -- reference[3] != CLHEP::RandGauss::shoot(&engine1) ||
275 -- reference[4] != CLHEP::RandGauss::shoot(&engine1)) {
276 -+
277 -+ v.clear();
278 -+ v.push_back(CLHEP::RandGauss::shoot(&engine1));
279 -+ v.push_back(CLHEP::RandGauss::shoot(&engine1));
280 -+ v.push_back(CLHEP::RandGauss::shoot(&engine1));
281 -+ v.push_back(CLHEP::RandGauss::shoot(&engine1));
282 -+ v.push_back(CLHEP::RandGauss::shoot(&engine1));
283 -+
284 -+ if (reference[0] != v[0] ||
285 -+ reference[1] != v[1] ||
286 -+ reference[2] != v[2] ||
287 -+ reference[3] != v[3] ||
288 -+ reference[4] != v[4]) {
289 - result = false;
290 - }
291 -
292 -@@ -93,11 +108,19 @@ void testRandGauss(std::vector<double> const& reference, bool& result) {
293 - // setFlag causes it to not use the cached value
294 - // and generate a new pair of random numbers
295 - CLHEP::RandGauss::setFlag(false);
296 -- if (reference[0] != CLHEP::RandGauss::shoot() ||
297 -- reference[1] != CLHEP::RandGauss::shoot() ||
298 -- reference[2] != CLHEP::RandGauss::shoot() ||
299 -- reference[3] != CLHEP::RandGauss::shoot() ||
300 -- reference[4] != CLHEP::RandGauss::shoot()) {
301 -+
302 -+ v.clear();
303 -+ v.push_back(CLHEP::RandGauss::shoot());
304 -+ v.push_back(CLHEP::RandGauss::shoot());
305 -+ v.push_back(CLHEP::RandGauss::shoot());
306 -+ v.push_back(CLHEP::RandGauss::shoot());
307 -+ v.push_back(CLHEP::RandGauss::shoot());
308 -+
309 -+ if (reference[0] != v[0] ||
310 -+ reference[1] != v[1] ||
311 -+ reference[2] != v[2] ||
312 -+ reference[3] != v[3] ||
313 -+ reference[4] != v[4]) {
314 - result = false;
315 - }
316 - CLHEP::HepRandom::setTheEngine(savedEngine);
317 ---
318 -2.29.2
319 -
320
321 diff --git a/sci-physics/clhep/files/clhep-modulemap.patch b/sci-physics/clhep/files/clhep-modulemap.patch
322 deleted file mode 100644
323 index 31b1eda620a7..000000000000
324 --- a/sci-physics/clhep/files/clhep-modulemap.patch
325 +++ /dev/null
326 @@ -1,24 +0,0 @@
327 -From ade5d82b54d2c72660b6b2c478323ac741ea7c01 Mon Sep 17 00:00:00 2001
328 -From: Guilherme Amadio <amadio@××××.ch>
329 -Date: Thu, 19 Nov 2020 09:55:12 +0100
330 -Subject: [PATCH] Install modulemap along with other header files
331 -
332 ----
333 - cmake/Modules/ClhepCopyHeaders.cmake | 2 +-
334 - 1 file changed, 1 insertion(+), 1 deletion(-)
335 -
336 -diff --git a/cmake/Modules/ClhepCopyHeaders.cmake b/cmake/Modules/ClhepCopyHeaders.cmake
337 -index bd38b8a2..c6483c3a 100644
338 ---- a/cmake/Modules/ClhepCopyHeaders.cmake
339 -+++ b/cmake/Modules/ClhepCopyHeaders.cmake
340 -@@ -49,6 +49,6 @@ macro (clhep_copy_headers )
341 - # handle the module.modulemap file
342 - CONFIGURE_FILE( ${CLHEP_SOURCE_DIR}/module.modulemap ${CLHEP_BINARY_DIR}/module.modulemap COPYONLY )
343 - INSTALL (FILES ${CLHEP_BINARY_DIR}/module.modulemap
344 -- DESTINATION include )
345 -+ DESTINATION include/CLHEP )
346 -
347 - endmacro (clhep_copy_headers)
348 ---
349 -2.29.2
350 -
Report Message
Find on MARC Find on Google Groups