gentoo resync : 29.08.2018

20 files changed, 593 insertions, 82 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 353e335f5e71..e40a7d982872 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index d88bfeae4dbd..24056c9922b6 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -14,5 +14,5 @@ DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947
 EBUILD blender-2.72b-r4.ebuild 8106 BLAKE2B 32e220cf9afc0219a0b5d4adf14f540f381ac37d64b71be671f6edeb48f6bbf22aa62604fdb229aaa8b115d5a12b907f289e4fe458279eb2d7bbef623858d667 SHA512 068fad5bfd2fe25a5846e00f1a456ceb0e1e828549e537a3cb967cc062639ce6d179b3501504623c5a881ae662c4bba62275a70e148c2f2018eedd17948e4e21
 EBUILD blender-2.79-r1.ebuild 8100 BLAKE2B 7c077c8d3847fa0d7b881b5f5989e42339574b7104bc78869c8e481073b1e6ca062e5a74233f0b96b9ff6b1390f1cc0f203038e733223ddf21b796e696ba508b SHA512 9af0b9f17969a6601c3945fbe3d3d10dc6707df0c88e86e1c2f1617e9b750019a21d05cecab5e726069b9908ba6345d2e190732d3960bbb87674d1f983e311ee
 EBUILD blender-2.79.ebuild 8049 BLAKE2B b4effa99e23ee172e685dff46235c88aecf129a40ab4e01a7b8dd0fb4993e52849c5ebbc712ff63999176644ea9027e572b1f21f4838d31845a525d09d396bbd SHA512 7b660679c69df11a108e58e76cc2e950843bf0285e962cf1f776b3cabf8e7b187ab65984ff6e4bd85120347489d10853ab163d916a4f1c833d890112dd2692c6
-EBUILD blender-2.79b.ebuild 8047 BLAKE2B 0b71da769d5a118f8bc76b8ad58f70a422421db068132e970f953b161f6e5984bc43b016c79ecaf7fd99a02bb3dfcd668cefa5dd8fed6f72f890062d605f042d SHA512 4c52099937783b9b4b6d5924567014214a4e0f1d3664f5f03049f0f9cf8decaf23298b6f6e08e5e4c92406233114f9db7fd25c0f645ee07af3644d208172f70a
-MISC metadata.xml 3716 BLAKE2B 2c04c8b2724d9153efc0bdf8772b4a107e072a009032d390977f53972fb4afe27eada91da3991f680f41d8114d22a75e84c4f359e00ef2b378e53d7b507a45de SHA512 77866e595fba02c31ac64d9a124af03a6fe9080b27434ea2f93e615c6e702d1a393103d96c361079b1b5af861f0775cc0e57888d23e528e32c326dca7af4c09d
+EBUILD blender-2.79b-r1.ebuild 8165 BLAKE2B 8dba69527cd1800c587afd1f5f3369d86eec60ca83a7631df3868ccd17eb42effef1f486a30e8ab772e1baab3cd26f8317bc6c521879fe9cb187525d8894fa3b SHA512 945aceb3481a451ac5ffa54ce8f08605c7d33c34e7de97d5bab0a90d7bfb63d55f739282ced5fa512fd69232c01df9245ab75f5ae5f1d1365b38bb463c30a9a1
+MISC metadata.xml 3599 BLAKE2B fbe6e8d0aca923eb7274eddc7d1bfe5dab20f09acf00479176aed6777788a48bde457f6c0495d86ae17a727e3152919712bfd5de80b394a4e86a9985b736a62c SHA512 1e0ce8315996355a12e9f688cde63f67cd5251cc605b1da32dd4f819c6f9a13cbe2874ab6553e00a426da02802c0de23971d408084ce6025533ac46fc9c5b617
diff --git a/media-gfx/blender/blender-2.79b.ebuild b/media-gfx/blender/blender-2.79b-r1.ebuild
index be1c95be0e8a..1b9da6f82314 100644
--- a/media-gfx/blender/blender-2.79b.ebuild
+++ b/media-gfx/blender/blender-2.79b-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.blender.org"
 SRC_URI="http://download.blender.org/source/${P}.tar.gz"
 
 # Blender can have letters in the version string,
-# so strip of the letter if it exists.
+# so strip off the letter if it exists.
 MY_PV="$(ver_cut 1-2)"
 
 SLOT="0"
@@ -75,7 +75,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
 	openvdb? (
-		media-gfx/openvdb[${PYTHON_USEDEP},-abi3-compat(-)]
+		media-gfx/openvdb[${PYTHON_USEDEP},-abi3-compat(-),abi4-compat(+)]
 		dev-cpp/tbb
 		>=dev-libs/c-blosc-1.5.2
 	)
@@ -139,6 +139,8 @@ src_configure() {
 	# shadows, see bug #276338 for reference
 	append-flags -funsigned-char
 	append-lfs-flags
+	# Blender is compatible ABI 4 or less, so use ABI 4.
+	append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=4
 
 	local mycmakeargs=(
 		-DPYTHON_VERSION="${EPYTHON/python/}"
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 92c09eab0ec7..685687e61af4 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -10,10 +10,6 @@
 		<name>Adrian Grigo</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index b076dff32ae5..13971c0957c0 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -3,5 +3,5 @@ DIST gifsicle-1.90.tar.gz 571910 BLAKE2B 607f8ff93818c3ab9d3d74bd7735bcf1bb6412c
 DIST gifsicle-1.91.tar.gz 571588 BLAKE2B be3973141e57618d50efb5205f79e485a4450ceed02d6c718e49305250941656f0d220c91d2056554348d14348ed1ddf03f0aa9c47e22589994c5e80046422f6 SHA512 49b89e6f99bffd0dd732c920b936c2430a2f4f595d46e41654e5f39f180acaf9b0a4aec6cf52597c470d7c60265f16b730f6ce82e08701a2054fc3d08754c6da
 EBUILD gifsicle-1.86.ebuild 653 BLAKE2B 2df49285519d1948d5d49f1f5957bf77d25be210057f605e3bb4c79ae9187bcb47f189e0a388384459c78f8d44571d7f72d5cbadaf5b92cecb84afbd597170f2 SHA512 c79392cae433fb0ab41486f8587a50c342c76b899e43a0024ab4ceb1ffda7b6d1fb09faaa0d48335e815368ef3b72b05a37feed56820ba07d406c7d9bc3afe1f
 EBUILD gifsicle-1.90.ebuild 625 BLAKE2B 8df3dc5fdcb3d648278b9cda9b9525a5e0b3347a18462d0ee3311d2d907f1021497e560106ce4dd1e79a43a9c052365c63de510c32852c14a62c92fc1fa0f31a SHA512 dec6aa40b49711d08671f04054b5b3d98c4ca9e365a736b19d7e97d4fbc033a902ce462dc5bd6125d72c1c039d7b72af3f3a21c3b77bc6192b3945c3a645d894
-EBUILD gifsicle-1.91.ebuild 665 BLAKE2B ca71e35302445cedad12ae3ba6179c100321cb77e1e66d28030af745055002bb7e213b46a88e00670d0c6a7ddb2df0e68b7a151fd820f0e87cd30695df5a7d51 SHA512 e401bc0507363a0d584995af296d67bda1b111c338e02a217fe9ccf06a26f554eefb6cebd6c7b43761d1791c1aa7d40898b851cbb746f6479c2ce8a81bf91f60
+EBUILD gifsicle-1.91.ebuild 664 BLAKE2B 68b81b9e33c05331fa0b57886797b3f5a7629b9736889604c1d284628719bcfec5b446ae43eb2711145ed107681c20896d18d58d2caa5a6a1e39ccab65da0619 SHA512 378e4bb6251fe7ffed3263229aa20a6c4f0d2c3be6154049f91c9535b27f5e0c105b31c82c28870941921c2c42da6d104bf5a877ab36f706b45a3cb463748f8c
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/gifsicle/gifsicle-1.91.ebuild b/media-gfx/gifsicle/gifsicle-1.91.ebuild
index 553981f8938a..6d131f898b84 100644
--- a/media-gfx/gifsicle/gifsicle-1.91.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.91.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 81913822ce24..e7ab440716ca 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -17,5 +17,5 @@ EBUILD gimp-2.10.2.ebuild 5296 BLAKE2B 2ab4fe7a79d779f93d62f95a83fb754dca40dd6f8
 EBUILD gimp-2.10.4.ebuild 5296 BLAKE2B fa52f60a44fbaa0a08569177ba247d746270a73475f32e2cbf802687bad283ed84fa59b97545eafb1116f1663d9d12b6dec64d0f2dbcea092b391becf8294240 SHA512 2236f5ce2d1e2098f6a5460ce0e28e00543e6549a8e23992955746ba8fa125236bd7e673a1a6827356f2c397906e0c27eb8490df3544f7a261be9a9522a7895d
 EBUILD gimp-2.8.22-r1.ebuild 5186 BLAKE2B 10a8d7c1074b14a4a7b79ec2e157a189597d16caaa1c225704f3c1c7a348cfaa53e711e7e8977f5eb21bf36d5bb2e465e4218e17402858484592c5c10a3b699b SHA512 ccfc14a7e358d66e100a5a4d2d47818a049eb93f64c01ec67f431e7113c4b23355420524413981d68ea4fd53545c9f126867201f0bebe57abfdf7ab3ee337d56
 EBUILD gimp-2.9.8-r1.ebuild 5734 BLAKE2B a176bcbabc8298b9e29b755f7d3dbdc26c3e6a77335e826762c6ce0273aeea38341378bc719df8e617a69bd6f8570442e46f92116119fd40043669201ecdcf50 SHA512 2778c83c74d87fd8492a1107b1b64aab8114ea167aaf8d7ca2290cec314ed9640d60096a04c7834b718159f242cf3e2a2c46c6293a03927d8084d834bc415ff5
-EBUILD gimp-9999.ebuild 5146 BLAKE2B fc245f0f86922ea132cc7839c45e5ecb18cce3f9eb14c29ec74589563e1e5621bcf119d943ae85fd90c960ba0b5a43a94c43404c7920fa4239e447fdb87ba0fa SHA512 57d76bac0516d2273c3cfbc8d7cb1d6598bb82b339e980463061b0b97d32e690988bf4ce03f35bec9e9e4e100c4ad9345f5c09023aa3cc9910a369f97caa952f
+EBUILD gimp-9999.ebuild 5152 BLAKE2B a11db288f69ce0bab6f10b7e8ab7a0f9ac7c2325f1333a1b9ed3be0d91917d6731aab0e9136443013a94f96bf3028def7245d4386151bdf0f497d54e25470e19 SHA512 ad9110037a965c98437733bec46eadc9d7f7a7197c749c37e8f2d95e4fb437b9c5477e404ef6148648dc1f5280ab4fe3e1fe990da331dbc3c9d480c0abe9f40f
 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 8d2e5828d246..9122fd25c7e1 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -9,7 +9,7 @@ inherit virtualx autotools gnome2 multilib python-single-r1 ltprune git-r3
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
-EGIT_REPO_URI="https://git.gnome.org/browse/gimp"
+EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git"
 SRC_URI=""
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index b81e734ef6e0..5943882ddf0c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,10 @@
 AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34
+AUX krita-4.0.3-libraw-0.19.patch 3124 BLAKE2B c84c94b2e0032b4f1f78f1ca944940688775c91a48a0a6449343af36d03f5a754a48749e67365a028314757c0b822db7bda5e9b4e7c7c58796b032306abcd19b SHA512 90e2d40a6d30990b7de7365c06a769e500d2df75281767f3d724b7e5288e131b4cfcfff989a75e66642e374f624bdb8da2e6afe8c12de0ba3282ebd362189140
+AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
 DIST krita-4.0.3.tar.gz 241332929 BLAKE2B 222a3425f64c98d964f421c84f48295d5cb72e622631e9b1cb5a2ac9980a6f59cbf12b0815df68a09daf138efc2d4e2e83cb46034c8e12ddd621cb49f1117b72 SHA512 13b3263a09dbb955dea435e97bf12b6f0670fce68c4c2c9e97e7b45b480301119f317e72fac63eec07caff295885b7d62ac7c6255545a139e1e5f4b1106989e8
+DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45
 EBUILD krita-3.3.3.ebuild 2559 BLAKE2B a8cff6bd75d240ab4f4b63ac7f58d3d329c7c830cd5c62b0846d3b8b9f5ccbc0cb3a4405daad513a4d3ed3db3de9d9c9f81696d204cbc1779721312a171fe6d8 SHA512 43163beb98c83de02b28da41e8172546cf9993280d395387ed471b0c35568a7e6393610cc53da64d55830c0460b00d0fabb5431d14a6a360bba17f8ad54d1f14
-EBUILD krita-4.0.3.ebuild 3033 BLAKE2B 9103366c623967ad717a23cab0be96b8f1214a6c6f3e7958cc6a70c11436093cb3b476521f728b999669f1fb2aef2d82cd63f542c8660b7cd33edfc49b1fbd72 SHA512 7e74f23f97e3053ef4d73b99ff769303824aa81d458d379e43603925aaff9b8567ce664a0cab3d5d62b16bf87b2d0441da8f4405d5708d75ec5bfdc003ce101c
+EBUILD krita-4.0.3.ebuild 3210 BLAKE2B f1a506c7cc4955e6429743d0be8ed2201c7a6c54cabaa06fcfc913869c3afafb5b75022cf4f6651af517ac1a1a1e285221a44ca46450702fdfaf0ccc7f14a0f8 SHA512 af446dc81bfc14f76d0cd131e0eb6bb9a5f2e2ceb3d84d0a05a9eafe24cb722083a5574341833884b314221f4c7df07a3bb3a790893ecf25948ada4787e85f75
+EBUILD krita-4.0.4.ebuild 3096 BLAKE2B 4d54402c4fe4ab7b6802b88338bf436b4d74410191d38e037df4ecb15c101a4a1c9c3b88a36a6c1731ea6df864e45f042bc1c84ed91b4d34c5c3e9a6ff559b21 SHA512 a8a288bd685a1b8f86078d398e35462dadffdb8d2ebb7ca4d967dfed80b1261bebc565e54bb51385e9bdd60e043d129188c147faaba276c39e66bec3d8859f52
 MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
diff --git a/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
new file mode 100644
index 000000000000..03dd3c6bc758
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
@@ -0,0 +1,77 @@
+From 9fd6b44701e674058b0eaa5d3f98a99e410a1e03 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 29 Aug 2018 17:50:28 +0200
+Subject: [PATCH] Fix build with libraw 0.19
+
+Summary:
+Patch taken from arojas in https://phabricator.kde.org/D15132 applied
+with little offset.
+
+Test Plan: Built fine against libraw-0.19 with krita.git master.
+
+Reviewers: rempt, #krita
+
+Subscribers: lbeltrame, rdieter, pino, arojas
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D15148
+---
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+index 1c761f8563..adc26d2662 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+@@ -375,6 +375,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
+             raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
+             break;
+         }
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+         case RawDecodingSettings::LINENR:
+         {
+             // (100 - 1000) => (0.001 - 0.02) conversion.
+@@ -391,23 +392,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
+             raw.imgdata.params.cfa_clean    = true;
+             break;
+         }
++#endif
+         default:   // No Noise Reduction
+         {
+             raw.imgdata.params.threshold    = 0;
+             raw.imgdata.params.fbdd_noiserd = 0;
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+             raw.imgdata.params.linenoise    = 0;
+             raw.imgdata.params.cfaline      = false;
+             raw.imgdata.params.lclean       = 0;
+             raw.imgdata.params.cclean       = 0;
+             raw.imgdata.params.cfa_clean    = false;
++#endif
+             break;
+         }
+     }
+ 
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+     // Chromatic aberration correction.
+     raw.imgdata.params.ca_correc  = m_parent->m_rawDecodingSettings.enableCACorrection;
+     raw.imgdata.params.cared      = m_parent->m_rawDecodingSettings.caMultiplier[0];
+     raw.imgdata.params.cablue     = m_parent->m_rawDecodingSettings.caMultiplier[1];
++#endif
+ 
+     // Exposure Correction before interpolation.
+     raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection;
+@@ -461,8 +467,10 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
+ 
+     raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations;
+     raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl;
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+     raw.imgdata.params.eeci_refine    = m_parent->m_rawDecodingSettings.eeciRefine;
+     raw.imgdata.params.es_med_passes  = m_parent->m_rawDecodingSettings.esMedPasses;
++#endif
+ 
+     //-------------------------------------------------------------------------------------------
+ 
+-- 
+2.18.0
+
diff --git a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch b/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
new file mode 100644
index 000000000000..c9e3ddc2aea3
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
@@ -0,0 +1,324 @@
+Autogenerated by KDE_TEST=forceoptional-recursive and edited.
+
+--- a/plugins/paintops/libpaintop/CMakeLists.txt	2018-08-29 18:17:38.843385842 +0200
++++ b/plugins/paintops/libpaintop/CMakeLists.txt	2018-08-29 18:17:38.846385865 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2018-08-29 18:17:38.851385903 +0200
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2018-08-29 18:17:38.854385926 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+ 
+ include_directories(brush
+                     duplicate
+--- a/plugins/impex/libkra/CMakeLists.txt	2018-08-29 18:17:38.858385956 +0200
++++ b/plugins/impex/libkra/CMakeLists.txt	2018-08-29 18:17:38.861385978 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritalibkra_LIB_SRCS
+     kis_colorize_dom_utils.cpp
+--- a/plugins/impex/exr/CMakeLists.txt	2018-08-29 18:17:38.866386016 +0200
++++ b/plugins/impex/exr/CMakeLists.txt	2018-08-29 18:17:38.869386039 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+ 
+--- a/plugins/impex/svg/CMakeLists.txt	2018-08-29 18:17:38.874386077 +0200
++++ b/plugins/impex/svg/CMakeLists.txt	2018-08-29 18:17:38.878386107 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritasvgimport_SOURCES
+     kis_svg_import.cc
+--- a/plugins/impex/jpeg/CMakeLists.txt	2018-08-29 18:17:38.883386145 +0200
++++ b/plugins/impex/jpeg/CMakeLists.txt	2018-08-29 18:17:38.887386175 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+ 
+--- a/plugins/impex/heightmap/CMakeLists.txt	2018-08-29 18:17:38.892386213 +0200
++++ b/plugins/impex/heightmap/CMakeLists.txt	2018-08-29 18:17:38.896386243 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+--- a/plugins/impex/psd/CMakeLists.txt	2018-08-29 18:17:38.901386281 +0200
++++ b/plugins/impex/psd/CMakeLists.txt	2018-08-29 18:17:38.904386304 +0200
+@@ -1,5 +1,7 @@
+ if (NOT MSVC AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++        add_subdirectory(tests)
++    endif()
+ endif()
+ 
+ configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
+--- a/plugins/impex/ppm/CMakeLists.txt	2018-08-29 18:17:38.909386342 +0200
++++ b/plugins/impex/ppm/CMakeLists.txt	2018-08-29 18:17:38.913386372 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+--- a/plugins/impex/png/CMakeLists.txt	2018-08-29 18:17:38.918386410 +0200
++++ b/plugins/impex/png/CMakeLists.txt	2018-08-29 18:17:38.922386440 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritapngimport_SOURCES
+     kis_png_import.cc
+--- a/plugins/impex/csv/CMakeLists.txt	2018-08-29 18:17:38.927386478 +0200
++++ b/plugins/impex/csv/CMakeLists.txt	2018-08-29 18:17:38.931386508 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ # import
+ 
+--- a/plugins/impex/xcf/CMakeLists.txt	2018-08-29 18:17:38.936386546 +0200
++++ b/plugins/impex/xcf/CMakeLists.txt	2018-08-29 18:17:38.940386576 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
+ 
+--- a/plugins/impex/tiff/CMakeLists.txt	2018-08-29 18:17:38.944386606 +0200
++++ b/plugins/impex/tiff/CMakeLists.txt	2018-08-29 18:17:38.947386630 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(libkritatiffconverter_LIB_SRCS
+     kis_tiff_converter.cc
+--- a/plugins/extensions/qmic/CMakeLists.txt	2018-08-29 18:17:38.952386667 +0200
++++ b/plugins/extensions/qmic/CMakeLists.txt	2018-08-29 18:17:38.955386690 +0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/filters/CMakeLists.txt	2018-08-29 18:17:38.959386720 +0200
++++ b/plugins/filters/CMakeLists.txt	2018-08-29 18:17:38.963386750 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt	2018-08-29 18:17:38.968386788 +0200
++++ b/plugins/filters/unsharp/CMakeLists.txt	2018-08-29 18:17:38.971386811 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaunsharpfilter_SOURCES
+     unsharp.cpp
+--- a/plugins/tools/basictools/CMakeLists.txt	2018-08-29 18:17:38.976386849 +0200
++++ b/plugins/tools/basictools/CMakeLists.txt	2018-08-29 18:17:38.980386879 +0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++        add_subdirectory(tests)
++    endif()
+ endif ()
+ 
+ set(kritadefaulttools_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt	2018-08-29 18:17:38.985386917 +0200
++++ b/plugins/tools/tool_transform2/CMakeLists.txt	2018-08-29 18:17:38.989386947 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++        add_subdirectory(tests)
++    endif()
+ endif()
+ 
+ set(kritatooltransform_SOURCES
+--- a/plugins/color/lcms2engine/CMakeLists.txt	2018-08-29 18:17:38.994386985 +0200
++++ b/plugins/color/lcms2engine/CMakeLists.txt	2018-08-29 18:17:38.998387015 +0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${LCMS2_INCLUDE_DIR}
+--- a/plugins/dockers/defaultdockers/CMakeLists.txt	2018-08-29 18:17:39.003387053 +0200
++++ b/plugins/dockers/defaultdockers/CMakeLists.txt	2018-08-29 18:17:39.007387084 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritadefaultdockers_SOURCES 
+   kis_layer_box.cpp
+--- a/plugins/dockers/animation/CMakeLists.txt	2018-08-29 18:17:39.012387121 +0200
++++ b/plugins/dockers/animation/CMakeLists.txt	2018-08-29 18:17:39.016387151 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++        add_subdirectory(tests)
++    endif()
+ endif()
+ 
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/dockers/lut/CMakeLists.txt	2018-08-29 18:17:39.021387189 +0200
++++ b/plugins/dockers/lut/CMakeLists.txt	2018-08-29 18:17:39.025387220 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${OCIO_INCLUDE_DIR}
+--- a/libs/store/CMakeLists.txt	2018-08-29 18:17:39.030387258 +0200
++++ b/libs/store/CMakeLists.txt	2018-08-29 18:17:39.033387280 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritastore_LIB_SRCS
+     KoDirectoryStore.cpp
+--- a/libs/flake/CMakeLists.txt	2018-08-29 18:17:39.038387318 +0200
++++ b/libs/flake/CMakeLists.txt	2018-08-29 18:17:39.042387349 +0200
+@@ -9,7 +9,9 @@
+ )
+ 
+ add_subdirectory(styles)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritaflake_SRCS
+     KoGradientHelper.cpp
+--- a/libs/widgetutils/CMakeLists.txt	2018-08-29 18:17:39.046387379 +0200
++++ b/libs/widgetutils/CMakeLists.txt	2018-08-29 18:17:39.049387401 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
+ 
+--- a/libs/odf/CMakeLists.txt	2018-08-29 18:17:39.054387439 +0200
++++ b/libs/odf/CMakeLists.txt	2018-08-29 18:17:39.058387469 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaodf_LIB_SRCS
+     KoOdf.cpp
+--- a/libs/pigment/CMakeLists.txt	2018-08-29 18:17:39.062387500 +0200
++++ b/libs/pigment/CMakeLists.txt	2018-08-29 18:17:39.067387538 +0200
+@@ -31,7 +31,9 @@
+     message("${__per_arch_factory_objs}")
+ endif()
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(benchmarks)
+ 
+ set(kritapigment_SRCS
+--- a/libs/widgets/CMakeLists.txt	2018-08-29 18:17:39.073387583 +0200
++++ b/libs/widgets/CMakeLists.txt	2018-08-29 18:17:39.078387621 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+--- a/libs/ui/CMakeLists.txt	2018-08-29 18:17:39.084387666 +0200
++++ b/libs/ui/CMakeLists.txt	2018-08-29 18:17:39.088387697 +0200
+@@ -8,7 +8,9 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ if (APPLE)
+     find_library(FOUNDATION_LIBRARY Foundation)
+--- a/libs/image/CMakeLists.txt	2018-08-29 18:17:39.092387727 +0200
++++ b/libs/image/CMakeLists.txt	2018-08-29 18:17:39.096387757 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ add_subdirectory( tiles3 )
+ 
+--- a/libs/image/tiles3/CMakeLists.txt	2018-08-29 18:17:39.101387795 +0200
++++ b/libs/image/tiles3/CMakeLists.txt	2018-08-29 18:17:39.105387825 +0200
+@@ -1 +1,3 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/global/CMakeLists.txt	2018-08-29 18:17:39.110387863 +0200
++++ b/libs/global/CMakeLists.txt	2018-08-29 18:17:39.113387886 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+--- a/libs/brush/CMakeLists.txt	2018-08-29 18:17:39.117387916 +0200
++++ b/libs/brush/CMakeLists.txt	2018-08-29 18:17:39.121387946 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(SYSTEM
+     ${EIGEN3_INCLUDE_DIR}
+--- a/libs/libkis/CMakeLists.txt	2018-08-29 18:17:39.126387984 +0200
++++ b/libs/libkis/CMakeLists.txt	2018-08-29 18:17:39.131388022 +0200
+@@ -46,4 +46,6 @@
+ install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
diff --git a/media-gfx/krita/krita-4.0.3.ebuild b/media-gfx/krita/krita-4.0.3.ebuild
index ef2f33ef2484..adfd8b17fc23 100644
--- a/media-gfx/krita/krita-4.0.3.ebuild
+++ b/media-gfx/krita/krita-4.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 PYTHON_COMPAT=( python3_{4,5,6} )
 inherit kde5 python-single-r1
@@ -69,7 +69,7 @@ COMMON_DEPEND="
 		dev-python/sip[${PYTHON_USEDEP}]
 	)
 	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( <media-libs/libraw-0.19:= )
+	raw? ( media-libs/libraw:= )
 	tiff? ( media-libs/tiff:0 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -86,11 +86,20 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
+PATCHES=(
+	"${FILESDIR}/${P}-tests-optional.patch"
+	"${FILESDIR}/${P}-libraw-0.19.patch"
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package color-management OCIO)
 		$(cmake-utils_use_find_package fftw FFTW3)
diff --git a/media-gfx/krita/krita-4.0.4.ebuild b/media-gfx/krita/krita-4.0.4.ebuild
new file mode 100644
index 000000000000..b7f682f286eb
--- /dev/null
+++ b/media-gfx/krita/krita-4.0.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui '-gles2')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_krita]
+	!app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
+	"${FILESDIR}/${PN}-4.0.3-libraw-0.19.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gif GIF)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 23e436ad5459..7d583dfd0948 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,5 +1,5 @@
 DIST libimagequant-2.11.4.tar.gz 74117 BLAKE2B 5d42dc876c77694a1d4576e633d2e3aa1e531061aa849a683542cf11b14333f65125bbae699f927bf42896a934ade6d745aa517d6cbc4b7097d96c7579532ec9 SHA512 e9d2aaac2f37968dc93ba0da7d03f0fcf60b3f17d9a0b9edfd6930eade25844dd603de74492d8e1de8dc2da4e7f3e47959a558b5a67588d71e9e1db035eca1cc
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 EBUILD libimagequant-2.11.4.ebuild 1175 BLAKE2B 45ebfb632526601318788fded0c26678026dd518e4168213a523e7baba7a46742fae05cb7db89fa8bca4f7687bdb5faff62da218d236f35c109392d90d7b93c8 SHA512 342ad821a2c7581c1fe603fdbacbe8b72d6f5ee2c3e41c56075056678a9fcaebeba79aa2b68f3c83f8115e1f2b6d2fb839842f67defd9a9fb7f35e30acb80f38
-EBUILD libimagequant-2.11.7.ebuild 1186 BLAKE2B 099896313b5e3ff117003ca12fb73ec1008005ed6ceea07bb37560bcfade862aae7cdce0317fccf85d6ee9402ed32de50fe89fe9227b8cc71571c96acbcd2568 SHA512 992e5efa7af1f9b7465ed67eb2d76c490ca61865a10630bb0021c120791b777b9a4eefd5a1ae5dc19c6d25a75496942c4eae52a4a7a0d0ea896ab7da83bdbb17
+EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B c38dfe15c909c359be1e15b775232a4ff1ee58fb084e7d2c7970e1b18d1f8700ea804a8acb0b2f85c055d9cf23964af73b2ff610571e19f6e34b09a841c12ead SHA512 43af02aa89b4d1b73d876c66460d44a316a09f8d7ae922fec3ab52a345342b2c8f67981342b9a0cb5143aa216c82b7a146067bf3eba73c3de7c6d8fbbbf99430
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
index 8abbaaba4176..384149b958a7 100644
--- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 586b9ca3ea4a..78ce96db08d0 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,11 +1,11 @@
 AUX openvdb-4.0.2-findboost-fix.patch 747 BLAKE2B a9dbded82960113bc3e4f623636d446a3877abf117980abc3660703e513bbebfe70b153d5b216afbebee9ccb7edda0902cbfb88c0e702e0282b9798910e965a3 SHA512 e29ee68ffd907da86d67cf7ca8e2adb955acc1725d5d22be7e1851f2c387e17fb51b46630964e897c3b536be3f05705f86ddd70be53c2329a171a8d23dd7fd4e
-AUX openvdb-5.1.0-use-gnuinstalldirs.patch 11555 BLAKE2B 3d5ceba96cbd21d58db9d1b76a5ea93f1b4abdb200875c728910d3872d4bba26d1b3ead21df43aab8d6bb7962d56d2585ffd1ae0995643581e4a5464226f1fa3 SHA512 d4a3383f7c757e3fa1380b33f92b5ba4c34719694608f7b8559d53d6b28c1fc183c873dbf88096bc66cd275302c655b528c801012f6de7609020d10b01a884d2
-AUX openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B 4e485c1fd697665949f938f40fe71444c8a2d3dcce7b04a9ebc7142cfd653897c3cc9b23caaf2258c2ee59d1cb36f80aeb7a241f277ab767958af9e692b9bc54 SHA512 c123e51ca0bd6e9f8491fbc1164a5e327672433779a9ce4e607db52a2f2f46c4065ace0ebdf375e0d72be37194186dea360d3f98976cb387ac2dfecfb1eaf0d3
+AUX openvdb-5.2.0-use-gnuinstalldirs.patch 10981 BLAKE2B 5ffdb1ec77280bc926d57fdccf9aa74db470e6031025a79e9503196bf4e4fa1984401eea8e5a7cb386545417014735a17bcf7dfc31aff79b8ef639ec82111255 SHA512 7ec960e07f1b1a81b32445e4cfc3769abb1d75d68076b825857fc12410525875bf50ba316da37d2a189d62162ad28c12530905d6c8696d1caa11b6d6752500a1
+AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B d6508d578fb8be689f0a6af41b54f0d8ff158a52c2b0a3fe5940cf8cbce0707f2dee8ce228e8a3a80866f6702121849f15e20af281343ff574aecfdb95eef5cc SHA512 ce91505ca64326457caea3036ff899ff58b2aac4787b7bf84581a4ee55978179f93b57bb8a82a59fcf85d90cb85679fb2ec5e2d95e8b20760159ba55d590d5d5
 DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a0608cfa776c1d4472cb4b25e4dad20d3c9648a952deef87ed0e24ce5f7c927c02da8cca76c829eafe1e2bb47fca061541668b3 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
-DIST openvdb-5.1.0.tar.gz 1739517 BLAKE2B e6ef09497d57dfd2069b8dd22856faa9dcc0591ca844b58c785ad0f2ab5b134d6c5278b0eb1820d2b7802303f1f073aea2380111ebda82ef04d7c503ba1d558b SHA512 c71d040a1862f5e31f084125e9695da3ebf171788956d7d4c16f99ead26a099a81d5a9c30ba2cc61f29e32e21f822796ae34f6c62496050894087735a19489f6
+DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
 EBUILD openvdb-4.0.2-r2.ebuild 2057 BLAKE2B 3890a45eeea15b6627e9b616bc98cad4f40e56a0bf756f48d0a98997d010c86c60e8dfaa4b8e0cfb3481c63432535c8963deca40351d1ba98afe030503b1e9be SHA512 6b708c5eb1041dbb0d9e6642db2fc599610cd8ef35b7892d1caf8d4fa3508f8e84a76730bd72c298ca0e1d69be9e19afa51f58f6ec1b0d38f395e6b1b0183136
 EBUILD openvdb-4.0.2.ebuild 1941 BLAKE2B a31708ae94c2e8b19b958878ee0653f4d1b14b5b4fa272b87c749e27d949211701eccc9508e39ac65d7175b0a39ab17b2ff99015fab8d8ace2c9863f1d0d4bec SHA512 33fc77be6833fa19dfc4783782b83182e4f7f3c5ce09e48fce856be6e3b32e937cc8da5ffb962e891c1b5903a10dba530956dd239644d3d010c301f290dc753e
-EBUILD openvdb-5.1.0.ebuild 1767 BLAKE2B 53e9e42f11bec0306356000c7ce1e6cf851afc1b555eef5cd7f34a39dd093ad6a9f60965488c6db49d1b261b2c4fa68fe517070ef9c7567fbbfd7ed0b32f2908 SHA512 be1a6f9247a068cdfd9cfcb33776c5ff7e5d3e8f04d346bef9303a59dda7a575c8e6127c127c9a252b242d47648d5394205bddc406e951ea2cf33ed3ebfa7318
-MISC metadata.xml 983 BLAKE2B f6ecf0c7d5bda2e9442636d7482b4c0d6dad309646f7b8a3763ddf905063f3427a79ffacaa70d80b9e85fbe7c0160afe12a5b85011c5c5ad735420c5c419dd71 SHA512 c450db63c1cc834a024acf9e8bfa144d76e1797b354a1f6368be9fdd98fbe4d5602b7431c2d91a0a70a8efa3b3edb09ae666431bb197897263741aa148cd90f4
+EBUILD openvdb-5.2.0.ebuild 1787 BLAKE2B 88a885ac4b0091d9cc4263103ca04ac4dbc1ba378d70744a26a52d153be829965e8a678e48e84d845c992bdb37b7f37a92d40e80d1cb03e7de714769fbcc599a SHA512 5c8a9c264f582d800daf2ae2e4a6317d2a0150d75b2e8912bc78f622862d778511bdec0c662ce2a5ed8b0c065458ebc2e7b644d1939a59ef371160307d703995
+MISC metadata.xml 1028 BLAKE2B a6d852019e2bf507aa175846fc1687f101df9fc498b7dd2c7de25d860f419e86eb37549e3a2b742c32d0a2f5c6fc0450b3c82da18ef96c65fc81e547f3e7e944 SHA512 2f9d7a4271998fd9fef7a0c4fbd9d77187ba0fe41d31a807e88b19554cc5b624686e3dca44a47e8e69edc71fa89a06fcd89de59f09bccf3378418500b268d287
diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch
index 791e05578729..d72f835adaa4 100644
--- a/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch
+++ b/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch
@@ -1,6 +1,6 @@
 diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
---- a/cmake/FindBlosc.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindBlosc.cmake	2018-08-07 21:01:16.869879255 +0100
+--- a/cmake/FindBlosc.cmake	2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindBlosc.cmake	2018-08-28 12:20:33.331930720 +0100
 @@ -37,7 +37,7 @@
  
  FIND_PACKAGE ( PackageHandleStandardArgs )
@@ -28,8 +28,8 @@ diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
  
  ENDIF ( BLOSC_FOUND )
 diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake
---- a/cmake/FindCPPUnit.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindCPPUnit.cmake	2018-08-07 21:02:15.421037954 +0100
+--- a/cmake/FindCPPUnit.cmake	2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindCPPUnit.cmake	2018-08-28 12:20:33.333930718 +0100
 @@ -38,7 +38,7 @@
  
  FIND_PACKAGE ( PackageHandleStandardArgs )
@@ -56,8 +56,8 @@ diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake
    
  ENDIF ( CPPUNIT_FOUND )
 diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
---- a/cmake/FindGLEW.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindGLEW.cmake	2018-08-07 21:04:32.804431135 +0100
+--- a/cmake/FindGLEW.cmake	2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindGLEW.cmake	2018-08-28 12:20:33.333930718 +0100
 @@ -39,7 +39,7 @@
  
  FIND_PACKAGE ( PackageHandleStandardArgs )
@@ -105,8 +105,8 @@ diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
  		NO_SYSTEM_ENVIRONMENT_PATH
  		)
 diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
---- a/cmake/FindGLFW3.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindGLFW3.cmake	2018-08-07 21:07:24.458954825 +0100
+--- a/cmake/FindGLFW3.cmake	2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindGLFW3.cmake	2018-08-28 12:20:33.334930718 +0100
 @@ -39,7 +39,7 @@
  
  FIND_PACKAGE ( PackageHandleStandardArgs )
@@ -116,30 +116,32 @@ diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
    "$ENV{GLFW3_ROOT}"
    NO_DEFAULT_PATH
    NO_SYSTEM_ENVIRONMENT_PATH
-@@ -50,9 +50,9 @@
+@@ -50,11 +50,11 @@
    )
  
  IF (GLFW3_FOUND)
 -  SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path")
 +  SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path")
+   SET (GLFW3_PATH_SUFFIXES x86_64-linux-gnu)
    IF (GLFW3_USE_STATIC_LIBS)
--    FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw3  ${GLFW3_LOCATION}/lib
-+    FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw3  ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+     FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw3
+-      PATHS ${GLFW3_LOCATION}/lib
++      PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+       PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
  	  NO_DEFAULT_PATH
  	  NO_CMAKE_ENVIRONMENT_PATH
- 	  NO_CMAKE_PATH
-@@ -60,7 +60,7 @@
- 	  NO_CMAKE_SYSTEM_PATH
+@@ -64,7 +64,7 @@
  	  )
    ELSE (GLFW3_USE_STATIC_LIBS)
--    FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw  ${GLFW3_LOCATION}/lib
-+    FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw  ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+     FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw
+-      PATHS ${GLFW3_LOCATION}/lib
++      PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
+       PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
  	  NO_DEFAULT_PATH
  	  NO_CMAKE_ENVIRONMENT_PATH
- 	  NO_CMAKE_PATH
 diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
---- a/cmake/FindGLFW.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindGLFW.cmake	2018-08-07 21:06:26.358774164 +0100
+--- a/cmake/FindGLFW.cmake	2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindGLFW.cmake	2018-08-28 12:20:33.334930718 +0100
 @@ -38,12 +38,12 @@
  
  SET ( GLFW_FOUND FALSE )
@@ -174,8 +176,8 @@ diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
  	  )
    ENDIF (APPLE)
 diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
---- a/cmake/FindOpenVDB.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindOpenVDB.cmake	2018-08-07 21:10:41.640588458 +0100
+--- a/cmake/FindOpenVDB.cmake	2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindOpenVDB.cmake	2018-08-28 12:20:33.334930718 +0100
 @@ -45,7 +45,7 @@
  
  FIND_PACKAGE( PackageHandleStandardArgs )
@@ -199,8 +201,8 @@ diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
    
    FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb
 diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
---- a/cmake/FindTBB.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindTBB.cmake	2018-08-07 21:11:48.477809067 +0100
+--- a/cmake/FindTBB.cmake	2018-08-13 16:33:07.000000000 +0100
++++ b/cmake/FindTBB.cmake	2018-08-28 12:20:33.335930717 +0100
 @@ -42,7 +42,7 @@
  
  # SET ( TBB_FOUND FALSE )
@@ -229,8 +231,8 @@ diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
  	  IF ( TBB_MATCH_COMPILER_VERSION )
  		STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION})
 diff -urN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2018-04-10 19:22:17.000000000 +0100
-+++ b/CMakeLists.txt	2018-08-07 20:59:54.149613568 +0100
+--- a/CMakeLists.txt	2018-08-13 16:33:07.000000000 +0100
++++ b/CMakeLists.txt	2018-08-28 12:20:33.335930717 +0100
 @@ -32,6 +32,8 @@
  
  ENABLE_TESTING()
@@ -241,8 +243,8 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt
  if(CCACHE_FOUND)
      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
 diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2018-04-10 19:22:17.000000000 +0100
-+++ b/openvdb/CMakeLists.txt	2018-08-07 21:21:02.352705838 +0100
+--- a/openvdb/CMakeLists.txt	2018-08-13 16:33:07.000000000 +0100
++++ b/openvdb/CMakeLists.txt	2018-08-28 12:20:33.335930717 +0100
 @@ -414,7 +414,7 @@
      )
  
@@ -298,26 +300,9 @@ diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
    PATTERN "python" EXCLUDE
    PATTERN "cmd" EXCLUDE
 diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2018-04-10 19:22:17.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt	2018-08-07 21:20:56.549685541 +0100
-@@ -54,10 +54,12 @@
-   pyVec3Grid.cc
-   )
- 
--SET ( PYOPENVDB_INSTALL_DIRECTORY
--  lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
--  CACHE STRING "The directory to install the pyopenvdb.so module."
--  )
-+IF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
-+  SET ( PYOPENVDB_INSTALL_DIRECTORY
-+    lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
-+    CACHE STRING "The directory to install the pyopenvdb.so module."
-+    )
-+ENDIF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
- 
- SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_PYTHON_MODULE_SOURCE_FILES}
-   PROPERTIES
-@@ -110,6 +112,6 @@
+--- a/openvdb/python/CMakeLists.txt	2018-08-13 16:33:07.000000000 +0100
++++ b/openvdb/python/CMakeLists.txt	2018-08-28 12:20:33.336930716 +0100
+@@ -107,6 +107,6 @@
    ${PYOPENVDB_INSTALL_DIRECTORY}
    )       
  
diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
index c2ecac0bf82d..c3999e54f9cf 100644
--- a/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch
+++ b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
@@ -1,6 +1,6 @@
 diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2018-08-07 21:21:02.000000000 +0100
-+++ b/openvdb/CMakeLists.txt	2018-08-07 21:47:02.355277361 +0100
+--- a/openvdb/CMakeLists.txt	2018-08-28 12:20:33.000000000 +0100
++++ b/openvdb/CMakeLists.txt	2018-08-28 12:25:19.807755722 +0100
 @@ -83,11 +83,12 @@
    ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
  ENDIF ()
@@ -58,8 +58,8 @@ diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
    stdc++
    )
 diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2018-08-07 21:20:56.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt	2018-08-07 21:31:55.508016795 +0100
+--- a/openvdb/python/CMakeLists.txt	2018-08-28 12:20:33.000000000 +0100
++++ b/openvdb/python/CMakeLists.txt	2018-08-28 12:25:19.808755721 +0100
 @@ -9,8 +9,8 @@
  IF ( NOT OPENVDB_BUILD_CORE )
    FIND_PACKAGE ( OpenVDB REQUIRED )
@@ -82,7 +82,7 @@ diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
  INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} )
  INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
  INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} )
-@@ -96,7 +96,7 @@
+@@ -91,7 +91,7 @@
    ${GLEW_GLEW_LIBRARY}
    ${Boost_PYTHON_LIBRARY}
    ${PYTHON_LIBRARY}
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 71a04b9d558d..b059b111063c 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -9,10 +9,6 @@
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Libraries from Dreamworks Animation for the efficient manipulation 
 		of volumetric data used in big budget movies like 'Cloudy with a
@@ -22,6 +18,9 @@
 		<flag restrict="&lt;media-gfx/openvdb-5.0.0" name="abi3-compat">
 			Disables newer features to maintain compatibility with ABI3. Enabled by default.
 		</flag>
+		<flag restrict="&gt;=media-gfx/openvdb-5.0.0" name="abi4-compat">
+			Disables newer features to maintain compatibility with ABI4. Enabled by default.
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">dreamworksanimation/openvdb</remote-id>
diff --git a/media-gfx/openvdb/openvdb-5.1.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0.ebuild
index c93ccbfb9404..eb5d399b7a68 100644
--- a/media-gfx/openvdb/openvdb-5.1.0.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> $
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc python test"
+IUSE="+abi4-compat doc python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -40,9 +40,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex] )
 	test? ( dev-util/cppunit )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.2-findboost-fix.patch"
-	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
 	"${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
 )
 
@@ -57,6 +55,7 @@ src_configure() {
 		-DBLOSC_LOCATION="${myprefix}"
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DGLFW3_LOCATION="${myprefix}"
+		-DOPENVDB_ABI_VERSION_NUMBER=$(usex abi4-compat 4 5)
 		-DOPENVDB_BUILD_DOCS=$(usex doc)
 		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
 		-DOPENVDB_BUILD_UNITTESTS=$(usex test)