gentoo auto-resync : 11:06:2023 - 14:17:09

4 files changed, 2 insertions, 217 deletions

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index cbbf21d898c6..b4830bce757a 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,9 +1,5 @@
 AUX opencolorio-2.1.1-gcc12.patch 421 BLAKE2B 9a16bf4f0fbf1a2fc277a46b547339415de07c07093f45fd7f4f445735f2c7bda437f75b5f7b30e72fd522af97e4995887312b7828d954ff4bc8a179f476f2c3 SHA512 1738924260ee3abf556207f3323c8cc45e3e5f9210ff46b8b1e9ac1766c39ac06cc50a61d0c77bdf10a318405f6f5dda84d15f4c004be950dce40e2dd3087f2b
 AUX opencolorio-2.1.2-musl-strtol.patch 1041 BLAKE2B 58384b1a2a6e2778219909aaabe95061f0348ea7302cf97f85f417b709511b250cec578b8c3d85f2b0c1d35a469c4ddde932cc0ee1040daec8664141e9c1df4e SHA512 d268ac0c55ff6dcf5e1756a65c0593e39b2a7b86ccb913d5cbeaf6877465b537592bd903187a4183ae69c96b3c420ac1bcdf2175ff2071339eaaeed49bb6f52e
-DIST opencolorio-2.1.1.tar.gz 11013141 BLAKE2B ffece30b9f37acd10665a716d519c9807f6398e5e59baedd194376a1424a6d875781c027d998567b2a241da6388a780c94d95237b0b4d64b836cc5ccccd4383c SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194
-DIST opencolorio-2.1.2.tar.gz 11021014 BLAKE2B 2612c31c88a86255b3b0389241649aaaf3754f065eec57e8438d3b594d9f8fcac81c71fe06cf0acf0680e40d0fbe019ad16a34a1371a7a3a57a21017f5efb463 SHA512 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353
 DIST opencolorio-2.1.3.tar.gz 11024701 BLAKE2B bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d SHA512 b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061
-EBUILD opencolorio-2.1.1-r7.ebuild 3235 BLAKE2B 736466e133cfcb69416fddd927ff256f5644c4194b56d6ee4e0563e3b4f477c0001f836be03c2754847b96a83b0198cb0ebae860fe9b0292bebfa12058edb8a1 SHA512 27bf39ea35142b3f89a732c001dbd961ed1274bbd300a96954163dc05c3f46f0dca9b40d8aef4acd5403b1cfa5d586c099768a1cbd3629e54aedaea0131384ce
-EBUILD opencolorio-2.1.2.ebuild 3255 BLAKE2B c8228ee0deed9595c5c6d2d178b135bb8348a2d771504ba878b7569f2d06d062ccb6df5823d1fb5e3f1f7752464830055c32d498c21742366574c060dca7adf4 SHA512 a5797681833f0ac23822e950d4b14cae429440b30035fbfec20e9ad2a5fabfd404117f0fd84b375cb2e80d664f5a80be997bf34a2e5b1b66ec89d64725f31aa1
-EBUILD opencolorio-2.1.3.ebuild 3229 BLAKE2B a7cf518d7d9aba5ca0490ef57eb39712e8991e5c60f1e4d4a8166ed388f6c3919d99257f340769510bdb527cda24cb60dba062c955ed3a464ad0570babc4a81b SHA512 b0e38fc2152f9265972fd2203d0ed5aa1c0f33d1172f9bbabd04a80e65f17ec93025c6c37ce843af76b0894cbd17184611250990e547e67b42657232cb8e13b7
+EBUILD opencolorio-2.1.3.ebuild 3223 BLAKE2B ef075595374b5f7bf5297c21762def8dc7b2d249ddc729bb2625001eb6e86074980aad05e11f40c073ba6c2cf60f3da97373ebd85a766c186a1edcba8b0c894c SHA512 cd4ebd845f05b28374a46f619514d593591030a8088a64d297579ddd8c345b9be4b99055cec1a5a5733aba5c1cc09911d3d3e50d794070e9e6ae2f15e600c0a6
 MISC metadata.xml 475 BLAKE2B a5e021764a849b172bc4e5a70bcf9c45930f2be703ec8b9db4ad2b6c0395eeab9cbe404d9146f2d48df5c7fb1d68b11bc1a5dc235c58ca6d6e715676fe2dea21 SHA512 823dba870b69fabaa8a61351ea24bbca701fec4a5d64d6a9a75a2306910b663447caaac7ef6e06ccb6d945a5e9eea4ebcb5322154eadcdc2d191abf879bf786d
diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
deleted file mode 100644
index e580b74e0f9d..000000000000
--- a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..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"
-# TODO: drop .1 on next SONAME bump (2.1 -> 2.2?) as we needed to nudge it
-# to force rebuild of consumers due to changing to openexr 3 changing API.
-SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
-REQUIRED_USE="
-	doc? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Works with older OIIO but need to force a version w/ OpenEXR 3
-RDEPEND="
-	dev-cpp/pystring
-	dev-python/pybind11
-	>=dev-cpp/yaml-cpp-0.7.0:=
-	>=dev-libs/imath-3.1.4-r2:=
-	dev-libs/tinyxml
-	opengl? (
-		media-libs/lcms:2
-		>=media-libs/openimageio-2.3.12.0-r3:=
-		media-libs/glew:=
-		media-libs/freeglut
-		virtual/opengl
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	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
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc12.patch
-)
-
-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
-
-	# 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 is required for building ociodisplay and ocioconvert (USE opengl)
-	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
-	local mycmakeargs=(
-		-DOCIO_USE_OPENEXR_HALF=OFF
-
-		-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
-}
diff --git a/media-libs/opencolorio/opencolorio-2.1.2.ebuild b/media-libs/opencolorio/opencolorio-2.1.2.ebuild
deleted file mode 100644
index 636c41a7c1a7..000000000000
--- a/media-libs/opencolorio/opencolorio-2.1.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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"
-# TODO: drop .1 on next SONAME bump (2.1 -> 2.2?) as we needed to nudge it
-# to force rebuild of consumers due to changing to openexr 3 changing API.
-SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
-REQUIRED_USE="
-	doc? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Works with older OIIO but need to force a version w/ OpenEXR 3
-RDEPEND="
-	dev-cpp/pystring
-	dev-python/pybind11
-	>=dev-cpp/yaml-cpp-0.7.0:=
-	>=dev-libs/imath-3.1.4-r2:=
-	dev-libs/tinyxml
-	opengl? (
-		media-libs/lcms:2
-		>=media-libs/openimageio-2.3.12.0-r3:=
-		media-libs/glew:=
-		media-libs/freeglut
-		virtual/opengl
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-gcc12.patch
-	"${FILESDIR}"/${PN}-2.1.2-musl-strtol.patch
-)
-
-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
-
-	# 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 is required for building ociodisplay and ocioconvert (USE opengl)
-	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
-	local mycmakeargs=(
-		-DOCIO_USE_OPENEXR_HALF=OFF
-
-		-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
-}
diff --git a/media-libs/opencolorio/opencolorio-2.1.3.ebuild b/media-libs/opencolorio/opencolorio-2.1.3.ebuild
index 67af7cfb5758..bc16874f06ed 100644
--- a/media-libs/opencolorio/opencolorio-2.1.3.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD"
 # TODO: drop .1 on next SONAME bump (2.1 -> 2.2?) as we needed to nudge it
 # to force rebuild of consumers due to changing to openexr 3 changing API.
 SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
 REQUIRED_USE="
 	doc? ( python )