gentoo auto-resync : 18:07:2023 - 00:58:24

15 files changed, 330 insertions, 11 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 49246e0a06c8..656ce0e8c821 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 5b7d77cc3b5f..4bd3548bcfbb 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,5 +1,5 @@
 DIST codec2-1.1.0.tar.gz 14925316 BLAKE2B 7f99dfa5704c5b7df3efbb0cf5aeafe8d66e294f622dfa639ffe6ebe8b32b347a1632113763d6a3693a1f04451c3a5ff54592bda8cffa2d281847b775c62a561 SHA512 efc0f31b1a265c7acf38ab1c6c856f7a3cce58acec6c214d94cf9cd560efdca08859b317b396efb286176b0e235b2256080c8a2f83695424454b744275d1c661
 DIST codec2-1.1.1.tar.gz 14925322 BLAKE2B 4d9d712c54c13e544b33b3f68f7863dbca9aa8dd19b241a0b1ba2b0ea8aae1f6477d24b33bee20dff537e4ea6743dae3f251691964f6dd7866ccd57718b2a5ac SHA512 d59c644018f16d99e0c5a7e163a2888cb1250f822dd00df419ee454552c61774ff6cdb5b1cf0a9bc09f0395bd78cf1b1b39217b8d314d238d65dc4c922bcbec2
 EBUILD codec2-1.1.0.ebuild 1230 BLAKE2B 036fabcac12d82e18171d30f35397d60bfbb6ec2f7abaec81f910d750fd89b51f208758ecb491e88bf5d87698357fb0451737ed575adce9ec987836a97fcf8d0 SHA512 fb21a9e9f7ae22deffac56f10bdd09ffd52e39b4e33a6d98cc971f7dfdd4790d9644107fe6ff124a21c08bb4f72790b478c2dffe166a163c79e32467b0977bab
-EBUILD codec2-1.1.1.ebuild 1236 BLAKE2B 96bdee9f5c80214fc7af82ca903ab7f2a19cf537208c9b0fa3bc3c0fdc95bcc3d958ced82704379a9169817c0e6dc4969e1aef8eb5e7cacf6ad0e2b71fea5127 SHA512 09a9b82bd9c9a3c5e04ac9887ad090a1de9f2d94787f389ba18b4e54996d5a19333b7716eea718a377a56c2593ed19a5262a0abc33b57c7d714f6e2972991287
+EBUILD codec2-1.1.1.ebuild 1231 BLAKE2B f68d0ddf1049e440b5216203226c3fee67c89c4730374ae674a62f93ea924285194cd505bd6c3742729a502f859368dfcc3715a3b992a56bd5a9d0c2b8c393a6 SHA512 28c30a4f132fd6e0fe0cf4700119dcc68d7fa50c2a04ce0a4d88a239f86ab32ba381702d7992e4777241296ce9ecc0c1afe0d7416c79072a74154ed07bed574c
 MISC metadata.xml 326 BLAKE2B a7fc8408d6f6b58ad9d7019e858c703fd65ba38072dfefa381a5d00b500fe5d0ba024c2a3ed2d37e8e11da71f53bbfbeb80ead070935b9e83929d75d3a7852af SHA512 73c8e213262ac05ced95080d9e97a1e2abfdb2ad9e436ededda82de01feea321c3d499c8c2e8b3725a81b434e9efc4b12b321d738ab966d104e3344f4e29206b
diff --git a/media-libs/codec2/codec2-1.1.1.ebuild b/media-libs/codec2/codec2-1.1.1.ebuild
index 7b8c5a0bc64b..34eeee583bf3 100644
--- a/media-libs/codec2/codec2-1.1.1.ebuild
+++ b/media-libs/codec2/codec2-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples test"
 
 # Not yet passing, but infrastructure added to run
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 65f119621387..f1c1fb6e2627 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,5 +1,5 @@
 DIST leptonica-1.82.0.tar.gz 14041481 BLAKE2B 2e60a7e14bf9120348460ac122fe0e9a1c696f17fd8f23cd3eb1b1316e13ae7fd25bbaef3fc8531df6e2572fa06e86d757138b11b29dcc24dda9576b9c00f3b0 SHA512 cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d
 DIST leptonica-1.83.1.tar.gz 14028566 BLAKE2B 56c501f16eb58366e4ed2f168f714adef968c271a0636cc0f3663b762aac29352a508421702e8ab063f78f3faf01e3d9eb72fff43093b05722a1a604beb66a59 SHA512 14c76b8795e494637cd225982cd27a1cd82d22b34c0c0d6ed061530c0ed8cec87fc1c8482bbda8f56a04f240b9fb50d481b8fffe5df846958cb146f9d2d51553
 EBUILD leptonica-1.82.0-r1.ebuild 2066 BLAKE2B 5915d60328aa57c44be294cf3c390ffd7fb2fac6cbfbb5a2f87a6133c6f1a14a9ba0e3cf5ff23cd4ecf1d6f85413207f55c7ea5fc781006ddee59e12f0d230e6 SHA512 227edb1fb6aa0ed926584b2344c0903dc589582e1fb3d492390e0c4d30752e62ab31df88661eef7a8c08405a1b3033da0a360fa1051d030833c3984ea6a441b4
-EBUILD leptonica-1.83.1.ebuild 2068 BLAKE2B c447341c2a7ae32322a80f1a3cb5645822f121c4cc9923db07ba04d1fd18034168382ea4cf5979414f5f6dda74e4606a5a9ef1868851b4a7ddf84997134fce43 SHA512 0286b7e3a2b6eebc879f66a56d56f146181af986157ee0d4d4c739e4ee52a33b92030f9aeadf0998ef4603858bb98383e34d3151749f31fa6f64677aa00216a4
+EBUILD leptonica-1.83.1.ebuild 2067 BLAKE2B fe33f1dc77f325d6945850de81a7303f71dc1d62d30acac587e180c1dfe5b7909d82e54a6ab622c7cf5d96c57db125e0b48812577a9f880ee82c8a7daf0e60dd SHA512 0a10889a79da4623e3496bc07c685f6a7e1cef4bd524e4c8b6ac7c0aa38aabb0a084a4afdc4be862fff59e52d85c40c50b38cf6c66d3bfab1ab0b687e6f0c334
 MISC metadata.xml 606 BLAKE2B 45193dccfdf3394ba6217bb096036b61059b96be60a22381e039df561a66ef091df4fe0476e2c6a6af9f4ee1cced1019d284171e767c18c56ffef3a737794582 SHA512 6b193ead9003b5f54617f4c4852a0a0477c8cd246b4a5e688578d17ec3c03293b6a45e2f6082a16ca6f432fb2bd3f43efe59c5d0cc1c5f741e91116321a10860
diff --git a/media-libs/leptonica/leptonica-1.83.1.ebuild b/media-libs/leptonica/leptonica-1.83.1.ebuild
index 81ed3a5d52f8..6859a3d21f12 100644
--- a/media-libs/leptonica/leptonica-1.83.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.83.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
 # N.B. Tests need some features enabled:
 REQUIRED_USE="test? ( jpeg png tiff zlib )"
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 9b91e222f8ee..83a87a0ad853 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -3,5 +3,5 @@ AUX libwebp-1.2.4-CVE-2023-1999.patch 1734 BLAKE2B 087b1bb4be5d3aceb7796ecbf497d
 DIST libwebp-1.2.4.tar.gz 4141376 BLAKE2B 522ee427f63ec51040b2813ad4bac9df0c86678ea441a28f36f979b01d35b25d11e5297a139e00ddf3e14bade298d3c1ab9ad3157246926cb9a713d3f51bb205 SHA512 01f21e2c3057f5878b33664d0070832d78420de3cb2fe4379b07ae6a27bb569fd1c27a920fe324beccb96ae7bfa8c05fdd9e7b0aeba6de06ab4d8b084bb38803
 DIST libwebp-1.3.1.tar.gz 4161782 BLAKE2B e3f0b66f98fb5add22653b0f8d7f7f5fff9df4e60eff221da78dda1a13d3a5b9da684d37dd0756dff52b1225c5ee04a54be95c008c34033bbe9fa824cbab7cee SHA512 f2c5e4fbbb5adf63d4a36bad88de23881c296da6f3ec73baded5e80fd55abef6cbeb90c271fd40766a76e170e5499c2983670d91e01064027ede22965d2b1d90
 EBUILD libwebp-1.2.4-r2.ebuild 1982 BLAKE2B d9cecd99518bd522a8359360bf221c483a24ddf6ab7ffd41ced900b57acd139dd10032852b842301e2e5d31a447d64128395bd4e064d43aa4a14de33093423f2 SHA512 6c0bb4b6197ecff259832345a366749e3f4c2c024035af3583af1607401035a9f0a226ed15c7aa92bd443bd5c97dcbc721c74f7248acf5d62a9e7f23488e9d83
-EBUILD libwebp-1.3.1.ebuild 1936 BLAKE2B 0a7ab04071f7d17c58b7c2ee778f23e9326c0570918a16170cdbd9dd6027a2bc5fd7519d0f6364d7f67da3185d3276f7711f26d93ddeaf6ce7b181067a20d1f2 SHA512 7adaf609d5873622c575b260471f7efb8d77b3b231770d31c863408fd26b66955c4dd5fd713f81e9f169effbe39492544180ab7412eba348c06b33475172160b
+EBUILD libwebp-1.3.1.ebuild 1949 BLAKE2B 1ccb08e40133258b412daaee199326d0a3d3de9be3b73f3a75ddd7f3c96f3fa05dbfbc9dc57038e6354cc4a96c2bc4eea1142f40a3c400f04828446d6c6a9518 SHA512 87d98e966723de15abc8aa3cac9a6b88ecdb5cd2f42027a45c41fd1c39cc73c02db280b205eb076722837cd1f320a3d9dec24928ed095b48b1c153b278702eb6
 MISC metadata.xml 442 BLAKE2B 3700315ba8872e208756f663236158c42f967eab7bec9b440b238b14f76357fe7721e571b7c11d79fff0f8df90f9ad35504cef3f6dc2803b8e5394ac0e3ea437 SHA512 5fceda7410ea654e3d9297f3adcad43b99c298b436ec5d77a9396259b61a0c9dd2945b98f7fa7d0b7d38622e14bf82bcfbbbdc18f011f0b949ae61a9a8794800
diff --git a/media-libs/libwebp/libwebp-1.3.1.ebuild b/media-libs/libwebp/libwebp-1.3.1.ebuild
index c89017f87f12..533658e7e1a7 100644
--- a/media-libs/libwebp/libwebp-1.3.1.ebuild
+++ b/media-libs/libwebp/libwebp-1.3.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
 
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 734948431fbb..ef415b010f93 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,9 +1,11 @@
 DIST openimageio-2.4.12.0.tar.gz 32157785 BLAKE2B b2578165b389029dc6ad295b50d008790f9690c03ca17fda7c1d1ede84039ab4065cb1c88402e2b20913736d669a72781bb523d391af2403a10ddae148ae07a6 SHA512 bf8fa84c6732cabd2810a5cfbdd3ea41b273d82e51762426c8a2b60a31e114ff672c18ce433eb5cf27eb250996da18b7f9ece1b34093a0cb4c7305328174e74e
+DIST openimageio-2.4.13.0.tar.gz 32162551 BLAKE2B f0d219b2f585528e8901f695ccde0c599943914ce1b64faf53c172d9eacd3c2f6843a2fd7c1eebd6fcda762b61643a7ea5ed7fbabfd909963afedbedd8d200a1 SHA512 9325beefce55b66a58fcfc2ce93e1406558ed5f6cc37cb1e8e04aee470c4f30a14483bebfb311c329f7868afb6c508a052661c6b12d819a69f707c1a30cd9549
 DIST openimageio-2.4.6.0.tar.gz 31951691 BLAKE2B c21caf6784f366200127ba17a296e2134fa0d494e2cbf9cf592d020fdb820f62db0269545ac37c3969d64ddd8352d06a4f002fa9a7b3f05503ca9ec7d4a15415 SHA512 6e4e5294209c533eb9cf7c8df89b531bc77547df28af0d7964e255ce78142c201d5aa92a1f5f3b17348fdfc7d2a7aa9f2121acdf22fa98a6a872f0d31936bdf5
 DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137901071 BLAKE2B 1e260eeba062026c719499425a3f7e3c2ccc7bd662725b6cceab4332d2d026bacc7df4c904cb776637ea60f9e2ba854d6e5010ffdc2a1621ad943b166d8402d3 SHA512 e7f7741d1cfadb3ea9ec5bab0b2556c58424c2dd89f938d5e93aeb99bff55479b11faa19cda4a481339be60de73317faa95e190d34d493c7825f706f4e57e73c
 DIST openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910860 BLAKE2B 1dfc1a87ae895e62f223d915583378581cc1be12489d46155009ae10c8f63ab0fa93bfc06b67afe85f6e8a313779b9fed4e32cc6d9b92cd7d53d3c4b6e51bcce SHA512 7a46681a22145e96da5dc6ba4e6432ef38c6c352a607db348dcd194d86caa45b4f76ecb10c28cd50e3ee597404fbb3ede4acf071b4ebabc2de4e7b3cd204dade
 EBUILD openimageio-2.4.12.0.ebuild 6052 BLAKE2B 784a93858a12c4bddcaf0c74bfadd80bfa7a5fa0acf9e06c3a55e3635e6d3278f6379df2d016766f216defc0de368610c521180fded9eac4a7e3ffe1f8ba6ecd SHA512 5f6094fd7fc7b1603140894df33c3003fc7d9d427189af0f5efd71a8a4991932b2b964c6e413285af5ac2a777db92ac118da86b93832f84fad5e9f01acef7fc7
+EBUILD openimageio-2.4.13.0.ebuild 6335 BLAKE2B 2a94eb46eedfeba974c01856be87fee4f156c5d4cd8b2e8adaa31ceaf4ce4f2175d35a04f3979890b491c5aaf54a5439df464e695c67e52f1e6c6611a33e4ff8 SHA512 697a1c2df64210348a87b41d94aaa8e8abb47007edc73270e500cac99d280bd885057708fdbfb2a32cc92ca1341331320e4909e3053feca1ad57e207674d9075
 EBUILD openimageio-2.4.6.0-r1.ebuild 5601 BLAKE2B b32f93d31b28d27735e63823f5b8b81770df031d79b53a3b493ff0d38ca254c3c1c33109fee56be96bfc70498de207e75df27122355c7a0be84be3ebc12c84f5 SHA512 658fddac9f1a55902fbec335d154251d337634113ab42e67221511dd14f18353e59629cd2eefe8e467a7ef514e6f2167e11f8906016b56c7e64ebd3508b133db
 MISC metadata.xml 869 BLAKE2B bfb9e5ed79810feaffb28bae0e974b3771e549e2d994b25e88ef842e37824870b61433594477ffc884e6e02e3d30af526deb5f16f2198cc855070f67cab50ac3 SHA512 8406f4f9cd7e74efb9f9f7f92e7a1ef764f6f03b1ce22095aa3c20a5bae239c6accae090716c5c39f349d92cdeb945dc99a62dfba91bb61e45837ef57f750eff
diff --git a/media-libs/openimageio/openimageio-2.4.13.0.ebuild b/media-libs/openimageio/openimageio-2.4.13.0.ebuild
new file mode 100644
index 000000000000..0dfa3bf23173
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.4.13.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{10..11} )
+
+TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
+TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
+inherit cmake flag-o-matic font 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/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+	https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+	https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+X86_CPU_FEATURES=(
+	aes:aes 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="dicom doc ffmpeg gif jpeg2k opencv openvdb ptex python qt5 qt6 raw test +tools +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( tools ) qt6? ( tools )"
+
+# Not quite working yet
+RESTRICT="!test? ( test )" # test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		media-libs/libglvnd
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? (
+		media-libs/libglvnd
+		dev-qt/qtbase:6[gui,widgets,opengl]
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_pretend() {
+	use qt5 && use qt6 && einfo "The \"qt5\" USE flag has no effect when the \"qt6\" USE flag is also enabled."
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+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")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TOOLS=$(usex tools)
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	if use qt5 || use qt6; then
+		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
+		if use qt6; then
+			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON )
+		else
+			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
+		fi
+	else
+		mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF )
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# TODO: investigate failures
+	local myctestargs=(
+		-E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openpgl/Manifest b/media-libs/openpgl/Manifest
index 3c1515f263f6..d40711308150 100644
--- a/media-libs/openpgl/Manifest
+++ b/media-libs/openpgl/Manifest
@@ -1,3 +1,3 @@
 DIST openpgl-0.5.0.tar.gz 10767365 BLAKE2B 051b26c17300506dd20989ba9dc1aa83b0baf77c5f24650c74518ae56081b5a0ecca88c13d5d79a71cb0b6fa4a5b4841ee03e5223ec91ab16bb5655f2e52a9d7 SHA512 9b992ffa17ad6f9fcde48add5d9cc1e58be2daacd40478fb1babe0741a6c7a64f12f36c9c1f7d5ec6f79cdd847c082d39e03e58cfd9af1a903adca56f1ac19e1
-EBUILD openpgl-0.5.0.ebuild 1002 BLAKE2B 84e32f033113a254b2f8488c7b1eb4fe3d81a74c2faf7b5055864e9e471fe69b7ab58ac247aef4a1cf2139154bd32c50ea24555103e173c0f7c8bb6318d32fef SHA512 4647e5cc1ae1816e66b749cabc452304496499280fc2e10d7c080bd99ac6c28126103a30bfeaf955be6c9d243392c0ec927a0d36a41ca19bcf2c338efdc7dbea
+EBUILD openpgl-0.5.0.ebuild 1180 BLAKE2B 1005036c59886c341889a3db6613a0681038e8cb17e085cc30900ad6dcc750cbac8917ff66164f67b366672df46dfb8b8c172a1401d21d53bebd8b39ca629912 SHA512 991ae41643fc1c3a435ff44c118e554ab38f6861d620bfb83ccf01366a273962b38cb54aefe4c7ae97dfee2903613930ef6c114f655c538cca0cbcea2b9757e8
 MISC metadata.xml 1011 BLAKE2B c88245ac6d49bf09e2a96754713dcf088ec1ba4700713d2551a8af4f9c509553edbde8e9775fb1bc410b2eec742df26527b07d5cd36194ae5a2b4c5c018b51b1 SHA512 ff6c48d3db9dfd2737410f5d689d08fcb49a062bc291eb0e5442851037723a701629c13d44929b6812df5098adda7695b1edbd1bae9ed3cca63cf04b710cfdf2
diff --git a/media-libs/openpgl/openpgl-0.5.0.ebuild b/media-libs/openpgl/openpgl-0.5.0.ebuild
index 67870a6bfa63..02987ca560ce 100644
--- a/media-libs/openpgl/openpgl-0.5.0.ebuild
+++ b/media-libs/openpgl/openpgl-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="Intel Open Path Guiding Library"
 HOMEPAGE="https://github.com/OpenPathGuidingLibrary/openpgl"
@@ -33,6 +33,9 @@ src_configure() {
 		-DOPENPGL_ISA_NEON=$(usex cpu_flags_arm_neon)
 	)
 
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	use cpu_flags_arm_neon && append-flags -flax-vector-conversions
+
 	# Disable asserts
 	append-cppflags $(usex debug '' '-DNDEBUG')
 
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index b853d30afa5b..4fdc1b798961 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,5 +1,7 @@
 DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e
+DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc
 DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
 EBUILD osl-1.12.11.0.ebuild 2642 BLAKE2B 5198c7fa8b98c3502357fbc35d88a7bf318528caaa43e69f5c88d5c62844d055a81d3279b16352bd4aade4e11ea88311c6c5d8c199bddbbc8987fc757b31921a SHA512 95fd0a96d38cf4a05da994f1743c290c63d8cad5c030f8d9a748d108e10780f5f233b5026900636f5c62c561df49cf1c7f17d4d3c3794762b12b8a14dfc6f996
+EBUILD osl-1.12.13.0.ebuild 2925 BLAKE2B a8bb4ffbd9a7a0ed45f16059ab546dc08797b3621b6dd31a35ddb73c259037b17bb7dbc1e426fcb4edb5d5cc4fbcef0d33ffc70a379aa3b246c90e49c6e5fca1 SHA512 0d77ce9f635ccbd5ee4d7c8e0d6c12f72c7df153c48de46edd6b0dcd62c3cfa2146ded38fea2909e2424fad588a9ccbd69de2000bb0468fc85ff7d6c188d2a3e
 EBUILD osl-1.12.7.0.ebuild 2749 BLAKE2B 0edaff95e7c4db07258c8da336ee727853f90346ce14504ca66e431bfb2334b68a1fc8b7fe787097972465e13314b54671d3464667c316bcf4b485b35a47cb33 SHA512 726f8b46bd6806a360a5eec216190384a1a1c93acf0975afb741ce9d7c505fc7e05abe8eac35897ba5792246d2f11ac9cb761b683016ced74971a60e214beb09
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/osl-1.12.13.0.ebuild b/media-libs/osl/osl-1.12.13.0.ebuild
new file mode 100644
index 000000000000..dd1d1fecff02
--- /dev/null
+++ b/media-libs/osl/osl-1.12.13.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+# Check this on updates
+LLVM_MAX_SLOT=15
+
+inherit cmake flag-o-matic llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+# If a development release, please don't keyword!
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+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"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	>=media-libs/openexr-3:0=
+	>=media-libs/openimageio-2.3.12.0:=
+	<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
+"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+
+	use python && python-single-r1_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")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	local gcc="$(tc-getCC)"
+	local mycmakeargs=(
+		-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)
+		-DPYTHON_VERSION="${EPYTHON/python}"
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# TODO: investigate failures
+	local myctestargs=(
+		-E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)"
+	)
+
+	cmake_src_test
+}
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 3ea879dbf89e..47a61b8fde5e 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,4 +1,4 @@
 AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654
 DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
-EBUILD qhull-2020.2-r3.ebuild 1563 BLAKE2B fe92efd3200b50c3f08e71595ab8dd7ebe682cc8bd2c8f81c5b24851d57dde2c7a0bbb3e1b45141d02c59a0fbe0af5e016af6b6c471592dae8de0e822a3153a8 SHA512 b84acd62e75263b3996b32318204de89d4bff4fed2661b6bcdf53dea378d9ced894b4b311662bd8259338936d3ca3ed843dbe468e4386544c1f934a4b51bfd31
+EBUILD qhull-2020.2-r3.ebuild 1576 BLAKE2B 00bc3621bc80f3df650291a6c4e159934964ea4fbc86aec3e2c3f4193339b29f07cace95b97be9ae99dac619dda306cfa51e0245d808a0881dd767ecdc288f29 SHA512 b15dedeb2019befe2834e8aa32104873b0ba46cfe4bead90420e76387468daf5e297f06353f817d09d7fd5a1ae439dba8bc2d0d5ff97fa834f06f2b62d880b3b
 MISC metadata.xml 1095 BLAKE2B 49dc96f8c6bf1b318b263cdc5f9d8e981cbed127dcf4c0dd485d98676665127c89600db3f6e177463529db183d95c117e31210c2270e19dcecc62d4d380fbe6a SHA512 a220f6870bf5d73f761b9b97ec51285c37ec77d5917aacc73cb43719f378c6045b27e772f12336e353238ffbcf3e30a7fe7b6f9c8b5d934b0a385a0d33712d51
diff --git a/media-libs/qhull/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
index ada3b39f58e3..fa2fd6b2a2c8 100644
--- a/media-libs/qhull/qhull-2020.2-r3.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0/8"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )