gentoo resync : 03.11.2021

6 files changed, 125 insertions, 9 deletions

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 8e955cca0e8b..73d3304c8eb2 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -10,8 +10,10 @@ DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78
 DIST opencolorio-2.0.0.tar.gz 9892414 BLAKE2B fdff2e144eadb444624f059f7582ea99d4e2dbd53cad5b89f92d19c7ca9dda2ff9ec4f8c8d00e6ac083da21134f9bc783b297c553a8e7d11936c936e5c41a2f3 SHA512 7110a1a30a5fa64b81d7fc5e33234673aaddbad5e19ce7f21436c590edd7d2ce767650c9a934011a96e53132c030bd0b654fcf93ad79c1bfc8c050762c57f6d0
 DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159 SHA512 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338
 DIST opencolorio-2.0.2.tar.gz 10812416 BLAKE2B 36f008035c36bef9473f9f79e9362eec20abb8e217a2131d3a2be5766de60cdab36e137547d414bf18e97ad368e30fb89a0ad4d8095b24bd184704d88ef192ae SHA512 ebc6b4b4251f69cb69f7203bc9ae962010f7f60ed5d53eb3ff14b64d5ef8cac2b98d0482485f1adaaf6b8c065cd4edd01c4e0577324a86ed4ebfe8e33e9fa667
-EBUILD opencolorio-1.1.1-r1.ebuild 2627 BLAKE2B 3a04ff5740dd6e830ba17f2356f2a2b87e1de465e7d103fea654ac95438160abd3dda92a7d6503fd2749542fb8d5717f547adf8a445a98db9c39e690949e6200 SHA512 f58868e63953ee16aa995cb6042458c510bfc3892f11f0e2f37a048b28678189d3fd4a787b5d2d4975e5b2fbdbc119d4cb2131d9fc1227bd3b594f807766aabe
-EBUILD opencolorio-2.0.0.ebuild 2773 BLAKE2B f1469f1917fa14f9cec3a9e5bb799a8c4a38b670a5fae43f9468fe7f97f0e49fdffd49f77958e0dee2d2b8367492fa61642b8177bc06290bd37e256cf72d49e4 SHA512 e527cc50a8d148ddb36ebb9d2e661e2be3c5b0558b7d8b8eaa4b2fc935a835954cffab1fb17f60a985b193818f3951d3e305398885ea329713fa7acfb3048650
-EBUILD opencolorio-2.0.1.ebuild 2709 BLAKE2B aa368b450adc2a11c09179d573bbc9999a220500b377bcaec4630dd4c05f2465987e01450744abea60edffee88119564e210eab96d4024aba59829ef8e863564 SHA512 5528729ab388d3045d5847963daddd038bd06d814a0c1078641c312117febbad76bdc56fcbed70b265f0c5c05955784c57d66df3735f49a1b31dbdd316f6db55
-EBUILD opencolorio-2.0.2.ebuild 2753 BLAKE2B c923b54f54aecf466f0ec37cf684fa9502f8cf41224c3270ecbe89a161a3189615f630c3ac870a5eebaa513312aea410859b23d7794960bf7e3ebbe3a30f0725 SHA512 5cefbce1d9ff3ec23ab4127c174a3ae1906dc0f110783694d5c6cb29ff71f257bf524fc913b4298d93f6726adb55d9f888bd5439d2de7097169650e239d36e4c
+DIST opencolorio-2.1.0.tar.gz 10970849 BLAKE2B 3703ab90c7dfa853583e3018eee9a28c9f471207b3c6743095cf681a4659da708893be508b521195bf84f59ac2c058f844a8f70f83666beaed208812cf845420 SHA512 a0f4fb62c768b392ca1129e2046df96d670d785fc057d4103768440b7adb65d8faf5b7d39729060791794e83e6cd4e67821aed9b30f3f04b410c60809cd72267
+EBUILD opencolorio-1.1.1-r3.ebuild 2750 BLAKE2B 22842c149b2d415b04932511630704b7e25276845d84aa65ebdd547f183f984e72214193fc9f73e0b0caa78ad246562a913b0b372fc843f17e7a7f419759cd92 SHA512 b010bf252e84634be4814e4c12f3503e2c47347a178b86ebf2bd4406c9507f0096a094c614107751bbb06a19d2aa9715f729996d1b5c93aa2ce616a0db813c28
+EBUILD opencolorio-2.0.0-r2.ebuild 2885 BLAKE2B 8bf3fe153366a15eeffc64637c013f6f8ed2e5d5ab831402ec3dff4e2dda285f72ce9838f4304dd0a863c376c6e58e5289079385c9adf8c96ec9c5786f39544f SHA512 86986428cadcd1aecd8583306d87a543f7408a18f1cbe2388b3e17a08f76119ef1215f5b633b7621a973af3c8fdce1a4b6753ebc91ef9fbf04ddc8f68eebb9d1
+EBUILD opencolorio-2.0.1-r2.ebuild 2820 BLAKE2B 7efa8a9aba25285125fce2d7a6ffbe990764cfc5593ef323411547f9c99b351e1511432df6cdad27effa314984f8e81db6606a3f8d958773459074d02fd845ab SHA512 922483a225a736443a67bbcc1e318ca4969be6d161692f0a42bdf88d723f07b6b9b7a398e11af20e68291c956e0ba9825b71554058dbd8adce9dae67b674f7f2
+EBUILD opencolorio-2.0.2-r2.ebuild 2865 BLAKE2B f59dc08bda96088c88cd2108353932f0781610d8c8b2148e4994e4653b8a80fa74585ab516acf04451c6596ef0467e232c487bffa540c2e7ddf18b4e7b835490 SHA512 2ef41f4c4c4d2009dc7624b22091245c1600387f87ae21439ba2e4e3e685e77ecc51a6c323901ecb37fa8e76055c1a591568bd6eb224d85d1e2e1098b5541cda
+EBUILD opencolorio-2.1.0-r1.ebuild 3030 BLAKE2B 1d406a80b0ba910dc73381bb20d41fbf5fa01ab3e8a4342a02f3460e842980a4f09b6f0fde17da9aa30135dfca742b37ff5076ac24d65745d3633fecc6f63010 SHA512 3d2aa32bdf71b9ba2f3f0ecad17e430d7c8e81794168455dbbbb0176dcffb064a384771c5ad738d7b6c4aa209cc9a922325dea0ebf3d37c0bdf85abbb9c8dfbe
 MISC metadata.xml 460 BLAKE2B 564c46a6d12ec479bfbe92401cda933760a3fbfd72b83221f8edc927a01eb5f18ecab877184b95aa5bcc8af20a0c36fbff8c6f45bf7ce2996c795b0f8fac1c9c SHA512 d58b105d94f1f11e52f1e88b9cb24885b5369207c3fa2a6ab4c2133c22e2b47a887a8358b79ea53cc9bdd63a44bb18672e5d26d614074e0bc08539cb4e73b49a
diff --git a/media-libs/opencolorio/opencolorio-1.1.1-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild
index ba79f07d083d..4a6a5c7dd95f 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1-r1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild
@@ -20,12 +20,15 @@ REQUIRED_USE="
 	doc? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
 RDEPEND="
 	<dev-cpp/yaml-cpp-0.7.0:=
 	dev-libs/tinyxml
 	opengl? (
 		media-libs/lcms:2
-		media-libs/openimageio
+		<media-libs/openimageio-2.3:=
 		media-libs/glew:=
 		media-libs/freeglut
 		virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.0.0.ebuild b/media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild
index b5898ec2ed44..d582251eb118 100644
--- a/media-libs/opencolorio/opencolorio-2.0.0.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild
@@ -26,6 +26,9 @@ REQUIRED_USE="
 	doc? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
 RDEPEND="
 	dev-cpp/pystring
 	dev-python/pybind11
@@ -34,7 +37,7 @@ RDEPEND="
 	dev-libs/tinyxml
 	opengl? (
 		media-libs/lcms:2
-		>=media-libs/openimageio-2.2.13.0
+		<media-libs/openimageio-2.3:=
 		media-libs/glew:=
 		media-libs/freeglut
 		virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.0.1.ebuild b/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
index a164851fb44a..8b6fd27357c6 100644
--- a/media-libs/opencolorio/opencolorio-2.0.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/O
 SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/OpenColorIO-${PV}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 LICENSE="BSD"
 SLOT="0"
 IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
@@ -21,6 +21,9 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
 RDEPEND="
 	dev-cpp/pystring
 	dev-python/pybind11
@@ -29,7 +32,7 @@ RDEPEND="
 	dev-libs/tinyxml
 	opengl? (
 		media-libs/lcms:2
-		>=media-libs/openimageio-2.2.13.0
+		<media-libs/openimageio-2.3:=
 		media-libs/glew:=
 		media-libs/freeglut
 		virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.0.2.ebuild b/media-libs/opencolorio/opencolorio-2.0.2-r2.ebuild
index 1d263c5aee8f..9897f5ded789 100644
--- a/media-libs/opencolorio/opencolorio-2.0.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.2-r2.ebuild
@@ -21,6 +21,9 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
 RDEPEND="
 	dev-cpp/pystring
 	dev-python/pybind11
@@ -29,7 +32,7 @@ RDEPEND="
 	dev-libs/tinyxml
 	opengl? (
 		media-libs/lcms:2
-		>=media-libs/openimageio-2.2.13.0
+		<media-libs/openimageio-2.3:=
 		media-libs/glew:=
 		media-libs/freeglut
 		virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..9a4f6d7d90ed
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic python-single-r1
+
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
+# 2.1.1 should be?
+#
+# See bug #802363 for yaml-cpp < dep
+RDEPEND="
+	dev-cpp/pystring
+	dev-python/pybind11
+	<dev-cpp/yaml-cpp-0.7.0:=
+	dev-libs/tinyxml
+	media-libs/ilmbase:=
+	opengl? (
+		media-libs/lcms:2
+		<media-libs/openimageio-2.3:=
+		media-libs/glew:=
+		media-libs/freeglut
+		virtual/opengl
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16.2-r1
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/testresources[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+	sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+}
+
+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 is required for building ociodisplay and ocioconvert (USE opengl)
+	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+	local mycmakeargs=(
+		# Don't use imath yet, needs some poking to find the right headers
+		-DOCIO_USE_OPENEXR_HALF=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DOCIO_BUILD_STATIC=$(usex static-libs)
+		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_APPS=$(usex opengl)
+		-DOCIO_BUILD_PYTHON=$(usex python)
+		-DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
+		-DOCIO_BUILD_JAVA=OFF
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_BUILD_TESTS=$(usex test)
+		-DOCIO_BUILD_GPU_TESTS=$(usex test)
+		-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
+		-DOCIO_INSTALL_EXT_PACKAGES=NONE
+	)
+
+	# We need this to work around asserts that can trigger even in proper use cases.
+	# See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
+	append-flags -DNDEBUG
+
+	cmake_src_configure
+}