gentoo auto-resync : 26:09:2023 - 23:29:12

6 files changed, 172 insertions, 9 deletions

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index c19671ec2dae..cdd02789ff16 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -2,8 +2,11 @@ AUX opencolorio-2.1.1-gcc12.patch 421 BLAKE2B 9a16bf4f0fbf1a2fc277a46b547339415d
 AUX opencolorio-2.1.2-musl-strtol.patch 1041 BLAKE2B 58384b1a2a6e2778219909aaabe95061f0348ea7302cf97f85f417b709511b250cec578b8c3d85f2b0c1d35a469c4ddde932cc0ee1040daec8664141e9c1df4e SHA512 d268ac0c55ff6dcf5e1756a65c0593e39b2a7b86ccb913d5cbeaf6877465b537592bd903187a4183ae69c96b3c420ac1bcdf2175ff2071339eaaeed49bb6f52e
 AUX opencolorio-2.2.1-adjust-python-installation.patch 864 BLAKE2B e4e68ec13d47648ca41dce07ea7302a218e784e0b2bd700456642708271763c05e1bc667cdd9338a94790ac23f9862f1301e1eb4680bdb5ff948baba7051e3db SHA512 91afc3a825dadca245b046b2fd63edba2ffb44759a124eb3c9665b88d890b0a6cb09c1bed2067adf974faf65dedfd8bddb901e15a80e2d6b1c3645c08a0a7c3e
 AUX opencolorio-2.2.1-support-minizip-ng-4.patch 3133 BLAKE2B f84abb93233d0834b1f1bd8066140db1120ddf1a1eeb95d340283ed5ef56bb598787d8a23cdc5b8acbbdc595d6850956c25e0a0f57139d872e45dd5469407d55 SHA512 d0c811f80978f8d08dccd94cd25b26b5fd9e8ba3bcb2cffa82426e9faea5e0afef46843128e297614d7e2fd0886bc9928ddb7e03b9b691fd03b05923693de8da
+AUX opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch 808 BLAKE2B aed4b9d8bf512e42578e239bfe9a60074cb812d5d8894fc489f535a709d1b755d1934cf1c556ee9a06b5fd199796f4f6defdb36b8f9df7503288fd4a7eb5db7c SHA512 cf5a4b007ab4a9c25f6f94caeb007a0f4f2d83203eca6a4b83b38abc9df08593eb10159194e9c399f5877a618acd4da355b8fb299f39a73d04a4c94a903dbecc
 DIST opencolorio-2.1.3.tar.gz 11024701 BLAKE2B bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d SHA512 b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061
 DIST opencolorio-2.2.1.tar.gz 11336775 BLAKE2B b463d6a0a7e7fec0a890fa8a0cd06ed269f925c5986dfb82eb53728a09d884c89e6c4dfe112706ce27351d4440909ff9680387028d1dc887e7d866b30c39c54f SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
-EBUILD opencolorio-2.1.3.ebuild 3223 BLAKE2B ef075595374b5f7bf5297c21762def8dc7b2d249ddc729bb2625001eb6e86074980aad05e11f40c073ba6c2cf60f3da97373ebd85a766c186a1edcba8b0c894c SHA512 cd4ebd845f05b28374a46f619514d593591030a8088a64d297579ddd8c345b9be4b99055cec1a5a5733aba5c1cc09911d3d3e50d794070e9e6ae2f15e600c0a6
-EBUILD opencolorio-2.2.1.ebuild 3413 BLAKE2B 5dcd8487851d4487eb3dd13fbc32071e9ced89bb2a5befc365a7c551f677c7aee3d1576648df443a3de9cad8a415f9353cbf2c16a77db8a98efaef6827550ef3 SHA512 996b6163f2c56d875ddaa6910ab00a926117f246ad499e85d037b6046011d2f0e76b6bef9e7a9807ae8af6b7b3bf2a335d540ef068114f600efa560108a0c776
-MISC metadata.xml 559 BLAKE2B 7536b8a64ac882a2d5ef74b9943ee018d7d838ea9be5c53660d15b1bc8746def38a0c11e3fa91a9adf21a573db9153f1f95f2b258933366d257fc799d6009484 SHA512 e42d01eacc2298ed20f377234555ca0c008e1996186ee0e3ad63dd1961299c15c7a3902aa73727b03b970c36ee6aa2e66dea2ab6cf9f67e7c41cc2aaa86f7c05
+DIST opencolorio-2.3.0.tar.gz 11406998 BLAKE2B 0e62e43de076a712f68b68b91c9908bc9050316e3500e0924fafb08a3356ce361953f49dfd1eb022eeada11e499653833a48a22a4ba593504617c1c61b16d488 SHA512 cdf20ca6c85b1d70244d8532d010344f1cf85be6a116d831e83ea04d7c47a961049691e6a241e9a7f632d864df57a4bccb68084e27187ec8a05f1fdf344824d7
+EBUILD opencolorio-2.1.3.ebuild 3222 BLAKE2B 51cc4cec191cc5cd5164eec7832e14f2e1a9eedc3e3e32cb3c44b750b260a132a3d02523b2bd2421fcc053c1dffe8b6274140350e574fd0b8ff5465bd09b3002 SHA512 bd559882da57dbd0ea36031080b47035b34368a16393900030c236b2d8b14fbef8c8143c2c24681c0667e8808c662c8e427ea0de3da2b7044cd60081ecc449ff
+EBUILD opencolorio-2.2.1.ebuild 3463 BLAKE2B e32a5861da009da8a7e92454a7d84db6e636e8434ac76b1c26522f5f5dd3f19862c482615937cabd8aff325e716b257df9446903d76ca7a1fcf57112f32fa4b1 SHA512 19fcaf6840e9fb1aee4187e785a9358bd0b12812044b803702a75eafe53f5451846dffc7e00b932f892ecb1ce51fec4ca11b037b905e6d245988fcc901c29c47
+EBUILD opencolorio-2.3.0.ebuild 3490 BLAKE2B 289dc87854d2bfc842159428601c4f41ad7901c1dfdc4106a0a6675046ad0bc7e2152c39ed16762a8002aaf2ba7ac3ceac3dcc46637750209cbdbb3c9f2450d9 SHA512 aa554cc96b3676805667e58d1b15a7293f780dd9d23030c5add9a16efc51082cba7e7e17071fe574f25cdd8820ae9b74819b2d35f9caff6257519d94b249f81e
+MISC metadata.xml 792 BLAKE2B 6b94c1223e756ef3179ab3442c134bf7881400434332691bc693a36c8bceb4db609dd143afb6a18192c7bfaa9ccb72015c215e08b3bd65fbdb3ccc2fb3ff713d SHA512 c1b3d44b5ce24813b3e07074ba2fe40c3af89033dfbe5a372b130be26fcfeba9fa9c2a0d9e6a695972dc402979aa732df27fd3c6128a8f3a51fe926ecb73cb25
diff --git a/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch b/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch
new file mode 100644
index 000000000000..924ed2092881
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch
@@ -0,0 +1,21 @@
+From: Bernd Feige <Bernd.Feige@gmx.net>
+https://bugs.gentoo.org/914716#c12
+
+Index: OpenColorIO-2.3.0/share/cmake/modules/Findyaml-cpp.cmake
+===================================================================
+--- OpenColorIO-2.3.0.orig/share/cmake/modules/Findyaml-cpp.cmake
++++ OpenColorIO-2.3.0/share/cmake/modules/Findyaml-cpp.cmake
+@@ -50,7 +50,12 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUA
+     endif()
+ 
+     if(yaml-cpp_FOUND)
+-        get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
++        if(TARGET yaml-cpp::yaml-cpp)
++	 # yaml-cpp >= 0.8
++	 get_target_property(yaml-cpp::yaml-cpp_LIBRARY yaml-cpp::yaml-cpp LOCATION)
++	else()
++	 get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
++	endif()
+     else()
+ 
+         # As yaml-cpp-config.cmake search fails, search an installed library
diff --git a/media-libs/opencolorio/metadata.xml b/media-libs/opencolorio/metadata.xml
index 6485e6974262..13813a4b0e7b 100644
--- a/media-libs/opencolorio/metadata.xml
+++ b/media-libs/opencolorio/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>negril.nx+gentoo@gmail.com</email>
+		<name>Paul Zander</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		OpenColorIO (OCIO) is a complete color management solution geared
 		towards motion picture production with an emphasis on visual effects
diff --git a/media-libs/opencolorio/opencolorio-2.1.3.ebuild b/media-libs/opencolorio/opencolorio-2.1.3.ebuild
index bc16874f06ed..6dfee6592f05 100644
--- a/media-libs/opencolorio/opencolorio-2.1.3.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.3.ebuild
@@ -30,7 +30,7 @@ RESTRICT="test"
 RDEPEND="
 	dev-cpp/pystring
 	dev-python/pybind11
-	>=dev-cpp/yaml-cpp-0.7.0:=
+	<dev-cpp/yaml-cpp-0.8.0:=
 	>=dev-libs/imath-3.1.4-r2:=
 	dev-libs/tinyxml
 	opengl? (
diff --git a/media-libs/opencolorio/opencolorio-2.2.1.ebuild b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
index ab405183a85e..b5c5ca2e8c1a 100644
--- a/media-libs/opencolorio/opencolorio-2.2.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake python-single-r1 virtualx
 
@@ -28,7 +28,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	dev-cpp/pystring
-	>=dev-cpp/yaml-cpp-0.7.0:=
+	<dev-cpp/yaml-cpp-0.8.0:=
 	dev-libs/expat
 	>=dev-libs/imath-3.1.5:=
 	sys-libs/minizip-ng
@@ -59,6 +59,7 @@ BDEPEND="
 			dev-python/recommonmark[${PYTHON_USEDEP}]
 			dev-python/six[${PYTHON_USEDEP}]
 			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-press-theme[${PYTHON_USEDEP}]
 			dev-python/sphinx-tabs[${PYTHON_USEDEP}]
 			dev-python/testresources[${PYTHON_USEDEP}]
 		')
@@ -79,8 +80,8 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.1-adjust-python-installation.patch
-	"${FILESDIR}"/${PN}-2.2.1-support-minizip-ng-4.patch
+	"${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch"
+	"${FILESDIR}/${PN}-2.2.1-support-minizip-ng-4.patch"
 )
 
 pkg_setup() {
diff --git a/media-libs/opencolorio/opencolorio-2.3.0.ebuild b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
new file mode 100644
index 000000000000..dc1dfe604786
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-single-r1 virtualx
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
+SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+# minizip-ng: ~arm ~arm64 ~ppc64 ~riscv
+# osl: ~riscv
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apps cpu_flags_x86_sse2 doc opengl python static-libs test"
+# TODO: drop opengl? It does nothing without building either the apps or the testsuite
+REQUIRED_USE="
+	apps? ( opengl )
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( opengl )
+"
+
+RDEPEND="
+	dev-cpp/pystring
+	>=dev-cpp/yaml-cpp-0.7.0:=
+	dev-libs/expat
+	>=dev-libs/imath-3.1.5:=
+	sys-libs/minizip-ng
+	sys-libs/zlib
+	apps? (
+		media-libs/lcms:2
+		>=media-libs/openexr-3.1.5:=
+	)
+	opengl? (
+		media-libs/freeglut
+		media-libs/glew:=
+		media-libs/libglvnd
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+	)
+"
+DEPEND="${RDEPEND}"
+# TODO: OSL tests would need OIIO, leading to a circular dependency. If OIIO
+# isn't found this test will be skipped (automagic if found?)
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/breathe[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-press-theme[${PYTHON_USEDEP}]
+			dev-python/sphinx-tabs[${PYTHON_USEDEP}]
+			dev-python/testresources[${PYTHON_USEDEP}]
+		')
+	)
+	opengl? (
+		media-libs/freeglut
+		media-libs/glew:=
+		media-libs/libglvnd
+	)
+"
+# 	test? (
+# 		>=media-libs/openimageio-2.2.14
+# 		>=media-libs/osl-1.11
+# 	)
+# "
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch"
+	"${FILESDIR}/${PN}-2.3.0-support-yaml-cpp-0.8.0.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Avoid automagic test dependency on OSL, bug #833933
+	# Can cause problems during e.g. OpenEXR unsplitting migration
+	cmake_run_in tests cmake_comment_add_subdirectory osl
+}
+
+src_configure() {
+	# Missing features:
+	# - Truelight and Nuke are not in portage for now, so their support are disabled
+	# - Java bindings was not tested, so disabled
+	# Notes:
+	# - OpenImageIO or OpenEXR (default) is required for building ociodisplay and
+	#	ocioconvert (USE opengl)
+	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+	local mycmakeargs=(
+		"-DBUILD_SHARED_LIBS=$(usex !static-libs)"
+		"-DOCIO_BUILD_APPS=$(usex apps)"
+		"-DOCIO_BUILD_DOCS=$(usex doc)"
+		"-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)"
+		"-DOCIO_BUILD_GPU_TESTS=$(usex test)"
+		"-DOCIO_BUILD_JAVA=OFF"
+		"-DOCIO_BUILD_PYTHON=$(usex python)"
+		"-DOCIO_BUILD_TESTS=$(usex test)"
+		"-DOCIO_INSTALL_EXT_PACKAGES=NONE"
+		"-DOCIO_USE_OIIO_CMAKE_CONFIG=ON"
+		"-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)"
+	)
+	use python && mycmakeargs+=(
+		"-DOCIO_PYTHON_VERSION=${EPYTHON/python/}"
+		"-DPython_EXECUTABLE=${PYTHON}"
+		"-DPYTHON_VARIANT_PATH=$(python_get_sitedir)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}