gentoo resync : 03.11.2021

3 files changed, 104 insertions, 11 deletions

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index a080bac1c551..67400d2ddc71 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,6 +1,7 @@
 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.ebuild 1638 BLAKE2B 196b6575fa7c97ac01adf354c6f3345a24ce3304c6099e89de4b41f3e6d9c2d1ff8fce38b76c14ed677f4929fca05bfe73d15c1de1cd710ce8b9c91591884d73 SHA512 42603d6e35d7f1b59d13bbdded3e054405293b89d97e5f33d4001c67c6b813dad75dd1ba1fadbb5fe4232491bcf2f679ce466dad935e54ee5e2b22501b601809
+EBUILD alembic-1.8.3-r1.ebuild 1722 BLAKE2B f0ed2d8cd08d8bb2d5ffa6ad3ebad6b201e0869e9ff894f70e5f252565e0bd8ef0a50c8db06974e509353594d59f259c7435c4859321308a43f7d36eac1a13f0 SHA512 c730dd1ae8dd8ee67a4bf817b1c3fa0d3ef20209c7f26baa790467f50d32eee8ab122f5749c77dbae98cc077df04fef783ac1bbf69959046826dcc7a9069fcf9
 MISC metadata.xml 824 BLAKE2B 55b10435d032292b05af14bde6a69772eaf7993bd1686a0f1489313624d14b3572037d6ba7e9caab7bb69ed36cb61d5f1518d6c945e9e7c3853dcde1e80e3e0d SHA512 55c878337d8297cd8d811443d8821835e4ee5096364014bc43c798a34645076dc47ec405bdfd3c62a03481f8539cca9fadd8f7f15a2bb98471c9f7d0d57450a1
diff --git a/media-gfx/alembic/alembic-1.8.3.ebuild b/media-gfx/alembic/alembic-1.8.3-r1.ebuild
index c46c467c35e5..3ec597c047e8 100644
--- a/media-gfx/alembic/alembic-1.8.3.ebuild
+++ b/media-gfx/alembic/alembic-1.8.3-r1.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit cmake python-single-r1
 
 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"
 
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="examples hdf5 python test"
@@ -20,13 +20,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	|| (
-		>=dev-libs/imath-3.0.1[python?,${PYTHON_SINGLE_USEDEP}]
-		(
-			>=media-libs/ilmbase-2.5.5
-			python? ( >=dev-python/pyilmbase-2.5.5[${PYTHON_SINGLE_USEDEP}] )
-		)
-	)
+	>=media-libs/ilmbase-2.5.5:=
+	python? ( >=dev-python/pyilmbase-2.5.5[${PYTHON_SINGLE_USEDEP}] )
 	hdf5? (
 		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
 		>=sys-libs/zlib-1.2.11-r1
@@ -35,7 +30,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch
+	"${FILESDIR}"/${P}-0001-find-py-ilmbase-in-config-mode.patch
+)
 
 DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
 
@@ -47,6 +45,10 @@ 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
diff --git a/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch b/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch
new file mode 100644
index 000000000000..bc7ac9f507a8
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch
@@ -0,0 +1,90 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 30 Oct 2021 11:56:04 +0200
+Subject: [PATCH] find (py)ilmbase in config mode
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+
+diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake
+index 9f52ca6..f076e14 100644
+--- a/cmake/AlembicIlmBase.cmake
++++ b/cmake/AlembicIlmBase.cmake
+@@ -43,23 +43,27 @@ IF (Imath_FOUND)
+ ELSE()
+     MESSAGE(STATUS "Could not find Imath looking for IlmBase instead.")
+     # What we really want to do is look for libs Imath and half
+-    FIND_PACKAGE(IlmBase)
++    FIND_PACKAGE(IlmBase CONFIG REQUIRED)
+     SET(ALEMBIC_USING_IMATH_3 OFF)
++    SET(ILMBASE_FOUND True)
++    GET_TARGET_PROPERTY(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY IlmBase::IlmBaseConfig INTERFACE_INCLUDE_DIRECTORIES)
++    SET(ALEMBIC_ILMBASE_HALF_LIB IlmBase::Half)
++    SET(ALEMBIC_ILMBASE_IEX_LIB IlmBase::Iex)
++    SET(ALEMBIC_ILMBASE_IEXMATH_LIB IlmBase::IexMath)
++    SET(ALEMBIC_ILMBASE_ILMTHREAD_LIB IlmBase::IlmThread)
++    SET(ALEMBIC_ILMBASE_IMATH_LIB IlmBase::Imath)
++    SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_HALF_LIB} ${ALEMBIC_ILMBASE_IEX_LIB} ${ALEMBIC_ILMBASE_IEXMATH_LIB}
++        ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} ${ALEMBIC_ILMBASE_IMATH_LIB})
+ 
+     IF (ILMBASE_FOUND)
+         SET(ALEMBIC_ILMBASE_FOUND 1 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise")
+-
+-        SET(ALEMBIC_ILMBASE_LIBS
+-            ${ALEMBIC_ILMBASE_IMATH_LIB}
+-            ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}
+-            ${ALEMBIC_ILMBASE_IEX_LIB}
+-            ${ALEMBIC_ILMBASE_HALF_LIB}
+-        )
+-
+-        if (${ALEMBIC_ILMBASE_IEXMATH_LIB})
+-            SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_LIBS} ${ALEMBIC_ILMBASE_IEXMATH_LIB})
+-        endif (${ALEMBIC_ILMBASE_IEXMATH_LIB})
+-
++        MESSAGE(STATUS "Found package IlmBase")
++        MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
++        MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
++        MESSAGE( STATUS "IEX LIB: ${ALEMBIC_ILMBASE_IEX_LIB}" )
++        MESSAGE( STATUS "IEXMATH LIB: ${ALEMBIC_ILMBASE_IEXMATH_LIB}" )
++        MESSAGE( STATUS "ILMTHREAD LIB: ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}" )
++        MESSAGE( STATUS "IMATH LIB: ${ALEMBIC_ILMBASE_IMATH_LIB}" )
+     ELSE()
+         SET(ALEMBIC_ILMBASE_FOUND 0 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise")
+     ENDIF()
+diff --git a/cmake/AlembicPyIlmBase.cmake b/cmake/AlembicPyIlmBase.cmake
+index 249e084..3cc6253 100644
+--- a/cmake/AlembicPyIlmBase.cmake
++++ b/cmake/AlembicPyIlmBase.cmake
+@@ -43,20 +43,19 @@ IF (Imath_FOUND)
+     SET(ALEMBIC_PYILMBASE_PYIMATH_LIB Imath::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR})
+     MESSAGE(STATUS "Found package Imath using: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}")
+ ELSE()
+-    FIND_PACKAGE(PyIlmBase)
++	MESSAGE(STATUS "Could not find Imath looking for PyIlmBase instead.")
++    FIND_PACKAGE(PyIlmBase CONFIG REQUIRED)
++    SET(PYILMBASE_FOUND True)
+     IF (PYILMBASE_FOUND)
+         SET(ALEMBIC_PYILMBASE_FOUND 1 CACHE STRING "Set to 1 if PyIlmBase is found, 0 otherwise")
+-
+-        SET(ALEMBIC_PYILMBASE_LIBS
+-            ${ALEMBIC_PYILMBASE_PYIMATH_LIB}
+-        )
+-
+-        GET_FILENAME_COMPONENT(ALEMBIC_PYILMBASE_LIB_DIRECTORY
+-            ${ALEMBIC_PYILMBASE_PYIMATH_LIB}
+-            PATH
+-        )
+-
++        SET(ALEMBIC_PYILMBASE_PYIMATH_LIB PyIlmBase::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR})
++        MESSAGE(STATUS "Found package PyIlmBase using: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}")
++        GET_TARGET_PROPERTY(ALEMBIC_PYILMBASE_INCLUDE_DIRECTORY PyIlmBase::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR} INTERFACE_INCLUDE_DIRECTORIES)
++        SET(ALEMBIC_PYIMATH_MODULE_DIRECTORY "/usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
++        MESSAGE(STATUS "PYILMBASE INCLUDE PATH: ${ALEMBIC_PYILMBASE_INCLUDE_DIRECTORY}")
++        MESSAGE(STATUS "PYIMATH LIB: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}")
++        MESSAGE(STATUS "PYIMATH MODULE: ${ALEMBIC_PYIMATH_MODULE_DIRECTORY}")
+     ELSE()
+         SET(ALEMBIC_PYILMBASE_FOUND 0 CACHE STRING "Set to 1 if PyIlmBase is found, 0 otherwise")
+     ENDIF()
+-ENDIF()
+\ No newline at end of file
++ENDIF()
+-- 
+2.33.1