gentoo resync : 25.09.2021

6 files changed, 351 insertions, 2 deletions

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 13190f79b2b0..46f604ca83b7 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,10 +1,15 @@
 AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385caf9c2a9291d2f7db30b2ed1dab99d1d8da25ad5487edc7961a62809811eca45066eaa4bfa0524d0e9c9daa25489fb84be2965b2 SHA512 bc7d5e2c1306fa540d51f425d4b1303c5ad9ab624ba7f44d03ed9d8df77f36a71c334b05049d0a880cabe068947f7936258e3e52479334987b7ae68f55631cc4
+AUX osl-1.11.15.0-fix-cmake.patch 644 BLAKE2B cd51bc2f59a59a80981d357c38a89ea2b7d4e128470616e9851ef28a0c55f3292e9ace6c681b7f15c5752b41ce1f07266adb97fffa5f1923c55242207a674fe9 SHA512 10546e4771f055fb06824113c9c77ec8cc8ea9929343a8a5a68a3ea7fc7d7e2ccb983269eed66782569275e6262fde872b56ce30008ee797ed65566f0f1359ba
 AUX osl-1.12.0.2-llvm-11.patch 1405 BLAKE2B 9e6e162591d4450609c6759d3e9aa45acee0addf5be60bcd21067fa861e6e77fdac83656a3542b3d977987dad4da0627074e36b80b85e1af5e73ae5a7ade9a4b SHA512 a3986d9c458338d1002e119b2c16372fced00a10ddf734b790774f533500f4e3c2cf8fae88431f14a8709d916f9eae4f3f5bdff573e38a1808bc39b0a015ffbf
 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.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 1982 BLAKE2B ba5db5bb799f094356b034d82a322a7f189b671b4b04f8e0573ff3f5b6478d1787ac4e9a91cfff3ad3444ca95f6e678b4b9f2829b425b84fc348057363e7089e SHA512 0b198ebc63420aad4adb20b29640d2a00d8b4b3cf8e62f68e454aefed2e60c5f7af977b9762a1d26074bac8e5016c6703ccf9d7a038cfa2649a701eda24045fd
+EBUILD osl-1.11.15.0.ebuild 2548 BLAKE2B a8fce08c238a82586720a336e8c8f2b3c98cc33f1b9cbaafe1b8c504416379045dc07e7852b18a9247e750643625adf2c40562e8d958b209b19be33121303f4c SHA512 4b6c0aa9dce8d5874d78f724fc4f4a72734d578558b2a030d51ff317903b6779486eb6e69f8c37fb2e3fc64336644a1c1a486c5f489b7459e2791fea6995f46c
+EBUILD osl-1.11.9.0-r1.ebuild 2481 BLAKE2B 8fa1fc232512feed8cd6b6ba72d457fd6626c87e6aed9e39244fe0138f33ba49f20a126a1e25c42258c3ee033807b4ce3fc3155f9d55a9720afa783487071b27 SHA512 2f526342d1f0cbbdf6822b24b46e23884b9753caf4159968e9ff7353678f67270911d3dc04be376a7016e140fe8daa4cb0f04676481258d9621c17d1f421795a
 EBUILD osl-1.11.9.0.ebuild 2144 BLAKE2B 74b8721250769b65c88f9f73441262414390c0d7d3ade2ebc9e15be7d7b14d6a58e578b11949ed1fc0f76373fd3ffe26b2fd1168f44e73d9fe029f07dd024ddf SHA512 2f1f7510283d594ac97e295e3201c5dc4470a0002a4f8067cb153e210e1145c96aa47755a3f6b57b2690b6ee2b300fa6cd0875fb438912f58303106c2ce3a952
-EBUILD osl-1.12.0.2.ebuild 1953 BLAKE2B 4b28ea43245f16be814cf4fea8862f935bc739a8b8a70d3c8a4ccab7770f4fac906a666db4f6be01a3d7a09b8e8b67f94b777c93f8f17721792ecdc539d05f26 SHA512 b6f1362e3014030cd8fc74a6aac0c817950f1f531fc87f9326a1105989b95a80cbab9b9bfa783b2472f07638bf67b1d82e566e6a54d304b066101f36b667f37b
+EBUILD osl-1.12.0.2-r1.ebuild 2299 BLAKE2B 496ea04a4a228a70cec0df481f6fb4f81cef95ce8c9efd0a2a94b0d7593c030562856d8de39f0a17740387622adb903d4716310b0449378cc832c05254ccd0dd SHA512 25f81545a2d2b912927b4d7afa99842313c82bb4272fee433f6ff5eb1626cd6659107cb5e2f14fc62efe77d50aa5fa809303e29593e748928b19727d74fb94b3
+EBUILD osl-1.12.0.2.ebuild 1971 BLAKE2B 4a1666b2b89899f32138a6fa5eb5ef0eca2c10919277974ae90670e60f46957ebfcac0d6f8af2e96f2801b51bde691cf1766bab9bde102d95f9904ec6d308aa8 SHA512 ebced39e709be034247d7dc90deb4e20aedf13d64e31712c6cb66b0a5833e3c76eddac52cf39aeaf12593757233ef0cc5f8a6954baf7b91e608a2419bff793b2
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
new file mode 100644
index 000000000000..020370d54bca
--- /dev/null
+++ b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
@@ -0,0 +1,24 @@
+https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/commit/14bd942f1bbb621c729f01c982925acd6d263d58.patch
+
+From: debaetsd <debaetsd@gmail.com>
+Date: Tue, 29 Dec 2020 22:01:21 +0100
+Subject: [PATCH] fixed cmake setup when tests are disabled (#1319)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
+         FILE ${OSL_TARGETS_EXPORT_NAME}
+         NAMESPACE ${PROJECT_NAME}::)
+ 
+-
+-
+-
+-osl_add_all_tests()
+-
++if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
++	osl_add_all_tests()
++endif ()
+ 
+ if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
+     include (packaging)
+
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild
new file mode 100644
index 000000000000..f4a19303d28c
--- /dev/null
+++ b/media-libs/osl/osl-1.11.15.0.ebuild
@@ -0,0 +1,110 @@
+# 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"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	media-libs/openimageio:=
+	<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
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-cmake.patch
+)
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+# Restricting tests as Make file 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.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.9.0-r1.ebuild
new file mode 100644
index 000000000000..10bd18b8492e
--- /dev/null
+++ b/media-libs/osl/osl-1.11.9.0-r1.ebuild
@@ -0,0 +1,106 @@
+# 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=10
+
+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"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	media-libs/openimageio:=
+	<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
+"
+
+PATCHES=()
+
+# Restricting tests as Make file 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-r1.ebuild
new file mode 100644
index 000000000000..d8094d703716
--- /dev/null
+++ b/media-libs/osl/osl-1.12.0.2-r1.ebuild
@@ -0,0 +1,104 @@
+# 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
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}-dev.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~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="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	media-libs/openimageio:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	sys-libs/zlib:=
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	partio? ( media-libs/partio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	${FILESDIR}/${P}-llvm-11.patch
+	${FILESDIR}/${P}-llvm-12.patch
+)
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
+
+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)
+	# LLVM needs CPP11. Do not disable.
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=14
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DUSE_CCACHE=OFF
+		-DLLVM_STATIC=OFF
+		-DOSL_BUILD_TESTS=$(usex test)
+		-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.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
index a312fa3bc86e..7532e89f4dd6 100644
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 X86_CPU_FEATURES=(
 	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2