gentoo resync : 08.10.2021

7 files changed, 19 insertions, 20 deletions

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 46f604ca83b7..8114871dad11 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -6,10 +6,10 @@ DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16
 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-r1.ebuild 2299 BLAKE2B 496ea04a4a228a70cec0df481f6fb4f81cef95ce8c9efd0a2a94b0d7593c030562856d8de39f0a17740387622adb903d4716310b0449378cc832c05254ccd0dd SHA512 25f81545a2d2b912927b4d7afa99842313c82bb4272fee433f6ff5eb1626cd6659107cb5e2f14fc62efe77d50aa5fa809303e29593e748928b19727d74fb94b3
-EBUILD osl-1.12.0.2.ebuild 1971 BLAKE2B 4a1666b2b89899f32138a6fa5eb5ef0eca2c10919277974ae90670e60f46957ebfcac0d6f8af2e96f2801b51bde691cf1766bab9bde102d95f9904ec6d308aa8 SHA512 ebced39e709be034247d7dc90deb4e20aedf13d64e31712c6cb66b0a5833e3c76eddac52cf39aeaf12593757233ef0cc5f8a6954baf7b91e608a2419bff793b2
+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.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.ebuild 1970 BLAKE2B b872758587a5b15768212a2952b72da718550c0728b04b38ed769691794baf635d61032650244bfc918e54327d49c615cd47afd6743a5307c3115d03ca70ac1b SHA512 e6d6579f9ad2ae29a4df92004facf8301c018fc879b743124051647f85c1a32e760ccfbdf9a4cfacab410a72bad22cb24cc8809c0ed7613c44579e84893098ea
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/osl-1.10.13.ebuild b/media-libs/osl/osl-1.10.13.ebuild
index fdab29afa48e..57d75feb4aaf 100644
--- a/media-libs/osl/osl-1.10.13.ebuild
+++ b/media-libs/osl/osl-1.10.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.10.5-fix-install-shaders.patch"
 )
 
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
 RESTRICT="test"
 
 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild
index f4a19303d28c..2874e67dd898 100644
--- a/media-libs/osl/osl-1.11.15.0.ebuild
+++ b/media-libs/osl/osl-1.11.15.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10} )
 
 # check this on updates
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=12
 
 CMAKE_REMOVE_MODULES_LIST=()
 
@@ -60,9 +60,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-cmake.patch
 )
 
-CMAKE_REMOVE_MODULES_LIST=()
-
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
 RESTRICT="test"
 
 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.9.0-r1.ebuild
index 10bd18b8492e..2c050efe222c 100644
--- a/media-libs/osl/osl-1.11.9.0-r1.ebuild
+++ b/media-libs/osl/osl-1.11.9.0-r1.ebuild
@@ -58,7 +58,7 @@ BDEPEND="
 
 PATCHES=()
 
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
 RESTRICT="test"
 
 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
index ea80a9490447..723fee86f662 100644
--- a/media-libs/osl/osl-1.11.9.0.ebuild
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -2,11 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake llvm toolchain-funcs
 
 # check this on updates
 LLVM_MAX_SLOT=10
 
+CMAKE_REMOVE_MODULES_LIST=()
+
+inherit cmake llvm toolchain-funcs
+
 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"
@@ -51,9 +54,7 @@ BDEPEND="
 
 PATCHES=()
 
-CMAKE_REMOVE_MODULES_LIST=()
-
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
 RESTRICT="test"
 
 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r1.ebuild
index d8094d703716..11944da63f69 100644
--- a/media-libs/osl/osl-1.12.0.2-r1.ebuild
+++ b/media-libs/osl/osl-1.12.0.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10} )
 
 # check this on updates
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=12
 
 inherit cmake llvm toolchain-funcs python-single-r1
 
@@ -60,7 +60,7 @@ PATCHES=(
 	${FILESDIR}/${P}-llvm-12.patch
 )
 
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
 RESTRICT="test"
 
 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
index 7532e89f4dd6..155cb0665f23 100644
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -51,7 +51,7 @@ PATCHES=(
 	${FILESDIR}/${P}-llvm-12.patch
 )
 
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
 RESTRICT="test"
 
 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"