gentoo resync : 20.03.2022

4 files changed, 79 insertions, 5 deletions

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index f0e220cd74d3..c12e27571f76 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -9,7 +9,8 @@ DIST openexr-3.1.2.tar.gz 20315253 BLAKE2B d11f26d3e2bb098c4c009271b40da1eca97b1
 DIST openexr-3.1.3.tar.gz 20322346 BLAKE2B e65cb00d1d9ae7544f6d1adf9c6f05193986b8de7b657fa22d20466f2b6dfccf244b5aa3dbe7f2abb0c934aec68d2007dd9edb3eeee91b2bbd8aab331eea7e90 SHA512 12a8f3660104e68ccea0856caf334d1fafbf0ee79115aae23cdce5b835299294ab8a23bafed282acfacd159ce9bc7f6ffc620b1e0df0d40f9ca0eb15a288964d
 DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12
 EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866fc55ee5de8211721745fbf048d2431aba65d1627ed9748862e751c04f58c51b50355fa34f3d22f163fbdde2a14 SHA512 4a91fa4d593dfc94aba295d5572ed9f7c73e9ccdba52b4f38053a0431bd4a89e1b195aa50aed4f5297464838815d62dbe388b24f72ff29ff40bcb0396c8c6e09
-EBUILD openexr-3.1.2.ebuild 2164 BLAKE2B 0854070dc3718954071b167178050914b8ef463deb7a64312cf03d5ce05929e4dd3064b2cf9952b74332b12f95eac5cd4db5e355e6a2a1f282b0506fcb1c78f6 SHA512 b5ac054271964dfa4509d27d0b3fb4bbae35b2619ba84879d828b4bf4b0f6dfe33eaa144717e70aee861acc29260769376877473c405bc19d84b57efc0706f6e
+EBUILD openexr-3.1.2.ebuild 2163 BLAKE2B 70e443af57f3f044be3e47030919b273b673a0c22f2d871ec9cfbb602dc0aa725f37704cc3d0a35c3a781c12c0dd6a780b386ed844094b0a6a3179c3962f9f41 SHA512 8c7e0d1ad8c15b11c5f6d8126dfcf648bf8f2b6a8b810a01856f26a8f65e49605b3941bd48e14539800114a49164c12fec71ae5f857bdf6f4496fa67139c16de
 EBUILD openexr-3.1.3.ebuild 2173 BLAKE2B 08e48ceac80017c6fdcf10bffc832cf6b2d5249b78a156c551ac14336a9c06cd8f950a3d6d3689d1babc8b9641a86641d0486a421da34ccf074aba945067eb8e SHA512 76908e459cd81c57d678f52b6d3cceb6da8a2b2c1748af20bc2fcbddd9d3483fd0b90804ecc447d818c6cbd8bdf6b99daa842904f033413d80109ef71fe6b193
-EBUILD openexr-3.1.4.ebuild 2173 BLAKE2B 08e48ceac80017c6fdcf10bffc832cf6b2d5249b78a156c551ac14336a9c06cd8f950a3d6d3689d1babc8b9641a86641d0486a421da34ccf074aba945067eb8e SHA512 76908e459cd81c57d678f52b6d3cceb6da8a2b2c1748af20bc2fcbddd9d3483fd0b90804ecc447d818c6cbd8bdf6b99daa842904f033413d80109ef71fe6b193
+EBUILD openexr-3.1.4-r1.ebuild 1910 BLAKE2B 2eb8cad3ae2a3951a534b5d3173f0788ba8a3792eb0bf4462321fe073580b3b71c04b99669e1a2ab6d599c9e0ed2062ceeb9185d0b48fb8c307c670123272bcd SHA512 b65c849f91b3226cc751052511f517e10607ad2c64eb7f17f80ad4e0cb8b2e9b28767741057095ef661787c327815cae16b1d15dc49c330522203d3b38b41c21
+EBUILD openexr-3.1.4.ebuild 2171 BLAKE2B 97a8f93dd83d637ceb65e9afa306efc80e4f1455b5f2920fd688767cd4460b498edccf7fd582bef570ea1c145c831ac2af8ed6ae48cd8e1f0a0bf76fcfb39c89 SHA512 ac2d49668c14d987ec0be17262cbee7a07a28585add7667e95aefe2f93ea593361345b48cddd77c60825fffd8b18ec303797f6f043a677962bfc038bb29ca6af
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-3.1.2.ebuild b/media-libs/openexr/openexr-3.1.2.ebuild
index 9a8c70d88e64..5fb127134ee7 100644
--- a/media-libs/openexr/openexr-3.1.2.ebuild
+++ b/media-libs/openexr/openexr-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 LICENSE="BSD"
 SLOT="3/30" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openexr/openexr-3.1.4-r1.ebuild b/media-libs/openexr/openexr-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..dd4e602ea9d6
--- /dev/null
+++ b/media-libs/openexr/openexr-3.1.4-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN=OpenEXR
+MY_PV=$(ver_cut 1)
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/30" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/imath-3.1.4-r1:=
+	sys-libs/zlib
+	!media-libs/openexr:3
+	!media-libs/ilmbase
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( dev-python/breathe )
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -e "s:/var/tmp/:${T}:" \
+		-i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
+
+	cmake_src_prepare
+
+	#mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DDOCS=$(usex doc)
+		-DOPENEXR_BUILD_TOOLS=$(usex utils)
+		-DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DOPENEXR_ENABLE_THREADING=$(usex threads)
+		-DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON
+		-DOPENEXR_INSTALL_TOOLS=$(usex utils)
+		-DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
+	)
+
+	use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
+
+	cmake_src_configure
+}
+
+src_install() {
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+
+	cmake_src_install
+}
diff --git a/media-libs/openexr/openexr-3.1.4.ebuild b/media-libs/openexr/openexr-3.1.4.ebuild
index afd43341887c..ffe4572facba 100644
--- a/media-libs/openexr/openexr-3.1.4.ebuild
+++ b/media-libs/openexr/openexr-3.1.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 LICENSE="BSD"
 SLOT="3/30" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
 RESTRICT="!test? ( test )"