gentoo resync : 25.01.2018

8 files changed, 132 insertions, 185 deletions

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index b0bbbff79e8e..b479d7cd1afe 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,15 +1,14 @@
-AUX openimageio-1.3.5-openexr-2.x.patch 1655 BLAKE2B e75ad1bd47d640e4f6b79246f90a853b0d6f8436b252e5625e48c5630b93a3a7754386cd038617c81d9efb606d69efe7d42ac1a92bbb139daf7970d7de020758 SHA512 3e7819aa866129b20d66ee371d653e80b34fd86a173a70ee280453f38d2b6815ca8fa403ddb85b2ae26a8f20dfbb6d319646b486b664933e665c48ea9ac54a87
 AUX openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch 15826 BLAKE2B 7f1744321e4dd59264502ecbb9ec958a6d0ee26a0e1a53be3e0b31fa5e3cc7f0846c95af81b66796f1901378689fb5c217bfd9f991d44451a95de0716a1bcb78 SHA512 57fbd123445ea474609239bb54a2032f4f97fd686ce74479431a90e1b251d4cae1d7f740b14c8360dd498edcac9c51c1d84dece82b2f6b513e709c386bb9ad9e
 AUX openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch 9877 BLAKE2B 0325e373bae367d3581343d49cda84ee27161a8a9a07e85ec00c81e6a0f11de5ce26d71ccc91153187ee79a97933d8307cbff84713524b3a5e40083dc075384c SHA512 e507ba714689a5da0f0a864804eaa0862b1aa4fc0e77f68934ae369c4de11ca566c9efd75ba5060d0294b42bf2bd7f20127eaf8e50efb4ff92497f1b60295f4c
 AUX openimageio-1.6.18-use-gnuinstalldirs.patch 11257 BLAKE2B 524d40a5ad4827743d20a259f2fd2ed094945439eef620473ff1097efb150cdfc80c66f4576b869aed6c7b9d086499d5d286c3dcaae4d891a37f6ae06f504a85 SHA512 3ca9e8474bc58b726686d1e87766d20f2cdcb2544b07b20a8a48594b442409f753c1e860219bfe948d19cdf0f5090bd04299ab6fdc6bf39f753d158d9f75a1e1
 AUX openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch 15432 BLAKE2B 550a6aa0b962b6efc5c9fb01dcb781dc78bc26a42624c8d4f4be24925464d66e6cbc1a0a7d9dcececa5c5681a70e34d97bfd72ee3224158cffe8ca151a0750c9 SHA512 433dda4b999d60248fecffe0c5866c1214a2db68dedb0e63e36f9c5e0fbcd5c54d3faff3effd19d7b3bb57bce9016eca10f58ba6b3a4143391325838cb637227
 AUX openimageio-1.7.17-use-gnuinstalldirs.patch 11236 BLAKE2B f8adc11f949906bce9046fffb0074487962c8832b4b026a7c2a47b081d0c30ca813536462a685feb5e67b793b37cb5985c3cfc6766df65424c6921ec0bc28e60 SHA512 27d51f70406812efad10cc099a3c9cabb21f98db4bc718ec14269bea564059be40e691210537cb5609708e1ba318fb485a8e02317a34c20106b2b826200ad79f
-DIST openimageio-1.3.5.tar.gz 13472488 BLAKE2B 2bd6985b338cc6ec4951d372c613aa79b10571b4a0f901f16ce34ecc9c03394aaa25de42b9e1a2e29f4c6f3a68694ee54788e766a2aaa6b5b782a6fd94cf5d22 SHA512 15c4a53ab4d139839da9e9b4bbbf8ad6e00da98e73e0373cec136ce8f54b0ceae0daa2b1680c8ddab49e1680825a08be7778a9f1b7a13dd30e020b8a8c517b95
 DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6
 DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51
 DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94
-EBUILD openimageio-1.3.5.ebuild 2751 BLAKE2B 906669397274921918f70ab582cd8b493ba2cf953b9b0efd3a878ffac352462b52bbf5ad75cadf88af105e0535fd6c3899aa247fd808af43a9847cbc742c607b SHA512 27bd18128ca8728ba14f6bb4efebc95d0fc4d8beb3b3fc761d9911eece4bc0f0111b22aaf323182d39b7f40c3437839df4e9d8ecf620c34b2c97f4ec4bce7265
-EBUILD openimageio-1.6.13.ebuild 2466 BLAKE2B 7273dfa5a76b39e7aaa7a9e6bfbda3c2de387d8c6c6e78605dd94b95342384b6c02242319df25e6eb927744e8d623c452b892ff509ac33904df13e840fe8c21b SHA512 3f9d4b34e90248b6bd8b8d0d2f631974d00af19dee7a232d025deba7919c549386644ba4c3959ed6f70a9442e180afdf181def470cf4dde8b037ac672390ee54
-EBUILD openimageio-1.6.18.ebuild 2965 BLAKE2B b090ec9bad08a9989363012a212fc781e44cce2877fb00bda995ff6076ce863255c913487c6a1a373dc41e8ec40af83ab741f749661b566201f0975d22b2ad01 SHA512 8de65e7d4a338ae771cefda91e48f0a90a2bf094e257ff7cf20c16fcd96e1f9e78c697be0005fafaadebf024d17fe89398a80bc10fea89a48a0e70e7ac077732
-EBUILD openimageio-1.7.17.ebuild 2964 BLAKE2B f9e01b2eaed873edd5935e01beb6c4149a5934b0a00ae8b949ce22a502577d790f86de147406e206ffd0ba12a8d0f0bbf4d070b876c08ad2b4c62baa624fe556 SHA512 a4a625449eb2737072760c8d00413d2193b7ddd3a70b5eeff1fb2e9daec31c6884635a0e6e49b61c65a3ebe83df118f29153464232cdae13cb0697404575a3c1
-MISC metadata.xml 993 BLAKE2B 5a252fa4f9f3fc0de4cfebaf1b4fe00e48943f018f1860c35d189e1ce78e995371a25ee6c9366fcc5e0d6d1d0e09144973c2c44b418002fd8e0badeafa0921a6 SHA512 71a43980fef699fcf83ff6a9773a8f10c33b87fe40ff0a3540052f79cf130eb71a0ad18f97247ca6ac9355a9dcf3d847e7df0822e775dd9877f5d2501733917f
+DIST openimageio-1.8.7.tar.gz 27658771 BLAKE2B 4fe680eacbcca8b6ac6f9f94ef68e4d8a118b5ad58bb7f7091f2800c6b8fa1ad0c2c125c76ca025e956e92c04dbf5e6e0cecb48e1f29feffd804b97abcd61678 SHA512 d31e2790798959572f02de26111805b4bb5a26f73252d2f222f749e867354ca93e292738c04a36769f08c35d9b26605d1fdf66d96b2de5928d8e726bb819e963
+EBUILD openimageio-1.6.13.ebuild 2381 BLAKE2B b8a5ff95b6acc88f1de5d12e113e9812b56f5330ee677fe470650f4077635d667071090226a51762d5c1c2e55bbae928b3c9583a8b9ae56b333ed4c16ae5b931 SHA512 e3b005728837a83100594e4fbce4ce18e5af8e24b5addb0023c0da4cc45cff66a42fd551960d6a13bc2e8342e234e5eb8f53a318cbd44a32264e57ef633f5e78
+EBUILD openimageio-1.6.18.ebuild 2884 BLAKE2B 5402981510f3886fd9a143403bacc084703c6a3898319d8f61b124111e26084bdabcb5d8cb0e085cf745d66e9e8d20a68c06ad9382319482fca17a59fd3f2ee4 SHA512 6b07dd2e6239aa9c86f1b2d7dd548dbc6501e06d41c184e99dfbf400a06bd0e4c3a02d54999017e44522c50b069e94d3539d57dce78937f84bb5fcd43a97a970
+EBUILD openimageio-1.7.17.ebuild 2947 BLAKE2B e3acdfbdc35099f771713866210a32a5dbb461a5c38f9a7351f65e2e12b168cf5d314f2a71b324f2577acaa427bdfa97f79424bc16433646c50733474ab57b86 SHA512 5237f675425d64a87a15d09b23c1f335d57f7a230f9c823bf823b0d0ea81e91f46490c591b60366bc98ec7f748b1ab7ab172187ff65d9affaa922a23ac34635a
+EBUILD openimageio-1.8.7.ebuild 2936 BLAKE2B bb57729c82e47998ff76ce112dca5d63950ae4e3c02b93ae8b3c57aef4d5af69ed8984318306c6ad38c66cf735cb856de7d1281d2880307d887656ce2eac6cac SHA512 d96f0ce9f748da35447758b6c1c9d38dff61ffc7d7823887cf8f5b8a97a282fc4a6237793905a7fc5b20ddeb69a6a8eb527600210a292d673d942625f45a0bb6
+MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
diff --git a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch b/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch
deleted file mode 100644
index 0668f0466a9a..000000000000
--- a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-There is no IlmBaseConfig.h in OpenEXR 2.x
-
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_init'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_settype'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_destroy'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_lock'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_unlock'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_destroy'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_init'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_detach'
-
---- src/cmake/modules/FindIlmBase.cmake
-+++ src/cmake/modules/FindIlmBase.cmake
-@@ -176,17 +176,11 @@
- set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
-   CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE)
- 
--# Link with pthreads if required
--if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
--  file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
--    ILMBASE_HAVE_PTHREAD
--    REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$"
--  )
--  if (ILMBASE_HAVE_PTHREAD)
--    find_package (Threads)
--    if (CMAKE_USE_PTHREADS_INIT)
--      set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
--    endif ()
-+# Always link to pthreads for OpenEXR 2.x
-+if (NOT WIN32)
-+  find_package (Threads)
-+  if (CMAKE_USE_PTHREADS_INIT)
-+    set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
-   endif ()
- endif ()
- 
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 935e4012defd..27cefe35ec56 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="ptex" restrict="&gt;=media-libs/openimageio-1.6.18">
 			Use <pkg>media-libs/ptex</pkg>
 		</flag>
-		<flag name="tbb">Use <pkg>dev-cpp/tbb</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">OpenImageIO/oiio</remote-id>
diff --git a/media-libs/openimageio/openimageio-1.3.5.ebuild b/media-libs/openimageio/openimageio-1.3.5.ebuild
deleted file mode 100644
index db5c150d4757..000000000000
--- a/media-libs/openimageio/openimageio-1.3.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils multilib python-single-r1 vcs-snapshot
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="gif jpeg2k colorio opencv opengl python qt4 ssl tbb +truetype"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/pugixml:=
-	media-libs/glew:=
-	media-libs/ilmbase:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/openexr:=
-	media-libs/tiff:0=
-	sci-libs/hdf5
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	gif? ( media-libs/giflib )
-	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
-	colorio? ( >=media-libs/opencolorio-1.0.7:= )
-	opencv? (
-		>=media-libs/opencv-2.3:=
-		python? ( >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] )
-	)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		)
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		)
-	ssl? ( dev-libs/openssl:0 )
-	tbb? ( dev-cpp/tbb )
-	truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-PATCHES=( "${FILESDIR}"/${P}-openexr-2.x.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled code to make it build
-	# https://github.com/OpenImageIO/oiio/issues/403
-	rm */pugixml* || die
-
-	# fix man page building
-	# https://github.com/OpenImageIO/oiio/issues/404
-	use qt4 || sed -i -e '/list.*APPEND.*cli_tools.*iv/d' doc/CMakeLists.txt
-
-	use python && python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DBUILDSTATIC=OFF
-		-DLINKSTATIC=OFF
-		$(use python && echo -DPYLIB_INSTALL_DIR="$(python_get_sitedir)")
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_FIELD3D=OFF # missing in Portage
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
-		-DSTOP_ON_WARNING=OFF
-		$(cmake-utils_use_use truetype freetype)
-		$(cmake-utils_use_use colorio OCIO)
-		$(cmake-utils_use_use opencv)
-		$(cmake-utils_use_use opengl)
-		$(cmake-utils_use_use jpeg2k OPENJPEG)
-		$(cmake-utils_use_use python)
-		$(cmake-utils_use_use qt4 QT)
-		$(cmake-utils_use_use tbb)
-		$(cmake-utils_use_use ssl OPENSSL)
-		$(cmake-utils_use_use gif)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm -rf "${ED}"/usr/share/doc
-	dodoc ../{CHANGES,CREDITS,README*} # doc/CLA-{CORPORATE,INDIVIDUAL}
-	docinto pdf
-	dodoc doc/*.pdf
-}
diff --git a/media-libs/openimageio/openimageio-1.6.13.ebuild b/media-libs/openimageio/openimageio-1.6.13.ebuild
index d1f065679aee..f7a101f8a20c 100644
--- a/media-libs/openimageio/openimageio-1.6.13.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE="colorio ffmpeg gif jpeg2k opencv opengl python qt4 raw ssl +truetype"
+IUSE="colorio ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -45,12 +45,6 @@ RDEPEND="
 		${PYTHON_DEPS}
 		dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		media-libs/glew:=
-	)
 	raw? ( media-libs/libraw:= )
 	ssl? ( dev-libs/openssl:0 )
 	truetype? ( media-libs/freetype:2= )"
@@ -91,7 +85,7 @@ src_configure() {
 		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_PYTHON=$(usex python)
 		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_QT=$(usex qt4)
+		-DUSE_QT=OFF # Deprecated
 	)
 
 	if [[ ${EPYTHON} == python3* ]]; then
diff --git a/media-libs/openimageio/openimageio-1.6.18.ebuild b/media-libs/openimageio/openimageio-1.6.18.ebuild
index 874a927f7b8d..7f5f2086dbf8 100644
--- a/media-libs/openimageio/openimageio-1.6.18.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.18.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -30,7 +30,7 @@ RDEPEND="dev-libs/boost:=
 	media-libs/openexr:=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
-	virtual/jpeg:=
+	virtual/jpeg:0
 	colorio? ( media-libs/opencolorio:0= )
 	ffmpeg? ( media-video/ffmpeg:0= )
 	field3d? ( media-libs/Field3D )
@@ -46,12 +46,6 @@ RDEPEND="dev-libs/boost:=
 		${PYTHON_DEPS}
 		dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		media-libs/glew:=
-	)
 	raw? ( media-libs/libraw:0= )
 	ssl? ( dev-libs/openssl:0= )
 	truetype? ( media-libs/freetype:2= )"
@@ -101,8 +95,8 @@ src_configure() {
 		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_PTEX=$(usex ptex)
 		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt4)
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_QT=OFF # Deprecated
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 
 	cmake-utils_src_configure
diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild
index 20a3d9542038..163f0a64e763 100644
--- a/media-libs/openimageio/openimageio-1.7.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.7.17.ebuild
@@ -20,7 +20,7 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/boost-1.62:=
 	>=media-libs/openexr-2.2.0-r2:=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
-	virtual/jpeg:=
+	virtual/jpeg:0
 	colorio? ( media-libs/opencolorio:= )
 	ffmpeg? ( media-video/ffmpeg:= )
 	field3d? ( media-libs/Field3D:= )
@@ -49,14 +49,11 @@ RDEPEND=">=dev-libs/boost-1.62:=
 		${PYTHON_DEPS}
 		dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		media-libs/glew:=
-	)
 	raw? ( media-libs/libraw:= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	truetype? ( media-libs/freetype:2= )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex] )"
@@ -105,8 +102,8 @@ src_configure() {
 		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_PTEX=$(usex ptex)
 		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt4)
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_QT=OFF # Deprecated
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 
 	cmake-utils_src_configure
diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
new file mode 100644
index 000000000000..1c69cf3c6d6a
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.8.7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils vcs-snapshot python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="test" #431412
+
+RDEPEND=">=dev-libs/boost-1.62:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	colorio? ( media-libs/opencolorio:= )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		media-libs/glew:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	truetype? ( media-libs/freetype:2= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[latex] )"
+
+DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CPP14=ON
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_JPEGTURBO=ON
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_NUKE=NO # Missing in Gentoo
+		-DUSE_NUKE=OFF
+		-DUSE_OCIO=$(usex colorio)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENSSL=$(usex ssl)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake-utils_src_configure
+}