gentoo resync : 03.11.2021

4 files changed, 113 insertions, 4 deletions

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 8114871dad11..f1174fc48933 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -4,12 +4,14 @@ AUX osl-1.12.0.2-llvm-11.patch 1405 BLAKE2B 9e6e162591d4450609c6759d3e9aa45acee0
 AUX osl-1.12.0.2-llvm-12.patch 10828 BLAKE2B b172c99210b6874033a157ea4d98d902f9bf4a1d348619ba3180f08cd1a97dd945bd17b5af2f5a87ff8a0240ec82aeac498aeb448861f8f1de5623e80ac39570 SHA512 547254e9eb2bffacd43dbdebf4aa1929475132f42433b4df9b5535e720578af44ae2b08a01a51d80e539fcc22f424291dece51ee6ea55821a821fd0efd76d619
 DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
 DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
+DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
 DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
 DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
 EBUILD osl-1.10.13.ebuild 1981 BLAKE2B 97232a51c24c3487f63d87d7767861278123b2f835a91324ac48ab086d14444769d5d9a7234659175be9540bd3239b0ef68a0b377afa2bccbd8a403d9180d053 SHA512 4588924ce659113de46252fea4206cab7b3ec1567ba62b8b56a471c39f949570040751b3bc7949cc9e1e699967bafe70d7a2ed48a80a6c9305529dd39ef4cd2b
-EBUILD osl-1.11.15.0.ebuild 2517 BLAKE2B 2d01ddfeb0a3ca760fa656fd0a71ec34edb2da5d8d6073097e1b1c15f99a74b1d927c25c0439f976e6a9b0e0f4a53d5ce9c183b3c3a99573d6162afc8858e074 SHA512 27345ac7369de8d65ba0cef986586a2ad41cdfe0f8333cd687e74a1a4defe9f4a0223696345db02e1f8f70c3b2987d3f4583679e28e90ee097d1e1c75ce75116
+EBUILD osl-1.11.15.0-r1.ebuild 2562 BLAKE2B 40df90315638c1651e2c5ab0e141de50eb59146baf900808a2db9757706f79e585f2904697fe479144d960f2c800c0d615203c1ba72904fc71589f39266e24a1 SHA512 108fc337ed3b098c32c8fa1a4c2f6d695b605aea00f4b65786413f722cbb04e77b4e9df64d76d181d4d123eed896d7603873fa0dff30e72ed429917638568004
+EBUILD osl-1.11.16.0.ebuild 2513 BLAKE2B f0e471a66d3ef4950d76c14cdb043f46b7caecaf908cb4e2567fec08f9e336b8369fe30a5f3faeb91088ac83d1a249249702b75884574a3f506d7c7c215abd9b SHA512 bbf760617e9e81505a0fe031b57e645956696f1cba89d4cb52ebc4230aa63f3e58a5c8f038120748fdd3ac61d4aef5752794b1ed57d1c9e06413e900fb0a6543
 EBUILD osl-1.11.9.0-r1.ebuild 2480 BLAKE2B 8dfa487a16d3d5b7fcf9878d1f74b859421f26a82afa491e4cd099628e349a9f62adaca9878369a4ed57ccf24b75fd24e2190b79f04a6f80956590f901910ecc SHA512 e4c87b26f0bb80e865de96cfbd20e1e8f921829682eac8121ff3a0e9eec2457f5846b6e430762dffad687cf765a4e7e4c179878c1655ef99929c1b503c6bde21
 EBUILD osl-1.11.9.0.ebuild 2144 BLAKE2B 957d748e1b107867eeb7e598995aa4b37efdb9222fe3b29f5c1a00b7da8c9aa93a08ec46f724d6f49a6cfb7e5209cbd0d59e5f7b028a94abd309a46f3966f00c SHA512 f68be55f42c0ac9375370fd22c94f7e7d643f76ad7caf41d1dbada0806168ab1429ddf8d817d7a311acc5a326cb01b8c5686656752659ec0bed3987d968e0f81
-EBUILD osl-1.12.0.2-r1.ebuild 2298 BLAKE2B fe159648e3585c696b205f39b3d152af6bee62d70994846703940a8c6ba7b9f1e59e019fd7eee52164eefdd00d48a545fd9032d1851b0a954e91c530f252845f SHA512 30acf08d9203585aad4c8b266ea0214d4148b29ff5a26d365d76473be326781e22691ceb7b3a3f87648e7455fda9a7428d8fa538ccda9737f5811012fcd807d0
+EBUILD osl-1.12.0.2-r3.ebuild 2343 BLAKE2B b8bed7e7922021e888578a3471858097f8a4a30813922ed4c9e5ce8dec9def9c97f90fac719290f3be6d86b7d1ac8458838b78e9aa499a8f838c15c013572abb SHA512 1c8b2863239a25734e3638b052ffb3a0fcf3f3229652dc7e8b2c22b173c9b51342c335c315b9e4063b9aaa296a78cabb4e139fa5b66110d0b2e717a209182d67
 EBUILD osl-1.12.0.2.ebuild 1970 BLAKE2B b872758587a5b15768212a2952b72da718550c0728b04b38ed769691794baf635d61032650244bfc918e54327d49c615cd47afd6743a5307c3115d03ca70ac1b SHA512 e6d6579f9ad2ae29a4df92004facf8301c018fc879b743124051647f85c1a32e760ccfbdf9a4cfacab410a72bad22cb24cc8809c0ed7613c44579e84893098ea
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0-r1.ebuild
index 2874e67dd898..5f806806db4c 100644
--- a/media-libs/osl/osl-1.11.15.0.ebuild
+++ b/media-libs/osl/osl-1.11.15.0-r1.ebuild
@@ -29,11 +29,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
 IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
 
+# See bug #821202 for openimageio < dep
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
 	media-libs/openexr:=
-	media-libs/openimageio:=
+	<media-libs/openimageio-2.3:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	sys-libs/zlib
 	partio? ( media-libs/partio )
diff --git a/media-libs/osl/osl-1.11.16.0.ebuild b/media-libs/osl/osl-1.11.16.0.ebuild
new file mode 100644
index 000000000000..d4591a784b78
--- /dev/null
+++ b/media-libs/osl/osl-1.11.16.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+# check this on updates
+LLVM_MAX_SLOT=13
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/11"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+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="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+
+# See bug #821202 for openimageio < dep
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	<media-libs/openimageio-2.3:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	sys-libs/zlib
+	partio? ( media-libs/partio )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+# Restricting tests as Makefile handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_configure() {
+	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 gcc=$(tc-getCC)
+
+	local mycmakeargs=(
+		# LLVM 10+ needs C++14
+		-DCMAKE_CXX_STANDARD=14
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DUSE_CCACHE=OFF
+		-DLLVM_STATIC=OFF
+		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
+		-DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r3.ebuild
index 11944da63f69..1006a0b16368 100644
--- a/media-libs/osl/osl-1.12.0.2-r1.ebuild
+++ b/media-libs/osl/osl-1.12.0.2-r3.ebuild
@@ -27,11 +27,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# See bug #821202 for openimageio < dep
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/pugixml
 	media-libs/openexr:=
-	media-libs/openimageio:=
+	<media-libs/openimageio-2.3:=
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	sys-libs/zlib:=
 	python? (