gentoo resync : 03.03.2021

4 files changed, 2 insertions, 131 deletions

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 8ca9c781c188..b115c7c27d45 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -10,11 +10,7 @@ AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8
 AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f41b77d25aaf04f9a20d0d406eeae17988cc6f3eecf805f6bac1e42805b283f3123455ca1b069d7c0dc04628835ded2d8dec SHA512 58ad1d8f5dc28be60cdc290c7829d8b50708d26f3a769530e054c629170457f6b7e2b526455f6f86d2ee24931d8afdb61345ada99ae49897d926c0d50fb579f6
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
-DIST openexr-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
-DIST openexr-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
 DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382
-EBUILD openexr-2.5.2-r1.ebuild 1673 BLAKE2B 6cb66a92a938e9e6878fa2550a9dba69afe2dd70853ca1fd1e0278c8dfdc774b4f164bb8c61b578210fe9183bb37fda5803e6b36c31d1a4f44f6492328a98bd5 SHA512 6731b8406a8b454366e96774003a1da4640fb6261c665d8327a4bbc83ab3fd8f59c1dc2b3d9ec3d3e148f4162de46c7a44ef034b073d55e3c472809ae570b18e
-EBUILD openexr-2.5.4.ebuild 1696 BLAKE2B 6090335e9c7eb793c43642efcf7ca9158ee6589c7752cf021d457c1b037cbd95d73f0755739822311a386e0c907e1d291710056de85b23b32bc56081194f817e SHA512 fb64443451b2ca0d8df6a31053ee3ee9a1ba70cd60855122ec5e0ca7059f388dd39eb51a4e1db75a4b12c53254d0e22db8ef563346c8351d608e237041ad0366
-EBUILD openexr-2.5.5.ebuild 1698 BLAKE2B a0e3e116800767c03b5eecb1afdd4bc543701edbd88d8a35a14c034fa0eb8bd9e3098d87e0674b2a9404553ebcb9a7fd3166600f88920fc91e0e895adcc0be19 SHA512 51bd2ed3daddc725f595209ff505421914a3bc312b727b6af19200f47fab209f03eda95269573e8a6d27bb29b657772ab920e4f819f88f0854c9c214459f575a
+EBUILD openexr-2.5.5.ebuild 1691 BLAKE2B ddaa5c3bca30159e1c1349a8d3ec8b79e670c0739f98abe62dac2286b8207352361f15461ec06577a9c90ab566bc0081372d2fd6f305e6a91fe7083eece97b9a SHA512 840e4a1652df0f5968b015dfcb14ea35f6587338f8b22e3e4b78dc4358dd33108cf7edf01c1406163f8e9a11e3b7c4e7582855d1784c8c4adb1f7d85f8c28015
 MISC metadata.xml 674 BLAKE2B e6f57d2c1adb7d004da06cd8667031bcebbd1dbcc30dc4e8e7238fc6dc9a57dc5277c8b94e66510533933fe57610c5899e1e1ab82679c66c4c705a35052cc240 SHA512 027357eccaa8494c0a79b19f14a3e7356f08255d7c62b227701d98d770b3d58f0dea1bc71bb87989e453379bd9eba7ecc658ac7d02a44b6e983db7767864ac5e
diff --git a/media-libs/openexr/openexr-2.5.2-r1.ebuild b/media-libs/openexr/openexr-2.5.2-r1.ebuild
deleted file mode 100644
index cd30b0dee54a..000000000000
--- a/media-libs/openexr/openexr-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/ilmbase:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/OpenEXR"
-
-DOCS=( PATENTS README.md )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfigInternal.h )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
-
-	if use abi_x86_32 && use test; then
-		eapply "${FILESDIR}/${P}-0001-IlmImfTest-main.cpp-disable-tests.patch"
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DINSTALL_OPENEXR_DOCS=$(usex doc)
-		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
-		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON				# default
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		DOCS+=( doc/*.pdf )
-	fi
-	einstalldocs
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/openexr/openexr-2.5.4.ebuild b/media-libs/openexr/openexr-2.5.4.ebuild
deleted file mode 100644
index 56d1fff0c5b0..000000000000
--- a/media-libs/openexr/openexr-2.5.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/OpenEXR"
-
-DOCS=( PATENTS README.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
-
-	if use abi_x86_32 && use test; then
-		eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
-	fi
-
-	multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DINSTALL_OPENEXR_DOCS=$(usex doc)
-		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
-		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON
-		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		DOCS+=( doc/*.pdf )
-	fi
-	einstalldocs
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/openexr/openexr-2.5.5.ebuild b/media-libs/openexr/openexr-2.5.5.ebuild
index 888a4b92902a..c60a06f6f05a 100644
--- a/media-libs/openexr/openexr-2.5.5.ebuild
+++ b/media-libs/openexr/openexr-2.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"