Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/scidavis/files/, sci-visualization/scidavis/
Date: Mon, 09 May 2022 15:50:11
Message-Id: 1652111378.5c433da8946eea1ee0c76a62aea5df79ed36bdca.andrewammerlaan@gentoo
1 commit: 5c433da8946eea1ee0c76a62aea5df79ed36bdca
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 9 15:49:38 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Mon May 9 15:49:38 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c433da8
7
8 sci-visualization/scidavis: drop 2.7-r1, 2.8
9
10 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
11
12 sci-visualization/scidavis/Manifest | 2 -
13 .../files/scidavis-2.7-find-qwtplot3d.patch | 15 ---
14 .../scidavis-2.7-fix-build-if-sip4-installed.patch | 13 ---
15 .../files/scidavis-2.7-install-locations.patch | 61 ------------
16 .../files/scidavis-2.8-fix-buildfailure.patch | 68 --------------
17 sci-visualization/scidavis/scidavis-2.7-r1.ebuild | 103 --------------------
18 sci-visualization/scidavis/scidavis-2.8.ebuild | 104 ---------------------
19 7 files changed, 366 deletions(-)
20
21 diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest
22 index acdc6f3f960f..7cc12ce69cc0 100644
23 --- a/sci-visualization/scidavis/Manifest
24 +++ b/sci-visualization/scidavis/Manifest
25 @@ -1,3 +1 @@
26 -DIST scidavis-2.7.tar.gz 11765155 BLAKE2B 10e218472893cd19fe3fb6ebef0116c37167b10b1535e6d39b3eb0f6e2f9a537a75c8da5648dae41b77add089d57cafea640d0c7f4dca459c5a9ef2cc24bff18 SHA512 8063d9f5fb29f824e0183d8902dfe9a8310b6041664ac2189765953088968136f3d72fd04f667d8dfce0ede16e17593e3351f5593d70e73705f1b737bf90b4de
27 -DIST scidavis-2.8.tar.gz 12796976 BLAKE2B a1774f89235c9a6f49c20a45bec64e914b71c80afb54ca3e8b71151fa660a6da75c6dd914e42932bbe1b2a9abffaee045b3542ecc30ddb2824f5c4c5ccdf5da4 SHA512 3250846cd4cd320aa765d564ef07de10ccba0621b89e033b5b6092850c5eae4ca30b47eca392b67540e7757cbd497909a8cabd09bf44791543a809087f199c21
28 DIST scidavis-2.9.0.tar.gz 9348738 BLAKE2B 70af736e0cbe62ffc4b8cc828fffe819b91245f01fa1dc089d1a225ba943495b947562aac84829b8b92664ffbe6e31ecc8f6d9b685adb144c4b21e619739c00e SHA512 3058b11e7864a646c31e5576ac4ebb3e30bcc08f382ee1798183935482236890bbd1090c8e2272c28b54e2498a42dfed801f17fc4c0aca83264ab76f4a7fb7ba
29
30 diff --git a/sci-visualization/scidavis/files/scidavis-2.7-find-qwtplot3d.patch b/sci-visualization/scidavis/files/scidavis-2.7-find-qwtplot3d.patch
31 deleted file mode 100644
32 index 857cca79bd98..000000000000
33 --- a/sci-visualization/scidavis/files/scidavis-2.7-find-qwtplot3d.patch
34 +++ /dev/null
35 @@ -1,15 +0,0 @@
36 -diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
37 -index 1b43375..a2bd52c 100644
38 ---- a/3rdparty/CMakeLists.txt
39 -+++ b/3rdparty/CMakeLists.txt
40 -@@ -46,8 +46,8 @@ endif()
41 - option( BUILD_QWTPLOT3D "Build QwtPlot3D using own code" OFF )
42 -
43 - if( NOT BUILD_QWTPLOT3D )
44 -- find_library ( QWTPLOT3D_LIBRARY
45 -- NAMES qwtplot3d-qt5
46 -+find_library ( QWTPLOT3D_LIBRARY
47 -+ NAMES qwtplot3d
48 - HINTS ${QT_LIBRARY_DIR}
49 - )
50 - if( NOT QWTPLOT3D_LIBRARY )
51
52 diff --git a/sci-visualization/scidavis/files/scidavis-2.7-fix-build-if-sip4-installed.patch b/sci-visualization/scidavis/files/scidavis-2.7-fix-build-if-sip4-installed.patch
53 deleted file mode 100644
54 index 2b415458da22..000000000000
55 --- a/sci-visualization/scidavis/files/scidavis-2.7-fix-build-if-sip4-installed.patch
56 +++ /dev/null
57 @@ -1,13 +0,0 @@
58 -diff --git a/libscidavis/CMakeLists.txt b/libscidavis/CMakeLists.txt
59 -index 8fc6c4e3..27464ec2 100644
60 ---- a/libscidavis/CMakeLists.txt
61 -+++ b/libscidavis/CMakeLists.txt
62 -@@ -483,7 +483,7 @@ if( SCRIPTING_PYTHON )
63 - set(scidavis_PyQt_HDR ${scidavis_SIP_OUTPUT_DIR}/sipAPIscidavis.h)
64 - if( SIP_VERSION VERSION_GREATER_EQUAL 5 )
65 - set( scidavis_SIP_HDR ${CMAKE_CURRENT_BINARY_DIR}/python/sip.h )
66 -- target_include_directories( libscidavis PUBLIC
67 -+ target_include_directories( libscidavis BEFORE PUBLIC
68 - "${CMAKE_CURRENT_BINARY_DIR}/python"
69 - "${scidavis_SIP_OUTPUT_DIR}"
70 - )
71
72 diff --git a/sci-visualization/scidavis/files/scidavis-2.7-install-locations.patch b/sci-visualization/scidavis/files/scidavis-2.7-install-locations.patch
73 deleted file mode 100644
74 index 1b8c994bc74e..000000000000
75 --- a/sci-visualization/scidavis/files/scidavis-2.7-install-locations.patch
76 +++ /dev/null
77 @@ -1,61 +0,0 @@
78 -diff --git a/CMakeLists.txt b/CMakeLists.txt
79 -index 1b75dcc..f6c730a 100644
80 ---- a/CMakeLists.txt
81 -+++ b/CMakeLists.txt
82 -@@ -1,4 +1,5 @@
83 - cmake_minimum_required( VERSION 3.16 )
84 -+include(GNUInstallDirs)
85 -
86 - # Target platform is Windows 10
87 - if( CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017" OR
88 -@@ -115,6 +116,7 @@ find_package( ZLIB "1.2.11" REQUIRED )
89 - find_package( OpenGL COMPONENTS OpenGL REQUIRED )
90 -
91 - # muParser
92 -+if( SCRIPTING_MUPARSER )
93 - find_library( MUPARSER_LIB
94 - NAMES muparser
95 - REQUIRED
96 -@@ -124,6 +126,7 @@ find_path( MUPARSER_INCLUDE_DIR
97 - REQUIRED
98 - )
99 - message( STATUS "Found muParser : ${MUPARSER_LIB} include: ${MUPARSER_INCLUDE_DIR}" )
100 -+endif()
101 -
102 - add_subdirectory( 3rdparty )
103 -
104 -@@ -149,7 +152,7 @@ set( DOC_FILES
105 - if( WIN32 )
106 - install( FILES ${DOC_FILES} DESTINATION . )
107 - else()
108 -- install( FILES ${DOC_FILES} DESTINATION share/doc/scidavis )
109 -+ install( FILES ${DOC_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR} )
110 - endif()
111 -
112 - if( MSVC )
113 -diff --git a/scidavis/CMakeLists.txt b/scidavis/CMakeLists.txt
114 -index cc68d4d..fb6da42 100644
115 ---- a/scidavis/CMakeLists.txt
116 -+++ b/scidavis/CMakeLists.txt
117 -@@ -127,15 +127,18 @@ if (NOT CMAKE_CROSS_COMPILING)
118 - install( FILES scidavis.desktop DESTINATION share/applications )
119 - install( FILES scidavis.xml DESTINATION share/mime/packages )
120 - install( FILES scidavis.1 DESTINATION share/man/man1 )
121 -- install( FILES scidavis.appdata.xml DESTINATION share/appdata )
122 -+ install( FILES scidavis.appdata.xml DESTINATION share/metainfo )
123 - install( FILES x-sciprj.desktop DESTINATION share/mimelnk/application )
124 - endif()
125 -
126 - if( SCRIPTING_PYTHON )
127 -+ if(NOT PYTHON_SCRIPTDIR)
128 -+ set(PYTHON_SCRIPTDIR etc)
129 -+ endif()
130 - if( MULTI_CONFIG )
131 -- install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/scidavisrc.pyc DESTINATION etc )
132 -+ install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/scidavisrc.pyc DESTINATION ${PYTHON_SCRIPTDIR} )
133 - else()
134 -- install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/scidavisrc.pyc DESTINATION etc )
135 -+ install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/scidavisrc.pyc DESTINATION ${PYTHON_SCRIPTDIR} )
136 - endif()
137 - install( FILES scidavisUtil.py DESTINATION share/scidavis )
138 - endif()
139
140 diff --git a/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch b/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch
141 deleted file mode 100644
142 index 779fb803cebb..000000000000
143 --- a/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch
144 +++ /dev/null
145 @@ -1,68 +0,0 @@
146 -diff --git a/scidavis/CMakeLists.txt b/scidavis/CMakeLists.txt
147 -index 9484a87..d177a55 100644
148 ---- a/scidavis/CMakeLists.txt
149 -+++ b/scidavis/CMakeLists.txt
150 -@@ -8,35 +8,35 @@ if( WIN32 )
151 - endif()
152 -
153 - # Translation Files
154 --#file( COPY translations DESTINATION . )
155 --#set( TS_FILES
156 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_de.ts"
157 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_es.ts"
158 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_fr.ts"
159 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ru.ts"
160 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ja.ts"
161 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_sv.ts"
162 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pt-br.ts"
163 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs.ts"
164 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs-alt.ts"
165 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pl.ts"
166 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-cn.ts"
167 --# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-tw.ts"
168 --# )
169 -+file( COPY translations DESTINATION . )
170 - set( TS_FILES
171 -- "translations/scidavis_de.ts"
172 -- "translations/scidavis_es.ts"
173 -- "translations/scidavis_fr.ts"
174 -- "translations/scidavis_ru.ts"
175 -- "translations/scidavis_ja.ts"
176 -- "translations/scidavis_sv.ts"
177 -- "translations/scidavis_pt-br.ts"
178 -- "translations/scidavis_cs.ts"
179 -- "translations/scidavis_cs-alt.ts"
180 -- "translations/scidavis_pl.ts"
181 -- "translations/scidavis_zh-cn.ts"
182 -- "translations/scidavis_zh-tw.ts"
183 -- )
184 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_de.ts"
185 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_es.ts"
186 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_fr.ts"
187 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ru.ts"
188 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ja.ts"
189 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_sv.ts"
190 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pt-br.ts"
191 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs.ts"
192 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs-alt.ts"
193 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pl.ts"
194 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-cn.ts"
195 -+ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-tw.ts"
196 -+ )
197 -+#set( TS_FILES
198 -+ #"translations/scidavis_de.ts"
199 -+ #"translations/scidavis_es.ts"
200 -+ #"translations/scidavis_fr.ts"
201 -+ #"translations/scidavis_ru.ts"
202 -+ #"translations/scidavis_ja.ts"
203 -+ #"translations/scidavis_sv.ts"
204 -+ #"translations/scidavis_pt-br.ts"
205 -+ #"translations/scidavis_cs.ts"
206 -+ #"translations/scidavis_cs-alt.ts"
207 -+ #"translations/scidavis_pl.ts"
208 -+ #"translations/scidavis_zh-cn.ts"
209 -+ #"translations/scidavis_zh-tw.ts"
210 -+ #)
211 -
212 - qt5_create_translation( QM_FILES "${CMAKE_SOURCE_DIR}/libscidavis" ${TS_FILES} )
213 -
214
215 diff --git a/sci-visualization/scidavis/scidavis-2.7-r1.ebuild b/sci-visualization/scidavis/scidavis-2.7-r1.ebuild
216 deleted file mode 100644
217 index 94668d6588f5..000000000000
218 --- a/sci-visualization/scidavis/scidavis-2.7-r1.ebuild
219 +++ /dev/null
220 @@ -1,103 +0,0 @@
221 -# Copyright 1999-2022 Gentoo Authors
222 -# Distributed under the terms of the GNU General Public License v2
223 -
224 -EAPI=8
225 -
226 -DOCS_BUILDER="doxygen"
227 -DOCS_DEPEND="media-gfx/graphviz"
228 -
229 -PYTHON_COMPAT=( python3_{8..10} )
230 -
231 -inherit python-single-r1 cmake docs virtualx xdg
232 -
233 -DESCRIPTION="Application for Scientific Data Analysis and Visualization"
234 -HOMEPAGE="http://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/"
235 -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
236 -
237 -LICENSE="GPL-2+ ZLIB"
238 -KEYWORDS="~amd64"
239 -SLOT="0"
240 -
241 -IUSE="doc origin python test"
242 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
243 -
244 -# requires network
245 -RESTRICT="test"
246 -PROPERTIES="test_network"
247 -
248 -RDEPEND="
249 - dev-cpp/muParser
250 - dev-qt/qtcore:5
251 - dev-qt/qtgui:5
252 - dev-qt/qtnetwork:5
253 - dev-qt/qtopengl:5
254 - dev-qt/qtprintsupport:5
255 - dev-qt/qtwidgets:5
256 - dev-qt/qtxml:5
257 - sci-libs/gsl:=
258 - sys-libs/zlib[minizip]
259 - x11-libs/qwt:5
260 - x11-libs/qwtplot3d
261 - origin? ( sci-libs/liborigin )
262 - python? (
263 - ${PYTHON_DEPS}
264 - $(python_gen_cond_dep '
265 - >=dev-python/PyQt5-5.15.6[${PYTHON_USEDEP}]
266 - dev-python/PyQt5-sip[${PYTHON_USEDEP}]
267 - >=dev-python/sip-6:5[${PYTHON_USEDEP}]
268 - ')
269 - )
270 -"
271 -DEPEND="${RDEPEND}"
272 -BDEPEND="
273 - dev-qt/linguist-tools:5
274 - test? (
275 - dev-libs/unittest++
276 - dev-cpp/gtest
277 - )
278 -"
279 -
280 -PATCHES=(
281 - "${FILESDIR}/${P}-install-locations.patch"
282 - "${FILESDIR}/${P}-find-qwtplot3d.patch"
283 - "${FILESDIR}/${P}-fix-build-if-sip4-installed.patch"
284 -)
285 -
286 -src_prepare() {
287 - cmake_src_prepare
288 -
289 - # Remove things which are packaged elsewhere
290 - rm -r 3rdparty/qwt5-qt5 3rdparty/qwtplot3d 3rdparty/liborigin || die
291 -
292 - # OF has been renamed in Gentoo https://bugs.gentoo.org/383179
293 - # Note this is *not* packaged in sys-libs/zlib[minizip] because
294 - # this file resides in the test directory in upstream zlib
295 - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' 3rdparty/minigzip/minigzip.c || die
296 -}
297 -
298 -src_configure() {
299 - local mycmakeargs=(
300 - # Even if we disable muparser scripting, we still need MuParser.h
301 - # for Graph3D.cpp. So just enable it unconditionally. Bug 834074
302 - -DSCRIPTING_MUPARSER=ON
303 - -DORIGIN_IMPORT=$(usex origin)
304 - -DSCRIPTING_PYTHON=$(usex python)
305 - -DBUILD_TESTS=$(usex test)
306 - )
307 -
308 - if use python; then
309 - mycmakeargs+=(
310 - -DPYTHON_SCRIPTDIR="$(python_get_scriptdir)"
311 - )
312 - fi
313 - cmake_src_configure
314 -}
315 -
316 -src_compile() {
317 - cmake_src_compile
318 - docs_compile
319 -}
320 -
321 -src_test() {
322 - virtx cmake_src_test
323 -}
324
325 diff --git a/sci-visualization/scidavis/scidavis-2.8.ebuild b/sci-visualization/scidavis/scidavis-2.8.ebuild
326 deleted file mode 100644
327 index 2a99b10ff17f..000000000000
328 --- a/sci-visualization/scidavis/scidavis-2.8.ebuild
329 +++ /dev/null
330 @@ -1,104 +0,0 @@
331 -# Copyright 1999-2022 Gentoo Authors
332 -# Distributed under the terms of the GNU General Public License v2
333 -
334 -EAPI=8
335 -
336 -DOCS_BUILDER="doxygen"
337 -DOCS_DEPEND="media-gfx/graphviz"
338 -
339 -PYTHON_COMPAT=( python3_{8..10} )
340 -
341 -inherit python-single-r1 cmake docs virtualx xdg
342 -
343 -DESCRIPTION="Application for Scientific Data Analysis and Visualization"
344 -HOMEPAGE="http://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/"
345 -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
346 -
347 -LICENSE="GPL-2+ ZLIB"
348 -KEYWORDS="~amd64"
349 -SLOT="0"
350 -
351 -IUSE="doc origin python test"
352 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
353 -
354 -# requires network
355 -RESTRICT="test"
356 -PROPERTIES="test_network"
357 -
358 -RDEPEND="
359 - dev-cpp/muParser
360 - dev-qt/qtcore:5
361 - dev-qt/qtgui:5
362 - dev-qt/qtnetwork:5
363 - dev-qt/qtopengl:5
364 - dev-qt/qtprintsupport:5
365 - dev-qt/qtwidgets:5
366 - dev-qt/qtxml:5
367 - sci-libs/gsl:=
368 - sys-libs/zlib[minizip]
369 - x11-libs/qwt:5
370 - x11-libs/qwtplot3d
371 - origin? ( sci-libs/liborigin )
372 - python? (
373 - ${PYTHON_DEPS}
374 - $(python_gen_cond_dep '
375 - >=dev-python/PyQt5-5.15.6[${PYTHON_USEDEP}]
376 - dev-python/PyQt5-sip[${PYTHON_USEDEP}]
377 - >=dev-python/sip-6:5[${PYTHON_USEDEP}]
378 - ')
379 - )
380 -"
381 -DEPEND="${RDEPEND}"
382 -BDEPEND="
383 - dev-qt/linguist-tools:5
384 - test? (
385 - dev-libs/unittest++
386 - dev-cpp/gtest
387 - )
388 -"
389 -
390 -PATCHES=(
391 - "${FILESDIR}/${PN}-2.7-install-locations.patch"
392 - "${FILESDIR}/${PN}-2.7-find-qwtplot3d.patch"
393 - "${FILESDIR}/${PN}-2.7-fix-build-if-sip4-installed.patch"
394 - "${FILESDIR}/${P}-fix-buildfailure.patch"
395 -)
396 -
397 -src_prepare() {
398 - cmake_src_prepare
399 -
400 - # Remove things which are packaged elsewhere
401 - rm -r 3rdparty/qwt5-qt5 3rdparty/qwtplot3d 3rdparty/liborigin || die
402 -
403 - # OF has been renamed in Gentoo https://bugs.gentoo.org/383179
404 - # Note this is *not* packaged in sys-libs/zlib[minizip] because
405 - # this file resides in the test directory in upstream zlib
406 - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' 3rdparty/minigzip/minigzip.c || die
407 -}
408 -
409 -src_configure() {
410 - local mycmakeargs=(
411 - # Even if we disable muparser scripting, we still need MuParser.h
412 - # for Graph3D.cpp. So just enable it unconditionally. Bug 834074
413 - -DSCRIPTING_MUPARSER=ON
414 - -DORIGIN_IMPORT=$(usex origin)
415 - -DSCRIPTING_PYTHON=$(usex python)
416 - -DBUILD_TESTS=$(usex test)
417 - )
418 -
419 - if use python; then
420 - mycmakeargs+=(
421 - -DPYTHON_SCRIPTDIR="$(python_get_scriptdir)"
422 - )
423 - fi
424 - cmake_src_configure
425 -}
426 -
427 -src_compile() {
428 - cmake_src_compile
429 - docs_compile
430 -}
431 -
432 -src_test() {
433 - virtx cmake_src_test
434 -}