gentoo auto-resync : 05:06:2024 - 00:07:52

4 files changed, 90 insertions, 82 deletions

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 4e4242cceb7d..4dbc7b31432c 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,9 +1,7 @@
 AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02
 AUX alembic-1.8.5-set-correct-libdir.patch 1593 BLAKE2B 4dec05376ed35261049886e38c851ded8f033040e5fe822337ec7655132f0b24b007e6b48caf9fb01cfc3a874a4a60b0f54649e3505f70464c1847423c684176 SHA512 befd7956ab3effb70d76648c15795cf8ea40d51687dab3988968a519267bdf1df945d475f1cd7a32747d6a5fd6cf1cf63c8f0bbbc058e9da704ba26b6bac443a
-DIST alembic-1.8.4.tar.gz 867788 BLAKE2B b7bc5ebcaebc5905a9a2e45be21170a72923fd6af6d9f97b81bdc7e8b80bb037ed3f667ea15a5b96194b33687010fda455e4df8355f92fc29aa000beae32cae8 SHA512 2473f4b9afe3fddbd2d0477bdc85d93697e413410253a7f7f0f030fba919dfb63dabd2d2d13829f59f3f901643ab842d230a9f08fb667e2c16cef0e751a8a687
-DIST alembic-1.8.5.tar.gz 867976 BLAKE2B 715ff6212ab78b2b4d3f5ea3b448468ade488008a8362193b4976671a69ad89337f926082c7736e64a0b07bf71e04d774df5e22abe409f8cfab1a15ccb3c86bb SHA512 89a480970eb09893112bf650011ede852205d1fa3718680a3983392bbcf3eb3f22f4ec01f42d12bfcaf655ce43d7d6f583b764ec03f4c5a84023359502b3636e
+AUX alembic-1.8.6-py312.patch 3382 BLAKE2B 88ffb08c4566b8ab06396f51991fbab10d6490c1f4e895828c6bf5d05b56a4cbd18dbdbac82e3a7f44a5b0209e6c8dc8f8c2e08a06dc76abeb65f3c05f32a04e SHA512 94cfc724627618aea05bcae0f5157ff2967e9144219be6136c687d8998a4a27cc1993ed06d579ba20bf0d2b1a5fb05003ff94c8a9092e2df439823a52e191c56
 DIST alembic-1.8.6.tar.gz 868945 BLAKE2B 1ac30ffa75a4b8bbb3f32820e6f67cebcd894465f16cd12ee0396c88611af821b13973f46228fd59726c6bc0cc8885afd4de81a0cebaa0f94cb30fd9daba9885 SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b
-EBUILD alembic-1.8.4.ebuild 1546 BLAKE2B a659e953e8e583f47fe7666bb07402711529a6bb73882b7adc774a23ebe0dcab37e2acebd91e6045edbdad20019eecb5a2d4cc45c5ef4f471a62df1e0c496313 SHA512 1d02598f85e6b27877c559bbf9f617857e49cf1775118226033f064c9ed2613e3403d776e26a5ef82858b4397f1f16cc2a5b1072c881e4d0793a3c05168f3c12
-EBUILD alembic-1.8.5.ebuild 1781 BLAKE2B f040c637568b14b05d2df3f083f6c304fd0cd3af042dbf71c3051dca8081885fe5638ac3e72666e0c24dd28d90f4059d24a43ad0dbd26c2b064dc8133d32b9b2 SHA512 825e3c1d7565870472d5bc093829c924d568bc3dd91ccc92d3717dbec3b834ab52d6aa0eb73eff1428ccf529a6035577d7ff637836f5152cb78e6dcd6fd8683b
+EBUILD alembic-1.8.6-r1.ebuild 1628 BLAKE2B 35425ebde74ee1ded3e9ad30626937c718a5e11357a6ee919d33de5af6316a70eecfe5e309efcc0e73688f4afac2be147beb85b4abf5708696d9b12e4f8f5034 SHA512 fdd09ac0606bbf102b5cfca5f1e37b0ab2d7e537efe20b369ff882b2a78eefc98ed280927822d6a2c36eef9ab81ea3b6870b505f87fb383a845e07ea30d961c9
 EBUILD alembic-1.8.6.ebuild 1782 BLAKE2B afe666d245ea9301a735e4b1d830f9b5b3ab4d2c92d538b21cbc7e9c2935546205f587757f88a4c7a09e60151a9d55422c76873e170edfcd1514cb095d420209 SHA512 8233be7302f3645ba88e876048f46fcb46704b164f3aa30bd0b2a6431dc7c304c8c87fe6321397f7494a5ede99088dbf73e3916df4314fea7cf881ca1a0e4c1f
 MISC metadata.xml 825 BLAKE2B 6dca2b2671780fecd86e7be3b4c5840d3db5298f8ba809b0137e138dcfc253a7e2b31bd85ccfa1d66bac9d7e066eb14506e7e726ab3998578a5e53ad3477218d SHA512 0dc6c13d0a95ac7a961fbb3d0023c66f9f058ed943e5a28331d2d8cfad756ec1bbf90b39450f48e461eba8a075a000d0e038342a3598b9be8efdc3f3bbe56651
diff --git a/media-gfx/alembic/alembic-1.8.5.ebuild b/media-gfx/alembic/alembic-1.8.5.ebuild
deleted file mode 100644
index 2e12359bdff6..000000000000
--- a/media-gfx/alembic/alembic-1.8.5.ebuild
+++ /dev/null
@@ -1,72 +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 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"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="examples hdf5 python test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	examples? ( python )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	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
-	)
-	python? ( $(python_gen_cond_dep 'dev-libs/boost[python,${PYTHON_USEDEP}]') )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.5-set-correct-libdir.patch )
-
-DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	# Tests are broken with python 3.11.  See also: https://github.com/alembic/alembic/issues/411
-	cmake_run_in "${S}/python/PyAlembic" cmake_comment_add_subdirectory Tests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_BUILD_LIBS=ON
-		-DALEMBIC_DEBUG_WARNINGS_AS_ERRORS=OFF
-		-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
-		-DUSE_PYALEMBIC=$(usex python)
-		-DUSE_TESTS=$(usex test)
-	)
-
-	use python && mycmakeargs+=( -DPython3_EXECUTABLE=${PYTHON} )
-
-	cmake_src_configure
-}
-
-# some tests may fail if run in parallel mode
-# see https://github.com/alembic/alembic/issues/401
-src_test() {
-	cmake_src_test -j1
-}
diff --git a/media-gfx/alembic/alembic-1.8.4.ebuild b/media-gfx/alembic/alembic-1.8.6-r1.ebuild
index f3bfe4a9376b..0d0e90f2f38a 100644
--- a/media-gfx/alembic/alembic-1.8.4.ebuild
+++ b/media-gfx/alembic/alembic-1.8.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake python-single-r1
 
@@ -13,14 +13,17 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="examples hdf5 python test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	examples? ( python )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/imath:=
+	>=dev-libs/imath-3.1.11-r1:=
 	python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] )
 	hdf5? (
 		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
@@ -30,7 +33,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.5-set-correct-libdir.patch"
+	"${FILESDIR}/${PN}-1.8.6-py312.patch"
+
+)
 
 DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
 
diff --git a/media-gfx/alembic/files/alembic-1.8.6-py312.patch b/media-gfx/alembic/files/alembic-1.8.6-py312.patch
new file mode 100644
index 000000000000..863388be22a9
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.8.6-py312.patch
@@ -0,0 +1,75 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>

+tests: use assertEqual instead of assertEquals

+tests: use assertRaises instead of failUnlessRaises

+

+diff --git a/python/PyAlembic/Tests/testCollections.py b/python/PyAlembic/Tests/testCollections.py

+index ab48a54..1745582 100644

+--- a/python/PyAlembic/Tests/testCollections.py

++++ b/python/PyAlembic/Tests/testCollections.py

+@@ -67,14 +67,14 @@ class CollectionTest(unittest.TestCase):

+         prop = group.getSchema().createCollection("prop")

+         prop.setValue(strVec)

+ 

+-        self.assertEquals(group.getSchema().getNumCollections(), 1)

++        self.assertEqual(group.getSchema().getNumCollections(), 1)

+ 

+         # TODO passing in time sampling here causes a segfault, most likely because

+         # of how createCollection currently takes an Argument &, see #274

+         cool = group.getSchema().createCollection("cool", md)

+         cool.setTimeSampling(ts)

+ 

+-        self.assertEquals(

++        self.assertEqual(

+             group.getSchema().getCollection(1).getMetaData().get("coupe"),

+             "de ville" )

+ 

+diff --git a/python/PyAlembic/Tests/testCurves.py b/python/PyAlembic/Tests/testCurves.py

+index dba9e1c..956625a 100644

+--- a/python/PyAlembic/Tests/testCurves.py

++++ b/python/PyAlembic/Tests/testCurves.py

+@@ -59,7 +59,7 @@ class CurvesTest(unittest.TestCase):

+                                            widthSamp, uvSamp )

+ 

+         knots = curvesSamp.getKnots()

+-        self.assertEquals(len(knots), 0)

++        self.assertEqual(len(knots), 0)

+ 

+         newKnots = FloatArray(4)

+         for ii in range(4):

+diff --git a/python/PyAlembic/Tests/testTypes.py b/python/PyAlembic/Tests/testTypes.py

+index bad9577..f0e8d26 100644

+--- a/python/PyAlembic/Tests/testTypes.py

++++ b/python/PyAlembic/Tests/testTypes.py

+@@ -60,7 +60,7 @@ class TypesTest(unittest.TestCase):

+         self.assertIsNotNone(POD.kUnknownPOD)

+ 

+         # If a new POD type is added, this will throw an exception

+-        self.assertEquals(POD.kNumPlainOldDataTypes, 14)

++        self.assertEqual(POD.kNumPlainOldDataTypes, 14)

+ 

+     def testDataTypeWrapper(self):

+         # Default Constructor

+diff --git a/maya/Tests/AbcExport_dupRoots_test.py b/maya/Tests/AbcExport_dupRoots_test.py

+index d532c10..f864281 100644

+--- a/maya/Tests/AbcExport_dupRoots_test.py

++++ b/maya/Tests/AbcExport_dupRoots_test.py

+@@ -48,7 +48,7 @@ class AbcExport_dupRootsTest(unittest.TestCase):

+         MayaCmds.group(n='group1')

+         MayaCmds.duplicate()

+ 

+-        self.failUnlessRaises(RuntimeError, MayaCmds.AbcExport,

++        self.assertRaises(RuntimeError, MayaCmds.AbcExport,

+             j='-root group1|cube -root group2|cube -f dupRoots.abc')

+ 

+         # the abc file shouldn't exist

+diff --git a/python/PyAlembic/Tests/testPropExcept.py b/python/PyAlembic/Tests/testPropExcept.py

+index e1a1dff..2ddf40d 100644

+--- a/python/PyAlembic/Tests/testPropExcept.py

++++ b/python/PyAlembic/Tests/testPropExcept.py

+@@ -70,5 +70,5 @@ class PropExceptTest(unittest.TestCase):

+         p = props.getProperty("myprop")

+         self.assertEqual(p.getName(), "myprop")

+ 

+-        self.failUnlessRaises(KeyError, props.getProperty, "notfound")

++        self.assertRaises(KeyError, props.getProperty, "notfound")

+         self.assertRaises(IndexError, props.getProperty, 99)