gentoo resync : 29.08.2018

16 files changed, 397 insertions, 43 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 771c7c31466d..128881001ecd 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 106cb7ee7cf4..15bcca38ef2a 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -2,6 +2,6 @@ AUX ViSP-3.0.0-ffmpeg3.patch 4291 BLAKE2B 2948a7e4cad247da78187a15198fbc5e804caa
 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
 DIST visp-3.0.1.tar.gz 26029005 BLAKE2B d8881b0dd56b38f5db88e33f13e7dfa29b0a64fa1aebc5160384db2c7124d3a0ab2f0a5b3ba0255cbe209b578a3cdeb4420dc138a063248f945e9a73e041f21d SHA512 558e9acbd7ac5ef2193dca026062b75e0a30a7efbcae7d1e7d392b0855e643ee96ab9f60c19465f6bfa861374e30d9e91faf2f860e0442fa48ea5ea384b4e3fa
 DIST visp-3.1.0.tar.gz 38743434 BLAKE2B 294eaaf95c7ff7a8ade8bdf2146018856b081a9c461aca68eedb6fb096d253e537f41ad9a81687cba7a9e42a34b5a3fe2d1a705917a1c96f47e1e3e708f20cc3 SHA512 b7d56d3286e3610ff0db4f4c3a51f953825578532a9c518f7654142a644f466343660901632487fb513b0f6a6503d3716d56e733830b4d52daf5839bc1cfbdb5
-EBUILD ViSP-3.0.1.ebuild 3154 BLAKE2B 35ff3e8fea605350c55383a1754d85d8781286f9114c70b0fafdb7ae1d7a74bf0d1d78582625148ee345f20ae5ee02b964bc0636abc36868573e7510d039214e SHA512 a47e3d09ebcf9d27349fd9f568168efe56b503479e887a4e4f4b308293e4d65db2a10a2a1727245c3d7bd84124473f1dc5cd248dc5bf9fc091dbf1e8675dedb6
-EBUILD ViSP-3.1.0.ebuild 3022 BLAKE2B 051f344a7e980d42d34142161fd1303f2490ef46b63429e4ba07b3134f814a421ed43d8ff2dd9e6d1891374228548a2f54e323194cfbb82e0b4d4df244d54597 SHA512 d2a044de8da68ca3c808fe52c3fa32f95f852957540bbe2691760e4eb35628dc75cc463f1836f70c3b5b6f7191e1c42b4ac410740cfac137e23937d33986b07e
+EBUILD ViSP-3.0.1.ebuild 3015 BLAKE2B 05eb7ce8f21b8d947580cf02ed9687db50803cb44a663c299936f2e1254f573ac354d9ed6d8038179dfa41de1c856f132537a174a818575275ef88faa67a5641 SHA512 c7e88b8d8758d140cf0f80e95ec78bd04308f2983a23504c5f8af82fa0cb4f54b34420d4e1796d2dcbdf319a0b84682188359b43c2a847d426347221b9bd8cf2
+EBUILD ViSP-3.1.0.ebuild 2883 BLAKE2B 36ed6f92bf7fa75338c6aa14ab20e585de6f55949a2e3bbb129fa364140aac058cc07022deb773a17dc3c0e5cf49e2cdf11337fb881a0bf14a385291c22eddad SHA512 d786fcd4ec5c1636f18bcba3d39532a4a59caaef824e0e28ea870dc0fcc972088593465a1dc5f4bde51548c798bf0224c7ced376c1c2b65949d05642c2caeac7
 MISC metadata.xml 1393 BLAKE2B f891f74d6a7a334f7ee024f188c70ee031b391bbbebe4f67ff45efa6fe5def3eff0515a769a312e691e8acfda5e3633daa11ed1c590f43110a0ab1a190f39473 SHA512 c66184a7997d1682047605e6773a341f3f8503b765c36aa6931ac13eda2a78b866cf2db3c8ca68eabca206235b4c4bea534e176bd07cd9f5dcad3d9e67583d5e
diff --git a/sci-libs/ViSP/ViSP-3.0.1.ebuild b/sci-libs/ViSP/ViSP-3.0.1.ebuild
index 390e20cb18a2..35fbfb4321bf 100644
--- a/sci-libs/ViSP/ViSP-3.0.1.ebuild
+++ b/sci-libs/ViSP/ViSP-3.0.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/3"
 KEYWORDS="~amd64 ~arm"
 IUSE="
 	+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre
-	ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib
+	ois opencv png test tutorials usb v4l X xml +zbar zlib
 	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
 "
 
@@ -26,11 +26,10 @@ RDEPEND="
 	ieee1394? ( media-libs/libdc1394 )
 	jpeg? ( virtual/jpeg:0 )
 	lapack? ( virtual/lapack )
-	!qt4? ( motif? ( media-libs/SoXt ) )
+	motif? ( media-libs/SoXt )
 	ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
-	opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) )
+	opencv? ( media-libs/opencv:= )
 	png? ( media-libs/libpng:0= )
-	qt4? ( media-libs/SoQt dev-qt/qtgui:4 )
 	usb? ( virtual/libusb:1 )
 	v4l? ( media-libs/libv4l )
 	X? ( x11-libs/libX11 )
@@ -48,7 +47,6 @@ RDEPEND="${RDEPEND}
 REQUIRED_USE="
 	ffmpeg? ( opencv )
 	ois? ( ogre )
-	qt4? ( coin )
 	motif? ( coin )
 "
 
@@ -73,8 +71,8 @@ src_configure() {
 		"-DUSE_OGRE=$(usex ogre ON OFF)"
 		"-DUSE_OIS=$(usex ois ON OFF)"
 		"-DUSE_OPENCV=$(usex opencv ON OFF)"
-		"-DUSE_SOQT=$(usex qt4 ON OFF)"
-		"-DUSE_SOXT=$(usex motif "$(usex qt4 OFF ON)" OFF)"
+		"-DUSE_SOQT=OFF"
+		"-DUSE_SOXT=$(usex motif ON OFF)"
 		"-DUSE_V4L2=$(usex v4l ON OFF)"
 		"-DUSE_X11=$(usex X ON OFF)"
 		"-DUSE_XML2=$(usex xml ON OFF)"
diff --git a/sci-libs/ViSP/ViSP-3.1.0.ebuild b/sci-libs/ViSP/ViSP-3.1.0.ebuild
index 07dfbbd91058..354edc0a62bd 100644
--- a/sci-libs/ViSP/ViSP-3.1.0.ebuild
+++ b/sci-libs/ViSP/ViSP-3.1.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0/3.1"
 KEYWORDS="~amd64 ~arm"
 IUSE="
 	+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre
-	ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib
+	ois opencv png test tutorials usb v4l X xml +zbar zlib
 	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
 "
 
@@ -25,11 +25,10 @@ RDEPEND="
 	ieee1394? ( media-libs/libdc1394 )
 	jpeg? ( virtual/jpeg:0 )
 	lapack? ( virtual/lapack )
-	!qt4? ( motif? ( media-libs/SoXt ) )
+	motif? ( media-libs/SoXt )
 	ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
-	opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) )
+	opencv? ( media-libs/opencv:= )
 	png? ( media-libs/libpng:0= )
-	qt4? ( media-libs/SoQt dev-qt/qtgui:4 )
 	usb? ( virtual/libusb:1 )
 	v4l? ( media-libs/libv4l )
 	X? ( x11-libs/libX11 )
@@ -46,7 +45,6 @@ RDEPEND="${RDEPEND}
 	demos? ( sci-misc/ViSP-images )"
 REQUIRED_USE="
 	ois? ( ogre )
-	qt4? ( coin )
 	motif? ( coin )
 "
 
@@ -70,8 +68,8 @@ src_configure() {
 		"-DUSE_OGRE=$(usex ogre ON OFF)"
 		"-DUSE_OIS=$(usex ois ON OFF)"
 		"-DUSE_OPENCV=$(usex opencv ON OFF)"
-		"-DUSE_SOQT=$(usex qt4 ON OFF)"
-		"-DUSE_SOXT=$(usex motif "$(usex qt4 OFF ON)" OFF)"
+		"-DUSE_SOQT=OFF"
+		"-DUSE_SOXT=$(usex motif ON OFF)"
 		"-DUSE_V4L2=$(usex v4l ON OFF)"
 		"-DUSE_X11=$(usex X ON OFF)"
 		"-DUSE_XML2=$(usex xml ON OFF)"
diff --git a/sci-libs/alglib/Manifest b/sci-libs/alglib/Manifest
index bb336516f5bf..0346de2888a4 100644
--- a/sci-libs/alglib/Manifest
+++ b/sci-libs/alglib/Manifest
@@ -2,6 +2,6 @@ AUX CMakeLists.txt 1076 BLAKE2B 8269169a16e2a1b56f976d47e5369c8c2106cad01f295875
 AUX CMakeLists.txt-3.8.2 1159 BLAKE2B bd12bd65ddc7e60d1e84b04d5c01391420accf099f17801680446856e817bd606315ee54a44b0bd559fe0a9fce35dfab8b9dfa2dd7edc406d57563ea0f77999a SHA512 193661b9f949972048132bc07b4619c2f0d38135d6f0030621cd8aabf87e9e78a6bec18cdb4fb9cb9e547fee9f4387e21ba3a02d45c41033a9c0be9221cf7d3c
 DIST alglib-3.10.0.cpp.gpl.tgz 1991101 BLAKE2B 884b80becce676285b7bc1f26ed8917c4c82f53b41c0350dfc8bff6573e2e6f12183e82fc317b54a8021b1f931eb7d5b55944902d0816f7097fdc05632128bdc SHA512 f02b3db5ab8dee841f27186b6693997c4e6876e75310b0a31a04593dbcb41d300920404e32e7aecb39c8dd15e54cfee05b725caa27397a67b453f6e64cd1ef5e
 DIST alglib-3.8.2.cpp.tgz 1674260 BLAKE2B 85379da805abe27b86025bddafab775fbcb132b74db07abb204c6677b4fe75bd392d2bacb01b26510e1a6f1086b062902f598c9f13892b46e3dca938e73d1ea7 SHA512 3d7b6e3b5a29f25aee476bdd69e583d7504a2e06d390822b4aa2792eeb500e08c13477176be348a9dd560bad358e423465c9086f0c7c12f73dc88024364aed50
-EBUILD alglib-3.10.0-r1.ebuild 612 BLAKE2B 20f0fc2a9af81f8542492da6c144df19d47c62f102a138998b0287797a6535fb8ccee2184846682c3a9e118a854bfd2ee79423c1439ff005c073794d68fbf48d SHA512 7b73e381edc67ace415cfcc150b9ab1c0e5e9d11ab4207aaac6049eaba53186763a0df7ce2893732ae59d1c5ab92e02e2f0e91761425427c29bcc47a034f6bba
+EBUILD alglib-3.10.0-r1.ebuild 611 BLAKE2B a903cf2e8a555b12e85bbd0b0abb22aafc7ea49e41dc7e8e6ff19a139adefaf784f4ae88c5d195171fc911a4613ff8a4b5120e03414499e5fbf254daa1dd5f9b SHA512 5b62b28e889a64b8ecbac1a4b22516085591586deff2c0d0e170fd3ace27f86a39a3a798e9a2527ecd46aadf9c0443b29618a4c9a4e845f51e3370961a9a9e91
 EBUILD alglib-3.8.2-r1.ebuild 606 BLAKE2B 2ac905bec314659c65974f54ddbc99f1e6383ea440f27b3abe0350f4326299e12cafa73fc49edd1fb2e4c53c75eff230764bbb82d65a20e87da13f8a44676349 SHA512 b1e71c39760f2e45384988f8c789456fb76ae110c5d9c6dd0ccb6f0bf72d898acee7a3bace7d888c7a90a9e5a62fdf1b0f223d7e92e6ac1a2914fd915ff2f0ad
 MISC metadata.xml 1592 BLAKE2B 96df655b24fc1e27a90f6a31388135e9ec14965eef850c14468797dbb19670ef4695219459b2af337613a92cc25a7eb12a1b07f95a3e1e4b058d9f9c38ded770 SHA512 e16165304d85c3201c428b46bb85006281a2faac170f6b7f2966bc683f57387a0d4b68eddd6ad2d4ed9d26af992f4f9b2616c761f0bf1102c6749a8025478844
diff --git a/sci-libs/alglib/alglib-3.10.0-r1.ebuild b/sci-libs/alglib/alglib-3.10.0-r1.ebuild
index 4144904b8fb4..71b8e121855a 100644
--- a/sci-libs/alglib/alglib-3.10.0-r1.ebuild
+++ b/sci-libs/alglib/alglib-3.10.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
@@ -22,6 +22,8 @@ src_prepare() {
 }
 
 src_configure() {
-	local mycmakeargs=( $(cmake-utils_use_build test) )
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test)
+	)
 	cmake-utils_src_configure
 }
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 8e99e47e2d1f..3c62edbdc6a7 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,6 +1,8 @@
 AUX 01_fix_perl_script_path.patch 8946 BLAKE2B 76f69ab764a150539732cfa71014bf8b4d50ae5f43352c244ee3eb8bf3048a6cd213198f12e89a560206dfb465d9a02416d8490b099bf2792865415d4b5a74ad SHA512 002b6fe72068a185ecf87ecf04990e8b085593aeee1faa399aacc64de2810f45ecfb181cac9651a37a07719b41cf0029176404ce33264e196350ff701b51f18a
 AUX 02_dcmtk_3.6.0-1.patch 3245 BLAKE2B 0aa7fae29baeacfddf676324ed13f8386be94129e45e3e8e5e4355491e2418177600b102b9b47e2969277b095f0d4d7c0d7c07ad931f788290c4ff8a69acb695 SHA512 369ee28f0d30f7aaa6f204aa45a4314218eb6ed070dc1e3a557802d62956ec3bdf8dcc1490c0b7b879d1a2e9145aa8bf0de691ef32e2bc7dd9270f63cc31f68a
 AUX 04_nostrip.patch 7339 BLAKE2B 1ff0efe77ba2d277e5d3eceec6de5ed3bd9bc0df415909584d95c74b2d40507b8a1a10eed0956182c944190c8f70fec2ecf68528b4f2f6916ae4c4064a311eb1 SHA512 7f8fb30a4ad4b2b0ab6ace37afb618efc3faed6af3dbed6793ff8c61dfd0a99aa26b880e6c0cc7addfffa008044ba8e81e622f94bebf6152cb0bd273da023e29
+AUX dcmtk-3.6.3-dcmqrdb-cfg.patch 3031 BLAKE2B 9fd21949e42c7f0c479db7d9b81c133837bec4ba68554e463d253c47b451ded6e1d74aa8d545ca10220570be48021f8640eb47f63706ad517ee0ae6c6b2fa2cf SHA512 2487f88a650e299cc6a2011ba12f74bd2c305c4d8aad57034b04f99f4c0095505f6e000cada9fcafe466590719c0678735cafec0254d473c48e171c3adc91d9a
+AUX dcmtk-3.6.3-nostrip.patch 7049 BLAKE2B 57d7b4d2cc3bdd683cb6c51c6d9c7e37023ddaf255655cf3f6c1473484d4e41d4a75b3bcb452a3caa06b8c751cfca47a14b0cd10372c1ebde936f7dec3046ed0 SHA512 00f28de0995c2d38b32b59298ac1c97878248647d403df86244d16a16cfd4c7ba47e7fe400592e5ac0f935a3704733a768fa3b94c9625903e86ab5f714d093bd
 AUX dcmtk-asneeded.patch 4403 BLAKE2B 14323df7dccad5de0f4746a025c25ed9fb92964c0acecacd25a9aed9d00e655e9681800cc4eb6fef562fbc2b941542d119b3f0531ec2dd0670c4c768be2a96ec SHA512 629b6cc819c0440b9173ca09343309399abaa1cd23b92f7a2a78b732508140c9b6f9885f38c18328dc9b3dc5e86534940595380fac9223c2fb45c901c9f1222c
 AUX dcmtk-fix_doc_install.patch 877 BLAKE2B 70b85d1e1747b309413c5ba2c201eaccf52dadf93e84a18bfd0dd8a202b1fa5f1a10755c6cca7b2dd8feb5df10bd6c3565de6bae4ec83d997ec17213f8fe2903 SHA512 243d4fe9c3259f852de3e662e5b3914a9ea8e22ebdd7992b61561f9e26d04fc2b78a1045eca63791d13ad34dcc26c3e9a76b750a1b7b1cc1040151cb454903b2
 AUX dcmtk-gcc472-error.patch 13994 BLAKE2B d9f376ea78c181c24caddb7fddcdf2a83fbee587e98152fd47048f84c8871611004fb01903e66fdfd054b92bae79c13f616e734be54436e8abda918d09e7abd8 SHA512 d408a83cd7b1de08041ff2c3df7ee3a766ffa31a7085c8a1e853de6fd3d4d871557a5b2a2a417c52953a4bcc4ed2d5f813cd3a5170fb27482caec60ff1361eac
@@ -8,5 +10,7 @@ AUX dcmtk_version_number.patch 5439 BLAKE2B 91f3a39227bb7c6a70005dca060709a5e976
 AUX png_tiff.patch 620 BLAKE2B a4bf8a55581723131f27a513f7e16550be70012b85f709bc54e4a4404a72f2211571f41be00e64042a520f7a51740a3d09a76e7889ff7fbc925102ac7a618892 SHA512 b6c30e40ffcabf77f3dd04dbf5ba76ac0e86972e06eec81a1833c472099e7b207c4343208dc756f650f5b5ff77df6b950b0acb24c43029f30e2d67a3f882fab2
 AUX regression_stacksequenceisodd.patch 4989 BLAKE2B 4a2ab9cb535d6d643b6b92134e5ebb53f25d600e6e744ee6ab51ee66b4fd1d37570c321c4b957678d28f5c0c94dfc112faafb07de01beccb45ad6152fd30f916 SHA512 bb126c947646ca3274863b8517478e738fcbe16f3e1e0bb75b8601ad2b5e6492400f96a89aaf25f683b06f6f3f9dad76391d5adc62177496cbffc0309aa7dc72
 DIST dcmtk-3.6.0.tar.gz 4673121 BLAKE2B 5694669bf4e612fbc39c5785a1498097972d47ecd5c66e437603dd2259258783b36ac86ea2dd57cc74b3af1701c933965e53c433dd09e1acd94dbb768b81b365 SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c
-EBUILD dcmtk-3.6.0.ebuild 2344 BLAKE2B 6180ee0edfe4536ac962d506a25a0a615fbf20b776bd4c0867f393b3db37a910fc1f64c277b433d0d07e695e987d3b67bf0e8e483f9f09e1ec07970c307e2f2a SHA512 61db7e555592693e1eab72421148d9d7bb725dad6b944f52ca543dd93a1817e7e8beed7368e62e0896a6c212cc465d3e3befd56b640db7cd2616edf2df4727d6
+DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
+EBUILD dcmtk-3.6.0.ebuild 2337 BLAKE2B ba98732e46fe8a25081bb6e2bc633b492e1fdb9c8180735a5516cd077faf298be5b022e8265d2b1f30ec4ad1c8a12eb1d0df7aa248c8991024cfbf22773ff1d0 SHA512 2af5f13e108f90614fb59da36887b49ca3adb5bfc4676997b9adbf75c770406af41588747c821cac2a731ebde1bf3540a9d6ae781495d6cc21304040d921302e
+EBUILD dcmtk-3.6.3.ebuild 2001 BLAKE2B 86e238bd4e5c4c407b586d00ba35647b76a90d115627950449a34da2b6ba22b2731317763c52fd5297a2f9cb7bfbd875aa2578620e938d9bed4a821f0458d666 SHA512 a2ffe250b409318886005a092c349dc510d754c46629fa23cfbdef1ab423876e43141c721784a6d19e3ddbbfdd829398731c88a4684c2a549fddd36dcf4d5ff1
 MISC metadata.xml 317 BLAKE2B cad6b71cf9d8e4f626ee594c2eaad2e75f8ae288ea53206ae8ba37f0be04168f2ce7adeef7e45876d1358250e7ec6f2d9a07cc1c0ea4cf929323f1292ae4853a SHA512 0c6bb7cc6f8d56a7809354d0630ee49f33b63f7b60ad0a0ccbbfd7f28391a4c6b0c9f56caeb7cefcc74bf169ed6d46adda4fd204ef633311376b3cc3f7193d68
diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
index 414724b2e234..1a94d20b5063 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 	# fix -D deprecation warnings
 	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
 		"${S}"/config/configure.in \
-		"${S}"/CMakeLists.txt
+		"${S}"/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -74,7 +74,7 @@ src_configure() {
 	cmake-utils_src_configure
 
 	if use doc; then
-		cd "${S}"/doxygen
+		cd "${S}"/doxygen || die
 		econf
 	fi
 }
@@ -83,16 +83,16 @@ src_compile() {
 	cmake-utils_src_compile
 
 	if use doc; then
-		emake -C "${S}"/doxygen || die
+		emake -C "${S}"/doxygen
 	fi
 }
 
 src_install() {
 	cmake-utils_src_install
 
-	doman doxygen/manpages/man1/* || die
+	doman doxygen/manpages/man1/*
 
 	if use doc; then
-		dohtml -r "${S}"/doxygen/htmldocs/* || die
+		dohtml -r "${S}"/doxygen/htmldocs/*
 	fi
 }
diff --git a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
new file mode 100644
index 000000000000..463fca72dfb1
--- /dev/null
+++ b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="The DICOM Toolkit"
+HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
+SRC_URI="ftp://dicom.offis.de/pub/dicom/offis/software/${PN}/${PN}363/${P}.tar.gz"
+
+LICENSE="OFFIS"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="doc png ssl tcpd tiff +threads xml zlib"
+
+RDEPEND="
+	dev-libs/icu:=
+	virtual/jpeg:0
+	png? ( media-libs/libpng:* )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	media-gfx/graphviz
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dcmqrdb-cfg.patch
+	"${FILESDIR}"/${P}-nostrip.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:share/doc/dcmtk:&-${PV}:" \
+		-e "s:DIR \"/:DIR \"/usr/:" \
+		-e "s:usr/etc:etc:" \
+		-e "s:/lib\":/$(get_libdir)\":" \
+		-e "s:COPYRIGHT::" \
+		-i CMakeLists.txt || die
+	sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
+		-i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
+	# Temporary workaround: docs are not built with CMake
+	sed -i -e '/include/d' doxygen/Makefile.in || die
+
+	# fix -D deprecation warnings
+	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
+		"${S}"/config/configure.in \
+		"${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DDCMTK_WITH_ICU=ON
+		-DDCMTK_WITH_TIFF=$(usex tiff)
+		-DDCMTK_WITH_PNG=$(usex png)
+		-DDCMTK_WITH_XML=$(usex xml)
+		-DDCMTK_WITH_ZLIB=$(usex zlib)
+		-DDCMTK_WITH_OPENSSL=$(usex ssl)
+		-DDCMTK_WITH_DOXYGEN=$(usex doc)
+		-DDCMTK_WITH_THREADS=$(usex threads)
+	)
+
+	cmake-utils_src_configure
+
+	if use doc; then
+		cd "${S}"/doxygen || die
+		econf
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		emake -C "${S}"/doxygen
+	fi
+}
+
+src_install() {
+	doman doxygen/manpages/man1/*
+
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )
+	fi
+	cmake-utils_src_install
+}
diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch
new file mode 100644
index 000000000000..4ccb58d4e34d
--- /dev/null
+++ b/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch
@@ -0,0 +1,87 @@
+Author: Jürgen Salk <jsa@debian.org>
+Description: The original maintainer Jürgen Salk applied
+ a set of patches to the original code.  This file contains
+ changes to C++ code
+
+Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg
+===================================================================
+--- a/dcmqrdb/etc/dcmqrscp.cfg	2010-09-09 19:20:25.000000000 +0200
++++ b/dcmqrdb/etc/dcmqrscp.cfg	2011-01-28 09:49:02.000000000 +0100
+@@ -10,7 +10,9 @@
+ NetworkTCPPort  = 104
+ MaxPDUSize      = 16384
+ MaxAssociations = 16
++UserName        = "dcmtk"
++GroupName       = "dcmtk"
+ 
+ #
+ # Default settings for specific character set behavior:
+ # SpecificCharacterSet = fallback
+@@ -28,12 +30,13 @@
+ # NOTE: in the current implementation you cannot substitute an IP address
+ # for a hostname.
+ #
+-acme1           = (ACME1, acmehost1, 5678)
+-acme2           = (ACME2, acmehost2, 5678)
+-acmeCTcompany   = acme1, acme2
+-united1         = (UNITED1, unitedhost1, 104)
+-united2         = (UNITED2, unitedhost2, 104)
+-unitedMRcompany = united1, united2
++# Example:
++#acme1           = (ACME1, acmehost1, 5678)
++#acme2           = (ACME2, acmehost2, 5678)
++#acmeCTcompany   = acme1, acme2
++#united1         = (UNITED1, unitedhost1, 104)
++#united2         = (UNITED2, unitedhost2, 104)
++#unitedMRcompany = united1, united2
+ #
+ HostTable END
+ 
+@@ -51,8 +54,9 @@
+ #       VendorName = SymbolicName
+ # The symbolic name should be defined in the HostTable.
+ #
+-"Acme CT Company"   = acmeCTcompany
+-"United MR Company" = unitedMRcompany
++# Example:
++#"Acme CT Company"   = acmeCTcompany
++#"United MR Company" = unitedMRcompany
+ #
+ VendorTable END
+ 
+@@ -70,8 +74,13 @@
+ #               Entry in HostTable                      |
+ #               ANY
+ #
+-COMMON       /home/dicom/db/COMMON       R  (200, 1024mb) ANY
+-ACME_STORE   /home/dicom/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany
+-UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany
++# Example:
++#
++#ACME_STORE   /var/lib/dcmtk/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany
++#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany
++#
++# Uncomment and adjust the following lines for a common r/rw storage area:
++#READWRITE     /var/lib/dcmtk/db/READWRITE    RW (10, 1024mb)  ANY
++#READ          /var/lib/dcmtk/db/READ         R  (200, 1024mb) ANY
+ #
+ AETable END
+Index: dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt
+--- a/dcmqrdb/docs/dcmqrcnf.txt	2010-09-09 19:20:12.000000000 +0200
++++ b/dcmqrdb/docs/dcmqrcnf.txt	2011-01-28 09:46:02.000000000 +0100
+@@ -44,8 +44,8 @@
+ MaxPDUSize           = 8192
+ MaxAssociations      = 20
+ SpecificCharacterSet = fallback
+-UserName             = (do not change user)
+-GroupName            = (do not change group)
++UserName             = "dcmtk"
++GroupName            = "dcmtk"
+ 
+ Available options for specific character sets are:
+ 
+Index: dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile	2011-01-28 09:46:02.000000000 +0100
+@@ -0,0 +1 @@
++
diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch
new file mode 100644
index 000000000000..83bd3a62fd90
--- /dev/null
+++ b/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch
@@ -0,0 +1,171 @@
+Remove all hardcoded calls to `strip` command
+
+Index: dcmtk-3.6.0/config/templates/Makefile.src
+===================================================================
+--- a/config/templates/Makefile.src	2009-01-30 10:27:58.000000000 +0100
++++ b/config/templates/Makefile.src	2011-01-28 09:53:28.000000000 +0100
+@@ -31,7 +31,7 @@
+ install-bin: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmdata/apps/Makefile.in
+===================================================================
+--- a/dcmdata/apps/Makefile.in	2009-11-04 10:58:05.000000000 +0100
++++ b/dcmdata/apps/Makefile.in	2011-01-28 09:53:45.000000000 +0100
+@@ -76,7 +76,7 @@
+ install-bin: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmimage/apps/Makefile.in
+===================================================================
+--- a/dcmimage/apps/Makefile.in	2009-10-13 16:08:33.000000000 +0200
++++ b/dcmimage/apps/Makefile.in	2011-01-28 09:53:59.000000000 +0100
+@@ -42,7 +42,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmimgle/apps/Makefile.in
+===================================================================
+--- a/dcmimgle/apps/Makefile.in	2009-10-28 10:53:39.000000000 +0100
++++ b/dcmimgle/apps/Makefile.in	2011-01-28 09:54:11.000000000 +0100
+@@ -39,7 +39,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmjpeg/apps/Makefile.in
+===================================================================
+--- a/dcmjpeg/apps/Makefile.in	2009-10-07 14:44:33.000000000 +0200
++++ b/dcmjpeg/apps/Makefile.in	2011-01-28 09:54:28.000000000 +0100
+@@ -72,7 +72,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ clean:
+Index: dcmtk-3.6.0/dcmnet/apps/Makefile.in
+===================================================================
+--- a/dcmnet/apps/Makefile.in	2009-11-04 11:24:29.000000000 +0100
++++ b/dcmnet/apps/Makefile.in	2011-01-28 09:54:50.000000000 +0100
+@@ -52,7 +52,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmpstat/apps/Makefile.in
+===================================================================
+--- a/dcmpstat/apps/Makefile.in	2009-10-13 16:57:49.000000000 +0200
++++ b/dcmpstat/apps/Makefile.in	2011-01-28 09:55:10.000000000 +0100
+@@ -113,7 +113,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmqrdb/apps/Makefile.in
+===================================================================
+--- a/dcmqrdb/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
++++ b/dcmqrdb/apps/Makefile.in	2011-01-28 09:55:24.000000000 +0100
+@@ -57,7 +57,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmsign/apps/Makefile.in
+===================================================================
+--- a/dcmsign/apps/Makefile.in	2009-09-04 17:42:31.000000000 +0200
++++ b/dcmsign/apps/Makefile.in	2011-01-28 09:55:35.000000000 +0100
+@@ -33,7 +33,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmsr/apps/Makefile.in
+===================================================================
+--- a/dcmsr/apps/Makefile.in	2009-10-13 16:57:49.000000000 +0200
++++ b/dcmsr/apps/Makefile.in	2011-01-28 09:55:48.000000000 +0100
+@@ -44,7 +44,7 @@
+ install-bin: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmwlm/apps/Makefile.in
+===================================================================
+--- a/dcmwlm/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
++++ b/dcmwlm/apps/Makefile.in	2011-01-28 09:55:58.000000000 +0100
+@@ -49,7 +49,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in
+===================================================================
+--- a/dcmrt/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
++++ b/dcmrt/apps/Makefile.in	2011-01-28 09:56:33.000000000 +0100
+@@ -55,7 +55,7 @@
+ install-bin: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in
+===================================================================
+--- a/dcmjpls/apps/Makefile.in	2011-01-28 09:56:54.000000000 +0100
++++ b/dcmjpls/apps/Makefile.in	2011-01-28 09:57:00.000000000 +0100
+@@ -71,7 +71,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest
index af7f220f96b4..76fa182424b6 100644
--- a/sci-libs/itpp/Manifest
+++ b/sci-libs/itpp/Manifest
@@ -1,3 +1,3 @@
 DIST itpp-4.3.1.tar.bz2 1289687 BLAKE2B e14b88e6e37185525bda0d85dd13b3ef9ec8fa68f1757f56dce6436f7b9492a40aa256872186058d8fc090be656e977e0ce3bdbdf7346d2a940b481865e6d02c SHA512 b46d048fa7f33e80d2291a5e38e205c159791ea200f92c70d69e8ad8447ac2f0c847fece566a99af739853a1643cb16e226b4200c8bf115417f324e6d38c66bd
-EBUILD itpp-4.3.1-r1.ebuild 1341 BLAKE2B 117fc06efc84cb9e093061d8c4273c71bd0c8e09947ed0cd2e7f7cc683f292b44ecfc9d849cfe2328a648abba12798c53df13cbc1e9207cc7a9e7ab926c50a53 SHA512 96c292cb3d6bd26c6a1396e74ce08fdc1d5bbfc9c75d2311686d62d12f28720cb74f17a616b687cea3f19d8c5f67565e3ccac9ce3fd45eb5bfa15a081bf99f47
+EBUILD itpp-4.3.1-r1.ebuild 1345 BLAKE2B 6e8ca886e084b1c21cab9bcded4f9e0a4471b3d60bb6339167dfe0cda2f5e97b2271bb192f4eeb0835a9d86ef47082710170bea6fa828bd077a87fae296c1e6b SHA512 728ef2d5fb9d34f5187b4e738cfbf4cac32c8bacc432a7abddc75e877f771ff6986edc3e00ff182ea29f3d351cbc2fe61f6b3166778ad5db4dc59fbfd64ad2df
 MISC metadata.xml 778 BLAKE2B 6f02b46a0e83a2afc1766af83cc3761574117aef83e5032628f7b84680c1467093a0ca314bc248935a4c9202ce39282f0fc6fbc50f905bab3f7af940ef5fc5b6 SHA512 daef37adb619d49abcb70482f581cbf3492f7fc352f0414f5da2f77ca114b45816fd20466e70028030de3f478ca2ebfb2ff576cb231f860be09e5918931860a8
diff --git a/sci-libs/itpp/itpp-4.3.1-r1.ebuild b/sci-libs/itpp/itpp-4.3.1-r1.ebuild
index 3abddec3041b..8d522b501ed5 100644
--- a/sci-libs/itpp/itpp-4.3.1-r1.ebuild
+++ b/sci-libs/itpp/itpp-4.3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="C++ library of mathematical, signal processing and communication"
 HOMEPAGE="http://itpp.sourceforge.net/"
@@ -15,12 +15,17 @@ KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
+	sci-libs/fftw:3.0=
 	virtual/blas
 	virtual/lapack
-	>=sci-libs/fftw-3"
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen virtual/latex-base )"
+	doc? (
+		app-doc/doxygen
+		virtual/latex-base
+	)
+"
 
 DOCS=( ChangeLog NEWS AUTHORS README )
 
@@ -37,8 +42,8 @@ src_prepare() {
 		itpp/CMakeLists.txt || die
 
 	# respect gentoo libdir
-	sed -i "s#/lib#/$(get_libdir)#" itpp-config.cmake.in
-	sed -i "s#/lib#/$(get_libdir)#" itpp.pc.cmake.in
+	sed -i "s#/lib#/$(get_libdir)#" itpp-config.cmake.in || die
+	sed -i "s#/lib#/$(get_libdir)#" itpp.pc.cmake.in || die
 	sed -i \
 		-e "s#LIBRARY DESTINATION lib#LIBRARY DESTINATION $(get_libdir)#" \
 		-e "s#ARCHIVE DESTINATION lib#ARCHIVE DESTINATION $(get_libdir)#" \
@@ -48,7 +53,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBLA_VENDOR=Generic
-		$(cmake-utils_use doc HTML_DOCS)
+		-DHTML_DOCS=$(usex doc)
 	)
 	cmake-utils_src_configure
 }
diff --git a/sci-libs/openfoam/Manifest b/sci-libs/openfoam/Manifest
index ff275463c301..84b9fca1a3b6 100644
--- a/sci-libs/openfoam/Manifest
+++ b/sci-libs/openfoam/Manifest
@@ -5,7 +5,7 @@ DIST OpenFOAM-2.3.1.tgz 37660806 BLAKE2B 36a9034bd9e601303c6d141d1f236650ed890ba
 DIST OpenFOAM-2.4.0.tgz 41640005 BLAKE2B d8d3efb323966d0b1617a80711724e9a9f52372f7548bab6f6d41c6920f20fb25f2d0dbfdb82a5b7ce6604548fc61ef3f383f045c3b90ac7d5c3132f3933ca8f SHA512 1916191d810676145a88492e902840f5cbd839f3b221dcf55c5edc26791b395c1d36fd6ef37e4c1bc1f813357a3b22ce3ec3e1b802ac49157f76d25e6ca53cbe
 EBUILD openfoam-2.2.1.ebuild 2734 BLAKE2B efc312a7b6236fb8347a6c00485f024ede75179c95c36c3c99336a99e09b8630f26980f907269060508e1261a987f830f8495a9cc9803760d89d9fd51228809e SHA512 840b31b22793d5258e26118049a3c1277fcb22f37511bf71217b006af830fd8b360e09640e5026362e88fdc185d2531e86bb80fa1a0c539957d20707bc303234
 EBUILD openfoam-2.2.2.ebuild 2734 BLAKE2B efc312a7b6236fb8347a6c00485f024ede75179c95c36c3c99336a99e09b8630f26980f907269060508e1261a987f830f8495a9cc9803760d89d9fd51228809e SHA512 840b31b22793d5258e26118049a3c1277fcb22f37511bf71217b006af830fd8b360e09640e5026362e88fdc185d2531e86bb80fa1a0c539957d20707bc303234
-EBUILD openfoam-2.3.0-r1.ebuild 3137 BLAKE2B d703fc3aa45673d22bd4d4df0464b54f36d30c1836b5445dc63cc6dc1b04dd4b394891383432c80885d4ddb34eb220b53ea584e0f48004e5fdbb2d70b0358728 SHA512 0bb6909e2d73ccbab116264ad3d32c744ec090df056f85811c2d92f1e68f6de5f55b639a10a121c3af306d0c07ae9222bd45d54493c9d534e8ee0aae26634779
-EBUILD openfoam-2.3.1-r1.ebuild 3135 BLAKE2B ba766d8228e76a439185cda5f702ed98253c8352b917e47b7033dc340899b4eded0368290e9110e285a489e736e3298f6d546dddcb10c755d68a550ea27e2717 SHA512 77e983ce44158d5a7119c8fd5229741fd5ac3be8fafef67dfa68f2a216b8d06cfcae7d1f2e8ee9af08f759b1db4576875b0116c571dfab78c8a764bc22e869c4
+EBUILD openfoam-2.3.0-r1.ebuild 3066 BLAKE2B 83612e8ca96df1a4f36964ca8e6fda2f93821480a4a21c5e6c37f91237186c887cb6e0ed5bfd83ecc85a4f12410e368c446469cb33069ea78399290b2b517b12 SHA512 217104ca626b89af62e67046ce248e2434b8d25370759ee8e1415af87098d29dba250f73c62d3e4c97e746adb0cfe216b8733566ffcc8a13db00dd2d79bb6d72
+EBUILD openfoam-2.3.1-r1.ebuild 3064 BLAKE2B faa119a8ea8d1945683404623a3969da6d1c8a510e0e242a0e764ce14dd701eabf4fc082963f6ce78931f3632217f925264bc1e2caac472006f4e51dca12dddd SHA512 1d32199999c08c1172440df5a290f40ce82f2652622823604566e85ae69e066613400bafffa9f2bb450a5fcc8f6e8f81f14a3d7d76a1c25e58caacab43ea8ea7
 EBUILD openfoam-2.4.0-r1.ebuild 3152 BLAKE2B 359a89fe8ea196ee09467f4af9d225b34e80deb98ca96eff439738ab8f8c4075f2b0ce1bba180001f8c2b69979503235735730f1928e809c7a3cc577bc9703e2 SHA512 89a58093dabb8f17f6c03bf39069da82cb6c125ab12df67701393fcac419e53ff42950d3efa5685770954982bcf2e4d91889e19f22b10073bf48a2c89d4d9bf5
 MISC metadata.xml 538 BLAKE2B fc2c49df471cc63cd4e9096776373df0c15b81eca0c9b7e6779805f8274d088d474efef69d0d68bdea1a63989289074f42a24601d8336b22e7171cb495655e10 SHA512 f69a0c2437906775c05a2130e1e3e0b16f9038f80158f9334453ec15d14bfc0fcb2791ab68147a34c62bb1f17100d51c2f120e869075b6921e1d9edf5cb76fb8
diff --git a/sci-libs/openfoam/openfoam-2.3.0-r1.ebuild b/sci-libs/openfoam/openfoam-2.3.0-r1.ebuild
index 45d328296a54..0935f6953805 100644
--- a/sci-libs/openfoam/openfoam-2.3.0-r1.ebuild
+++ b/sci-libs/openfoam/openfoam-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="2.3"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples opendx src paraview"
+IUSE="doc examples opendx src"
 
 RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
 	!=sci-libs/openfoam-kernel-${MY_PV}*
@@ -28,8 +28,7 @@ RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
 	sci-libs/parmgridgen
 	sci-libs/scotch
 	virtual/mpi
-	opendx? ( sci-visualization/opendx )
-	paraview? ( ~sci-visualization/paraview-4.1.0[development] )"
+	opendx? ( sci-visualization/opendx )"
 DEPEND="${DEPEND}
 	doc? ( app-doc/doxygen[dot] )"
 
diff --git a/sci-libs/openfoam/openfoam-2.3.1-r1.ebuild b/sci-libs/openfoam/openfoam-2.3.1-r1.ebuild
index 1e302b58e1e2..9ed9cb2b0907 100644
--- a/sci-libs/openfoam/openfoam-2.3.1-r1.ebuild
+++ b/sci-libs/openfoam/openfoam-2.3.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.sourceforge.net/foam/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="2.3"
 KEYWORDS="amd64 x86"
-IUSE="doc examples opendx src paraview"
+IUSE="doc examples opendx src"
 
 RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
 	!=sci-libs/openfoam-kernel-${MY_PV}*
@@ -28,8 +28,7 @@ RDEPEND="!=sci-libs/openfoam-bin-${MY_PV}*
 	sci-libs/parmgridgen
 	sci-libs/scotch
 	virtual/mpi
-	opendx? ( sci-visualization/opendx )
-	paraview? ( ~sci-visualization/paraview-4.1.0[development] )"
+	opendx? ( sci-visualization/opendx )"
 DEPEND="${DEPEND}
 	doc? ( app-doc/doxygen[dot] )"