gentoo resync : 20.03.2022

3 files changed, 5 insertions, 65 deletions

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index c6049fa7bec9..4c4ecdb30436 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,7 +1,5 @@
 AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02
 AUX alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch 4247 BLAKE2B 4c921f4774e20ec9739fd6afd0b6e4bdd7fe4cdf3374ef63d9c7ba1ac8d7255ca0bbca4c248465da7445f2b08c72e9425280e44dd64edec95088291c13dec0ed SHA512 45caa1fc850cf14eacef80f9271a07a8c502e1a098bb2cbdbd84bae0f9d80c819a4c058b5cb0d67f848eecd52de4cf9802f12e1c651c0bc2b826a9e56959a913
-DIST alembic-1.8.2.tar.gz 861796 BLAKE2B 9ea2dea33b3116331dd02802055e8db7faa736bc2674e6b30209a9e178877523d9f14516b35729eaf6fc348b89367e9830ca1b998a8c7d10766b9b2f265b97d8 SHA512 23fec3d51cfd8ac8bc02749550de53a7b699ebe67654336864a8208a6a1d4f69e8e1a2c8e07832665c203788cbabbb65f346582741bac10ceb0d56c16d6b4217
 DIST alembic-1.8.3.tar.gz 862221 BLAKE2B 81639b0968dbcaac0096eac83385b7d6b1dc27b4b1652ede8cf6b6cf3aa3eea3c6f5e53f033708b61f79d99ebfaa766a9cac3345a043d6cc0ba6d6c29dcb9ed0 SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036
-EBUILD alembic-1.8.2.ebuild 1234 BLAKE2B 8fc18141031dcbf54bef2d0323c4a4e7f7315a7f2be9297c2af1683ac073530ae34271c97fb7d2f4961afb05baf5625bdb680caaf64f5da25cdc9dfdbaa55707 SHA512 7d2f20abc3d8d656dfe9b41528bf9ed494accd9678b46fd695637df4baa6bf116b770f21a1494f58370190f2af8ec20876b3e5639e9bd5f67bf15b055fdd9cfb
-EBUILD alembic-1.8.3-r1.ebuild 1721 BLAKE2B f8855a372c19dbdf6b1724936ecdcbc7ecf81e96391ee9fc48345bf7031a48b54b61cee12931ebbfd338529686b4bb1c0e2731306555bc4de0490c40cc92f404 SHA512 a44895fc2461407198b8108333564d362a0a907d20c6690ad29023c9bb3a6f310fe7e5c312321a4ce84d4eb92f08dd978e238fbe36c54ee6390126676325548b
+EBUILD alembic-1.8.3-r2.ebuild 1606 BLAKE2B ad0a0436be060eb8ef44cfd7873058b55c7577a5f205c827c017bf07c12585178c188a0c2543993f378fc3b98a39fe5f18e5d4c7aa9295e99c012b793677131d SHA512 bbe8cc6aa020e1e3570fa13e0c42638b690eb66c1a0d9b85d0551f324642d077dbf3fd90822151514f393ca5b3ba8dc3cc435752d155244f6927b94892c33660
 MISC metadata.xml 824 BLAKE2B 55b10435d032292b05af14bde6a69772eaf7993bd1686a0f1489313624d14b3572037d6ba7e9caab7bb69ed36cb61d5f1518d6c945e9e7c3853dcde1e80e3e0d SHA512 55c878337d8297cd8d811443d8821835e4ee5096364014bc43c798a34645076dc47ec405bdfd3c62a03481f8539cca9fadd8f7f15a2bb98471c9f7d0d57450a1
diff --git a/media-gfx/alembic/alembic-1.8.2.ebuild b/media-gfx/alembic/alembic-1.8.2.ebuild
deleted file mode 100644
index 70bbe084164e..000000000000
--- a/media-gfx/alembic/alembic-1.8.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-# either pyilmbase or imath need to be keyworded for arm{,64} to re-add
-# python / pyalembic support
-IUSE="examples hdf5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		>=dev-libs/imath-3.0.1
-		>=media-libs/ilmbase-2.5.5
-	)
-	hdf5? (
-		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
-		>=sys-libs/zlib-1.2.11-r1
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.0-0001-set-correct-libdir.patch" )
-
-DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_BUILD_LIBS=ON
-		-DALEMBIC_SHARED_LIBS=ON
-		# currently does nothing but require doxygen
-		-DDOCS_PATH=OFF
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=OFF
-		# TODO: needs imath keyworded for arm{,64}
-		-DUSE_PYALEMBIC=OFF
-		-DUSE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/alembic/alembic-1.8.3-r1.ebuild b/media-gfx/alembic/alembic-1.8.3-r2.ebuild
index 909f899aa86f..55cf6d2bd757 100644
--- a/media-gfx/alembic/alembic-1.8.3-r1.ebuild
+++ b/media-gfx/alembic/alembic-1.8.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
@@ -20,8 +20,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=media-libs/ilmbase-2.5.5:=
-	python? ( >=dev-python/pyilmbase-2.5.5[${PYTHON_SINGLE_USEDEP}] )
+	dev-libs/imath:=
+	python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] )
 	hdf5? (
 		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
 		>=sys-libs/zlib-1.2.11-r1
@@ -45,10 +45,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		# Force falling back to ilmbase for now
-		# bug #818232
-		-DCMAKE_DISABLE_FIND_PACKAGE_Imath=ON
-
 		-DALEMBIC_BUILD_LIBS=ON
 		-DALEMBIC_SHARED_LIBS=ON
 		# currently does nothing but require doxygen