gentoo resync : 02.04.2018

12 files changed, 141 insertions, 188 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 3e7c0327a7a5..5f0632e64a6a 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index d603e5dffbb0..4653edc54a48 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -7,7 +7,7 @@ DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e878
 DIST gnuplot-5.2.2.tar.gz 5282973 BLAKE2B a15c72aaa8d62079ea3e9f20fa9fe3aaaf6036cf8dc67a784dee79ac7bd0ad7bfac754c9583b50c46deeef2f1bcd920d1094a5d1e19a1dae75405de8c3249621 SHA512 51d5b2234dae358580cc2794ed63f8a5b950baf73edc5362f5bb18d77e8066c3c010239c3b29840db11e5936cb9381bb57193de751bd274af5547a45d6d88b0b
 EBUILD gnuplot-5.0.1-r1.ebuild 5692 BLAKE2B 62aa0d443aeb5690a274c1a7e389e506a152eac52a4d0ec36d412158c7bd963a8eee6d558b9f2b1608b4d8612879a34b89f476f21ebef5c4d73fc95c28f2e70d SHA512 6058590102387ce8899f50f2621fdb6221b2faa5f9778cda0cea465aa1501bc78c02c6e769f3f05297c8769f48087787fe20a9af7bc6e7038752c82d68993849
 EBUILD gnuplot-5.0.6.ebuild 5894 BLAKE2B d8941924ae4636d6d5cbd91307c89619940c7a56f99e4f34bd60f21588104b70b768e85917805ba58e374a980652ebaf47790787db1169a1ff2151fac80ff835 SHA512 d472d7e9f63f8ffb53f749aeceb49eda3036e2303b509c7829e7fa003582e1e03dcf38b7f4a7a7c69fb39842cc17db09ca470e1b0bf52950cef3b0a352a8e451
-EBUILD gnuplot-5.0.7.ebuild 5841 BLAKE2B 5ec51b1cb3af96cdaac5e4f8b32a9138963a7576d895f0abb52d81908c3231049c72553ac0f7e7c64f6b5ba122e01c1902237e9caa76f7652d24f08616540b57 SHA512 88d2277cf778b486a56c0f1bf20f729158811a4286f292542b1ce7ec47afb11cf62d2b238aba365b6a3a9331af16feff2ed4e1e5f55ea55e0ceac15ce90feabc
+EBUILD gnuplot-5.0.7.ebuild 5846 BLAKE2B cbdc0289eb84becfbd1077dbe98c1b4e8129d30c3cefce735f813206682462d017b393b996b67493aacb95db383cd3d12607ca557861f384b91e119fe4400dd3 SHA512 224ef4d41d5367f888289c28c87c64e262b88dc52739d5c25605360aeaf669b92b9df5c518fb30dce32e77e85b6c8da5c0715a21e73413f9ad4aea1c90cb4b9b
 EBUILD gnuplot-5.2.2.ebuild 5860 BLAKE2B 1c1cb9b7e2ac370674628a8bd9d1e444a60aae2967eca5d53bcbd52202d8f3e4623071da33ab12c2f58462855bcb871bf3edd8c42da7082e6a7616a282ee826e SHA512 ae23cfd5c27f35102e76dba5f204b69b5a5df8e7e41ede76be867043233a3611ca17420217c7adc3045a5f8480483253a34771dd3c97e2d59881607344a41e96
 EBUILD gnuplot-5.2.9999.ebuild 5807 BLAKE2B 3a2afe5f7ac171bd54334c94ac51d7ecf289ef19d4ff0109598e997a1174bf1451885ba885c86e03ec488cbe7ce2df9a21a26e4f1dcfd30e7dd1e7cf4aee1e27 SHA512 c197bda66704c895b49a0935bdfa20fd8e85c9460966ad621a46f0bc195e1648c3329e53d3be43dab137fb4eb9ebdb84727e82ff748e02f9aadd0e5be21909d1
 EBUILD gnuplot-5.3.9999.ebuild 5794 BLAKE2B ca534f75fe5a9c39d93b9e750ec020aecacf426bec9c1852ce21879b44cbcb3e77c2599ea52dc02b69fb20b8a94a34b97225f5c793ea820985b40017ba5ecba5 SHA512 501777c51d6fd6fb63106857a25bdfc1038bcbaed039d5e9e351f2e80043ed88d90055f611c72964f60b4fe948d562db6ebe2c1c9adf1fb10940666c1d147d42
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index 80fcbdd5ab5d..bc81e2f3988a 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
@@ -17,11 +17,11 @@ if [[ -z ${PV%%*9999} ]]; then
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
 	SRC_URI=""
-	KEYWORDS="amd64 ia64 x86"
+	KEYWORDS="alpha amd64 ia64 x86"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sci-visualization/opendx-samples/Manifest b/sci-visualization/opendx-samples/Manifest
index dd75eb3a2298..56d768e63225 100644
--- a/sci-visualization/opendx-samples/Manifest
+++ b/sci-visualization/opendx-samples/Manifest
@@ -1,5 +1,5 @@
 AUX opendx-samples-4.4.0-nojava.patch 1744 BLAKE2B 56ac7ca38c06717250bb2fabb9d28d047c86e66df06d28a3c90eb16a5f8738ecf24fa6f98e9b30d559ed4af6c04f7c1f193138d12ab071c23edc2719cee0c65a SHA512 ae72bab2a2c130263d75e4b7254b6e210c55b80eed9621493f66b2221fd92451378bb86ae1c9e4a4997a18d5902576fde5cfa9ef84660f65a6310de595d5d29f
 DIST dxsamples-4.4.0.tar.gz 7791659 BLAKE2B f3fb5ac4990ed13718390229debd8f72f84f1b751dae6e6497388e31e0e8f3869d9c30cc7e2e2b5a58fc0e32aab3127751451c616c0081606f28dd41250d9924 SHA512 ae740be888728750de2cf21e94094a4aa01adec8ea0cfe937f03a67803ad7cb0d92968c8d4325e22022c698f871d4af45df02d3b8e8639434a1001dd46e0b311
 DIST opendx-samples-4.4.0-install.patch.bz2 4195 BLAKE2B eb520ac16311e4252f36b7911ebff11f21cf16fa3d3b31a8e1209c28d66e78ae66b57c3b3edd4db66f26e82a25f3675c9a5e0ad146bb1b4ed74d1196007cc836 SHA512 3c276355d0796b2713d42ea11ce34d02c72e5b679aff4feb9792ec58c8a3c6aed1d79981d09a93b842d6d47fdc6cacd5fca4fc96f88cc764a90a5adf10797fc6
-EBUILD opendx-samples-4.4.0-r2.ebuild 673 BLAKE2B ac572c29e551080a1a05f8d80657d67bdc22b0df8fad33aad707195ef876e1a304e28b1e4e56612302c7a60c1595f577f21677b94919ad1666a7fb226b67528f SHA512 940e1fc0bdbe4744e1061b5257ecc715b7ddc2b05254e4ed7c46b6b9b0a9ef7ac2b8b6a8f2ce28849649321285a83855c63e2f4c75e5a149521851398a7c5580
+EBUILD opendx-samples-4.4.0-r2.ebuild 668 BLAKE2B eebe53d44b624665fdb8f5badaa4d46ebe7c1ba0223e242f4e1c629ae62e7b67a616e875d24768edd557c3fee4d4c1f46cb259b58c07fa3a0174e0cdbef1d976 SHA512 21a242d6f480e760452417bf4fc98abf8ab67d29d33d8a14d7aeb91ac56934830da37b333a9393743c115419aee267120297cbf71efd80f42d0bb06c42b974ca
 MISC metadata.xml 497 BLAKE2B 374ef32a6b37150f7b6cd89225b23789ea0e04b70af9342ec5cb1f0fa31d55008bbe4ef8d8ac21601c02e848122b85665efab5bc244280b9821a3d2b7e0c1308 SHA512 6bcd3f858eb24e2b9e76c288588db7ac38d0d71821f3496295b049e89290a5536bf2a953b2df2b1aa87395b8fd1ef3bbf54e98e8e2cb074a6443ce642e3f2936
diff --git a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
index 2efa4c437c0d..2dbd69320cc6 100644
--- a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
+++ b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 S="${WORKDIR}/${MY_P}"
 
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=sci-visualization/opendx-4.4.4-r2"
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index 86db7e614f3d..d3b13b0d6011 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -3,6 +3,7 @@ AUX opendx-4.4.4-concurrent-make-fix.patch 2388 BLAKE2B a8d7458ff6a2c04783299141
 AUX opendx-4.4.4-dx-errno.patch 340 BLAKE2B b1a94a80e785655070d76f2b45aeaadf89f2f9ca6efc4515ffc8a8f004c3f03cdeb01cd18523bb9e8ddcda886a8c2f1c7db79aa280e7f85a703027322909cbc9 SHA512 9a23d0fd98b7e70202032e09a2ccd04f54b13331f03b83c2de61dc63d009a921b892ce1f7570f15d834471f16fb3c23bfaa28b66db86104d7a8c205aee5456b3
 AUX opendx-4.4.4-gcc43.patch 13310 BLAKE2B 4e4a2240d76e44010b8e736cfb8de99b816d195273407c1d0aed2268ac8e0930c29cfaed4b07f851d114126edb7a5c0e21ead01e64e14e1eb09eab75a578ee3c SHA512 b61e2cf13092b72f0e575491ceabadf00158a58f0af7d09d28858f96b06d2d6062c025e527b89c3860d945608554a318c00415d6153af6f70792bb5504ec3945
 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
@@ -11,6 +12,5 @@ AUX opendx-4.4.4-szip.patch 1409 BLAKE2B aee4ce76798a95299d3d41c60f584e011f18e39
 AUX opendx-4.4.4-xdg.patch 712 BLAKE2B 365b4fe07e6eb7961c4ab04260246238c00a509e90ed1f5679bc3a0ac5c1953109fb73fa8e84555b18fe293bf01aa031832c2a63d6211b7049883dc550c54810 SHA512 290df3d1f5a1a2b59473062d4a4d9247b13c333af8fb33b00580823d185358d181d94acc37691c4eb4e0a7d159bdf62b6d3cbb59c5c7d29bb01073b39871b70e
 DIST dx-4.4.4.tar.gz 9676049 BLAKE2B d628d2cf7d2cae5cfd1f69c72de06529ee3df0192bcb0973916110cc795fd408c9e297d1161e8685cdd62d0c09a985f41d4b2f72ca69ae2cd74488174e392a31 SHA512 e6ef0075a696c442fd4615eb32b9ebd3f85728321a33297e3402b19bbc6210953a6599d643fc0a20bc349fbc72411326c69187223ee0e65560603d8e6f7527ee
 DIST opendx-4.4.4_p20160917-fix-c++14.patch.bz2 3162 BLAKE2B 7998a0099f197ea35543559e69a30b564521cbb0d504e90a64adde2492da2920b2ca4a96fca296ff88ef19f51ea3e0dd40337f205b8fa54133b7f9669d2086c0 SHA512 0d671e5a085b446969fbe57eb9d08e4dd103bc29058ce8c6167c3cad18f14b816a3f2cae329b194ef9827ff6590d31da95fc04176e0824f95bdf89761007bc6f
-EBUILD opendx-4.4.4-r5.ebuild 1977 BLAKE2B fbb0191a2b3b071f92f840118c9a38e741fc9465ab9f70da798c49c6af1fb8c3fd96b4a2016269d3ae7c836006d7d63ec59923e9307068cc1a800079f34bdfe3 SHA512 14926d453cff938d207b3b50a0388855164763c3d8ab28255924056ecc9a02f1cf8b3d6ea44b152e849d64c234f3d96691a3cf2f1a19adbdabd9d72f8df25880
-EBUILD opendx-4.4.4-r6.ebuild 1975 BLAKE2B ce519cbbe34cc6ac08b09699795a192a9068abdf707877a4c40b0cdb7c05334ad3d197663968cfecb12257c2eb2951ee39e9241789ceab9b663dcb4e8f7ded95 SHA512 ebc892b19d7b3423a32a0a085bf4002f2388b240fc9958a5ffcaa36b944834abc9d65fea23185a536d4afdf2b26a8e8e9d99a2ce876696e382fcc92e6de92d7a
+EBUILD opendx-4.4.4-r7.ebuild 2016 BLAKE2B 0d301ba14ed712087b4bf2ad8e149ef33d70d783a56907ef3b4f148b83967079a95842d566d9f7bd83870b68fa320c015d9dc1c545507da734e9f558762625e9 SHA512 e2956ae4b88902019ae60a8127382985112b3ac13dac3cd6cc2e26ab2cc91042c042e9c74329fc280935c2319d83a06750243b26b74c567c0cd3487fc312f90e
 MISC metadata.xml 1039 BLAKE2B 1bf8942dcdace2138067741cf409d8f67a9f77a3928ee7e20db7786b24447c8572c98bdd5d449ec7e15e92d974025e4f006f1de409bfc19be9580b1057b40627 SHA512 b7bbf799b059f5f101ffe34e0119dfc71f9d08be5b058621dd2cdd2f7f72d3a00d08a1c53cae4bd4cb9eb86f25ff6e15f6a61712e262ecbcf74481faaee97ee3
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch b/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch
new file mode 100644
index 000000000000..579cceb96842
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-invalid-conversion.patch
@@ -0,0 +1,13 @@
+diff --git a/src/uipp/dxuilib/EditorWindow.C b/src/uipp/dxuilib/EditorWindow.C
+index c406cc1..d6c0765 100644
+--- a/src/uipp/dxuilib/EditorWindow.C
++++ b/src/uipp/dxuilib/EditorWindow.C
+@@ -5997,7 +5997,7 @@ char msg[128];
+     //
+     const char *tmpdir = theDXApplication->getTmpDirectory();
+     int tmpdirlen = STRLEN(tmpdir);
+-    if (!tmpdirlen) return FALSE;
++    if (!tmpdirlen) return (char*)FALSE;
+     if (tmpdir[tmpdirlen-1] == '/') {
+ 	sprintf(netfilename, "%sdx%d.net", tmpdir, getpid());
+ 	sprintf(cfgfilename, "%sdx%d.cfg", tmpdir, getpid());
diff --git a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
deleted file mode 100644
index cd523aace726..000000000000
--- a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MYP=dx-${PV}
-inherit eutils flag-o-matic autotools multilib
-
-DESCRIPTION="3D data visualization tool"
-HOMEPAGE="http://www.opendx.org/"
-SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz"
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="hdf cdf netcdf tiff imagemagick szip smp"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libXi
-	x11-libs/libXp
-	x11-libs/libXpm
-	>=x11-libs/motif-2.3:0
-	virtual/opengl
-	virtual/glu
-	szip? ( virtual/szip )
-	hdf? ( sci-libs/hdf )
-	cdf? ( sci-libs/cdf )
-	netcdf? ( sci-libs/netcdf )
-	tiff? ( media-libs/tiff )
-	imagemagick? ( virtual/imagemagick-tools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
-	epatch "${FILESDIR}/${P}-installpaths.patch"
-	epatch "${FILESDIR}/${P}-xdg.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-dx-errno.patch"
-	epatch "${FILESDIR}/${P}-libtool.patch"
-	epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
-	epatch "${FILESDIR}/${P}-open.patch"
-	epatch "${FILESDIR}/${P}-szip.patch"
-	epatch "${FILESDIR}/${P}-null.patch"
-	epatch "${FILESDIR}/${P}-magick.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# check flag filtering
-	# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
-	append-flags -fno-strength-reduce
-
-	# (#82672)
-	filter-flags -finline-functions
-	replace-flags -O3 -O2
-
-	# opendx uses this variable
-	unset ARCH
-
-	# javadx is currently broken. we may try to fix it someday.
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--with-x \
-		--without-javadx \
-		$(use_with szip szlib) \
-		$(use_with cdf) \
-		$(use_with netcdf) \
-		$(use_with hdf) \
-		$(use_with tiff) \
-		$(use_with imagemagick magick) \
-		$(use_enable smp smp-linux)
-}
-
-src_install() {
-	default
-	newicon src/uipp/ui/icon50.xpm ${PN}.xpm
-	make_desktop_entry dx "Open Data Explorer"
-}
diff --git a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
index 2aae53cbc9d5..024c2706ae3c 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,13 +14,14 @@ SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="hdf cdf netcdf tiff imagemagick szip smp"
 
-RDEPEND="x11-libs/libXmu
-	x11-libs/libXi
-	x11-libs/libXp
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXmu
 	x11-libs/libXpm
+	x11-libs/libXt
 	>=x11-libs/motif-2.3:0
 	virtual/opengl
 	virtual/glu
@@ -46,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-open.patch"
 	"${FILESDIR}/${P}-szip.patch"
 	"${FILESDIR}/${P}-null.patch"
+	"${FILESDIR}/${P}-invalid-conversion.patch"
 	"${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch"
 )
 
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index b56b95ae7557..d2b082337bb5 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,7 +1,8 @@
 AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad65594982f4fd403c45a80ae1294d1acb11cda61adc8c62f97243651679b044130e94850ecd9e06f26da1c538268fd02ba8 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472
 AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f954808f7db47c7765b9084a99d2e0ea6297d30092d1b3dae7ab26df7ac1e4de6559805748c0994853e2ad34c0f8f639ce732b12 SHA512 18526dc29219fd8dbc3679920ce271977cfb153a51cf217d49ba544510da23ee02f57b3ee9450ad9ee421d272a18fecdf3bd5043225cc16d04a2b115f62ce1f0
-DIST ParaView-v5.2.0.tar.gz 47087129 BLAKE2B 4792569c28c8c800882389810cb3a73087ee64a26971b59ed76d3e5b3c0e121b2dad3736f610cfef8cdc99b61098cee82379bd08e06f750c0eb2e0728ec3535d SHA512 d46b71a03717bde164fe2b6cdcc1c478384ad0d379e203e75e69e1532f8703b4ce12f8992d39e61d09e2ad7bbf1e249fc1f00c4cdd65aabef831e0dca83485f1
+AUX paraview-5.4.1-jsoncpp_1.8.4.patch 787 BLAKE2B 1978d56feb0d25fb4730dac0138803327984c4a7defee2921a9d42ba69a75788d3b5abde03c99c33024e3c89de71b93f24d3ba2a60011a24445919f16824fbf4 SHA512 9ffd209bfc5de42e6100669614771a20c904b809cea7beda90709b5b2e2c36a533ab3474495d6f6e6e7141d033e2cc53ff1dfc241287eadfb13996b7a123eadf
 DIST ParaView-v5.3.0.tar.gz 45173528 BLAKE2B 878e8dae0b5de4bee5d72a4a272a5048fa587fac8e949d39c8e040b9fe3553b787e53f183ae98d20f24755db7e355280b85a9f572037764c53740de2eb4a9e30 SHA512 3dc3c2a1c27a0f0dc82fc04ce84477a26aacb329d6ea42c276c4204e39d11bc78adbc1807e1e7168aade31aa48b6d628775841b8b94b5122084eac46e358a23f
-EBUILD paraview-5.2.0.ebuild 9346 BLAKE2B c1a56fd0c8ea13fb0dbe62659af561735edcee444ef0746f0eb7d6863ff8d02bbdc379408d884c7c2a4d0b59251ae22749648efe0799fb03c75895b3bde0e229 SHA512 9be4b41d1589eadaa6fd54a7bee6036210b6753704dbf1fcae3f757620b9cb26230f12a4e73ad0d19dd5ef32cee923aacdaa1e605794092357d1505fbd9c31e2
+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
 MISC metadata.xml 748 BLAKE2B 25046c08c0a8df768efba10cae82ef24d583776d21ddda5fd65f895e11214ca9745205458f27e96f45d83fd0d6e77d5f2c12653206eaef09f398fa7a9275418e SHA512 5354c12b5448883903bca724a5d3adfc1cccf352d378317f7ab43f3e4125e2329d9477081eff7e37c8602aaba2aa6df0c73a240d409541017555920f57847d65
diff --git a/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch b/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch
new file mode 100644
index 000000000000..b4b64e94eef8
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch
@@ -0,0 +1,17 @@
+diff --git a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
+index b6e2b55..d27ad9d 100644
+--- a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
++++ b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
+@@ -788,7 +788,10 @@ public:
+           this->GetSettingBelowPriority(propertySettingCString, highestPriority);
+         if (lowerPriorityValue.isNull())
+         {
+-          if (!proxyValue.removeMember(property->GetXMLName()).isNull())
++          // Allocated as done in Json::Value removeMember(const char* key).
++          Json::Value removedValue;
++          if (proxyValue.removeMember(property->GetXMLName(), &removedValue) &&
++            !removedValue.isNull())
+           {
+             this->Modified();
+           }
+
diff --git a/sci-visualization/paraview/paraview-5.2.0.ebuild b/sci-visualization/paraview/paraview-5.4.1.ebuild
index 5abd820a7332..ebd30586b09a 100644
--- a/sci-visualization/paraview/paraview-5.2.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
@@ -25,21 +25,26 @@ REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
 	mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
 
 RDEPEND="
+	app-arch/lz4
 	dev-libs/expat
 	dev-libs/jsoncpp
 	dev-libs/libxml2:2
 	dev-libs/protobuf
+	dev-libs/pugixml
 	media-libs/freetype
+	media-libs/glew:0
 	media-libs/libpng:0
 	media-libs/libtheora
 	media-libs/tiff:0=
+	sci-libs/cgnslib
 	sci-libs/hdf5[mpi=]
 	>=sci-libs/netcdf-4.2[hdf5]
 	>=sci-libs/netcdf-cxx-4.2:3
+	sci-libs/xdmf2
 	sys-libs/zlib
+	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
-	virtual/glu
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
@@ -55,10 +60,14 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	python? (
 		${PYTHON_DEPS}
+		dev-python/constantly[${PYTHON_USEDEP}]
+		dev-python/incremental[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/sip[${PYTHON_USEDEP}]
-		dev-python/twisted-core
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
 		dev-python/zope-interface[${PYTHON_USEDEP}]
 		mpi? ( dev-python/mpi4py )
 		qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
@@ -86,6 +95,8 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
+	"${FILESDIR}"/${P}-jsoncpp_1.8.4.patch
 )
 
 pkg_pretend() {
@@ -102,7 +113,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	default
 
 	# lib64 fixes
 	sed -i \
@@ -114,13 +125,10 @@ src_prepare() {
 	sed -i \
 		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
 		CMakeLists.txt \
-		Plugins/SciberQuestToolKit/CMakeLists.txt \
 		ParaViewConfig.cmake.in \
 		CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
 		ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
-		ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \
-		Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \
-		Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die
+		ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx || die
 
 	# no proper switch
 	if ! use nvcontrol; then
@@ -135,8 +143,6 @@ src_configure() {
 		export QT_SELECT=qt5
 	fi
 
-	# VTK_USE_SYSTEM_QTTESTING
-	# PARAVIEW_USE_SYSTEM_AUTOBAHN
 	local mycmakeargs=(
 		-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
@@ -148,24 +154,33 @@ src_configure() {
 		-DCMAKE_COLOR_MAKEFILE=TRUE
 		-DCMAKE_USE_PTHREADS=ON
 		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DPARAVIEW_USE_SYSTEM_MPI4PY=ON
-		-DPROTOC_LOCATION=$(type -P protoc)
 		-DVTK_Group_StandAlone=ON
 		-DVTK_RENDERING_BACKEND=OpenGL2
 		-DVTK_USE_FFMPEG_ENCODER=OFF
 		-DVTK_USE_OFFSCREEN=TRUE
+		# -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
+		-DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
+		-DVTK_USE_SYSTEM_GLEW=ON
 		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_INCREMENTAL=ON
 		-DVTK_USE_SYSTEM_JPEG=ON
 		-DVTK_USE_SYSTEM_JSONCPP=ON
+		-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
@@ -175,95 +190,82 @@ src_configure() {
 		-DModule_vtkUtilitiesProcessXML=ON
 		)
 
-	# TODO: XDMF_USE_MYSQL?
-	# VTK_WRAP_JAVA
 	mycmakeargs+=(
-		$(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES)
-		$(cmake-utils_use qt5 PARAVIEW_BUILD_QT_GUI)
+		-DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
+
+		-DModule_vtkGUISupportQtOpenGL="$(usex qt5)"
+		-DModule_vtkGUISupportQtSQL="$(usex qt5)"
+		-DModule_vtkGUISupportQtWebkit="$(usex qt5)"
+		-DModule_vtkRenderingQt="$(usex qt5)"
+		-DModule_vtkViewsQt="$(usex qt5)"
+		-DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
+		-DVTK_Group_ParaViewQt="$(usex qt5)"
+		-DVTK_Group_Qt="$(usex qt5)"
+		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
 		$(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
-		$(cmake-utils_use qt5 Module_vtkGUISupportQtOpenGL)
-		$(cmake-utils_use qt5 Module_vtkGUISupportQtSQL)
-		$(cmake-utils_use qt5 Module_vtkGUISupportQtWebkit)
-		$(cmake-utils_use qt5 Module_vtkRenderingQt)
-		$(cmake-utils_use qt5 Module_vtkViewsQt)
-		$(cmake-utils_use qt5 VTK_Group_ParaViewQt)
-		$(cmake-utils_use qt5 VTK_Group_Qt)
-		$(cmake-utils_use !qt5 PQWIDGETS_DISABLE_QTWEBKIT)
-		$(cmake-utils_use boost Module_vtkInfovisBoost)
-		$(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg)
-		$(cmake-utils_use mpi PARAVIEW_USE_MPI)
-		$(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND)
-		$(cmake-utils_use mpi PARAVIEW_USE_ICE_T)
-		$(cmake-utils_use mpi VTK_Group_MPI)
-		$(cmake-utils_use mpi VTK_XDMF_USE_MPI)
-		$(cmake-utils_use mpi XDMF_BUILD_MPI)
-		$(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
-		$(cmake-utils_use python VTK_Group_ParaViewPython)
-		$(cmake-utils_use python XDMF_WRAP_PYTHON)
-		$(cmake-utils_use python Module_vtkPython)
-		$(cmake-utils_use python Module_pqPython)
-		$(cmake-utils_use python Module_vtkWrappingPythonCore)
-		$(cmake-utils_use python Module_vtkPVPythonSupport)
-		$(cmake-utils_use python Module_AutobahnPython)
-		$(cmake-utils_use python Module_Twisted)
-		$(cmake-utils_use python Module_ZopeInterface)
-		$(cmake-utils_use python Module_vtkmpi4py)
-		$(usex qt5 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF")
-		$(cmake-utils_use doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION)
-		$(cmake-utils_use examples BUILD_EXAMPLES)
-		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
-		$(cmake-utils_use mysql Module_vtkIOMySQL)
-		$(cmake-utils_use sqlite Module_vtksqlite)
-		$(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST)
-		$(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG)
-		$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
-		$(cmake-utils_use ffmpeg Module_vtkIOFFMPEG)
-		$(cmake-utils_use tk VTK_Group_Tk)
-		$(cmake-utils_use tk VTK_USE_TK)
-		$(cmake-utils_use tk Module_vtkRenderingTk)
-		$(cmake-utils_use tcl Module_vtkTclTk)
-		$(cmake-utils_use tcl Module_vtkWrappingTcl)
-		$(cmake-utils_use test BUILD_TESTING)
+
+		-DModule_vtkInfovisBoost="$(usex boost)"
+
+		-DPARAVIEW_USE_ICE_T="$(usex mpi)"
+		-DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
+		-DPARAVIEW_USE_MPI="$(usex mpi)"
+		-DVTK_Group_MPI="$(usex mpi)"
+		-DVTK_XDMF_USE_MPI="$(usex mpi)"
+		-DXDMF_BUILD_MPI="$(usex mpi)"
+
+		-DModule_AutobahnPython="$(usex python)"
+		-DModule_pqPython="$(usex python)"
+		-DModule_Twisted="$(usex python)"
+		-DModule_vtkmpi4py="$(usex python)"
+		-DModule_vtkPython="$(usex python)"
+		-DModule_vtkWrappingPythonCore="$(usex python)"
+		-DModule_ZopeInterface="$(usex python)"
+		-DPARAVIEW_ENABLE_PYTHON="$(usex python)"
+		-DXDMF_WRAP_PYTHON="$(usex python)"
+
+		-DBUILD_DOCUMENTATION="$(usex doc)"
+
+		-DBUILD_EXAMPLES="$(usex examples)"
+
+		-DModule_vtkIOMySQL="$(usex mysql)"
+
+		-DModule_vtksqlite="$(usex sqlite)"
+
+		-DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
+
+		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
+		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
+		-DModule_vtkIOFFMPEG="$(usex ffmpeg)"
+
+		-DVTK_Group_Tk="$(usex tk)"
+		-DVTK_USE_TK="$(usex tk)"
+		-DModule_vtkRenderingTk="$(usex tk)"
+		-DModule_vtkTclTk="$(usex tcl)"
+		-DModule_vtkWrappingTcl="$(usex tcl)"
+		-DBUILD_TESTING="$(usex test)"
 		)
 
 	if use openmp; then
 		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
 	fi
 
-	if use qt5 ; then
-		mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer )
-		if use python ; then
-			# paraview cannot guess sip directory properly
-			mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" )
-		fi
-	fi
-
 	# TODO: MantaView VaporPlugin VRPlugin
 	mycmakeargs+=(
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
-		$(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering)
+		-DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
 		# these are always needed for plugins
-		$(cmake-utils_use plugins Module_vtkFiltersFlowPaths)
-		$(cmake-utils_use plugins Module_vtkPVServerManagerApplication)
+		-DModule_vtkFiltersFlowPaths="$(usex plugins)"
+		-DModule_vtkPVServerManagerApplication="$(usex plugins)"
 		)
 
 	cmake-utils_src_configure