1 |
commit: c987881e192becd6236fcb681e6cd58a46b35b3a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 28 16:04:46 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 28 16:09:53 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c987881e |
7 |
|
8 |
sci-visualization/visit: Remove last-rited package |
9 |
|
10 |
Closes: https://bugs.gentoo.org/552374 |
11 |
Closes: https://bugs.gentoo.org/657952 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
profiles/package.mask | 5 - |
15 |
sci-visualization/visit/Manifest | 1 - |
16 |
.../visit/files/visit-2.12.3-cmakelist.patch | 10 -- |
17 |
.../visit-2.12.3-dont_symlink_visit_dir.patch | 18 --- |
18 |
.../visit/files/visit-2.12.3-findpython.patch | 19 --- |
19 |
.../visit/files/visit-2.12.3-findsilo.patch | 12 -- |
20 |
.../visit/files/visit-2.12.3-findvtk.patch | 29 ----- |
21 |
.../visit/files/visit-2.12.3-qwt.patch | 14 --- |
22 |
.../visit/files/visit-2.12.3-vtklibs.patch | 133 --------------------- |
23 |
.../visit/files/visit-2.12.3-vtkmpi.patch | 46 ------- |
24 |
sci-visualization/visit/metadata.xml | 21 ---- |
25 |
sci-visualization/visit/visit-2.12.3-r1.ebuild | 119 ------------------ |
26 |
12 files changed, 427 deletions(-) |
27 |
|
28 |
diff --git a/profiles/package.mask b/profiles/package.mask |
29 |
index 03df835a916..21c03dd4f37 100644 |
30 |
--- a/profiles/package.mask |
31 |
+++ b/profiles/package.mask |
32 |
@@ -760,11 +760,6 @@ sci-astronomy/kapteyn |
33 |
=sci-libs/vtk-6* |
34 |
sci-libs/vtkdata |
35 |
|
36 |
-# Andreas Sturmlechner <asturm@g.o> (2019-11-28) |
37 |
-# Depends on broken =sci-libs/vtk-6*, needs to be bumped to 3.0.2, bug #657952 |
38 |
-# Removal in 30 days. |
39 |
-=sci-visualization/visit-2* |
40 |
- |
41 |
# Jonas Stein <jstein@g.o> (2019-11-26) |
42 |
# Package is obsolete. Successor is net-wireless/b43-fwcutter |
43 |
# Bug #537786. |
44 |
|
45 |
diff --git a/sci-visualization/visit/Manifest b/sci-visualization/visit/Manifest |
46 |
deleted file mode 100644 |
47 |
index 44c0813d968..00000000000 |
48 |
--- a/sci-visualization/visit/Manifest |
49 |
+++ /dev/null |
50 |
@@ -1 +0,0 @@ |
51 |
-DIST visit2.12.3.tar.gz 80491441 BLAKE2B b144dd2ef1ea6ea3213df16c0dbf37449d64d3be00c33f5bf0536abec0278189bfac7a4c399512742267aa4c5f6a46d519b9261e58b4f3eef91e98c7a9a4c36e SHA512 78e939657a556040fc593766855c06a5bef85c76d3c43cd6a941ea90517e49ad556f1b10aa5b984327260001d3b53c67b8cb4692ba04ffbad8b6fefac704e842 |
52 |
|
53 |
diff --git a/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch b/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch |
54 |
deleted file mode 100644 |
55 |
index f0f56f5a6d5..00000000000 |
56 |
--- a/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch |
57 |
+++ /dev/null |
58 |
@@ -1,10 +0,0 @@ |
59 |
---- a/CMakeLists.txt 2015-06-25 07:30:40.907149341 +0200 |
60 |
-+++ b/CMakeLists.txt 2015-06-25 07:30:57.537148929 +0200 |
61 |
-@@ -991,7 +991,6 @@ |
62 |
- DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE |
63 |
- GROUP_READ GROUP_WRITE GROUP_EXECUTE |
64 |
- WORLD_READ WORLD_EXECUTE |
65 |
-- CONFIGURATIONS "" None Debug Release RelWithDebInfo MinSizeRel |
66 |
- FILES_MATCHING PATTERN "*.h" |
67 |
- PATTERN "*.hpp" |
68 |
- PATTERN ".svn" EXCLUDE |
69 |
|
70 |
diff --git a/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch b/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch |
71 |
deleted file mode 100644 |
72 |
index 5ab4c7c995d..00000000000 |
73 |
--- a/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch |
74 |
+++ /dev/null |
75 |
@@ -1,18 +0,0 @@ |
76 |
-diff -ru visit2.7.1.old2/src/CMakeLists.txt visit2.7.1/src/CMakeLists.txt |
77 |
---- a/CMakeLists.txt 2014-01-27 22:10:06.520297262 +0100 |
78 |
-+++ b/CMakeLists.txt 2014-01-27 22:11:30.520298002 +0100 |
79 |
-@@ -807,14 +807,6 @@ |
80 |
- \"${VISIT_VERSION}\" |
81 |
- \"${CMAKE_INSTALL_PREFIX}/beta\") |
82 |
- ") |
83 |
-- ELSE(VISIT_INSTALL_AS_BETA) |
84 |
-- INSTALL(CODE " |
85 |
-- MESSAGE(\"Symlinking current to ${VISIT_VERSION}\") |
86 |
-- EXECUTE_PROCESS(WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX} |
87 |
-- COMMAND \${CMAKE_COMMAND} -E create_symlink |
88 |
-- \"${VISIT_VERSION}\" |
89 |
-- \"${CMAKE_INSTALL_PREFIX}/current\") |
90 |
-- ") |
91 |
- ENDIF(VISIT_INSTALL_AS_BETA) |
92 |
- ENDIF(WIN32) |
93 |
- MARK_AS_ADVANCED( |
94 |
|
95 |
diff --git a/sci-visualization/visit/files/visit-2.12.3-findpython.patch b/sci-visualization/visit/files/visit-2.12.3-findpython.patch |
96 |
deleted file mode 100644 |
97 |
index 4723c494de9..00000000000 |
98 |
--- a/sci-visualization/visit/files/visit-2.12.3-findpython.patch |
99 |
+++ /dev/null |
100 |
@@ -1,19 +0,0 @@ |
101 |
-diff -ru visit2.7.1.old/src/CMake/FindVisItPython.cmake visit2.7.1.new/src/CMake/FindVisItPython.cmake |
102 |
---- a/CMake/FindVisItPython.cmake 2013-09-13 21:06:57.000000000 +0200 |
103 |
-+++ b/CMake/FindVisItPython.cmake 2014-01-25 20:30:06.948654123 +0100 |
104 |
-@@ -141,11 +141,12 @@ |
105 |
- FIND_LIBRARY(PYTHON_LIBRARY |
106 |
- NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION} |
107 |
- PATHS |
108 |
-- ${PYTHON_DIR}/lib |
109 |
-- ${PYTHON_DIR}/libs |
110 |
-- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs |
111 |
-+ ${PYTHON_DIR}/lib |
112 |
-+ ${PYTHON_DIR}/lib64 |
113 |
-+ ${PYTHON_DIR}/libs |
114 |
-+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs |
115 |
- NO_DEFAULT_PATH |
116 |
- NO_CMAKE_ENVIRONMENT_PATH |
117 |
- NO_CMAKE_PATH |
118 |
- NO_SYSTEM_ENVIRONMENT_PATH) |
119 |
- |
120 |
|
121 |
diff --git a/sci-visualization/visit/files/visit-2.12.3-findsilo.patch b/sci-visualization/visit/files/visit-2.12.3-findsilo.patch |
122 |
deleted file mode 100644 |
123 |
index 987907c3a71..00000000000 |
124 |
--- a/sci-visualization/visit/files/visit-2.12.3-findsilo.patch |
125 |
+++ /dev/null |
126 |
@@ -1,12 +0,0 @@ |
127 |
-diff -ru visit2.7.1-old/src/CMake/FindSilo.cmake visit2.7.1-new/src/CMake/FindSilo.cmake |
128 |
---- a/CMake/FindSilo.cmake 2013-11-20 20:30:44.000000000 +0100 |
129 |
-+++ b/CMake/FindSilo.cmake 2014-02-01 02:22:29.410541850 +0100 |
130 |
-@@ -90,7 +90,7 @@ |
131 |
- NO_CMAKE_PATH |
132 |
- NO_SYSTEM_ENVIRONMENT_PATH) |
133 |
- IF(SILOH5_LIBRARY_EXISTS) |
134 |
-- SET_UP_THIRD_PARTY(SILO lib include siloh5) |
135 |
-+ SET_UP_THIRD_PARTY(SILO lib include siloh5 hdf5 z) |
136 |
- ELSE(SILOH5_LIBRARY_EXISTS) |
137 |
- SET_UP_THIRD_PARTY(SILO lib include silo) |
138 |
- ENDIF(SILOH5_LIBRARY_EXISTS) |
139 |
|
140 |
diff --git a/sci-visualization/visit/files/visit-2.12.3-findvtk.patch b/sci-visualization/visit/files/visit-2.12.3-findvtk.patch |
141 |
deleted file mode 100644 |
142 |
index 2b24e91d084..00000000000 |
143 |
--- a/sci-visualization/visit/files/visit-2.12.3-findvtk.patch |
144 |
+++ /dev/null |
145 |
@@ -1,29 +0,0 @@ |
146 |
---- a/CMake/FindVisItVTK.cmake.orig 2015-01-09 12:18:54.467780216 +0100 |
147 |
-+++ b/CMake/FindVisItVTK.cmake 2015-01-09 12:19:59.737780932 +0100 |
148 |
-@@ -234,15 +234,22 @@ |
149 |
- |
150 |
- # check for python wrappers |
151 |
- IF (NOT WIN32) |
152 |
-- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/) |
153 |
-+ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VTK_LIBRARY_DIRS}/python*/) |
154 |
- ELSE (NOT WIN32) |
155 |
- IF(${VTK_VERSION} VERSION_LESS "6.1.0") |
156 |
-- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib) |
157 |
-+ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib) |
158 |
- ELSE() |
159 |
-- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib/python*) |
160 |
-+ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib/python*) |
161 |
- ENDIF() |
162 |
- ENDIF (NOT WIN32) |
163 |
--MESSAGE(STATUS " VTK_PY_WRAPPERS_DIR=${VTK_PY_WRAPPERS_DIR}") |
164 |
-+MESSAGE(STATUS " VTK_PY_WRAPPERS_DIRECTORIES=${VTK_PY_WRAPPERS_DIRECTORIES}") |
165 |
-+ |
166 |
-+FOREACH(X ${VTK_PY_WRAPPERS_DIRECTORIES}) |
167 |
-+ IF(EXISTS "${X}/site-packages/vtk") |
168 |
-+ SET(VTK_PY_WRAPPERS_DIR "${X}") |
169 |
-+ ENDIF() |
170 |
-+ENDFOREACH(X) |
171 |
-+ |
172 |
- |
173 |
- IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk) |
174 |
- MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}") |
175 |
|
176 |
diff --git a/sci-visualization/visit/files/visit-2.12.3-qwt.patch b/sci-visualization/visit/files/visit-2.12.3-qwt.patch |
177 |
deleted file mode 100644 |
178 |
index 4d0dbb19aac..00000000000 |
179 |
--- a/sci-visualization/visit/files/visit-2.12.3-qwt.patch |
180 |
+++ /dev/null |
181 |
@@ -1,14 +0,0 @@ |
182 |
---- a/CMake/FindQwt.cmake.orig 2017-07-12 07:46:34.560120549 +0200 |
183 |
-+++ b/CMake/FindQwt.cmake 2017-07-12 07:46:58.120121063 +0200 |
184 |
-@@ -54,7 +54,10 @@ |
185 |
- SET(QWT_LIBRARY ${QWT_LIBRARY_DIR}/${QWT_LIB}/qwt) |
186 |
- ENDIF(VISIT_STATIC) |
187 |
- ELSE (WIN32) |
188 |
-- SET_UP_THIRD_PARTY(QWT lib include qwt) |
189 |
-+ SET(QWT_FOUND true CACHE BOOL "QWT library found" FORCE) |
190 |
-+ SET(QWT_INCLUDE_DIR "/usr/include/qwt6") |
191 |
-+ SET(QWT_LIBRARY_DIR "/usr/lib") |
192 |
-+ SET(QWT_LIB "/usr/lib/libqwt6-qt5.so") |
193 |
- SET(QWT_LIBRARY ${QWT_LIB} CACHE STRING "name of qwt library" FORCE) |
194 |
- ENDIF (WIN32) |
195 |
- |
196 |
|
197 |
diff --git a/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch b/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch |
198 |
deleted file mode 100644 |
199 |
index 8b8c88e59a3..00000000000 |
200 |
--- a/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch |
201 |
+++ /dev/null |
202 |
@@ -1,133 +0,0 @@ |
203 |
-diff -ur visit2.8.2-old/src/engine/main/CMakeLists.txt visit2.8.2-new/src/engine/main/CMakeLists.txt |
204 |
---- a/engine/main/CMakeLists.txt 2014-10-01 00:28:19.000000000 +0200 |
205 |
-+++ b/engine/main/CMakeLists.txt 2015-01-05 15:14:43.850783973 +0100 |
206 |
-@@ -188,8 +188,8 @@ |
207 |
- ${engine_ser_exe_EPlot_ser} |
208 |
- engine_ser |
209 |
- visit_verdict |
210 |
-- vtkjpeg |
211 |
-- vtkpng |
212 |
-+ jpeg |
213 |
-+ png |
214 |
- ${VTKZLIB_LIB} |
215 |
- ${VTK_FREETYPE_LIBRARIES} |
216 |
- vtkftgl |
217 |
-@@ -273,8 +273,8 @@ |
218 |
- ${engine_par_exe_EPlot_par} |
219 |
- engine_par |
220 |
- visit_verdict |
221 |
-- vtkjpeg |
222 |
-- vtkpng |
223 |
-+ jpeg |
224 |
-+ png |
225 |
- ${VTKZLIB_LIB} |
226 |
- ${VTK_FREETYPE_LIBRARIES} |
227 |
- vtkftgl |
228 |
-diff -ur visit2.8.2-old/src/mdserver/main/CMakeLists.txt visit2.8.2-new/src/mdserver/main/CMakeLists.txt |
229 |
---- a/mdserver/main/CMakeLists.txt 2014-08-11 23:45:16.000000000 +0200 |
230 |
-+++ b/mdserver/main/CMakeLists.txt 2015-01-05 15:15:41.810784062 +0100 |
231 |
-@@ -119,10 +119,10 @@ |
232 |
- visit_verdict |
233 |
- vtkCommonCore |
234 |
- vtkIOCore |
235 |
-- vtktiff |
236 |
-+ tiff |
237 |
- ${VTKZLIB_LIB} |
238 |
-- vtkpng |
239 |
-- vtkjpeg |
240 |
-+ png |
241 |
-+ jpeg |
242 |
- ${ZLIB_LIB} |
243 |
- ${CMAKE_THREAD_LIBS} |
244 |
- ${DL_LIB} |
245 |
-diff -ur visit2.8.2-old/src/tools/convert/CMakeLists.txt visit2.8.2-new/src/tools/convert/CMakeLists.txt |
246 |
---- a/tools/convert/CMakeLists.txt 2014-08-11 23:46:08.000000000 +0200 |
247 |
-+++ b/tools/convert/CMakeLists.txt 2015-01-05 15:14:28.880783951 +0100 |
248 |
-@@ -105,8 +105,8 @@ |
249 |
- ) |
250 |
- |
251 |
- SET(VTK_EXTRA_LIBS |
252 |
--vtkjpeg |
253 |
--vtkpng |
254 |
-+jpeg |
255 |
-+png |
256 |
- ${VTKZLIB_LIB} |
257 |
- ${VTK_FREETYPE_LIBRARIES} |
258 |
- vtkftgl |
259 |
-diff -ur visit2.8.2-old/src/tools/dataserver/CMakeLists.txt visit2.8.2-new/src/tools/dataserver/CMakeLists.txt |
260 |
---- a/tools/dataserver/CMakeLists.txt 2014-08-11 23:46:12.000000000 +0200 |
261 |
-+++ b/tools/dataserver/CMakeLists.txt 2015-01-05 15:13:02.000783818 +0100 |
262 |
-@@ -70,9 +70,9 @@ |
263 |
- ) |
264 |
- |
265 |
- SET(VTK_EXTRA_LIBS |
266 |
--vtktiff |
267 |
--vtkjpeg |
268 |
--vtkpng |
269 |
-+tiff |
270 |
-+jpeg |
271 |
-+png |
272 |
- ${VTKZLIB_LIB} |
273 |
- ${VTK_FREETYPE_LIBRARIES} |
274 |
- vtkftgl |
275 |
-diff -ur visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt |
276 |
---- a/tools/mcurvit/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200 |
277 |
-+++ b/tools/mcurvit/CMakeLists.txt 2015-01-05 15:16:02.400784093 +0100 |
278 |
-@@ -104,9 +104,9 @@ |
279 |
- ) |
280 |
- |
281 |
- SET(VTK_EXTRA_LIBS |
282 |
--vtktiff |
283 |
--vtkjpeg |
284 |
--vtkpng |
285 |
-+tiff |
286 |
-+jpeg |
287 |
-+png |
288 |
- ${VTKZLIB_LIB} |
289 |
- ${VTK_FREETYPE_LIBRARIES} |
290 |
- vtkftgl |
291 |
-diff -ur visit2.8.2-old/src/tools/protocol/CMakeLists.txt visit2.8.2-new/src/tools/protocol/CMakeLists.txt |
292 |
---- a/tools/protocol/CMakeLists.txt 2014-08-11 23:46:14.000000000 +0200 |
293 |
-+++ b/tools/protocol/CMakeLists.txt 2015-01-05 15:12:46.480783795 +0100 |
294 |
-@@ -76,9 +76,9 @@ |
295 |
- ) |
296 |
- |
297 |
- SET(VTK_EXTRA_LIBS |
298 |
--vtktiff |
299 |
--vtkjpeg |
300 |
--vtkpng |
301 |
-+tiff |
302 |
-+jpeg |
303 |
-+png |
304 |
- ${VTKZLIB_LIB} |
305 |
- ${VTK_FREETYPE_LIBRARIES} |
306 |
- vtkftgl |
307 |
-diff -ur visit2.8.2-old/src/viewer/main/CMakeLists.txt visit2.8.2-new/src/viewer/main/CMakeLists.txt |
308 |
---- a/viewer/main/CMakeLists.txt 2014-08-11 23:46:26.000000000 +0200 |
309 |
-+++ b/viewer/main/CMakeLists.txt 2015-01-05 15:12:11.380783741 +0100 |
310 |
-@@ -279,8 +279,8 @@ |
311 |
- ${viewer_exe_IPlot} |
312 |
- ${viewer_exe_VPlot} |
313 |
- viewer |
314 |
-- vtkpng |
315 |
-- vtkjpeg |
316 |
-+ png |
317 |
-+ jpeg |
318 |
- ${VTKZLIB_LIB} |
319 |
- ${VTK_FREETYPE_LIBRARIES} |
320 |
- vtkftgl |
321 |
-diff -ur visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt |
322 |
---- a/visit_vtk/full/CMakeLists.txt 2014-08-11 23:45:14.000000000 +0200 |
323 |
-+++ b/visit_vtk/full/CMakeLists.txt 2015-01-05 15:11:17.680783659 +0100 |
324 |
-@@ -125,9 +125,9 @@ |
325 |
- ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES}) |
326 |
- |
327 |
- IF(HAVE_LIB_R) |
328 |
-- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff vtkFiltersStatisticsGnuR) |
329 |
-+ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR) |
330 |
- ELSE(HAVE_LIB_R) |
331 |
-- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff) |
332 |
-+ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle) |
333 |
- ENDIF(HAVE_LIB_R) |
334 |
- # Add vtk definitions |
335 |
- ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}") |
336 |
|
337 |
diff --git a/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch b/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch |
338 |
deleted file mode 100644 |
339 |
index 39dc8571173..00000000000 |
340 |
--- a/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch |
341 |
+++ /dev/null |
342 |
@@ -1,46 +0,0 @@ |
343 |
-diff -ru visit2.8.2-old/src/tools/annotations/CMakeLists.txt visit2.8.2-new/src/tools/annotations/CMakeLists.txt |
344 |
---- a/tools/annotations/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200 |
345 |
-+++ b/tools/annotations/CMakeLists.txt 2015-01-07 08:19:35.000735956 +0100 |
346 |
-@@ -54,9 +54,9 @@ |
347 |
- # Specify the libraries to link against |
348 |
- TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy) |
349 |
- IF(HAVE_LIB_R) |
350 |
--TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOImage) |
351 |
-+TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOMPIImage) |
352 |
- ELSE(HAVE_LIB_R) |
353 |
--TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOImage) |
354 |
-+TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOMPIImage) |
355 |
- ENDIF(HAVE_LIB_R) |
356 |
- # add vtk definitions |
357 |
- ADD_TARGET_DEFINITIONS(time_annotation "${VTK_DEFINITIONS}") |
358 |
-diff -ru visit2.8.2-old/src/vtkqt/CMakeLists.txt visit2.8.2-new/src/vtkqt/CMakeLists.txt |
359 |
---- a/vtkqt/CMakeLists.txt 2014-08-11 23:46:46.000000000 +0200 |
360 |
-+++ b/vtkqt/CMakeLists.txt 2015-01-07 08:19:00.950735904 +0100 |
361 |
-@@ -64,9 +64,9 @@ |
362 |
- |
363 |
- # Specify the libraries to link against on Windows & Mac |
364 |
- IF(HAVE_LIB_R) |
365 |
-- TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR) |
366 |
-+ TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR) |
367 |
- ELSE(HAVE_LIB_R) |
368 |
-- TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY}) |
369 |
-+ TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY}) |
370 |
- ENDIF(HAVE_LIB_R) |
371 |
- # Add vtk definitions |
372 |
- ADD_TARGET_DEFINITIONS(vtkqt "${VTK_DEFINITIONS}") |
373 |
---- a/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:53.249224731 +0100 |
374 |
-+++ b/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:28.569224460 +0100 |
375 |
-@@ -125,9 +125,11 @@ |
376 |
- ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES}) |
377 |
- |
378 |
- IF(HAVE_LIB_R) |
379 |
-- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR) |
380 |
-+ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction |
381 |
-+ vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR) |
382 |
- ELSE(HAVE_LIB_R) |
383 |
-- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle) |
384 |
-+ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction |
385 |
-+ vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle) |
386 |
- ENDIF(HAVE_LIB_R) |
387 |
- # Add vtk definitions |
388 |
- ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}") |
389 |
|
390 |
diff --git a/sci-visualization/visit/metadata.xml b/sci-visualization/visit/metadata.xml |
391 |
deleted file mode 100644 |
392 |
index ecde19ef8dc..00000000000 |
393 |
--- a/sci-visualization/visit/metadata.xml |
394 |
+++ /dev/null |
395 |
@@ -1,21 +0,0 @@ |
396 |
-<?xml version="1.0" encoding="UTF-8"?> |
397 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
398 |
-<pkgmetadata> |
399 |
- <longdescription> |
400 |
- VisIt is a free, open source, platform independent, distributed, |
401 |
- parallel, visualization tool for visualizing data defined on two- |
402 |
- and three-dimensional structured and unstructured meshes. |
403 |
- </longdescription> |
404 |
- <!-- maintainer-needed --> |
405 |
- <use> |
406 |
- <flag name="cgns"> |
407 |
- Builds the reader for the CFD General Notation System file format. |
408 |
- </flag> |
409 |
- <flag name="silo"> |
410 |
- Adds support for reading .silo files. |
411 |
- </flag> |
412 |
- <flag name="xdmf2"> |
413 |
- Support for xdmf2 formatted data. |
414 |
- </flag> |
415 |
- </use> |
416 |
-</pkgmetadata> |
417 |
|
418 |
diff --git a/sci-visualization/visit/visit-2.12.3-r1.ebuild b/sci-visualization/visit/visit-2.12.3-r1.ebuild |
419 |
deleted file mode 100644 |
420 |
index 14564343708..00000000000 |
421 |
--- a/sci-visualization/visit/visit-2.12.3-r1.ebuild |
422 |
+++ /dev/null |
423 |
@@ -1,119 +0,0 @@ |
424 |
-# Copyright 1999-2018 Gentoo Foundation |
425 |
-# Distributed under the terms of the GNU General Public License v2 |
426 |
- |
427 |
-EAPI=6 |
428 |
- |
429 |
-PYTHON_COMPAT=( python2_7 ) |
430 |
-inherit cmake-utils python-single-r1 qmake-utils |
431 |
- |
432 |
-DESCRIPTION="A software that delivers parallel interactive visualizations" |
433 |
-HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/visit" |
434 |
-SRC_URI="http://portal.nersc.gov/svn/visit/trunk/releases/${PV}/${PN}${PV}.tar.gz" |
435 |
- |
436 |
-LICENSE="BSD" |
437 |
-SLOT="0" |
438 |
-KEYWORDS="~amd64 ~x86" |
439 |
-IUSE="cgns debug hdf5 mpi netcdf silo tcmalloc threads xdmf2" |
440 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
441 |
- |
442 |
-RDEPEND="${PYTHON_DEPS} |
443 |
- dev-qt/designer:5 |
444 |
- dev-qt/qtcore:5 |
445 |
- dev-qt/qtgui:5 |
446 |
- dev-qt/qtnetwork:5 |
447 |
- dev-qt/qtopengl:5 |
448 |
- dev-qt/qtprintsupport:5 |
449 |
- dev-qt/qtwidgets:5 |
450 |
- dev-qt/qtxml:5 |
451 |
- dev-qt/qtx11extras:5 |
452 |
- =sci-libs/vtk-6.1.0*[imaging,mpi=,python,rendering,qt5,xdmf2?,${PYTHON_USEDEP}] |
453 |
- sys-libs/zlib |
454 |
- x11-libs/qwt:6[qt5(+)] |
455 |
- cgns? ( sci-libs/cgnslib ) |
456 |
- hdf5? ( sci-libs/hdf5 ) |
457 |
- netcdf? ( sci-libs/netcdf ) |
458 |
- silo? ( sci-libs/silo ) |
459 |
- tcmalloc? ( dev-util/google-perftools ) |
460 |
-" |
461 |
-DEPEND="${RDEPEND} |
462 |
- xdmf2? ( sci-libs/xdmf2 ) |
463 |
-" |
464 |
- |
465 |
-S="${WORKDIR}/${PN}${PV}/src" |
466 |
- |
467 |
-PATCHES=( |
468 |
- "${FILESDIR}/${P}-findpython.patch" |
469 |
- "${FILESDIR}/${P}-findsilo.patch" |
470 |
- "${FILESDIR}/${P}-findvtk.patch" |
471 |
- "${FILESDIR}/${P}-vtklibs.patch" |
472 |
- "${FILESDIR}/${P}-dont_symlink_visit_dir.patch" |
473 |
- "${FILESDIR}/${P}-cmakelist.patch" |
474 |
- "${FILESDIR}/${P}-qwt.patch" |
475 |
-) |
476 |
- |
477 |
-src_prepare() { |
478 |
- cmake-utils_src_prepare |
479 |
- use mpi && eapply "${FILESDIR}/${P}-vtkmpi.patch" |
480 |
- |
481 |
- sed -i 's/exec python $frontendlauncherpy $0 ${1+"$@"}/exec '${EPYTHON}' \ |
482 |
- $frontendlauncherpy $0 ${1+"$@"}/g' "bin/frontendlauncher" || die |
483 |
-} |
484 |
- |
485 |
-src_configure() { |
486 |
- local mycmakeargs=( |
487 |
- -DCMAKE_INSTALL_PREFIX=/opt/visit |
488 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
489 |
- -DPYTHON_DIR="${EPREFIX}/usr" |
490 |
- -DVISIT_PYTHON_SKIP_INSTALL=true |
491 |
- -DVISIT_VTK_SKIP_INSTALL=true |
492 |
- -DQT_BIN="${EPREFIX}/usr/bin" |
493 |
- -DVISIT_ZLIB_DIR="${EPREFIX}/usr" |
494 |
- -DVISIT_HEADERS_SKIP_INSTALL=false |
495 |
- -DVISIT_QWT_DIR="${EPREFIX}/usr" |
496 |
- -DVISIT_QT5=true |
497 |
- -DVISIT_QT_DIR=$(qt5_get_libdir)/qt5/ |
498 |
- -DUSE_VISIT_THREAD=$(usex threads) |
499 |
- ) |
500 |
- if use hdf5; then |
501 |
- mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr" ) |
502 |
- fi |
503 |
- if use tcmalloc; then |
504 |
- mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr" ) |
505 |
- fi |
506 |
- if use cgns; then |
507 |
- mycmakeargs+=( -DCGNS_DIR="${EPREFIX}/usr" ) |
508 |
- fi |
509 |
- if use silo; then |
510 |
- mycmakeargs+=( -DSILO_DIR="${EPREFIX}/usr" ) |
511 |
- fi |
512 |
- if use netcdf; then |
513 |
- mycmakeargs+=( -DNETCDF_DIR="${EPREFIX}/usr" ) |
514 |
- fi |
515 |
- if use xdmf2; then |
516 |
- mycmakeargs+=( -DOPT_VTK_MODS="vtklibxml2" -DVISIT_XDMF_DIR=/usr/ ) |
517 |
- fi |
518 |
- |
519 |
- cmake-utils_src_configure |
520 |
-} |
521 |
- |
522 |
-src_install() { |
523 |
- cmake-utils_src_install |
524 |
- |
525 |
- PACKAGES_DIR="${ROOT}opt/${PN}/${PV}/linux-$(arch)/lib/site-packages" |
526 |
- cd "${ED}${PACKAGES_DIR}" |
527 |
- for i in *; do |
528 |
- dosym "${PACKAGES_DIR}/${i}" "$(python_get_sitedir)/$i" |
529 |
- done |
530 |
- |
531 |
- cat > "${T}"/99visit <<- EOF |
532 |
- PATH=${EPREFIX}/opt/${PN}/bin |
533 |
- LDPATH=${EPREFIX}/opt/${PN}/${PV}/linux-$(arch)/lib/ |
534 |
- EOF |
535 |
- doenvd "${T}"/99visit |
536 |
-} |
537 |
- |
538 |
-pkg_postinst () { |
539 |
- ewarn "Remember to run " |
540 |
- ewarn "env-update && source /etc/profile" |
541 |
- ewarn "if you want to use visit in already opened session" |
542 |
-} |