gentoo resync : 10.04.2018

5 files changed, 2 insertions, 98 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 5f0632e64a6a..e5245276eacd 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index d3b13b0d6011..a0c190b4875a 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -5,7 +5,6 @@ AUX opendx-4.4.4-gcc43.patch 13310 BLAKE2B 4e4a2240d76e44010b8e736cfb8de99b816d1
 AUX opendx-4.4.4-installpaths.patch 11983 BLAKE2B 052cb3c1bbe3a45852f2cfc0fa8e2d0c0242598c6641ed11062365f1511af9baf8b5ea17da4b2bd741455fd30032e0e8c3c5eefe2c4169ff4c00492fa971d210 SHA512 a06e21431540138a412ad80168d493495cc2808b2d677efc1055b40875610b94e2089dc58f1d1b693eae590e35c95281d17fcaa9af322e3638dccc6d003c5cff
 AUX opendx-4.4.4-invalid-conversion.patch 558 BLAKE2B 073e8119b0ef2f80c5bf593ba465a5b513b5c1808569806fc4f63b3f2d74c8d4621469424d42e59efa3b1d44b7cf215a37bca5dcf2b96795e13e9fcde0b16676 SHA512 f613ede076bb15beca5299fa5e4eb71470be455533922618b40d3580041d3cc3eccf912ac5e885f663770e68e688f71c5f3605856168e2e8d761314fede4000d
 AUX opendx-4.4.4-libtool.patch 319 BLAKE2B 137d0251df4c12a889ae97f628338fa88d4fee01fa4cf4e312be0646ab1da674b1aed5028a551e953fbf08cbb7f3604d5bb3d6d94c836c3f3337d19a67d625a2 SHA512 a98d7a19f1e9c096bc9e7ffdfb9e7a6237bf3599a4f6c29aa3994a0c91653e7369626e86ea69f0d32d6b6dcecb9bc889a888fcddde81d9ca52272be49e957864
-AUX opendx-4.4.4-magick.patch 2863 BLAKE2B 049e0f49054dd55ae599f58c57f90561b802859a0207928d136e413de7a8e76117ae9393a5c57d020422553434f331a306451018240d7964aa13b389759e865f SHA512 e7c35a68768bd58015dbb0d705c4ea82ec09306b5b3e738d45ab4a20fa3ae30b2372c12af55470e59d2b44b3a1bc9bf7bb11289b8c4127b41242772f5ccbcf97
 AUX opendx-4.4.4-null.patch 584 BLAKE2B 6ad58c7c1001069c80a7e9f99059203ce8d0fc87ccf6c25d9812c51aa1eea01a325c8606947c0faaefac7e4022892e444739c47e58efcb52072961c91d65b89c SHA512 9af10aebd267b181be4ade5009987cffaeabc5e1ff68343e63f836722098ffffa813a8b0c6c514b088221dbb5c4a654dd3a756449069fa0ef8edebc8cffb35b5
 AUX opendx-4.4.4-open.patch 1671 BLAKE2B 86578e560c1e7cae30dae208cee14ce64e73362e3c5ab6495be58cf2bc3e4eee6422c0f7d58faa6d3d09ba5503783469f82e6f3a759ed79b268e666938e6c41a SHA512 a35889802f28fc7fa91e887c8c8fc9fc6c7757c877e7469f1b01835de2c8c59c3f29a52e3dc6f30587dfd45f30b0783679273af28820c0120c28733dfed12a38
 AUX opendx-4.4.4-szip.patch 1409 BLAKE2B aee4ce76798a95299d3d41c60f584e011f18e390bc8143968c27ea5bcfbff4ceb3119f46de7b66f96ddb820a88ab15aa4d609b693163aa182bbddbe9d89f7e76 SHA512 50084839a1033e377dda52ec12ce80030555618c9baed7ec36a7eaa5a812e014c22f6a745bb8663fd0763db1a431f0d5c21cca5fcef51dc20c17c2daa0d411a4
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-magick.patch b/sci-visualization/opendx/files/opendx-4.4.4-magick.patch
deleted file mode 100644
index 5b50470970c3..000000000000
--- a/sci-visualization/opendx/files/opendx-4.4.4-magick.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-newer magick libraries, use pkg-config, add possibility to link with
-graphicsmagick, fix for as-needed
-
---- dx-4.4.4.orig/src/exec/dxmods/_im_image.c
-+++ dx-4.4.4/src/exec/dxmods/_im_image.c
-@@ -329,7 +329,7 @@
-             DestroyImageInfo(new_frame_info);
-             DestroyImageInfo(image_info);
- #if MagickLibVersion > 0x0537
--            DestroyConstitute();
-+            ConstituteComponentTerminus();
- #endif
-              DXSetError(ERROR_INTERNAL, "reason = %s, description = %s",
-                         image->exception.reason,
-@@ -346,7 +346,7 @@
-             DestroyImageInfo(new_frame_info);
-             DestroyImageInfo(image_info);
- #if MagickLibVersion > 0x0537
--            DestroyConstitute();
-+            ConstituteComponentTerminus();
- #endif
-             DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c");
-         }
-@@ -375,7 +375,7 @@
-         DestroyImageInfo(image_info);
-         DestroyImageInfo(new_frame_info);
- #if MagickLibVersion > 0x0537
--        DestroyConstitute();
-+        ConstituteComponentTerminus();
- #endif
-         
-         DEBUGMESSAGE("back from DestroyImage");
-@@ -491,7 +491,7 @@
-         DestroyImage(image);
-         DestroyImageInfo(image_info);
- #if MagickLibVersion > 0x0537
--        DestroyConstitute();
-+        ConstituteComponentTerminus();
- #endif
-     }
-     return (OK);
---- dx-4.4.4.orig/configure.ac
-+++ dx-4.4.4/configure.ac
-@@ -799,7 +799,29 @@
- LIB_MAGICK=''
- if test "$with_magick" != 'no'
- then
--    AS_MESSAGE([checking for ImageMagick support ......])
-+    found=0
-+    static_lib="libGraphicsMagick.a"
-+    PKG_CHECK_MODULES(GraphicsMagick, GraphicsMagick, [found=1], [found=0])
-+    MAGICK_CFLAGS="$GraphicsMagick_CFLAGS"
-+    MAGICK_LIBS="$GraphicsMagick_LIBS"
-+    if test $found -eq 0
-+    then
-+        static_lib="libMagick.a"
-+        PKG_CHECK_MODULES(ImageMagick, ImageMagick, [found=1], [found=0])
-+        MAGICK_CFLAGS="$ImageMagick_CFLAGS"
-+        MAGICK_LIBS="$ImageMagick_LIBS"
-+    fi
-+    if test $found -eq 1
-+    then
-+	CFLAGS="$CFLAGS $MAGICK_CFLAGS"
-+dnl UNIQUIFY will remove duplicate library tokens leaving the last instance.
-+	AC_UTILS_UNIQUIFY([$LIBS $MAGICK_LIBS], LIBS)
-+	FMT_LIBS="$FMT_LIBS $static_lib"
-+	AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries])
-+        have_magick='yes'
-+dnl legacy checks installations without pkg-config
-+    else
-+    AS_MESSAGE([checking for ImageMagick support (no pkg-config) ......])
-     AC_CHECK_PROG(HAVE_MC, Magick-config, yes, no)
- 
-     failed=0;
-@@ -866,6 +888,7 @@
-   fi
- fi
- fi
-+fi
- 
- AC_LANG([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a = true;]])],
---- dx-4.4.4.orig/src/exec/dxmods/Makefile.am
-+++ dx-4.4.4/src/exec/dxmods/Makefile.am
-@@ -113,4 +113,5 @@
- 	$(SOURCES6) \
- 	$(SOURCES7)
- 
-+libDXMODS_la_LIBADD = @MAGICK_LIBS@
- @LOCALMAKE@
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index d2b082337bb5..c5b17e35eb3f 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -4,5 +4,5 @@ AUX paraview-5.4.1-jsoncpp_1.8.4.patch 787 BLAKE2B 1978d56feb0d25fb4730dac013880
 DIST ParaView-v5.3.0.tar.gz 45173528 BLAKE2B 878e8dae0b5de4bee5d72a4a272a5048fa587fac8e949d39c8e040b9fe3553b787e53f183ae98d20f24755db7e355280b85a9f572037764c53740de2eb4a9e30 SHA512 3dc3c2a1c27a0f0dc82fc04ce84477a26aacb329d6ea42c276c4204e39d11bc78adbc1807e1e7168aade31aa48b6d628775841b8b94b5122084eac46e358a23f
 DIST ParaView-v5.4.1.tar.gz 43783720 BLAKE2B 2197d7f390b7192eb58ad67b88c84119da35fc4229547a42ef12a600874304addb410d0a53684a785855f617011762bf6a819231821f0bff8ee226111df8e577 SHA512 6a720f9ed9e03b7b97f0e84bb6d67b2a28c4ffc5079427d544e9522ce313264eed273c9b7ae13b11e34ab4de903132a22bacc337452d1e9da9876416449520f5
 EBUILD paraview-5.3.0.ebuild 9230 BLAKE2B c65d17b150e9a9aacaa9a98331556d06422140cde16a066df2ae2107fe35fd445d6f6b427b6cee9a7cbcbb21c7ea451a6973079490bc473e1cd981c4ea81cace SHA512 7d8ea25c399d2951b3892d50c429cf136a5c9d7be199a0b55978d1ee3dc0228298ba79e69f57358e3cce9517804e509d6680ba700552e1f86e277693164c6cec
-EBUILD paraview-5.4.1.ebuild 8315 BLAKE2B f89db2b9909c164b5742387336905ed6345993c31de0eed15d2eccd34e4cf3fc7fcb6da1555eac6039d8261f7fb07c4713ff343b10569ea6d62a15e27ab9e471 SHA512 48c83c2aa241f2336d6ed876583fb6cf012c85d88599d1e9e9cba795251d73c2ebc8eac605381adf37363ca3c2b3b213a4cccc53c607327b17956bc13ab2309e
+EBUILD paraview-5.4.1.ebuild 8171 BLAKE2B 3c93b9f6cce92c4e974eee32b75d43b4e0c8f1ee5a8b533279444e018b863ca47f4e8122c45d8d4803ef1a5886ab530f61f842c2af36f81d08e19e9e1b3492b7 SHA512 862f9b25809cb12768f2f4abea89d666dadea82cce53f10fe52c7146f93a201098652c8ed4df829688df311a647f9fc257c0f4ce3b0ab033d0bb0e4c2ebe03bd
 MISC metadata.xml 748 BLAKE2B 25046c08c0a8df768efba10cae82ef24d583776d21ddda5fd65f895e11214ca9745205458f27e96f45d83fd0d6e77d5f2c12653206eaef09f398fa7a9275418e SHA512 5354c12b5448883903bca724a5d3adfc1cccf352d378317f7ab43f3e4125e2329d9477081eff7e37c8602aaba2aa6df0c73a240d409541017555920f57847d65
diff --git a/sci-visualization/paraview/paraview-5.4.1.ebuild b/sci-visualization/paraview/paraview-5.4.1.ebuild
index ebd30586b09a..acefd924baed 100644
--- a/sci-visualization/paraview/paraview-5.4.1.ebuild
+++ b/sci-visualization/paraview/paraview-5.4.1.ebuild
@@ -114,6 +114,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+	cmake-utils_src_prepare
 
 	# lib64 fixes
 	sed -i \
@@ -152,7 +153,6 @@ src_configure() {
 		-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
 		-DBUILD_SHARED_LIBS=ON
 		-DCMAKE_COLOR_MAKEFILE=TRUE
-		-DCMAKE_USE_PTHREADS=ON
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DVTK_Group_StandAlone=ON
 		-DVTK_RENDERING_BACKEND=OpenGL2
@@ -161,7 +161,6 @@ src_configure() {
 		# -DVTK_USE_SYSTEM_AUTOBAHN once we transitioned to Python 3...
 		-DVTK_USE_SYSTEM_CGNS=ON
 		-DVTK_USE_SYSTEM_PUGIXML=ON
-		-DVTK_USE_SYSTEM_PYGMENTS=ON
 		-DVTK_USE_SYSTEM_EXPAT=ON
 		-DVTK_USE_SYSTEM_FREETYPE=ON
 		-DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
@@ -173,18 +172,14 @@ src_configure() {
 		-DVTK_USE_SYSTEM_LIBHARU=OFF # doesn't compile, requires modified sources
 		-DVTK_USE_SYSTEM_LIBXML2=ON
 		-DVTK_USE_SYSTEM_LZ4=ON
-		-DVTK_USE_SYSTEM_MPI4PY=ON
 		-DVTK_USE_SYSTEM_NETCDF=ON
 		-DVTK_USE_SYSTEM_OGGTHEORA=ON
 		-DVTK_USE_SYSTEM_PNG=ON
 		-DVTK_USE_SYSTEM_PROTOBUF=ON
-		-DVTK_USE_SYSTEM_SIX=ON
 		-DVTK_USE_SYSTEM_TIFF=ON
 		-DVTK_USE_SYSTEM_XDMF2=ON
-		-DVTK_USE_SYSTEM_TWISTED=ON
 		-DVTK_USE_SYSTEM_XDMF2=OFF
 		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
 		# force this module due to incorrect build system deps
 		# wrt bug 460528
 		-DModule_vtkUtilitiesProcessXML=ON