Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/, sys-cluster/openmpi/, ...
Date: Tue, 22 May 2018 22:25:46
Message-Id: 1527027926.bdf54b77ee8152d9240e83ffe1250723bc199653.tamiko@gentoo
1 commit: bdf54b77ee8152d9240e83ffe1250723bc199653
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 22 17:02:38 2018 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Tue May 22 22:25:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf54b77
7
8 sci-visualization/paraview: version bump to 5.5.0
9
10 Package-Manager: Portage-2.3.38, Repoman-2.3.9
11
12 sci-visualization/paraview/Manifest | 1 +
13 .../paraview-5.5.0-allow_custom_build_type.patch | 18 ++
14 sci-visualization/paraview/paraview-5.5.0.ebuild | 281 +++++++++++++++++++++
15 sys-cluster/openmpi/Manifest | 1 +
16 4 files changed, 301 insertions(+)
17
18 diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
19 index de7bfe7a43c..90a7a061616 100644
20 --- a/sci-visualization/paraview/Manifest
21 +++ b/sci-visualization/paraview/Manifest
22 @@ -1,2 +1,3 @@
23 DIST ParaView-v5.3.0.tar.gz 45173528 BLAKE2B 878e8dae0b5de4bee5d72a4a272a5048fa587fac8e949d39c8e040b9fe3553b787e53f183ae98d20f24755db7e355280b85a9f572037764c53740de2eb4a9e30 SHA512 3dc3c2a1c27a0f0dc82fc04ce84477a26aacb329d6ea42c276c4204e39d11bc78adbc1807e1e7168aade31aa48b6d628775841b8b94b5122084eac46e358a23f
24 DIST ParaView-v5.4.1.tar.gz 43783720 BLAKE2B 2197d7f390b7192eb58ad67b88c84119da35fc4229547a42ef12a600874304addb410d0a53684a785855f617011762bf6a819231821f0bff8ee226111df8e577 SHA512 6a720f9ed9e03b7b97f0e84bb6d67b2a28c4ffc5079427d544e9522ce313264eed273c9b7ae13b11e34ab4de903132a22bacc337452d1e9da9876416449520f5
25 +DIST ParaView-v5.5.0.tar.gz 51414419 BLAKE2B 832a01701d21f463c07186912501796756c2477063803fa3b2b67dbb9ac2c9db28a45a8b3d22077085255adf16eb429c3289093848b3712ebab46c0ae4c17956 SHA512 0915eac75a710736334fa9d436369a14546e2f90a1b55f9a0f7a96fedb94ced043d27576d2a179f275478be17e326cd3bee76f06266a776d586f6510722f3172
26
27 diff --git a/sci-visualization/paraview/files/paraview-5.5.0-allow_custom_build_type.patch b/sci-visualization/paraview/files/paraview-5.5.0-allow_custom_build_type.patch
28 new file mode 100644
29 index 00000000000..1549e58af86
30 --- /dev/null
31 +++ b/sci-visualization/paraview/files/paraview-5.5.0-allow_custom_build_type.patch
32 @@ -0,0 +1,18 @@
33 +diff -urNd ParaView-v5.5.0/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt ParaView-v5.5.0-fix/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt
34 +--- ParaView-v5.5.0/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt 2018-04-07 06:03:33.000000000 +1000
35 ++++ ParaView-v5.5.0-fix/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt 2018-04-10 16:19:08.841144557 +1000
36 +@@ -21,14 +21,6 @@
37 + set(CMAKE_BUILD_TYPE "Release")
38 + endif()
39 +
40 +-string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
41 +-if( NOT cmake_build_type_tolower STREQUAL "debug"
42 +- AND NOT cmake_build_type_tolower STREQUAL "release"
43 +- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
44 +- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
45 +-endif()
46 +-
47 +-
48 + #############################################################################
49 + # retrieve version infomation #
50 + #############################################################################
51
52 diff --git a/sci-visualization/paraview/paraview-5.5.0.ebuild b/sci-visualization/paraview/paraview-5.5.0.ebuild
53 new file mode 100644
54 index 00000000000..580afbbb19f
55 --- /dev/null
56 +++ b/sci-visualization/paraview/paraview-5.5.0.ebuild
57 @@ -0,0 +1,281 @@
58 +# Copyright 1999-2018 Gentoo Foundation
59 +# Distributed under the terms of the GNU General Public License v2
60 +
61 +EAPI=6
62 +
63 +PYTHON_COMPAT=( python2_7 )
64 +inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
65 +
66 +MAIN_PV=$(get_major_version)
67 +MAJOR_PV=$(get_version_component_range 1-2)
68 +MY_P="ParaView-v${PV}"
69 +
70 +DESCRIPTION="ParaView is a powerful scientific data visualization application"
71 +HOMEPAGE="http://www.paraview.org"
72 +SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
73 +RESTRICT="mirror"
74 +
75 +LICENSE="paraview GPL-2"
76 +KEYWORDS="~amd64 ~x86"
77 +SLOT="0"
78 +IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk"
79 +RESTRICT="test"
80 +
81 +REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
82 + mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
83 +
84 +RDEPEND="
85 + app-arch/lz4
86 + dev-libs/expat
87 + dev-libs/jsoncpp
88 + dev-libs/libxml2:2
89 + dev-libs/protobuf
90 + dev-libs/pugixml
91 + media-libs/freetype
92 + media-libs/glew:0
93 + media-libs/libpng:0
94 + media-libs/libtheora
95 + media-libs/tiff:0=
96 + sci-libs/cgnslib
97 + sci-libs/hdf5[mpi=]
98 + >=sci-libs/netcdf-4.2[hdf5]
99 + >=sci-libs/netcdf-cxx-4.2:3
100 + sci-libs/xdmf2
101 + sys-libs/zlib
102 + virtual/glu
103 + virtual/jpeg:0
104 + virtual/opengl
105 + x11-libs/libX11
106 + x11-libs/libXext
107 + x11-libs/libXmu
108 + x11-libs/libXt
109 + coprocessing? (
110 + plugins? (
111 + dev-python/PyQt5
112 + dev-qt/qtgui:5[-gles2]
113 + )
114 + )
115 + ffmpeg? ( virtual/ffmpeg )
116 + mpi? ( virtual/mpi[cxx,romio] )
117 + mysql? ( virtual/mysql )
118 + python? (
119 + ${PYTHON_DEPS}
120 + dev-python/constantly[${PYTHON_USEDEP}]
121 + dev-python/incremental[${PYTHON_USEDEP}]
122 + dev-python/matplotlib[${PYTHON_USEDEP}]
123 + dev-python/numpy[${PYTHON_USEDEP}]
124 + dev-python/pygments[${PYTHON_USEDEP}]
125 + dev-python/sip[${PYTHON_USEDEP}]
126 + dev-python/six[${PYTHON_USEDEP}]
127 + dev-python/twisted-core[${PYTHON_USEDEP}]
128 + dev-python/zope-interface[${PYTHON_USEDEP}]
129 + mpi? ( dev-python/mpi4py )
130 + qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
131 + )
132 + qt5? (
133 + dev-qt/designer:5
134 + dev-qt/qtgui:5[-gles2]
135 + dev-qt/qthelp:5
136 + dev-qt/qtopengl:5[-gles2]
137 + dev-qt/qtsql:5
138 + dev-qt/qttest:5
139 + dev-qt/qtwebkit:5
140 + dev-qt/qtx11extras:5
141 + )
142 + sqlite? ( dev-db/sqlite:3 )
143 + tcl? ( dev-lang/tcl:0= )
144 + tk? ( dev-lang/tk:0= )"
145 +DEPEND="${RDEPEND}
146 + ${PYTHON_DEPS}
147 + >=dev-util/cmake-3.4
148 + boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
149 + doc? ( app-doc/doxygen )"
150 +
151 +S="${WORKDIR}/${MY_P}"
152 +
153 +PATCHES=(
154 + "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
155 + "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
156 + "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
157 +)
158 +
159 +pkg_pretend() {
160 + if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
161 + eerror "For USE=openmp a gcc with openmp support is required"
162 + eerror
163 + return 1
164 + fi
165 +}
166 +
167 +pkg_setup() {
168 + python-single-r1_pkg_setup
169 + PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
170 +}
171 +
172 +src_prepare() {
173 + cmake-utils_src_prepare
174 +
175 + # lib64 fixes
176 + sed -i \
177 + -e "s:/lib/python:/$(get_libdir)/python:g" \
178 + VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
179 + sed -i \
180 + -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
181 + ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
182 +}
183 +
184 +src_configure() {
185 + if use qt5; then
186 + export QT_SELECT=qt5
187 + fi
188 +
189 + local mycmakeargs=(
190 + -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
191 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
192 + -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
193 + -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
194 + -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
195 + -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
196 + -DBUILD_SHARED_LIBS=ON
197 + -DCMAKE_COLOR_MAKEFILE=TRUE
198 + -DCMAKE_VERBOSE_MAKEFILE=ON
199 + -DVTK_Group_StandAlone=ON
200 + -DVTK_RENDERING_BACKEND=OpenGL2
201 + -DVTK_USE_FFMPEG_ENCODER=OFF
202 + -DVTK_USE_OFFSCREEN=TRUE
203 + # -DVTK_USE_SYSTEM_AUTOBAHN once we transitioned to Python 3...
204 + -DVTK_USE_SYSTEM_CGNS=ON
205 + -DVTK_USE_SYSTEM_PUGIXML=ON
206 + -DVTK_USE_SYSTEM_EXPAT=ON
207 + -DVTK_USE_SYSTEM_FREETYPE=ON
208 + -DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
209 + -DVTK_USE_SYSTEM_GLEW=ON
210 + -DVTK_USE_SYSTEM_HDF5=ON
211 + -DVTK_USE_SYSTEM_INCREMENTAL=ON
212 + -DVTK_USE_SYSTEM_JPEG=ON
213 + -DVTK_USE_SYSTEM_JSONCPP=ON
214 + -DVTK_USE_SYSTEM_LIBHARU=OFF # doesn't compile, requires modified sources
215 + -DVTK_USE_SYSTEM_LIBXML2=ON
216 + -DVTK_USE_SYSTEM_LZ4=ON
217 + -DVTK_USE_SYSTEM_NETCDF=ON
218 + -DVTK_USE_SYSTEM_OGGTHEORA=ON
219 + -DVTK_USE_SYSTEM_PNG=ON
220 + -DVTK_USE_SYSTEM_PROTOBUF=ON
221 + -DVTK_USE_SYSTEM_TIFF=ON
222 + -DVTK_USE_SYSTEM_XDMF2=ON
223 + -DVTK_USE_SYSTEM_XDMF2=OFF
224 + -DVTK_USE_SYSTEM_ZLIB=ON
225 + # force this module due to incorrect build system deps
226 + # wrt bug 460528
227 + -DModule_vtkUtilitiesProcessXML=ON
228 + )
229 +
230 + mycmakeargs+=(
231 + -DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
232 +
233 + -DModule_vtkGUISupportQtOpenGL="$(usex qt5)"
234 + -DModule_vtkGUISupportQtSQL="$(usex qt5)"
235 + -DModule_vtkGUISupportQtWebkit="$(usex qt5)"
236 + -DModule_vtkRenderingQt="$(usex qt5)"
237 + -DModule_vtkViewsQt="$(usex qt5)"
238 + -DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
239 + -DVTK_Group_ParaViewQt="$(usex qt5)"
240 + -DVTK_Group_Qt="$(usex qt5)"
241 + -DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
242 + $(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
243 + -DVTK_USE_NVCONTROL="$(usex nvcontrol)"
244 +
245 + -DModule_vtkInfovisBoost="$(usex boost)"
246 +
247 + -DPARAVIEW_USE_ICE_T="$(usex mpi)"
248 + -DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
249 + -DPARAVIEW_USE_MPI="$(usex mpi)"
250 + -DVTK_Group_MPI="$(usex mpi)"
251 + -DVTK_XDMF_USE_MPI="$(usex mpi)"
252 + -DXDMF_BUILD_MPI="$(usex mpi)"
253 +
254 + -DModule_AutobahnPython="$(usex python)"
255 + -DModule_pqPython="$(usex python)"
256 + -DModule_Twisted="$(usex python)"
257 + -DModule_vtkmpi4py="$(usex python)"
258 + -DModule_vtkPython="$(usex python)"
259 + -DModule_vtkWrappingPythonCore="$(usex python)"
260 + -DModule_ZopeInterface="$(usex python)"
261 + -DPARAVIEW_ENABLE_PYTHON="$(usex python)"
262 + -DXDMF_WRAP_PYTHON="$(usex python)"
263 +
264 + -DBUILD_DOCUMENTATION="$(usex doc)"
265 +
266 + -DBUILD_EXAMPLES="$(usex examples)"
267 +
268 + -DModule_vtkIOMySQL="$(usex mysql)"
269 +
270 + -DModule_vtksqlite="$(usex sqlite)"
271 +
272 + -DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
273 +
274 + -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
275 + -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
276 + -DModule_vtkIOFFMPEG="$(usex ffmpeg)"
277 +
278 + -DVTK_Group_Tk="$(usex tk)"
279 + -DVTK_USE_TK="$(usex tk)"
280 + -DModule_vtkRenderingTk="$(usex tk)"
281 + -DModule_vtkTclTk="$(usex tcl)"
282 + -DModule_vtkWrappingTcl="$(usex tcl)"
283 + -DBUILD_TESTING="$(usex test)"
284 + )
285 +
286 + if use openmp; then
287 + mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
288 + fi
289 +
290 + # TODO: MantaView VaporPlugin VRPlugin
291 + mycmakeargs+=(
292 + -DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
293 + -DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
294 + -DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
295 + -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
296 + -DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
297 + -DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
298 + -DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
299 + -DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
300 + -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
301 + -DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
302 + -DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
303 + -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
304 + # these are always needed for plugins
305 + -DModule_vtkFiltersFlowPaths="$(usex plugins)"
306 + -DModule_vtkPVServerManagerApplication="$(usex plugins)"
307 + )
308 +
309 + cmake-utils_src_configure
310 +}
311 +
312 +src_compile() {
313 + cmake-utils_src_compile
314 +}
315 +
316 +src_install() {
317 + cmake-utils_src_install
318 +
319 + # remove wrapper binaries and put the actual executable in place
320 + for i in "${ED}"/usr/bin/*; do
321 + mv "${ED}"/usr/lib/"$(basename $i)" "$i" || die
322 + done
323 +
324 + # install libraries into correct directory respecting get_libdir:
325 + mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
326 + mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
327 + mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
328 + rmdir "${ED}"/usr/lib_tmp || die
329 +
330 + # set up the environment
331 + echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
332 + doenvd "${T}"/40${PN}
333 +
334 + newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
335 + make_desktop_entry paraview "Paraview" paraview
336 +
337 + use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
338 +}
339
340 diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
341 index 5312125db61..7faa634d496 100644
342 --- a/sys-cluster/openmpi/Manifest
343 +++ b/sys-cluster/openmpi/Manifest
344 @@ -11,3 +11,4 @@ DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8
345 DIST openmpi-2.1.3.tar.bz2 8311304 BLAKE2B a6a2d0d759a7207e4e9e9bb1526825ce5b0c9acd22c113f71712381fd7cab55228e78294533a5af6ef2b243803d789c5c71c6d59dd7a8ebbf10b2aa5d99296fd SHA512 61ecf53d840feb4cad1e792225c7fb07a8c4cb849f21693051359cde2cf1b5060de3a9d00ba3b55ded20b5b93bc5ac439951b4fe5cb1a74d4e800f26c979feba
346 DIST openmpi-3.0.0.tar.bz2 9267606 BLAKE2B 9ee569a9c5f5918bb3d389a2945a2e7a5d98464afbd111eb2426a4e8296a23cf6d5b558554ce8126b13f910bd59acbb77e93ac297f3cf222c4bc764836b39ee6 SHA512 7e37eacf959a803d6d89dff4291b64a1f3d83bc7941b778a2fb13d12be0f205cb904e4a807d79676ad1e31fd99ffb15f255c8a227e830673455abb144f14616a
347 DIST openmpi-3.0.1.tar.bz2 9176460 BLAKE2B 65fdaeb492da3cf86a68c2d47d19568c8d65e92d0202041853ae3cbe0f057d8bdc79953538921b5b8c9eb9c9cedab8502816985e12524704992069a51e08d857 SHA512 15fad504ba743d564e7196b62a112027798d4b26e9c8d11d9c1c00ac2968f1858ebc168df30473104c5a31f71e38ab558204b598260b535a12b6094aa77182b8
348 +DIST openmpi-3.1.0.tar.bz2 9443759 BLAKE2B 7670b2cec327bad1bf348e08def3d39ea0b971c9534ec3e462a56719c4a1ebc8ceaf4a76556d0213cc2b7610c26f849d881f84ceaaaf54645ffbcefbd0273663 SHA512 23a43a16683c4b56f96c711fe009d992f3bd4e10cf9ef55091865a5b1aed195cc1de6a87720564f70d3b60a2441966bab39cda8969293aeb118cda10aead3dee