gentoo resync : 30.06.2018

13 files changed, 72 insertions, 66 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 220909b5f0b6..607e9e91c52e 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index 48e732104de3..7419f7921e44 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,5 +1,5 @@
 DIST fityk-1.2.9.tar.bz2 1370476 BLAKE2B 30cc6f640bcf3323d592563ce153a47a0e2770f70d0a0cf8ff6a886b1e86421e370cbc142ed89914eb63ed32e35cc6c67c1297bd8680e022ed58697ebe174e5e SHA512 e6d4846a0690ea5e7b94fc067de48d67d6342ff595844d709af9f3b978bf4bd9d0095ce348716fd0053c5575b4bff5825f8f126a53bf7e11f4e6e8a2cc6ddb1a
 DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2 SHA512 4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
 EBUILD fityk-1.2.9.ebuild 2012 BLAKE2B a708b82b98388478c8775fa093efa22f7f977a2d31da9c15ce64e87ac3fd9c48b0fffcd2fa99c2c4cb9a7e5fc30f43a0ee117daca7dc15aa2843d386478169d2 SHA512 cf27943281c5c4e5c6bd09b7c5751383a5e1f3e977d056bfe74dc434f976c485307bbd460a86406cc28a58ff4cde7ed761ef1c0a3513ca03fb713674d2586669
-EBUILD fityk-1.3.1.ebuild 2168 BLAKE2B be56e921ddef0fe85e701d3c832ea5b517e62807f858f790a051db314249e79f1536f71473d8072ee564adabb19bb32ef9c7bc7b192ae6f8c891749766d648b4 SHA512 64ac23c3ca367578585d55c1dcdb04826a54507a786fb1731f8680242cf92e30eacc6e5b334902cca831ee14ecb8afc73de338576cb80d6c58ab49950a70f7a3
+EBUILD fityk-1.3.1.ebuild 2172 BLAKE2B a6f0ac9492c7022c7e610d449b42bb157e81e097da00b6069f81b8eb9dda63abac43bd8ef627c59f31462b05ac7dc6c2c9fc3f872ada4016ffb9cb38a3c56f21 SHA512 89315f402fa2289d0fe065906272742425e00d0596c8e60eaf128936e4b632851a9f6a845465d460a1ff6b13a8958119f26c93dbe3170b840fb2066140b9aa17
 MISC metadata.xml 1378 BLAKE2B a6b73be959353e2a764d5c39ae13c4fe1bc38c5c0ea5a3c2557e32825077e13d0a97504f8d79e338a65803bc98326fe25cb7e86d3aaa8c93c5d9bdce30cbec90 SHA512 38e516a5e0ec249d3ed4e54d4780830e1b53994e9dc1999c664b2f37aac0247df780522e7b25c124ffb0d9766d1292871ec0f9a238c2b3aa9994cef3581befe6
diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild b/sci-visualization/fityk/fityk-1.3.1.ebuild
index 309321d1e376..79fd660aecd2 100644
--- a/sci-visualization/fityk/fityk-1.3.1.ebuild
+++ b/sci-visualization/fityk/fityk-1.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER=3.0
 
-PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
 
 inherit fdo-mime python-r1 wxwidgets
 
diff --git a/sci-visualization/visit/Manifest b/sci-visualization/visit/Manifest
index a4dfe1b8f366..b40203b6830b 100644
--- a/sci-visualization/visit/Manifest
+++ b/sci-visualization/visit/Manifest
@@ -1,11 +1,11 @@
-AUX visit-2.12.3-cmakelist.patch 506 BLAKE2B aab7637341d0aaf4821301d714159f238a16e5593dd9838fc903f183ebc7c4fed2225217516cbd56dc86e91bbca02a1af36c7170038d45dfe5b049e307f5a4a8 SHA512 528d0b1d48f457958c5b3c21dc08d29f99ec93b5c6a109a82ca356879ec0d6d0cba28025e1369438d5b2fd850ff48afbf01490c3a2ac635130e69c0186a4c676
-AUX visit-2.12.3-dont_symlink_visit_dir.patch 743 BLAKE2B 36ed92bb8f661cb04d8902ba94cb647ef7bedd0bfe62cb663870511cf9379bd59dc5d440e4fb503679d3b1a42f5552560260125cb2636d745489c17b5c0f0271 SHA512 c385a3e6fa6c5856223df8c5aea329ba01dd625980257c3cd7d2784eb9e1aca3640e50d2afb0af0e02553dc6f72bb23bec666f3dc726706690c7bd45c6cc5336
-AUX visit-2.12.3-findpython.patch 833 BLAKE2B 92d6bc9bfe63cbfc8c4bf54864ae9d3edc53b9bbb32dc01fdd89a631c13bbd123daf0fb6e25cbcc5fa09caf91542da95a0e151f047a3b49121cd634b2c879fec SHA512 9b73e00e7884fed34e63ea51aa14483212227f05c83412a1638a31a56a0685bf7fdfdf511a1a53c9f1a55289ae8d4a0bac8ff92d3380d9c989502d2cb95e8679
-AUX visit-2.12.3-findsilo.patch 585 BLAKE2B 6b151c010c11e86b5d0535b6323d1f55a3b212de2828e00850157f7b3b35d6910061330acc87a209036560950d44c04efe729464ec69c48c734019828c768f31 SHA512 76bec5fd134318724d0d2ad59a345d78652867a9680abaca7504af11ddd818a678338afd10bdf9385295f672d265439a1341c1c71697c7a98aae6406abe4565d
-AUX visit-2.12.3-findvtk.patch 1175 BLAKE2B c4d5f817c6c853a9ba279c6312920270d11ad62b4d9fcf0f1dbded7b111ba46a6858d74583a5e7ab12dd9f265438d62344af01e33b6eee1f3e3a319e5a45aef0 SHA512 8c45db6d8f00031afc5710109e744af6abc9808cbd86e1c3115047c21f23ad840f76f8d4ff245838075753952f3268e6f753c638ed58e3d6e338e8e1898b0fbd
-AUX visit-2.12.3-qwt.patch 550 BLAKE2B c74f8a9bc78525dd9ea12676ce3d6ca4c97b9d937eaa651565ca8e37afa50d5f77014a7efa1f7e82754dbd843b95c3f3c7a931795b33199c55089f03986be12b SHA512 8d0ca1285206ccf8c6eadd6b26ad89e7adc44ab0f5b344bb5eceec87809272ed290f6b7c5c81988283e4d9fa82cc6ed4096a90474bbf0ff361fa9bd8dfe55ec0
-AUX visit-2.12.3-vtklibs.patch 4727 BLAKE2B 8593c1bf680ae2bd430e85c6a953d27920f9020d9b41f514649d688b913da1fb40682a478aa6e54e2ac9e016b19f6c46d4a3e22742499247a44c072af7cff7b5 SHA512 5ff42cd456818fc9086d43e1a2af3eedb2a90a8e4dbfabadc51aaf01e649024658ae6bff58a086dc732f9058a5e04099babc2b000bd089a470a047c709dcc85f
-AUX visit-2.12.3-vtkmpi.patch 3824 BLAKE2B 15e507b81aed42ba55c5620052bb7749d5e7031710bc7f23ec631288b0dd0c3c446e97e00d15a295546324aa5920b39ff17af50eb493bafb0acae19135ca5286 SHA512 b12395b397374311f005545b8c18ef85d331533c8a4d8092c0731cc8697523a8be2dfa46307e4566e68b518841df5eb1dd21453db3adba529248a238ff955e40
+AUX visit-2.12.3-cmakelist.patch 505 BLAKE2B 2038997be3bb896dc3db88822fee8a07192f3fcf6b1a922d8f1917c6d8411259b3fd1d9f8b9bd6b148cb5cc6bf71e54be520c2e4bf44f3f4e9a8371a21b5e038 SHA512 80f3fc7dd03f9f5c18a8f52815692f1261cbab6a05bf758fc163b4466960ffeed0530070791f77d53fb7bd6ccce83a5aec5890357c8667f9ab7598e4a787c7cf
+AUX visit-2.12.3-dont_symlink_visit_dir.patch 712 BLAKE2B 6131257e8657fd8ec2cbec2938ab6b3ac52e56611d57d43a73d38dd525841a7d2630748977544ebe6463b065a3f1e93fe6dc8dcb81a1fcf35cdad6b189c330a5 SHA512 69541328e241e90b6cbf8bc8a98449c5a5783f985f2da552d32a03abb21122fc3fb8591acb2cfb438043fa92e8dcbe57ae4733b7e55dc0581c64d61a37336498
+AUX visit-2.12.3-findpython.patch 799 BLAKE2B 75f234c6eaf0f3639677078ba21230d24fea10f09b41580f52073f6dbf0af6fde5d4b2efc3072fb2ebaaa3dc3cb18b6f2db5e75157bafcbb0f74a9d37c8ebef9 SHA512 1def509e5d75fade975bf79624c4799a4974e289b39888ed5b589823d728c8edde353c7b7eefbd43d6525222cb55b37c15474325ba4ae5fcef387720fca054d4
+AUX visit-2.12.3-findsilo.patch 551 BLAKE2B f54daef0280b7b1310a7e758f22dc109ed29e6356e6b367753a26d1ccf6207f7cfff8936b489cd70bda3c0b1ba3b92a87e0b3f80ff881ffdeed237b0aea6abf4 SHA512 f2bc25b7104a1ae179778f695d3aada50860e3c70e9d6677827c460703bf6d3b66611a9a207a7fb45ae589cb6163ea254b4a12e111b1d9dacc698b7f17fa6ee0
+AUX visit-2.12.3-findvtk.patch 1149 BLAKE2B 81090ff715b0cabcc2738787d8d0690d6abdd77e43934960ff98daa16873c02651661e0252bd5b985a579da947321f8e230cc228211a3733f081f2e4e1388159 SHA512 07f713a819c016df7e3c624abd27515c861f0f07cba923c6543b4ce40c502d12d20701abc4503b07394841750c73133477ee5ce0789818de6d2ecf5905891f58
+AUX visit-2.12.3-qwt.patch 554 BLAKE2B 1963a817afa2885ed6bcbd0bd1dbbc5be77ff20449c5186e849dfab2a33529149b76411381eba04f122b440204d92b6e4284d4cff2a198066f5ae00cf18a4fd5 SHA512 5bdbb10ab4368a9457df6bdea56e4c2f3fccc5f892d2b33a284fb742f92e6646aa75376b6c945c1473a5a5d1d0d5c69095eff3c7ee2b9be570d6722e999fb4c3
+AUX visit-2.12.3-vtklibs.patch 4455 BLAKE2B 82b57e8f8051e0845c98fd034ef430b939a1900fddb4b9bfcb901b933654b6b23290e49b7813c05bf2b6d51ccc46c65e54f991f1990e2980b637f7cfc1396281 SHA512 6955b1c80486570487d7c085a1929a7fcc87573e6e47d09eac00e6589ca9802adbad8b8e858567ad1b275650f7326a8119e1c0d69e9adb312298bc5b252e1774
+AUX visit-2.12.3-vtkmpi.patch 3722 BLAKE2B 6f7404a2762e46d43aeee1d86026ebbe74d6710432781a6404b3b8b4166c9ab7ca4f6cc8c2d7c9f291218614e10e8977fb9b7c2ca818465291e6c86ae0033390 SHA512 8d906e717a4286a6b6159bb772de85720a1c24086084a84dc119d5cc62aca4548d828d70ef6176280c11c7183b606d0c0ac6abcb30397daa4c4138d613e70e95
 DIST visit2.12.3.tar.gz 80491441 BLAKE2B b144dd2ef1ea6ea3213df16c0dbf37449d64d3be00c33f5bf0536abec0278189bfac7a4c399512742267aa4c5f6a46d519b9261e58b4f3eef91e98c7a9a4c36e SHA512 78e939657a556040fc593766855c06a5bef85c76d3c43cd6a941ea90517e49ad556f1b10aa5b984327260001d3b53c67b8cb4692ba04ffbad8b6fefac704e842
-EBUILD visit-2.12.3.ebuild 2945 BLAKE2B 44a8b6bdc664c92ad65c6f32c5cabec24d835be38c0b490b2ca1b96d379adbbd122d83199cf963345d31474eab696bebc04cb19ed36bee6749e9d3af3a7d4cec SHA512 25a01a20f6dc3cec2dbe9197e296f7531a72a6a1e11c8adad2e44cd70b355317e78001bacb71d9cd92b58b068f05aca193d5b89417b1dcc94f1a051308b96396
+EBUILD visit-2.12.3-r1.ebuild 3088 BLAKE2B 0d927e4f94e5a5ae9ae839e94224a68b6495b02cd3423e30358f448e77f8103877b5bc8f4bfd6e38dc8d5e7c5f4bca0738ce13dac2137c1952ae77744ca8d7d7 SHA512 920c23bdfa9ef3cdfb287eee76ebfc82553f914ffee72a64060827ffa1edcc7800a2dbbb77c080299ea2aac2151b7cff0f362352c9ed75a02b9671938a5be368
 MISC metadata.xml 741 BLAKE2B 7323a708be8cf726ff3f6a6359385aac2e022b51f5c34de3baac6c5f77f4a86eb6ecec07a04bf5606efab25082c2ac217136ddd65258a69b31cb6321812427c0 SHA512 c9a53bb71f13089b96d999088cb8cdc1d71bbf62d2f65dd5e0f6396d903221c4455ceaa988a0b0a5056de2dee4826af5a5b18cb1ca0ed0ad31ac24a3013b819e
diff --git a/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch b/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch
index 8c8618a24219..f0f56f5a6d5d 100644
--- a/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch
+++ b/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2015-06-25 07:30:40.907149341 +0200
-+++ CMakeLists.txt	2015-06-25 07:30:57.537148929 +0200
+--- a/CMakeLists.txt	2015-06-25 07:30:40.907149341 +0200
++++ b/CMakeLists.txt	2015-06-25 07:30:57.537148929 +0200
 @@ -991,7 +991,6 @@
          DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                                GROUP_READ GROUP_WRITE GROUP_EXECUTE
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
index 0953e5b9e605..5ab4c7c995dd 100644
--- 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
@@ -1,6 +1,6 @@
 diff -ru visit2.7.1.old2/src/CMakeLists.txt visit2.7.1/src/CMakeLists.txt
---- visit2.7.1.old2/src/CMakeLists.txt	2014-01-27 22:10:06.520297262 +0100
-+++ visit2.7.1/src/CMakeLists.txt	2014-01-27 22:11:30.520298002 +0100
+--- a/CMakeLists.txt	2014-01-27 22:10:06.520297262 +0100
++++ b/CMakeLists.txt	2014-01-27 22:11:30.520298002 +0100
 @@ -807,14 +807,6 @@
              \"${VISIT_VERSION}\"
              \"${CMAKE_INSTALL_PREFIX}/beta\")
diff --git a/sci-visualization/visit/files/visit-2.12.3-findpython.patch b/sci-visualization/visit/files/visit-2.12.3-findpython.patch
index 180ffbf379ab..4723c494de9b 100644
--- a/sci-visualization/visit/files/visit-2.12.3-findpython.patch
+++ b/sci-visualization/visit/files/visit-2.12.3-findpython.patch
@@ -1,6 +1,6 @@
 diff -ru visit2.7.1.old/src/CMake/FindVisItPython.cmake visit2.7.1.new/src/CMake/FindVisItPython.cmake
---- visit2.7.1.old/src/CMake/FindVisItPython.cmake	2013-09-13 21:06:57.000000000 +0200
-+++ visit2.7.1.new/src/CMake/FindVisItPython.cmake	2014-01-25 20:30:06.948654123 +0100
+--- a/CMake/FindVisItPython.cmake	2013-09-13 21:06:57.000000000 +0200
++++ b/CMake/FindVisItPython.cmake	2014-01-25 20:30:06.948654123 +0100
 @@ -141,11 +141,12 @@
    FIND_LIBRARY(PYTHON_LIBRARY
      NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
diff --git a/sci-visualization/visit/files/visit-2.12.3-findsilo.patch b/sci-visualization/visit/files/visit-2.12.3-findsilo.patch
index 04d73c37fc16..987907c3a71d 100644
--- a/sci-visualization/visit/files/visit-2.12.3-findsilo.patch
+++ b/sci-visualization/visit/files/visit-2.12.3-findsilo.patch
@@ -1,6 +1,6 @@
 diff -ru visit2.7.1-old/src/CMake/FindSilo.cmake visit2.7.1-new/src/CMake/FindSilo.cmake
---- visit2.7.1-old/src/CMake/FindSilo.cmake	2013-11-20 20:30:44.000000000 +0100
-+++ visit2.7.1-new/src/CMake/FindSilo.cmake	2014-02-01 02:22:29.410541850 +0100
+--- a/CMake/FindSilo.cmake	2013-11-20 20:30:44.000000000 +0100
++++ b/CMake/FindSilo.cmake	2014-02-01 02:22:29.410541850 +0100
 @@ -90,7 +90,7 @@
        NO_CMAKE_PATH
        NO_SYSTEM_ENVIRONMENT_PATH)
diff --git a/sci-visualization/visit/files/visit-2.12.3-findvtk.patch b/sci-visualization/visit/files/visit-2.12.3-findvtk.patch
index 2fec72e1f4f3..2b24e91d084f 100644
--- a/sci-visualization/visit/files/visit-2.12.3-findvtk.patch
+++ b/sci-visualization/visit/files/visit-2.12.3-findvtk.patch
@@ -1,5 +1,5 @@
---- visit2.8.2/src/CMake/FindVisItVTK.cmake.orig	2015-01-09 12:18:54.467780216 +0100
-+++ visit2.8.2/src/CMake/FindVisItVTK.cmake	2015-01-09 12:19:59.737780932 +0100
+--- a/CMake/FindVisItVTK.cmake.orig	2015-01-09 12:18:54.467780216 +0100
++++ b/CMake/FindVisItVTK.cmake	2015-01-09 12:19:59.737780932 +0100
 @@ -234,15 +234,22 @@
  
  # check for python wrappers
diff --git a/sci-visualization/visit/files/visit-2.12.3-qwt.patch b/sci-visualization/visit/files/visit-2.12.3-qwt.patch
index b714aec45630..4d0dbb19aac3 100644
--- a/sci-visualization/visit/files/visit-2.12.3-qwt.patch
+++ b/sci-visualization/visit/files/visit-2.12.3-qwt.patch
@@ -1,5 +1,5 @@
---- CMake/FindQwt.cmake.orig	2017-07-12 07:46:34.560120549 +0200
-+++ CMake/FindQwt.cmake	2017-07-12 07:46:58.120121063 +0200
+--- a/CMake/FindQwt.cmake.orig	2017-07-12 07:46:34.560120549 +0200
++++ b/CMake/FindQwt.cmake	2017-07-12 07:46:58.120121063 +0200
 @@ -54,7 +54,10 @@
      SET(QWT_LIBRARY ${QWT_LIBRARY_DIR}/${QWT_LIB}/qwt)
    ENDIF(VISIT_STATIC)
diff --git a/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch b/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch
index a6b47096e813..8b8c88e59a33 100644
--- a/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch
+++ b/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch
@@ -1,6 +1,6 @@
 diff -ur visit2.8.2-old/src/engine/main/CMakeLists.txt visit2.8.2-new/src/engine/main/CMakeLists.txt
---- visit2.8.2-old/src/engine/main/CMakeLists.txt	2014-10-01 00:28:19.000000000 +0200
-+++ visit2.8.2-new/src/engine/main/CMakeLists.txt	2015-01-05 15:14:43.850783973 +0100
+--- a/engine/main/CMakeLists.txt	2014-10-01 00:28:19.000000000 +0200
++++ b/engine/main/CMakeLists.txt	2015-01-05 15:14:43.850783973 +0100
 @@ -188,8 +188,8 @@
      ${engine_ser_exe_EPlot_ser}
      engine_ser 
@@ -24,8 +24,8 @@ diff -ur visit2.8.2-old/src/engine/main/CMakeLists.txt visit2.8.2-new/src/engine
          ${VTK_FREETYPE_LIBRARIES}
          vtkftgl
 diff -ur visit2.8.2-old/src/mdserver/main/CMakeLists.txt visit2.8.2-new/src/mdserver/main/CMakeLists.txt
---- visit2.8.2-old/src/mdserver/main/CMakeLists.txt	2014-08-11 23:45:16.000000000 +0200
-+++ visit2.8.2-new/src/mdserver/main/CMakeLists.txt	2015-01-05 15:15:41.810784062 +0100
+--- a/mdserver/main/CMakeLists.txt	2014-08-11 23:45:16.000000000 +0200
++++ b/mdserver/main/CMakeLists.txt	2015-01-05 15:15:41.810784062 +0100
 @@ -119,10 +119,10 @@
      visit_verdict 
      vtkCommonCore
@@ -41,8 +41,8 @@ diff -ur visit2.8.2-old/src/mdserver/main/CMakeLists.txt visit2.8.2-new/src/mdse
      ${CMAKE_THREAD_LIBS} 
      ${DL_LIB}
 diff -ur visit2.8.2-old/src/tools/convert/CMakeLists.txt visit2.8.2-new/src/tools/convert/CMakeLists.txt
---- visit2.8.2-old/src/tools/convert/CMakeLists.txt	2014-08-11 23:46:08.000000000 +0200
-+++ visit2.8.2-new/src/tools/convert/CMakeLists.txt	2015-01-05 15:14:28.880783951 +0100
+--- a/tools/convert/CMakeLists.txt	2014-08-11 23:46:08.000000000 +0200
++++ b/tools/convert/CMakeLists.txt	2015-01-05 15:14:28.880783951 +0100
 @@ -105,8 +105,8 @@
  )
  
@@ -55,8 +55,8 @@ diff -ur visit2.8.2-old/src/tools/convert/CMakeLists.txt visit2.8.2-new/src/tool
  ${VTK_FREETYPE_LIBRARIES}
  vtkftgl
 diff -ur visit2.8.2-old/src/tools/dataserver/CMakeLists.txt visit2.8.2-new/src/tools/dataserver/CMakeLists.txt
---- visit2.8.2-old/src/tools/dataserver/CMakeLists.txt	2014-08-11 23:46:12.000000000 +0200
-+++ visit2.8.2-new/src/tools/dataserver/CMakeLists.txt	2015-01-05 15:13:02.000783818 +0100
+--- a/tools/dataserver/CMakeLists.txt	2014-08-11 23:46:12.000000000 +0200
++++ b/tools/dataserver/CMakeLists.txt	2015-01-05 15:13:02.000783818 +0100
 @@ -70,9 +70,9 @@
  )
  
@@ -71,8 +71,8 @@ diff -ur visit2.8.2-old/src/tools/dataserver/CMakeLists.txt visit2.8.2-new/src/t
  ${VTK_FREETYPE_LIBRARIES}
  vtkftgl
 diff -ur visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt
---- visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt	2014-08-11 23:46:11.000000000 +0200
-+++ visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt	2015-01-05 15:16:02.400784093 +0100
+--- a/tools/mcurvit/CMakeLists.txt	2014-08-11 23:46:11.000000000 +0200
++++ b/tools/mcurvit/CMakeLists.txt	2015-01-05 15:16:02.400784093 +0100
 @@ -104,9 +104,9 @@
  )
  
@@ -87,8 +87,8 @@ diff -ur visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt visit2.8.2-new/src/tool
  ${VTK_FREETYPE_LIBRARIES}
  vtkftgl
 diff -ur visit2.8.2-old/src/tools/protocol/CMakeLists.txt visit2.8.2-new/src/tools/protocol/CMakeLists.txt
---- visit2.8.2-old/src/tools/protocol/CMakeLists.txt	2014-08-11 23:46:14.000000000 +0200
-+++ visit2.8.2-new/src/tools/protocol/CMakeLists.txt	2015-01-05 15:12:46.480783795 +0100
+--- a/tools/protocol/CMakeLists.txt	2014-08-11 23:46:14.000000000 +0200
++++ b/tools/protocol/CMakeLists.txt	2015-01-05 15:12:46.480783795 +0100
 @@ -76,9 +76,9 @@
  )
  
@@ -103,8 +103,8 @@ diff -ur visit2.8.2-old/src/tools/protocol/CMakeLists.txt visit2.8.2-new/src/too
  ${VTK_FREETYPE_LIBRARIES}
  vtkftgl
 diff -ur visit2.8.2-old/src/viewer/main/CMakeLists.txt visit2.8.2-new/src/viewer/main/CMakeLists.txt
---- visit2.8.2-old/src/viewer/main/CMakeLists.txt	2014-08-11 23:46:26.000000000 +0200
-+++ visit2.8.2-new/src/viewer/main/CMakeLists.txt	2015-01-05 15:12:11.380783741 +0100
+--- a/viewer/main/CMakeLists.txt	2014-08-11 23:46:26.000000000 +0200
++++ b/viewer/main/CMakeLists.txt	2015-01-05 15:12:11.380783741 +0100
 @@ -279,8 +279,8 @@
      ${viewer_exe_IPlot}
      ${viewer_exe_VPlot}
@@ -117,8 +117,8 @@ diff -ur visit2.8.2-old/src/viewer/main/CMakeLists.txt visit2.8.2-new/src/viewer
      ${VTK_FREETYPE_LIBRARIES}
      vtkftgl
 diff -ur visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt
---- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt	2014-08-11 23:45:14.000000000 +0200
-+++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt	2015-01-05 15:11:17.680783659 +0100
+--- a/visit_vtk/full/CMakeLists.txt	2014-08-11 23:45:14.000000000 +0200
++++ b/visit_vtk/full/CMakeLists.txt	2015-01-05 15:11:17.680783659 +0100
 @@ -125,9 +125,9 @@
  ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
  
diff --git a/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch b/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch
index 40aa7b8e2e50..39dc85711730 100644
--- a/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch
+++ b/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch
@@ -1,6 +1,6 @@
 diff -ru visit2.8.2-old/src/tools/annotations/CMakeLists.txt visit2.8.2-new/src/tools/annotations/CMakeLists.txt
---- visit2.8.2-old/src/tools/annotations/CMakeLists.txt	2014-08-11 23:46:11.000000000 +0200
-+++ visit2.8.2-new/src/tools/annotations/CMakeLists.txt	2015-01-07 08:19:35.000735956 +0100
+--- a/tools/annotations/CMakeLists.txt	2014-08-11 23:46:11.000000000 +0200
++++ b/tools/annotations/CMakeLists.txt	2015-01-07 08:19:35.000735956 +0100
 @@ -54,9 +54,9 @@
  # Specify the libraries to link against
  TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy)
@@ -14,8 +14,8 @@ diff -ru visit2.8.2-old/src/tools/annotations/CMakeLists.txt visit2.8.2-new/src/
  # add vtk definitions
  ADD_TARGET_DEFINITIONS(time_annotation "${VTK_DEFINITIONS}")
 diff -ru visit2.8.2-old/src/vtkqt/CMakeLists.txt visit2.8.2-new/src/vtkqt/CMakeLists.txt
---- visit2.8.2-old/src/vtkqt/CMakeLists.txt	2014-08-11 23:46:46.000000000 +0200
-+++ visit2.8.2-new/src/vtkqt/CMakeLists.txt	2015-01-07 08:19:00.950735904 +0100
+--- a/vtkqt/CMakeLists.txt	2014-08-11 23:46:46.000000000 +0200
++++ b/vtkqt/CMakeLists.txt	2015-01-07 08:19:00.950735904 +0100
 @@ -64,9 +64,9 @@
  
  # Specify the libraries to link against on Windows & Mac
@@ -28,8 +28,8 @@ diff -ru visit2.8.2-old/src/vtkqt/CMakeLists.txt visit2.8.2-new/src/vtkqt/CMakeL
  ENDIF(HAVE_LIB_R)
  # Add vtk definitions
  ADD_TARGET_DEFINITIONS(vtkqt "${VTK_DEFINITIONS}")
---- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt	2015-01-14 13:08:53.249224731 +0100
-+++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt	2015-01-14 13:08:28.569224460 +0100
+--- a/visit_vtk/full/CMakeLists.txt	2015-01-14 13:08:53.249224731 +0100
++++ b/visit_vtk/full/CMakeLists.txt	2015-01-14 13:08:28.569224460 +0100
 @@ -125,9 +125,11 @@
  ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
  
diff --git a/sci-visualization/visit/visit-2.12.3.ebuild b/sci-visualization/visit/visit-2.12.3-r1.ebuild
index 59ee01722b4e..14564343708f 100644
--- a/sci-visualization/visit/visit-2.12.3.ebuild
+++ b/sci-visualization/visit/visit-2.12.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
 
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1 qmake-utils
 
 DESCRIPTION="A software that delivers parallel interactive visualizations"
 HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/visit"
@@ -16,22 +16,31 @@ KEYWORDS="~amd64 ~x86"
 IUSE="cgns debug hdf5 mpi netcdf silo tcmalloc threads xdmf2"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="
-	${PYTHON_DEPS}
-	tcmalloc? ( dev-util/google-perftools )
+RDEPEND="${PYTHON_DEPS}
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	=sci-libs/vtk-6.1.0*[imaging,mpi=,python,rendering,qt5,xdmf2?,${PYTHON_USEDEP}]
+	sys-libs/zlib
+	x11-libs/qwt:6[qt5(+)]
 	cgns? ( sci-libs/cgnslib )
 	hdf5? ( sci-libs/hdf5 )
 	netcdf? ( sci-libs/netcdf )
 	silo? ( sci-libs/silo )
-	=sci-libs/vtk-6.1.0*[imaging,mpi=,python,rendering,qt5,xdmf2?,${PYTHON_USEDEP}]
-	dev-qt/qtx11extras:5
-	sys-libs/zlib
-	x11-libs/qwt:6[qt5]"
+	tcmalloc? ( dev-util/google-perftools )
+"
 DEPEND="${RDEPEND}
 	xdmf2? ( sci-libs/xdmf2 )
 "
 
 S="${WORKDIR}/${PN}${PV}/src"
+
 PATCHES=(
 	"${FILESDIR}/${P}-findpython.patch"
 	"${FILESDIR}/${P}-findsilo.patch"
@@ -43,14 +52,11 @@ PATCHES=(
 )
 
 src_prepare() {
-	for p in ${PATCHES[@]} ; do
-		epatch "${p}"
-	done
-	if use mpi ; then
-		epatch "${FILESDIR}/${P}-vtkmpi.patch"
-	fi
+	cmake-utils_src_prepare
+	use mpi && eapply "${FILESDIR}/${P}-vtkmpi.patch"
 
-	sed -i 's/exec python $frontendlauncherpy $0 ${1+"$@"}/exec '${EPYTHON}' $frontendlauncherpy $0 ${1+"$@"}/g' "bin/frontendlauncher"
+	sed -i 's/exec python $frontendlauncherpy $0 ${1+"$@"}/exec '${EPYTHON}' \
+		$frontendlauncherpy $0 ${1+"$@"}/g' "bin/frontendlauncher" || die
 }
 
 src_configure() {
@@ -65,8 +71,8 @@ src_configure() {
 		-DVISIT_HEADERS_SKIP_INSTALL=false
 		-DVISIT_QWT_DIR="${EPREFIX}/usr"
 		-DVISIT_QT5=true
-		-DVISIT_QT_DIR=/usr/lib/qt5/
-		$(cmake-utils_use threads VISIT_THREAD)
+		-DVISIT_QT_DIR=$(qt5_get_libdir)/qt5/
+		-DUSE_VISIT_THREAD=$(usex threads)
 	)
 	if use hdf5; then
 		mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr" )