gentoo resync : 02.04.2018

4 files changed, 22 insertions, 89 deletions

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"
 )