gentoo auto-resync : 07:06:2024 - 00:08:01

2 files changed, 84 insertions, 68 deletions

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 4dbc7b31432c..b258d6cd12d3 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,6 +1,6 @@
 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
-AUX alembic-1.8.6-py312.patch 3382 BLAKE2B 88ffb08c4566b8ab06396f51991fbab10d6490c1f4e895828c6bf5d05b56a4cbd18dbdbac82e3a7f44a5b0209e6c8dc8f8c2e08a06dc76abeb65f3c05f32a04e SHA512 94cfc724627618aea05bcae0f5157ff2967e9144219be6136c687d8998a4a27cc1993ed06d579ba20bf0d2b1a5fb05003ff94c8a9092e2df439823a52e191c56
+AUX alembic-1.8.6-py312.patch 3861 BLAKE2B 307786b786aeb8868103e7d1564305fa7fa7d082acc43e2886bfda17413c993b506ba77ed54f254b87ca5123945596d0be445f558279ec1ff9b7f6cc23ea835c SHA512 70078658fc4b70618e9e2c1c694b50726eec510e30e1625f01cd1dcfae2f649162b7b94c791b12068f064c68e1deea7ccabb00a31de7fd32cc052299035662b8
 DIST alembic-1.8.6.tar.gz 868945 BLAKE2B 1ac30ffa75a4b8bbb3f32820e6f67cebcd894465f16cd12ee0396c88611af821b13973f46228fd59726c6bc0cc8885afd4de81a0cebaa0f94cb30fd9daba9885 SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b
 EBUILD alembic-1.8.6-r1.ebuild 1628 BLAKE2B 35425ebde74ee1ded3e9ad30626937c718a5e11357a6ee919d33de5af6316a70eecfe5e309efcc0e73688f4afac2be147beb85b4abf5708696d9b12e4f8f5034 SHA512 fdd09ac0606bbf102b5cfca5f1e37b0ab2d7e537efe20b369ff882b2a78eefc98ed280927822d6a2c36eef9ab81ea3b6870b505f87fb383a845e07ea30d961c9
 EBUILD alembic-1.8.6.ebuild 1782 BLAKE2B afe666d245ea9301a735e4b1d830f9b5b3ab4d2c92d538b21cbc7e9c2935546205f587757f88a4c7a09e60151a9d55422c76873e170edfcd1514cb095d420209 SHA512 8233be7302f3645ba88e876048f46fcb46704b164f3aa30bd0b2a6431dc7c304c8c87fe6321397f7494a5ede99088dbf73e3916df4314fea7cf881ca1a0e4c1f
diff --git a/media-gfx/alembic/files/alembic-1.8.6-py312.patch b/media-gfx/alembic/files/alembic-1.8.6-py312.patch
index 863388be22a9..499645280d9a 100644
--- a/media-gfx/alembic/files/alembic-1.8.6-py312.patch
+++ b/media-gfx/alembic/files/alembic-1.8.6-py312.patch
@@ -1,46 +1,83 @@
-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):

+From 3b6c04d8c02520a973c95b51ca1fa4bd5e7e8e73 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Tue, 4 Jun 2024 14:15:11 +0200
+Subject: [PATCH] python/PyAlembic/Tests: update do python3.12
+
+tests: use assertEqual instead of assertEquals
+tests: use assertRaises instead of failUnlessRaises
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ maya/Tests/AbcExport_dupRoots_test.py     | 2 +-
+ python/PyAlembic/Tests/testCollections.py | 4 ++--
+ python/PyAlembic/Tests/testCurves.py      | 2 +-
+ python/PyAlembic/Tests/testPropExcept.py  | 2 +-
+ python/PyAlembic/Tests/testTypes.py       | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+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/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/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)
+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

@@ -49,27 +86,6 @@ index bad9577..f0e8d26 100644
  

      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)

+-- 
+2.45.1
+