gentoo resync : 19.01.2018

22 files changed, 323 insertions, 188 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f02907fe8fc0..eb307de99f29 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 2bd8eb9e4cbc..9b38d0933f8e 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -6,6 +6,7 @@ DIST babl-0.1.24.tar.bz2 616887 BLAKE2B 7f553076b8d540089d4825747d1d02d6480c3015
 DIST babl-0.1.26.tar.bz2 614865 BLAKE2B 537f1f2e23f2df7710d79f7733f8cbad7c9ae79ca39fea16af267488f4e6be429ad8eb41843b2ff6497a9c036f89f840baa8f2e0fa7e56994305b1d72942e010 SHA512 6db3e6edaa6b40a114733c517d565dc2c38f3e445a72df5efa85647f693785ca0e8290daa698a93e8aba01ea96ea59de4d53caf9162000cce55cf30c8c868e5f
 DIST babl-0.1.30.tar.bz2 616595 BLAKE2B e93f56c243373634ad8c2f5a493cae80113c9b9174bf388525b943e7702024fd4d2afeaf544fbeb01b44b3c77d90c7ebcb064f94a6953876bb91c06fbcb30311 SHA512 391182786312140fe3fa8b4b8448df2829230ef6a1d9957d8bb729c464e94f5b1300ad761d04f51b3d777c4de9fb462dd0391c3f0c2daa53e9c53bf697e58dca
 DIST babl-0.1.38.tar.bz2 653047 BLAKE2B 8bc43a7e0b7265f72122743ff4b3e25825e4bbe6797a6e077de16d47239a67cc8fcb93253f54de31012cfb1622cafed2c220cba5cb3cdd9eb1599e5d11b4000f SHA512 4b55b666170322adad4b4624c98110d7a34c496f7aadb22a53c09d1ce5ae518122c2105fd2cb2a057e752fe1540beb703f8192e48e7c43601342a75db2bfdca0
+DIST babl-0.1.40.tar.bz2 653272 BLAKE2B 4e5694db5a6d29c2faeada7046cacc511623bf54794386a47c6403abb2e86cfd5d0953cf9198e8a5cf20060366e770a344a8c8b503c0496d95ce9d92e149a4f6 SHA512 73812247bade66ce38cb4239974e94a6ced05e4d9f5feae7eb111ffdf2c364197c0a2d9883ba28f5ff839f9f9ffb9dd272209c4720046c12cf2446fedae34ce1
 EBUILD babl-0.1.12.ebuild 1336 BLAKE2B 0034d85113ab047a7e0eb363e1bce67246678b4c08a5d562cd4121fa8465ab4c8f571af5ca46fed7e9184e2e710d36a0ecd57dc7c181e47e8a3f0488488da630 SHA512 4b97fc493ade3c9ab855e007120e710a6918875481656f86f9d721dfae0e68d591208f55787069fc6a7473da9ecdabe27dec7031906b3ab0f1116f1b9a7f03d4
 EBUILD babl-0.1.18.ebuild 1466 BLAKE2B 8aa28a3d191cec1963032c99a7b8f6bcb663ba90290062c1e86efd760d96086a9e94de7f0bcc3881ce27ff583d627ded168e81693a9062a563ee47075aef9ca0 SHA512 4b4af9460080eeb97899a303c04527e7c970664b8bc754073b11ac8ace172b048109c40831bad70e14d3bd081a6a9f3509418f6f9995cbc3ae171e5d7a232d99
 EBUILD babl-0.1.20.ebuild 1474 BLAKE2B 670df7c287b3ddb67aa63e770e58d546465f2fe67b484fc4847d761c4268a7582f7af84d55b3ca4db4b7e3a38ea46e9947cd3c1eb75a25683b0df3951fa86557 SHA512 76b6996b06b4b346d500752f2d6096c7b0ad568d8d81c540f0662454175143aa143ca856140cafb96941fc1259e6633892501281b421c66f6b7c1d322e83cb9d
@@ -13,6 +14,7 @@ EBUILD babl-0.1.22.ebuild 1470 BLAKE2B ed22d82d070011f4ea7b74287354d7a24fa3d678c
 EBUILD babl-0.1.24.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 EBUILD babl-0.1.26.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 EBUILD babl-0.1.30.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
-EBUILD babl-0.1.38.ebuild 1469 BLAKE2B e3a02df1c8226f53efa3e9e799868150892178d10713cf4b1fe204425063e83edaee61693fe02938c69e1821b5219b1cf1862659388cfd7d5bb9fad2fa0e5e8b SHA512 e0f24471cb2196d70991f0a9f50cb9e47659d20b65ab0ed83bb65e0076791ded6f2eb291a9a339ecc7bc703633f5e92e6f1b94b1ef34fb5c99f80b9cb37d79ab
+EBUILD babl-0.1.38.ebuild 1468 BLAKE2B 4ab7be16d6559d1a6b1ff4ddcacb66d52e9a415bae39e1792d4a219f0f28739b7eb91dfcf4ca3b63a8a9c747c1941b6585c829c053c5510bae392202ef719f6d SHA512 171b3777b21aee036ee3ac720512bfbe6b13accda5df860496b394629535cde6b19a9da1ea464fa9017e00cafc80966c302a5b153750ec8e60d67d51ff894ab8
+EBUILD babl-0.1.40.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56
 EBUILD babl-9999.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.38.ebuild b/media-libs/babl/babl-0.1.38.ebuild
index 7a87189aa52b..60f420141191 100644
--- a/media-libs/babl/babl-0.1.38.ebuild
+++ b/media-libs/babl/babl-0.1.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/babl/babl-0.1.40.ebuild b/media-libs/babl/babl-0.1.40.ebuild
new file mode 100644
index 000000000000..f5da34a496f1
--- /dev/null
+++ b/media-libs/babl/babl-0.1.40.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.gnome.org/babl"
+	SRC_URI=""
+else
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	econf \
+		--disable-docs \
+		--disable-static \
+		--disable-maintainer-mode \
+		$(use_enable altivec) \
+		$(use_enable cpu_flags_x86_f16c f16c) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/dssi/Manifest b/media-libs/dssi/Manifest
index d6e540faaa18..061f73570d1f 100644
--- a/media-libs/dssi/Manifest
+++ b/media-libs/dssi/Manifest
@@ -1,3 +1,3 @@
 DIST dssi-1.1.1.tar.gz 712038 BLAKE2B 426fcbf5eb9024b6b0a4fad34fd8c0e0b18ff8eefdab22902cd929dae86be55d8cdc01e92c0c75c9cf1c6e5918317109b78f8aad4d2db0abafd6d9405eb285e4 SHA512 faf35ae851b889ad17a8ba624c713af8a5f33bb93db8e34842e8b778a0e36c3eab9ab712a40e4ca7ecd96954f3e70504d89a75b3826dd138332085e176c0d34d
-EBUILD dssi-1.1.1-r1.ebuild 1003 BLAKE2B 574942a380e6a5cab357a0a4192415b5a48b161d895acb7d2c94aaa21db1ee9bfbefabfc0c49d67245380c5ced3a77f2fb93219f2e58eb03bb4395aa689baca7 SHA512 4d349465abed81070b2c4d05dfb1c074c95f6364c16b4d09745b840f71012b1a0c11f5532e7d48261e00fbbfa2b958953042c67118dd3826fe472e1650f1b2d9
+EBUILD dssi-1.1.1-r1.ebuild 950 BLAKE2B ffbc7834b17ba026819acf11ec8e91b68582d219ac13dd55f8482574d8b8a472de87b79b00e2d02ac55057669e852fb76e3c72ce197ea58c108483fbbc4458a2 SHA512 8c21b4032422a405c7b4bb4c1dd29b50487e7340af90ce4f2bc44dc6f41e191d1a69229fa22a3a360ec2fdf442c92467189b49f6f32ecce4f76f098ae0ed048e
 MISC metadata.xml 333 BLAKE2B e39f496c64a33bc34c7f8f6401731cad91786984d96c0707e4fa3c8d21157f54a0b4efba3d654a3fb19b51a85422f93962730e28ad1699ed0b2e80f1d8864f1a SHA512 051e33a55f071b13cb45d35abc79ae192a053e55186051f5cf166c126145d222739e16e96e59ee58d119b103568714eae67d149a6861332d19fc0a5a8c8fb83f
diff --git a/media-libs/dssi/dssi-1.1.1-r1.ebuild b/media-libs/dssi/dssi-1.1.1-r1.ebuild
index 78011f84f74a..bdb76d8a6085 100644
--- a/media-libs/dssi/dssi-1.1.1-r1.ebuild
+++ b/media-libs/dssi/dssi-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -11,15 +11,14 @@ SRC_URI="mirror://sourceforge/dssi/${P}.tar.gz"
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="qt4"
+IUSE=""
 
 RDEPEND="media-libs/alsa-lib
 	>=media-libs/liblo-0.12
 	virtual/jack
 	>=media-libs/ladspa-sdk-1.12-r2
 	>=media-libs/libsndfile-1.0.11
-	>=media-libs/libsamplerate-0.1.1-r1
-	qt4? ( dev-qt/qtgui:4 )"
+	>=media-libs/libsamplerate-0.1.1-r1"
 DEPEND="${RDEPEND}
 	sys-apps/sed
 	virtual/pkgconfig"
@@ -29,9 +28,7 @@ src_prepare() {
 		-e 's:libdir=.*:libdir=@libdir@:' \
 		dssi.pc.in || die
 
-	if ! use qt4; then
-		sed -i -e '/PKG_CHECK_MODULES(QT/s:QtGui:dIsAbLe&:' configure.ac || die
-	fi
+	sed -i -e '/PKG_CHECK_MODULES(QT/s:QtGui:dIsAbLe&:' configure.ac || die
 
 	eautoreconf
 }
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index b3776ddac5d1..748ce0cd73e4 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -21,7 +21,7 @@ EBUILD gegl-0.3.0-r1.ebuild 5372 BLAKE2B 843c8bb6c10947cc0378be51d6b269ae866840f
 EBUILD gegl-0.3.0.ebuild 5290 BLAKE2B eb698fbe621dead0979582fa83a47c0cdab26a556194778375045b25b6774dc72375b9fe19dfda8b6ce64ad024a5ee69cb26aea51fd3693f3e80b13a78d812a6 SHA512 eae35de6ca10d0fee700ce98bcf4fe8ba4af0ec43325fb097f67d2934bc951cc356f9e07ad0b81f07e8d715ba3fba9c50babc27ba6b2670c2e23056d6108e41b
 EBUILD gegl-0.3.20.ebuild 5182 BLAKE2B 97e2103ba355c528511106181c826feffeb7a2956521212d4973167ea088e39e90ff8d01af17f2e46becbfbebbe8b72a0847a5a20ec5b466c9e1721023ef9bc1 SHA512 ce8f8bb01a6469f1a5cefc6bc2b127f6ba38e8492496bae712b811ce7227c2c6102d2ab84e0da2c25dbb8a4b48ced1b00e0fb173b54d3e325d2445249841c13e
 EBUILD gegl-0.3.24.ebuild 5227 BLAKE2B fa9df9507e86249d5ea604dd879b86aa8fcd323401ed2f34b1f172ebf82df88ac9618457c11da08f821de1bb013c5b85f660da7ed52f6e1069e45765ce27267a SHA512 ff2b34a6fda2bd47c38203010140988bdf6b7565638b3edb8a71a8c4e26318c028cc121ee99ab4d974c077ea2d7242498f6e98dcb38e57a9d10f0d68b250142d
-EBUILD gegl-0.3.26.ebuild 5226 BLAKE2B df1eb6cc2d5f33463d291913eec095e3cff981acd5db18fc5f64dfa1eb157201c0a392711146c3a7cf76ea93497f489eab7808d347af043d1b5c0ab3cf3401cf SHA512 5994a999e7e78bde427c40189b7988c37ae53aa7df9b016498bd569cd79d96c0082fdce7619f246a0424d70c79c7942fa6850ac567c3792bc75049dd1fe4d6cb
+EBUILD gegl-0.3.26.ebuild 5225 BLAKE2B 0856fa12c5382a81e4c182c2d636be4825d1a85f7bb2078e62106c42cd0a8314668805cbb58064df52eb1065bff40b2eccf52e5d5880b4c3bf35d58d050b1a5f SHA512 288bb3b22c419d1f659d41de213518d88fdf85dda0a4e6b09ede20563c92069e76831a8fc9a65e922b7594b9b17845532c4b7d2658cb898a23b526bfcd91db3c
 EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501
 EBUILD gegl-0.3.8.ebuild 5219 BLAKE2B 093e9816058f439e3b18308256d8c00acdb7dd2fc3a6595df03a04f26ab4b13830160783a0c745a544a277ffa7b2e9290332d89bd93685cfe94157462a88ba9a SHA512 66deb4d2c45850c9ac870d741419c16bf84a20c14cd936f90aebf626f6d9a45471aa65d3f632c617c78d9717206b0418424614b9edc3e8643ec1f61c93c3ac42
 EBUILD gegl-9999.ebuild 4921 BLAKE2B c5e2f1513eb418db2b725759bee29b5c97cd3be89b020d7b86eac4edf56b295d93b3dfbc8b7d2766411b3dcd4fb3c618ed44e9ed5a27ed38b844e530465b6acf SHA512 c6acfcfa7e2c50aa64b1ad31dda9c52d530a886e4ef477f06c56d32eab809215bc018ccf0180175abd81745b4432b8f9563e51ec6e1df72cf0a6125c95635478
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index f1024965079b..e3e898f40bb3 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index c7657953d627..9901f48b5fd5 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -9,5 +9,5 @@ EBUILD glew-1.10.0-r2.ebuild 2383 BLAKE2B bcee911ca94615c4f78e2108210b2451b6ee3c
 EBUILD glew-1.13.0.ebuild 2434 BLAKE2B f032991fe90dac59e789cd2fba1f08a42308c8e9230f7ec253b755ee8a7621e1a18634ff3324c3a08f9ea239404bee3ba176b750c3adca3cdd09433aa90d57e1 SHA512 e001a5bbc743a291292e22d588bdf754753dc258b32a7ae9e8bcdd9ae0d49055b6f6e2bd189f5c722c98e6d53ec009872e8eb56a9da88a1f29bb44a9b9f3cccc
 EBUILD glew-1.6.0-r100.ebuild 1918 BLAKE2B f4e0743ba9f5e76e6a9b1a19411b59a6fd08f71a01443c61e819bd4d2ba4528a1f635826ce5c7359ea31d0a1f6045888b36f4833c15b88ab0c5265ad9839ff25 SHA512 2b862eac1583f939d416570776e48675aa307762c7a437c44dd07d212c60fee33cc7671b4a3b659d9d86e5fa7938ab8d9a09fc340d412c10080827378c598bbb
 EBUILD glew-2.0.0.ebuild 2552 BLAKE2B 2b9e63c2b52f21ad3997345dc8293aadbec6993c611cdedb74f00026f182a3347ad4d68f695085dd0c0a5dfd18eb3756a0c82776873843de85719756c2efd8b4 SHA512 f22c0fac87d9b64fc8a2eb0e5228d9c8598d02ca04c054d3b1a65f3295e94e697c3db2c6ee25dac07d9f6fc767ecbc0ad846681aac2ccdc80ed3986338011c5a
-EBUILD glew-2.1.0.ebuild 2488 BLAKE2B c995fc379c87fb52454c4cfd91e2e6c3a13ca6a0cb47628112af2b76c293ac8c9baec7f6d29de039ee96e380dd7f8dba5514a45b572a7435e345069ba3deb26b SHA512 32ab49dfaf419861c927c86afaaa23cb3e2150bd285232baeeadfdca59e7ededcfdf38cd74161f2e33295871ac607920fb7296a8d0b14b9fc8baee8c6210fe32
+EBUILD glew-2.1.0.ebuild 2521 BLAKE2B f1800be40dcd2ef5b95357cabf70e8d92845237cd3b01f151692d0dcb0cb36abbe9953d5ee39ed859554092420e308e9fb6ae522d96cbc93f7178b9cb4becf49 SHA512 4ea2e680e4c77320f16e82cfe7aa3ae079d8931ae1b69761471d5291ac3b88018bbcedd87e4b4b03ec9f8bc45bd6ad71674004883e222f9eaf9cc2998b3c2a1f
 MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/glew-2.1.0.ebuild b/media-libs/glew/glew-2.1.0.ebuild
index 3ddebf5f8301..f003f13e40c6 100644
--- a/media-libs/glew/glew-2.1.0.ebuild
+++ b/media-libs/glew/glew-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -78,6 +78,7 @@ set_opts() {
 multilib_src_compile() {
 	set_opts
 	emake \
+		GLEW_PREFIX="${EPREFIX}/usr" \
 		GLEW_DEST="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		"${myglewopts[@]}"
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index e92eeec2e3a9..4467c972af02 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,9 +1,11 @@
 AUX opencolorio-1.0.8-documentation-gen.patch 1973 BLAKE2B dd84c68f70af7cd6ebef7b2651f1edc8352e97fa08290e6854175f30ddfda4fa3c2451d8313cdf3791777ced76974d0944b855eca8a52c76d034dcb94ae6c61c SHA512 779fa5311a889afb30a31b278e60aaa5253311d071ded8764d2f33e6f69432a41bffd9745059e0b20e28db8445494bdee4aa69908e709e1248a08ea5c2f9c93c
 AUX opencolorio-1.0.9-remove-external-doc-utilities.patch 2674 BLAKE2B b5fc774305224345c642c2d1f8813e1229519768679e9ea9a21b6922d90831fcdefcd77b5462a581cd00349476a18c76eb02ba14ad806c23e355597a9b5f06c8 SHA512 f04dc9255dc9c84fd842eab14bb46d3084f1accfc9746a559a0b428a580669e8486d03229f9d00204c761c11c3962f15754d9667daf6b968a95ae2fc2b0f3ac5
-AUX opencolorio-1.1.0-cmake-fixes.patch 6937 BLAKE2B 509b1a11309a9854c15581ad0bdae40277473f5dcaf2c02377346ad5075ddd4c65bf2811c6975d53c0495384a123bc128d4b2c4ff0a52fdfae4f1a7d8bc2c7bd SHA512 aa50831b22740ccbfd6d990ac334f77f82725c6ce6701205857099ec662329309fb8cca6a472ec9650573a9b6c82f26f6076f570ca2066cde445139feea7691c
+AUX opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch 2786 BLAKE2B 91747af3ceac6477d6847c1f87fa69cd77e2cdaaced18cc038ca231af006d453ce4382229b642e8c38ae1642c1f4788c7e9062951e867881bd20012c26a6dcd4 SHA512 2338e1b0994486a7be896d4edddcef67b3b84df9d609e7aebe7a87172163b5f6e7636341e0bfeb0e45d7fdb663932c273ca0568a49ac9d4aa2b827d3808493bc
+AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd13c22cdcf23e7af75b0c92dd1b85f86e9046c76eadb22b0c1b2bad06f1937bc0d2220a4e2c9a85c0b1b5e6d356b9257fd149ba503944d1bd1356b3d0d51bf SHA512 e14370a15e3e6fc5e3dc70fa52d4e11cf7ac35c2dbc8635e94c52cb02a47f10936e57b1b713f8ee2ca8481ed467e2e6835bf392468bd82d1236a50289df6584e
+AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
 DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4 SHA512 8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
 DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
 EBUILD opencolorio-1.0.9-r2.ebuild 2375 BLAKE2B 6e50184ecd9df51cec933a55fbdb9365c82661b7e9d66d804bebdc329433c996d616898334bd3f1856b381371083584488faa46476962fe3c306db324d891575 SHA512 0e3d7dc603f5811e547ba6de400ae05c519e87ba6135bcda8d7fdbc1d5d87526c0fd8a2f8dd26062b39826bacdc6590fda538036d3cd7d09a0b86e70ccb202c1
-EBUILD opencolorio-1.1.0.ebuild 2186 BLAKE2B 0dfafb7a611aaa519e4a20ba464c778976f0feaa9ad6bbbbda397c3aeb044074363f584f7b1db244bdb2f91b67edc6424ffca257506032efe89a9d52718b8f88 SHA512 3512e32d06ad7d43e51266f480fbc366e0ef0cafbd7bf5e6cfd40023f0a3020cdf08915eae291509b238d9c0b4bfe8fa64ce7ecd3cf3944aeb17e790e5491cbf
-MISC metadata.xml 634 BLAKE2B b707f9f7705642ba845a2d2c624432198dc2006bfeffce5d62407e3a078e04a963b297ecf0d615d73cc0cc2ab352bc191ea5f11347b84b137d2aa8acceb25b45 SHA512 4557bc67a3d3e02c66335890947b85a2d8f46c7c73eceae8b29a3e732ea6c0bb767ee87a932a7148f4cfc0f125c184657fc8d7e23c8ba5ba1523f7e35ce4e047
+EBUILD opencolorio-1.1.0-r1.ebuild 2313 BLAKE2B 86e303621292f421ab94be33daa16b6390fa942166d3bb3cb9fe26627cb441723107f3cb0cd007aeb9eca0eaa8769e2e1a0b70ec9dd63eec1543562a3b2ec2d1 SHA512 a7cc0ae8a2de100a0dca4a4a54fdf7930958cdc0dec0e0e8850f1587a1c0a3db52c77572cc3e5be8efee0719a2f514c7642f6f87039db0eab603562cfb24b14a
+MISC metadata.xml 686 BLAKE2B d2e3b9c9bc524854acf2fdd3d67d596606434bee2bbe5ceef3c2f45823e2948be0c0dc3bbcce82f90d2fb77e1fb5ae74b4e82ec737051f31c2726f82aecf05ee SHA512 68ba2a2e1063a0f8c3e345aa908f4327f38b876581f0cf3cce0e2075a06919c60ca77b40545fcbc923a61700d00e46bb0ff2ce5d44ac5cbe40b1523491e34822
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch
new file mode 100644
index 000000000000..b5455d010b42
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch
@@ -0,0 +1,92 @@
+From 8d38317f68d0e4663abbccdceca0bcd41f3dcf4a Mon Sep 17 00:00:00 2001
+From: Patrick Hodoul <patrick.hodoul@autodesk.com>
+Date: Mon, 27 Nov 2017 17:29:57 -0500
+Subject: [PATCH 1/3] Fix compile error with Lut1DOp.cpp
+
+Fix Linux compilation
+Fix gcc 5.4.0 build breaks
+Fix the temp filename for Linux
+---
+ src/core/Lut1DOp.cpp                 |  4 +++-
+ src/core/MathUtils.cpp               | 23 ++++++++++++-----------
+ src/pyglue/PyAllocationTransform.cpp |  1 -
+ 3 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/src/core/Lut1DOp.cpp b/src/core/Lut1DOp.cpp
+index 404ee0b..180e30f 100644
+--- a/src/core/Lut1DOp.cpp
++++ b/src/core/Lut1DOp.cpp
+@@ -188,7 +188,8 @@ OCIO_NAMESPACE_ENTER
+         {
+             return simple_lut[clamp(index, 0.0f, maxIndex)];
+         }
+-        
++
++#if defined(OCIO_UNIT_TEST) || !defined(USE_SSE)
+         void Lut1D_Nearest(float* rgbaBuffer, long numPixels, const Lut1D & lut)
+         {
+             float maxIndex[3];
+@@ -218,6 +219,7 @@ OCIO_NAMESPACE_ENTER
+                 rgbaBuffer += 4;
+             }
+         }
++#endif
+ #ifdef USE_SSE
+         void Lut1D_Nearest_SSE(float* rgbaBuffer, long numPixels, const Lut1D & lut)
+         {
+diff --git a/src/core/MathUtils.cpp b/src/core/MathUtils.cpp
+index e1a26c0..3881eb3 100644
+--- a/src/core/MathUtils.cpp
++++ b/src/core/MathUtils.cpp
+@@ -327,17 +327,6 @@ OCIO_NAMESPACE_ENTER
+         GetV4Sum(vout, vout, v2);
+     }
+     
+-    namespace
+-    {
+-    
+-    void GetMxbResult(float* vout, float* m, float* x, float* v)
+-    {
+-        GetM44V4Product(vout, m, x);
+-        GetV4Sum(vout, vout, v);
+-    }
+-    
+-    } // anon namespace
+-    
+     bool GetMxbInverse(float* mout, float* vout,
+                        const float* m_, const float* v_)
+     {
+@@ -372,6 +361,18 @@ OCIO_NAMESPACE_USING
+ 
+ #include "UnitTest.h"
+ 
++namespace
++{
++
++    void GetMxbResult(float* vout, float* m, float* x, float* v)
++    {
++        GetM44V4Product(vout, m, x);
++        GetV4Sum(vout, vout, v);
++    }
++
++}
++
++
+ OIIO_ADD_TEST(MathUtils, M44_is_diagonal)
+ {
+     {
+diff --git a/src/pyglue/PyAllocationTransform.cpp b/src/pyglue/PyAllocationTransform.cpp
+index 20bb50e..06b418a 100644
+--- a/src/pyglue/PyAllocationTransform.cpp
++++ b/src/pyglue/PyAllocationTransform.cpp
+@@ -53,7 +53,6 @@ OCIO_NAMESPACE_ENTER
+         ///
+         
+         int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds);
+-        PyObject * PyOCIO_AllocationTransform_equals(PyObject * self,  PyObject * args);
+         PyObject * PyOCIO_AllocationTransform_getAllocation(PyObject * self);
+         PyObject * PyOCIO_AllocationTransform_setAllocation(PyObject * self,  PyObject * args);
+         PyObject * PyOCIO_AllocationTransform_getNumVars(PyObject * self);
+-- 
+2.15.1
+
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch
index 9cb3500d9dab..9041677c9ce4 100644
--- a/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
+++ b/media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch
@@ -1,35 +1,19 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-11-29 22:51:15.000000000 +0000
-+++ b/CMakeLists.txt	2017-12-27 16:49:51.461300828 +0000
-@@ -59,6 +59,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
+From 967369b36c9684d7ffb73a926c442d8991a3afef Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Mon, 15 Jan 2018 13:09:31 +0000
+Subject: [PATCH 3/3] Remove building of bundled programs
+
+---
+ docs/CMakeLists.txt | 98 ++---------------------------------------------------
+ 1 file changed, 3 insertions(+), 95 deletions(-)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index a822a19..d588139 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -1,90 +1,4 @@
  
- enable_language(CXX)
- 
-@@ -531,7 +532,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -646,4 +647,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/CMake)
-diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
---- a/docs/CMakeLists.txt	2017-11-29 22:51:15.000000000 +0000
-+++ b/docs/CMakeLists.txt	2017-12-27 16:53:28.976491353 +0000
-@@ -1,91 +1,5 @@
- 
- ###############################################################################
+-###############################################################################
 -### External Doc Apps ###
 -
 -if (WIN32)
@@ -115,10 +99,9 @@ diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
 -    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
 -)
 -
--###############################################################################
+ ###############################################################################
  ### Create Doc Targets ###
  
- message(STATUS "Create sphinx conf.py from conf.py.in")
 @@ -122,7 +36,7 @@ else()
  endif()
  
@@ -128,32 +111,30 @@ diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
      DEPENDS
          ${DEPLIBS}
          ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -133,20 +47,18 @@ add_custom_target(doc ALL
+@@ -131,11 +45,7 @@ add_custom_target(doc ALL
+         developers/api/OpenColorTypes.rst
+         ${RSTDOC_OUTPUT}
      COMMENT "Building html docs"
      SOURCES ${DOCFILES})
- 
+-
 -# note: ExternalProject will not build when added to a add_custom_target this
 -# works around this problem. This seems to be fixed in the cmake ^HEAD
 -add_dependencies(doc Sphinx) 
--
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
  
-+if(OCIO_BUILD_PDF_DOCS)
-+
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
+         DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
+@@ -146,8 +56,8 @@ find_package(LATEX)
  find_package(LATEX)
  if(PDFLATEX_COMPILER)
      
-     add_custom_target(latex
+-    add_custom_target(latex
 -        COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
++    add_custom_target(latex ALL
 +        COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
          DEPENDS
              OpenColorIO
              ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -156,7 +68,6 @@ if(PDFLATEX_COMPILER)
+@@ -156,14 +66,12 @@ if(PDFLATEX_COMPILER)
              ${RSTDOC_OUTPUT}
          COMMENT "Building latex doc"
          SOURCES ${DOCFILES})
@@ -161,13 +142,13 @@ diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
      
      add_custom_target(pdf ALL
          COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
-@@ -166,6 +77,8 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
+         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-latex
+         COMMENT "Building pdf doc"
+         SOURCES ${DOCFILES})
+-    add_dependencies(pdf latex)
      
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-+
-+endif()
+             DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-- 
+2.15.1
+
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch
new file mode 100644
index 000000000000..e4c6296f1d7f
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch
@@ -0,0 +1,102 @@
+From c43cc918c3e79e324f11ca47e95bfe36e9e0dd15 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Sun, 14 Jan 2018 19:59:31 +0000
+Subject: [PATCH] Add GNUInstallDirs variables and fix install location for
+ cmake files
+
+GNUInstallDirs is supported on all platforms and variables are set
+to the standard GNU locations.
+
+This patch corrects the location where the CMake files are
+installed.
+
+Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
+---
+ CMakeLists.txt                     | 9 +++++----
+ docs/CMakeLists.txt                | 4 ++--
+ export/pkgconfig/OpenColorIO.pc.in | 6 ++----
+ 3 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b05c7e4..452fa1e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,6 +59,7 @@ endif()
+ include(ParseArguments)
+ include(OCIOMacros)
+ include(ExternalProject)
++include(GNUInstallDirs)
+ 
+ enable_language(CXX)
+ 
+@@ -531,7 +532,7 @@ endif()
+ configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
+     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
+ 
+-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
++INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
+ 
+ ###############################################################################
+ ### CPACK ###
+@@ -596,7 +597,7 @@ if(TARGET OpenColorIO_STATIC)
+         set(OCIO_STATIC_COMPILE_DEFINITIONS )
+     endif()
+ endif()
+-install(EXPORT OpenColorIO DESTINATION cmake)
++install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
+ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
+     "
+     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
+@@ -608,7 +609,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
+     
+     ## targets libraries + associated definitions
+     if(NOT TARGET OpenColorIO)
+-        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
++        include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
+         if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
+             message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
+             set(OpenColorIO_LIBRARY         OpenColorIO)
+@@ -646,4 +647,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
+     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
+     "
+ )
+-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
++install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 3fd0299..a822a19 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -138,7 +138,7 @@ add_custom_target(doc ALL
+ add_dependencies(doc Sphinx) 
+ 
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
+-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
++        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
+         PATTERN .* EXCLUDE
+ )
+ 
+@@ -166,6 +166,6 @@ if(PDFLATEX_COMPILER)
+     add_dependencies(pdf latex)
+     
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
+-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
++            DESTINATION ${CMAKE_INSTALL_DOCDIR})
+     
+ endif()
+diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
+index 81ab4ce3..c4553a4f 100644
+--- a/export/pkgconfig/OpenColorIO.pc.in
++++ b/export/pkgconfig/OpenColorIO.pc.in
+@@ -1,7 +1,5 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
+-includedir=${prefix}/include
+-libdir=${exec_prefix}/lib@LIB_SUFFIX@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: OpenColorIO
+ Description: A color management framework for visual effects and animation
+-- 
+2.15.1
+
diff --git a/media-libs/opencolorio/metadata.xml b/media-libs/opencolorio/metadata.xml
index 10fb0496f9c4..8622e02f2f8b 100644
--- a/media-libs/opencolorio/metadata.xml
+++ b/media-libs/opencolorio/metadata.xml
@@ -7,7 +7,8 @@
 	</maintainer>
 	<longdescription lang="en">OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation.</longdescription>
 	<use>
-		<flag name="pdf">Install extra documentation in PDF format</flag>
+		<flag name="pdf" restrict="&lt;=media-libs/opencolorio-1.1.0-r1">
+			Install extra documentation in PDF format</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">imageworks/OpenColorIO</remote-id>
diff --git a/media-libs/opencolorio/opencolorio-1.1.0.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
index c1504ae4a464..82a5b17acd9e 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
@@ -11,13 +11,12 @@ inherit cmake-utils python-single-r1 vcs-snapshot
 DESCRIPTION="A color management framework for visual effects and animation"
 HOMEPAGE="http://opencolorio.org/"
 
-SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz \
-		-> ${P}.tar.gz"
+SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc opengl pdf python cpu_flags_x86_sse2 test"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
 REQUIRED_USE="
 	doc? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
@@ -36,15 +35,16 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? (
-		pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] )
-		!pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	)"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 # Restricting tests, bugs #439790 and #447908
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${P}-cmake-fixes.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-fix-compile-error-with-Lut1DOp.cpp.patch"
+	"${FILESDIR}/${P}-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
+	"${FILESDIR}/${P}-remove-building-of-bundled-programs.patch"
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -67,19 +67,19 @@ src_configure() {
 		-DOCIO_BUILD_JNIGLUE=OFF
 		-DOCIO_BUILD_NUKE=OFF
 		-DOCIO_BUILD_SHARED=ON
-		-DOCIO_BUILD_STATIC=OFF
+		-DOCIO_BUILD_STATIC=$(usex static-libs)
 		-DOCIO_STATIC_JNIGLUE=OFF
 		-DOCIO_BUILD_TRUELIGHT=OFF
 		-DUSE_EXTERNAL_LCMS=ON
 		-DUSE_EXTERNAL_TINYXML=ON
 		-DUSE_EXTERNAL_YAML=ON
-		-DOCIO_BUILD_DOCS="$(usex doc)"
-		-DOCIO_BUILD_APPS="$(usex opengl)"
-		-DOCIO_BUILD_PDF_DOCS="$(usex pdf)"
-		-DOCIO_BUILD_PYGLUE="$(usex python)"
-		-DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)"
-		-DOCIO_BUILD_TESTS="$(usex test)"
+		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_APPS=$(usex opengl)
+		-DOCIO_BUILD_PYGLUE=$(usex python)
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_BUILD_TESTS=$(usex test)
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON # They don't build
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 6f60a0e3f220..6be1f3afd84b 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,7 +1,4 @@
-AUX openh264-1.5.0-pkgconfig-pathfix.patch 1903 BLAKE2B e1287e4f3bb2453c170c1fb25ff2e784529fffdd770fba3aa0d0431dddd22d17a3160740db40247506a0386e4797696d7009e01c0d669db3b299145c4d631b84 SHA512 054ede3fe66365fd7309f7ea1ac038f640daf4867dcb58d67fbecf62828d1bb49e68f1b8a2ab7b785149c4aca03e4c91c04be5f7cd91b6de8ed8c401c94b0db9
 AUX openh264-1.7.0-pkgconfig-pathfix.patch 1921 BLAKE2B 22d3ab7bd9cbe4c0ac638760a0c2b947eb6749a18d61cd3aca22ac84647af24d6dced048f9eae2ae9e9ee9b0813a255a6d1c8a1ff04e3e6ae2bdc1d508c82d7b SHA512 4545c9c2a696d9ceaf463fe74f391614ba41abc51ce00c32b285baf37e34d8e8bc55f2c3288309a2b44a4ff420ed7d1bc2aa26f2214abe65576d267488dd0849
-AUX pkgconfig-pathfix.patch 1921 BLAKE2B 1f807eeca318dd8e78033291e3465f0da92c156b42f3aa848b2af81be4ac5d1980b791e63da41947a9c7ffc3df3eb9b39cb248b61efb49222554c21e9b378126 SHA512 b080d65385e384ea0402d829dabd38959f10b7f0880d3fb3f5611593493e2a2c5679c7f37a48c58c0cbccce04bffdc58a359fd5262614d5c98e98c491c5807d8
-AUX pkgconfig_install.patch 711 BLAKE2B c75f750f3c4419323a34acc4c8490525a1dc6b1c628ea1233a124e4689c6ac1ef4338c5786cc040b9a87fd446708cbbc338fe37b2edfc16298391bdd7c66fe7a SHA512 1d3a38b35ac73cc3af6ae24d9bd537712d66f99faa9687bb8c26b3a45d559ccad6917ea1aff11030ff61c9b4c4e89701584d72e35b80b52c514e5f4e56516fe0
 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a
 DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc271c289165233aa1375e10ce6e60f7be7307eeb7acedd459c3170b57fbc5c7a0e9b6bd0c355be6447fb036192f35 SHA512 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa
 EBUILD openh264-1.7.0-r1.ebuild 2929 BLAKE2B 9e72b4b26c0748f1d8293943a1bae1fc90346ed78474e508d7c265dcd86366b8a737ea556b9f58cf9516bb5b91e153402b371af4f2a34813388bf2e93a594d89 SHA512 dd008099e9cea12ad28f5ab1b447cca9308e3cdb3f859818eb5889b540241d7ef7e460fca4d9fd00b964cc65119cd6e5b764e4b0f3902ab42576b06851ed17cd
diff --git a/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch
deleted file mode 100644
index a39823aeee77..000000000000
--- a/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/Makefile	2015-10-19 21:49:05.000000000 -0400
-+++ b/Makefile	2016-02-17 12:16:06.102945631 -0500
-@@ -27,6 +27,7 @@
- DESTDIR=
- LIBDIR_NAME=lib
- SHAREDLIB_DIR=$(PREFIX)/lib
-+INCLUDES_DIR=$(PREFIX)/include
- PROJECT_NAME=openh264
- MODULE_NAME=gmpopenh264
- GMP_API_BRANCH=Firefox39
-@@ -244,14 +245,14 @@
- endif
- 
- $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
--	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
-+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
- 
- $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
--	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
-+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
- 
- install-headers:
--	mkdir -p $(DESTDIR)$(PREFIX)/include/wels
--	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels
-+	mkdir -p $(DESTDIR)/$(INCLUDES_DIR)/wels
-+	install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)/$(INCLUDES_DIR)/wels
- 
- install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
- 	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
---- a/openh264.pc.in	2015-10-19 21:49:05.000000000 -0400
-+++ b/openh264.pc.in	2016-02-17 12:17:03.792768147 -0500
-@@ -1,6 +1,6 @@
- prefix=@prefix@
--libdir=${prefix}/lib
--includedir=${prefix}/include
-+libdir=@sharedlibdir@
-+includedir=@includesdir@
- 
- Name: OpenH264
- Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
diff --git a/media-libs/openh264/files/pkgconfig-pathfix.patch b/media-libs/openh264/files/pkgconfig-pathfix.patch
deleted file mode 100644
index 455b91331df4..000000000000
--- a/media-libs/openh264/files/pkgconfig-pathfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/Makefile	2015-03-25 03:43:00.000000000 -0400
-+++ b/Makefile	2015-06-18 17:28:42.436110085 -0400
-@@ -24,6 +24,7 @@
- OBJ=o
- DESTDIR=
- SHAREDLIB_DIR=$(PREFIX)/lib
-+INCLUDES_DIR=$(PREFIX)/include
- PROJECT_NAME=openh264
- MODULE_NAME=gmpopenh264
- GMP_API_BRANCH=Firefox38
-@@ -229,14 +230,14 @@
- endif
- 
- $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
--	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $(PROJECT_NAME).pc.in > $@
-+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $(PROJECT_NAME).pc.in > $@
- 
- $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
--	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $(PROJECT_NAME).pc.in > $@
-+	@sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;;' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $(PROJECT_NAME).pc.in > $@
- 
- install-headers:
--	mkdir -p $(DESTDIR)/$(PREFIX)/include/wels
--	install -m 644 codec/api/svc/codec*.h $(DESTDIR)/$(PREFIX)/include/wels
-+	mkdir -p $(DESTDIR)/$(INCLUDES_DIR)/wels
-+	install -m 644 codec/api/svc/codec*.h $(DESTDIR)/$(INCLUDES_DIR)/wels
- 
- install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
- 	mkdir -p $(DESTDIR)/$(PREFIX)/lib
---- a/openh264.pc.in	2015-06-18 17:32:58.356114757 -0400
-+++ b/openh264.pc.in	2015-06-18 17:31:12.096112817 -0400
-@@ -1,6 +1,6 @@
- prefix=@prefix@
--libdir=${prefix}/lib
--includedir=${prefix}/include
-+libdir=@sharedlibdir@
-+includedir=@includesdir@
- 
- Name: OpenH264
- Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
diff --git a/media-libs/openh264/files/pkgconfig_install.patch b/media-libs/openh264/files/pkgconfig_install.patch
deleted file mode 100644
index 50d8715ce6f3..000000000000
--- a/media-libs/openh264/files/pkgconfig_install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: openh264-1.4.0/Makefile
-===================================================================
---- openh264-1.4.0.orig/Makefile
-+++ openh264-1.4.0/Makefile
-@@ -253,8 +253,8 @@ install-shared: $(LIBPREFIX)$(PROJECT_NA
- 	if [ "$(SHAREDLIBSUFFIXVER)" != "$(SHAREDLIBSUFFIX)" ]; then \
- 		cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)/$(SHAREDLIB_DIR); \
- 	fi
--	mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
--	install -m 644 $(PROJECT_NAME).pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
-+	mkdir -p $(DESTDIR)/$(SHAREDLIB_DIR)/pkgconfig
-+	install -m 644 $(PROJECT_NAME).pc $(DESTDIR)/$(SHAREDLIB_DIR)/pkgconfig
- ifneq ($(EXTRA_LIBRARY),)
- 	install -m 644 $(EXTRA_LIBRARY) $(DESTDIR)/$(PREFIX)/lib
- endif
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 1bce0b9ace79..18bab6b71771 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,6 +1,6 @@
 AUX simage-1.7.0-libpng15.patch 572 BLAKE2B 7f4eacdd5aac3e6634fd26824d0dfb7ec779fcf6be86e642f2870c62b1f0bd86b1ef767e19034e05fd62cba9904ef45e13a85be7657e00133febb67b0469c337 SHA512 0a867187b0dbc644182784e56dfd26b51f48c9355b01228fe3386fab05cee084e0066d4b18eb3f63110a25c0d2abf8f8b214d9b94e2e7dc7438e90308653e4e8
 AUX simage-1.7.0-pkgconfig-partial.patch 467 BLAKE2B a2957c1d5fc6939df7ecb1bb15743253294142a87f98d4043368f189dc4f5ee302de16e84572a69e3ea5755124326fb075b2e45d3574a1759c899d9e96eaf828 SHA512 791db9c02fc0dc7526ed43b340ab6f92baea91a5bf9005099f6adf1550a7ab73ef36790d2e761f0b50b88098e9124f3035ff21149cca00d819c2262d8e180618
 DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f
-EBUILD simage-1.7.0-r1.ebuild 1820 BLAKE2B 6042cc61c5c2a1663617519b3220cdef11b6439b1aab26279c74f0add1583014f9e5c130135e5e1000012a526b666e1478eb104bd01f9c085083e846ac3ca8a9 SHA512 5ba19751344b39d929d779d42b533ab58728930749f201bb3713383ef214f749bfa4eb8fd0e666c86d27963f2afad1245373b8187d91524e5090aad12a50bb6a
+EBUILD simage-1.7.0-r1.ebuild 1819 BLAKE2B bf3be9828da38712acf316dc1a44c8c093f019d9b2236aa16cfb55b3eefb4e7bbb8eea9012a9275f07f201ed0698560d52de67b0bbe71773d58e80b55c793565 SHA512 7a16ac76fe956c145983c18b2204b390a2bbb3e793ba556db06303204e763ccac6fa6cb5bb05e05b5f3972825a26b9c4253e2f5ff028052ae887fa78b4b43871
 EBUILD simage-1.7.0.ebuild 1797 BLAKE2B a59ec07def228a517d059b4b7bcb1ee1ec177feb681220c3bfc072ae73e3d431760b1b04c3cdeb75bac6d5840233a8ce7725ba243408be6bf659b0de5b421f49 SHA512 fee38faec0e6671220b7eda84c5639be3ea66d88384bda168296de2184e8cc38b45555801ab0c6988fc737af0b60c3d78a34984f48faad99c0236a3baf6182c3
 MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild
index 7d2ebd4d9581..b49018795d74 100644
--- a/media-libs/simage/simage-1.7.0-r1.ebuild
+++ b/media-libs/simage/simage-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ HOMEPAGE="https://bitbucket.org/Coin3D/simage"
 SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
 
 LICENSE="public-domain mpeg2enc"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
 SLOT="0"
 IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib"
 RESTRICT="mirror bindist" #465086