gentoo resync : 12.01.2019

4 files changed, 7 insertions, 153 deletions

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 337643caf35b..a69bcfa49c68 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -3,15 +3,12 @@ AUX openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch 9877
 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
-AUX openimageio-1.8.7-ffmpeg4.patch 752 BLAKE2B 53b0ee1dec1dd5ef3c9847d46868130bb4e8203f212932af15670c02ef9d99e22a2f8dfbfc02d1fcb4c8b25599969b92997855189bb075fc75342d3932c1dad4 SHA512 ce34f1ae3854d35d17028bf09ec034c22c028d603247a7c0fee94566ada493cb106a7a08241e37f61e8b15f9c4cc67635e0d56734846a1887ce54fce8b8ae42e
 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
-DIST openimageio-1.8.13.tar.gz 27829708 BLAKE2B 8c3a6721f7039e22fcea538694c32651e042d926f40494e5b3623c11158da2f49a8e49698920269d0f3076d060c5849c62f2a6bb256d77dcd5565f86e6de04d2 SHA512 578d039399846f994dd8e4b94a7b56f2bcec45571c2144705fc4e2fe6a3e1d878d79a96c0484350d54b46eef7796d46becda9f5d50f266cd730f63d97af0650e
-DIST openimageio-1.8.7.tar.gz 27658771 BLAKE2B 4fe680eacbcca8b6ac6f9f94ef68e4d8a118b5ad58bb7f7091f2800c6b8fa1ad0c2c125c76ca025e956e92c04dbf5e6e0cecb48e1f29feffd804b97abcd61678 SHA512 d31e2790798959572f02de26111805b4bb5a26f73252d2f222f749e867354ca93e292738c04a36769f08c35d9b26605d1fdf66d96b2de5928d8e726bb819e963
+DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
 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 2946 BLAKE2B 7a40878d3fab0bf03777a4a9b45118525985bbfa1b494f0641a52a73d3fecc9bc7d76616e1c61757b8b10b93c60c2a9ba5a3066971b017271aeb5b21e4ec266b SHA512 cb9df0dade489b996818b73a62e0d4de82a485b7e7f2123c95be1a46a2405d7690913878d676477857bbda07a8877138de805f8390e0d2899f3f7a26ccbf8128
-EBUILD openimageio-1.8.13.ebuild 2958 BLAKE2B b37b784f30d4f2815cc7fa2421436bc7f56acfe5b5f6996c4f9ca48ac296acf655f7834693871f2549a51a132318295abd204623d05c21e64dbe3995c4c2ce91 SHA512 b3d31a096a1b450aac0779536e971f6a558facabfce87d7a869db1f14f67e46b468da743917019aa8c43e7032bd0cb5be939b655dcdf5d36aea8bd691872a57d
-EBUILD openimageio-1.8.7.ebuild 2983 BLAKE2B 8b71066fbc00e8ede83b6767a37956aa1df54dea03d8bb00ffabd6c65e3d95f453153482e34b4c090bc9f694370bfa5a06d92e2d45014dd10bf9a841e2c69ca3 SHA512 5f314056c16ba4585afe8c68aabe74fcb3580e05d0b19952e8fea373fd0cc65f50ac58270501a2391cc8a1d8ad14d97387b49e9dcce244949302b6a5b361492a
+EBUILD openimageio-1.8.17.ebuild 2936 BLAKE2B 4daf451960cb6c56c32b0910a7ec287889347b0e7476b3f945d4e3f03779444362074496d68da7c84c8763fcd850e0d9af3b8dd3536f341193d23ed06ae6f0bf SHA512 0fd614758cf2540e82dc5d51dcfae960d0a0075a56f1ffc0be2eb780e024bbff4c35aec5ba5b72113247bf16446ad5346f3341ac39e86108c7d1b1ebd624d61c
 MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
diff --git a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
deleted file mode 100644
index 92cad26c9335..000000000000
--- a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 810a0235837d6f31d8b3c05544f99461df71403e
-Author: Larry Gritz <lg@larrygritz.com>
-Date:   Mon Apr 23 15:50:14 2018 -0700
-
-    Changes to allow building against the new ffmpeg 4.0 (#1926)
-
-diff --git a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp
-index 4e0cb3b9..548ddba4 100644
---- a/src/ffmpeg.imageio/ffmpeginput.cpp
-+++ b/src/ffmpeg.imageio/ffmpeginput.cpp
-@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture,
- }
- #endif
- 
-+
-+// Changes for ffmpeg 4.0
-+#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100))
-+
-+#if USE_FFMPEG_4_0
-+#  define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY
-+#endif
-+
-+
- #include <boost/thread/once.hpp>
- 
- #include <OpenImageIO/imageio.h>
diff --git a/media-libs/openimageio/openimageio-1.8.13.ebuild b/media-libs/openimageio/openimageio-1.8.17.ebuild
index 7e8ccfa61034..5dd03517a4f4 100644
--- a/media-libs/openimageio/openimageio-1.8.13.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
 inherit cmake-utils python-single-r1
 
@@ -67,12 +67,12 @@ DEPEND="${RDEPEND}
 
 DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
 
+S="${WORKDIR}/oiio-Release-${PV}"
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-S="${WORKDIR}/oiio-Release-${PV}"
-
 src_configure() {
 	# Build with SIMD support
 	local cpufeature
@@ -89,7 +89,6 @@ src_configure() {
 		-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)
diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
deleted file mode 100644
index 22956201293b..000000000000
--- a/media-libs/openimageio/openimageio-1.8.7.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ffmpeg4.patch"
-)
-
-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
-}