gentoo auto-resync : 25:09:2022 - 05:33:00

12 files changed, 390 insertions, 46 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9dd268d14447..8799dacd3701 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 43ad184fa073..6b7459fbbee8 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,9 +1,10 @@
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
+AUX gimp-2.99.12_fix_libheif-1.13_build.patch 2309 BLAKE2B 32d4edf87f20f9fc0b7839352adbae6006dc021b3e3e6541fc48f1f44496780e39870da41642e0abe2551302d942a8a1382a539180437be4b37e78c1c0b55c48 SHA512 1f7b8a0479603376dd356bb156354d31b113513213f39e11e65fa75b99eac52375d6c32043a7bb56a21e7e1e6bdf9371099bfe3f1eb41f3528fdd1f81bec4b2a
 DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
 DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3
 DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
 EBUILD gimp-2.10.32.ebuild 5649 BLAKE2B ed0b99850166d7d0a464d16aa74faa18aea2a92e5dab1ae8680bf813e9eed1323a2fb042c08b3a6fec416fa9e5cc83c14591e785931ecf7ffaf5ab3a404cc271 SHA512 ed4a2a0a1f4c3eb0188d97cc8527996cfe5c18279cbbe7577c14435229261aeb7e77d7ec87b4295fdb9e298bb7e91d767f5bc5048ffaa9e6cb21d0b95bc4f5fd
 EBUILD gimp-2.99.10-r1.ebuild 6613 BLAKE2B 2883d26916fa9a54d5037c7524f141b47faeba5816dcf086e549f0c5eadcd607e591c655bce0ae8322ba9d69f14f20a7f816ad732fc7cc0ba063715e3286e1d0 SHA512 17e79ffad687a53ce0da2280c628b2309245aff2935997a6817e2297435291992216b934ece01bdbef69633744740849faf1115e6230e92053ef6c19621835f9
-EBUILD gimp-2.99.12.ebuild 6801 BLAKE2B 8e3539c9d455cf4d440aacfd5917a560c31c84158087326f69d84017b758945f36933ffa07ad7a40701f6462086043eb3f391f47d71846c752dde391708da2c3 SHA512 a2371421e9c4aac2b44ea03eefeba2e8f53dd808491d5b7d862aad2e96db1bb52af51a28de6e27532622a6a3744c9b566f18a89a5ef3967a343b60841fda7694
+EBUILD gimp-2.99.12.ebuild 6862 BLAKE2B 2cd043793acc11e23526a1a2f68b808c664472738e91e9d08a25d6812ac8e4deb0854941a936c8da9c769628ca352cc2d31e0e3f76afab35fba02b28949737b9 SHA512 cc8ce92d51e1340ae595eae143c26720eadfba0381d334fa8bf9d6d2bbd024e019cdca3c4b1be04121c0b32afec4c3af37911353c8c037bf7cf9b3b5ff7cd320
 EBUILD gimp-9999.ebuild 6714 BLAKE2B 027a7b3582dc93f251c6efe6150990e5a13ed4173f6923717052b9fbd28494d031af1cabb7a8bd3d6cd2b26dd403dd8d4cf1ba2ca81491017c83903b667cd54b SHA512 dda911c6d56ec16cd67387beb4199a47d9d9e7d081afb7b6cf44b2d92280f5a2e57be1dd1ad91a74a3b984ce7eb98e86dd476a8ae074ef2fb629e9d6de582536
 MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d
diff --git a/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch b/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch
new file mode 100644
index 000000000000..672a9ef7217e
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.99.12_fix_libheif-1.13_build.patch
@@ -0,0 +1,78 @@
+Upstream issue: "GIMP fails to build with libheif >= 1.13.0"
+https://gitlab.gnome.org/GNOME/gimp/-/issues/8570
+
+From a61299ddb184babca015a846c72bf3e1a57faf2a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
+Date: Sat, 3 Sep 2022 13:19:33 +0200
+Subject: [PATCH] plug-ins: fix builing with libheif 1.13.0+
+
+---
+ plug-ins/common/file-heif.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/plug-ins/common/file-heif.c b/plug-ins/common/file-heif.c
+index 76bc41f44d..36899bcf5f 100644
+--- a/plug-ins/common/file-heif.c
++++ b/plug-ins/common/file-heif.c
+@@ -56,24 +56,24 @@ typedef enum _HeifpluginExportFormat
+   HEIFPLUGIN_EXPORT_FORMAT_YUV420 = 3
+ } HeifpluginExportFormat;
+ 
+-typedef struct _Heif      Heif;
+-typedef struct _HeifClass HeifClass;
++typedef struct _GimpHeif      GimpHeif;
++typedef struct _GimpHeifClass GimpHeifClass;
+ 
+-struct _Heif
++struct _GimpHeif
+ {
+   GimpPlugIn      parent_instance;
+ };
+ 
+-struct _HeifClass
++struct _GimpHeifClass
+ {
+   GimpPlugInClass parent_class;
+ };
+ 
+ 
+-#define HEIF_TYPE  (heif_get_type ())
+-#define HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HEIF_TYPE, Heif))
++#define GIMP_HEIF_TYPE  (gimp_heif_get_type ())
++#define GIMP_HEIF (obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_HEIF_TYPE, GimpHeif))
+ 
+-GType                   heif_get_type         (void) G_GNUC_CONST;
++GType                   gimp_heif_get_type    (void) G_GNUC_CONST;
+ 
+ static GList          * heif_init_procedures  (GimpPlugIn           *plug_in);
+ static GimpProcedure  * heif_create_procedure (GimpPlugIn           *plug_in,
+@@ -123,14 +123,14 @@ static gboolean         save_dialog           (GimpProcedure        *procedure,
+                                                GimpImage            *image);
+ 
+ 
+-G_DEFINE_TYPE (Heif, heif, GIMP_TYPE_PLUG_IN)
++G_DEFINE_TYPE (GimpHeif, gimp_heif, GIMP_TYPE_PLUG_IN)
+ 
+-GIMP_MAIN (HEIF_TYPE)
++GIMP_MAIN (GIMP_HEIF_TYPE)
+ DEFINE_STD_SET_I18N
+ 
+ 
+ static void
+-heif_class_init (HeifClass *klass)
++gimp_heif_class_init (GimpHeifClass *klass)
+ {
+   GimpPlugInClass *plug_in_class = GIMP_PLUG_IN_CLASS (klass);
+ 
+@@ -140,7 +140,7 @@ heif_class_init (HeifClass *klass)
+ }
+ 
+ static void
+-heif_init (Heif *heif)
++gimp_heif_init (GimpHeif *heif)
+ {
+ }
+ 
+-- 
+GitLab
+
diff --git a/media-gfx/gimp/gimp-2.99.12.ebuild b/media-gfx/gimp/gimp-2.99.12.ebuild
index 5a97b3f4724a..fc46f29d2a4a 100644
--- a/media-gfx/gimp/gimp-2.99.12.ebuild
+++ b/media-gfx/gimp/gimp-2.99.12.ebuild
@@ -111,6 +111,8 @@ BDEPEND="
 
 DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
 
+PATCHES=( "${FILESDIR}/${P}_fix_libheif-1.13_build.patch" )
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 827e467c3070..d085b5954f5b 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -8,17 +8,20 @@ AUX openvdb-8.2.0-unconditionally-search-Python-interpreter.patch 1390 BLAKE2B 5
 AUX openvdb-9.0.0-fix-atomic.patch 1548 BLAKE2B 718d9eb0511ea50733d7f11b6720a90fd052452f049afbeceecedb2612963f8dfa53d81030671dd426acb1b8d9280e780bfe39030660152b933c80c21c5e1fbd SHA512 316eb3253d53f7fda43f90e3e6f432aa8e5a687c535cefee04c5af682ede05e744513394f16569c50b4cb2baf142750ed19ae815141738d25babad41699e8a46
 AUX openvdb-9.0.0-numpy.patch 6113 BLAKE2B 4424e930ddaa3863245fc8f32954b5732aaba84792f930cc25f8598cbe0282c68540eaf7f2721959841ec3f40bbe5ed1f770c5c90425389a3a0646ebe3b75c9d SHA512 23b53db3895f1b44605e002e1b3649fe1101844f1ac864cf6083c19fdb4ab40701ee20177d7095c7a8e683e01a3e4fad1fa5087207580dd64e6f5adf4f14fdbc
 AUX openvdb-9.0.0-unconditionally-search-Python-interpreter.patch 1471 BLAKE2B e13ad11bfcb13a763bc73f2a26dbc11d1967098942d6f685cbd9fa2de467ac64c71d093e267db1d2d15e40ac3ab25d9b3995e40cc58d069109ded5abdd8ecb3f SHA512 137f96d8d906f2ea321670823c6fb80256b98179e7d4e044e78e62417d7489eae464f9596f13e80fd2dcafbcd946cf94e192965de48d900e061418f39f16c39c
+AUX openvdb-9.1.0-disable-failing-tests.patch 5113 BLAKE2B 0df70f2943368386b41a1d82167c28c4fb16d0a5481a29cfbba93f116ea1eaf99ac2471fbe1645867fcddeca4765cca0d725c9a3c1a84d2f83fdb1b5387822e2 SHA512 765d20bdd961d1a9e41f79b396ede95c2a28a90af2e81b7dfa5e171f8cafc971aac384fa6fe27112fb6dd37173ef5713205cf30e99df833140eaf1ff78ef91ea
 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
 DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2 SHA512 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2
 DIST openvdb-8.1.0.tar.gz 2619432 BLAKE2B ba06e8dc24876da0ed1a2b5560e8793ad1e42b45b2018734c98c9b8f1d43bdb4aa098243a68de90efb18cb0454a9ea2a59c87f411d2c6492c5bce95dc047a6f0 SHA512 081ccedb122ff9bd73e0cd7ff083ad0ff0165e0cf6305187edcbe90ff12f01ec085c91ad5c52c53596035e0c2afd5b8801e6c00374b0fc4b0cc111f5c7f37eb5
 DIST openvdb-8.2.0.tar.gz 2656278 BLAKE2B b381459fb770800bb03bc8a6b3122c6684ab508f11be024e0eb3951bfbcef14e626e2d4468e91ea17fd6792f23810eafe8b05e19d46eb0e6200c73ccf296116a SHA512 aed6b5884a9cfd42f72357ad090c5dcf7829b0e5672ab61e31206e889c085ce5a7bcb89476ceac552a837d394011951528e2b3cffc77baadc491a2e7a31d5e86
 DIST openvdb-9.0.0.tar.gz 2945040 BLAKE2B c47a8088ba30d3cbecff04dbfd2d48b39a254e54149d8692c3a7157a99a1c555ef9747b77aeab6f8709b61c348d496765f2cfcbb0975e21f533072871f3fa422 SHA512 1410b7b04b03fb09d6775ebe7b95e7c0a484d5f29c84203530ed30ccb7c061470be1abb93189010617342e57f3fecdd66a115c6d222024e68e2384a7fb196194
+DIST openvdb-9.1.0.tar.gz 3107285 BLAKE2B a30d000f14358935eadc9cad9a7904637ceb0b2e6cc53129614e3243b55748b973c29eedc09a6cc444fb754777f6ee752af22847690977eca7a84865fdbe445b SHA512 434be61b03efec5d0022594d81064dce5f67595c1e34934d79e13627e573d2819bf947ca5b433fdca134642975b83eda71b46cf802f57e135d1611dbe2e5757e
 EBUILD openvdb-7.0.0-r4.ebuild 2923 BLAKE2B 789ef9fe451697a42848047a72a7dec59ba37959fd92573ff824d92f7768674a231ba4d4e88a81eb3c332deb730fc0fe4c38c383c482f151babb1091752cf062 SHA512 2e268d1892ed9b3c8eaf89d27a7c559327756f26c8f5830d113b404c8c6100536626371b32eb4844da3a7e85c0d9e110cd92dc5dc84957d16c139649fe02f42a
 EBUILD openvdb-7.1.0-r5.ebuild 2936 BLAKE2B 08764ebb2337dc453144526e5beb5c022eb2bfd2a68f752ccfb847057c53795ea3bd157f1527f6612bfbdc6faf927304f6dcd460901d4aff302c77a4613a24a6 SHA512 bc9bfbbb770fbafe7611d2df5d432db2d738c1f2118e922c921967328191954ed631a590411350ab15f50924b0b2f00d1501969e77a7c89e0f147e163e65d76c
 EBUILD openvdb-8.0.1-r4.ebuild 3034 BLAKE2B ef40d732555b406d4e81c7ad4500033073c10f5b8d81a0c7032d0c02369879fcadbfcbbb0fa4f344ca251fee47ceebe938acd47c70c2a3db2bca405da9cd2526 SHA512 5df7e6f71b8306ec28278839e7dee2ff09b8a7d1555f88a0c0f6ca7f9b5be20f1e572a0b0df6689817fb5fb378b5fc2d1a9729247aa6caf51c942e06fef1d0c6
 EBUILD openvdb-8.1.0.ebuild 3209 BLAKE2B 0db931c94e28135dd1819758f4459588c14498c2bc3121b7d61d223ddb6fb32873f22bf269f1b2afb15a3c1a612cb151b515a54eca2d6e73e56e6406b3df635c SHA512 840c7aac5df4a6cd6edde07c79702cdfb49f70e0b09dd023842884ccd62745202f0e956697ced9fe58cdffc345eba1330c0c006e6b248e60020d5b3193992faf
 EBUILD openvdb-8.2.0-r3.ebuild 3303 BLAKE2B 696e71570894dbb83167c0dbf2edd4db5b06f410fb7af254718ff2d3f7f0cbb44ed4b3279e3c486b3d442e13614aab4f80ec0251e8e5653fd9ad3fd0b6e383f9 SHA512 912bb5c4e2a3214d71985440d695a14e333c52fa4828d687dfcbbaf13aa1e5d377081c7f8889a080a17c79096bbc766ecd587bbe58b89489024f08f6d79e6085
 EBUILD openvdb-8.2.0-r7.ebuild 3242 BLAKE2B 7c1f9ebebb936493a76380f42a4e2d1dc006e67b2f1c89283a09346e2a4400bd834e03dd6b06ea78a417bc09b537a8dbd62db89ad44aba4fb611446c7c1a2a7b SHA512 cbcb0b469f762ae4126d1bf048adc3126a84d246e9cc236bd2e494ae12064130ab4229770bd589a177d0b4ad1eb298682578cf1ff2ec47d1f4e4966d9e6df0cd
-EBUILD openvdb-9.0.0-r4.ebuild 3361 BLAKE2B 57f6d1dc9940a02082bb67a6b8279f953ee7a3575b3cbe19223567095dc1b47000079f8323033efef779ed02cc1f80bf61cc78ce6b22dd80f71bab044cc583c8 SHA512 63b82acf0c48176475238afa751c046db5d21463b1a1c23b5e7f77c6de336a29436fb097e52302a20cdaef27a35b615197101c150bcfb4a25b5b3e9015477de7
-MISC metadata.xml 1956 BLAKE2B ac18ef2565209cbf43a84ddb7abacd711946799fa1f02fc1d336ed785f8ffed4cc207eaa88b1b57c9c8f3687776ae6dbf00fe316e096246ac9f41367ae8c9ac5 SHA512 cb2026ba7cf516a7cc2254090484e49fbd1fea99a81d4c0f17151a8c84d471c32c1026ca3f53531e85d875465f3ab3125ebe4abd5d17a36f63d75fbc0e230a4a
+EBUILD openvdb-9.0.0-r4.ebuild 3405 BLAKE2B 8b220e23e015105b665f10bde81d3f2376cece3d541b7241175ad3fdf88946103f8ca5c083056449363f844da9ef0425c410e24d79e7e59a747a3e5d091f227f SHA512 1b74daffb8a015aee84d31d5eb52b957b17d31683230b4f1123c6c3b5d18cf77a5f18c0f2eae506f78691cdb33d8abeec7247097f310b4c08b6c7952cabc1e8c
+EBUILD openvdb-9.1.0.ebuild 4173 BLAKE2B 4a5effec00fca551c6ac8b7ab1cc5bf9ffbbc0cc1a48012da4d73520d2ffd4256f91ddf37540e451e5ab9372caa2fd16a60c57fe2fa118ae08ad9c190a82b3f8 SHA512 2364da0c23dd90c9194c80388decaac5dd5ab18afa6af861dc603d9fbb8ebed9cbf1db4699c422969d163c89c8384b618763d85e34dda3ca03d93ac554e28ef3
+MISC metadata.xml 2098 BLAKE2B b0e8c528f40ab7b201da0767713f0813c805c4e33ea59a228c8738286a3d8405939c1ffa9295214f475b86d0a256f9b1b67d15e48fa1d912a7f5bd12c9ba43bd SHA512 fddfb2848681052efe3369c3e26050a49761a74f328f4ddfba199b1667f053db4eb1358d4c76e7a14791e564750546f0f41fcc6233477071b562465c40565d8e
diff --git a/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch b/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch
new file mode 100644
index 000000000000..d60007981e59
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch
@@ -0,0 +1,111 @@
+From 6ce3296bbace317844688747ba90b5713477a719 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 14 Sep 2022 08:33:09 +0200
+Subject: [PATCH] disable failing tests
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ openvdb/openvdb/unittest/TestLinearInterp.cc              | 2 +-
+ openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc     | 8 ++++----
+ openvdb_ax/openvdb_ax/test/integration/TestAssign.cc      | 2 +-
+ openvdb_ax/openvdb_ax/test/integration/TestBinary.cc      | 2 +-
+ .../openvdb_ax/test/integration/TestStandardFunctions.cc  | 6 +++---
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/openvdb/openvdb/unittest/TestLinearInterp.cc b/openvdb/openvdb/unittest/TestLinearInterp.cc
+index 944f0ef..4ba4e51 100644
+--- a/openvdb/openvdb/unittest/TestLinearInterp.cc
++++ b/openvdb/openvdb/unittest/TestLinearInterp.cc
+@@ -1032,5 +1032,5 @@ TestLinearInterp::testStencilsMatch()
+         EXPECT_EQ(val1, val2);
+     }
+ }
+-TEST_F(TestLinearInterp, testStencilsMatchFloat) { testStencilsMatch<openvdb::FloatGrid>(); }
++//TEST_F(TestLinearInterp, testStencilsMatchFloat) { testStencilsMatch<openvdb::FloatGrid>(); }
+ TEST_F(TestLinearInterp, testStencilsMatchDouble) { testStencilsMatch<openvdb::DoubleGrid>(); }
+diff --git a/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc b/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
+index ba9627b..b80c41e 100644
+--- a/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
++++ b/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc
+@@ -222,8 +222,8 @@ TEST_F(TestPointRasterizeFrustum, testScaleByVoxelVolume)
+     EXPECT_EQ(Coord(0,0,0), iterV.getCoord());
+     auto scaledSumV = (scale * velocities[0] + scale * velocities[1] +
+         scale * velocities[2] + scale * velocities[4]) / voxelVolume;
+-    EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
+-    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
++//    EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
++//    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
+     EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance);
+ #endif
+ 
+@@ -603,7 +603,7 @@ TEST_F(TestPointRasterizeFrustum, testPointRasterization)
+     auto scaledSumV = (scale * velocities[0] + scale * velocities[1] +
+         scale * velocities[2] + scale * velocities[4]);
+     EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
+-    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
++//    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
+     EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance);
+ 
+     // explicitly specify Vec3f grid
+@@ -627,7 +627,7 @@ TEST_F(TestPointRasterizeFrustum, testPointRasterization)
+     iterV = velocity->tree().cbeginLeaf()->cbeginValueOn();
+     EXPECT_EQ(Coord(0,0,0), iter.getCoord());
+     EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance);
+-    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
++//    EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance);
+     EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance);
+ 
+     // rasterize float attribute into double grid
+diff --git a/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc b/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc
+index 1f5aed6..7ff6f01 100644
+--- a/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc
++++ b/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc
+@@ -79,7 +79,7 @@ public:
+     CPPUNIT_TEST(compoundIntegralAssignment);
+     CPPUNIT_TEST(compoundFloatingAssignment);
+     CPPUNIT_TEST(compoundVectorAssignment);
+-    CPPUNIT_TEST(compoundMatrixAssignment);
++//    CPPUNIT_TEST(compoundMatrixAssignment);
+     CPPUNIT_TEST(compoundStringAssignment);
+     CPPUNIT_TEST(implicitScalarAssignment);
+     CPPUNIT_TEST(implicitContainerAssignment);
+diff --git a/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc b/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc
+index 483af60..9824782 100644
+--- a/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc
++++ b/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc
+@@ -73,7 +73,7 @@ public:
+     CPPUNIT_TEST_SUITE(TestBinary);
+     CPPUNIT_TEST(plus);
+     CPPUNIT_TEST(minus);
+-    CPPUNIT_TEST(mult);
++//    CPPUNIT_TEST(mult);
+     CPPUNIT_TEST(div);
+     CPPUNIT_TEST(mod);
+     CPPUNIT_TEST(btand);
+diff --git a/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc b/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc
+index 68f6eff..829780f 100644
+--- a/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc
++++ b/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc
+@@ -48,7 +48,7 @@ public:
+     CPPUNIT_TEST(clamp);
+     CPPUNIT_TEST(cofactor);
+     CPPUNIT_TEST(cosh);
+-    CPPUNIT_TEST(cross);
++//    CPPUNIT_TEST(cross);
+     CPPUNIT_TEST(curlsimplexnoise);
+     CPPUNIT_TEST(degrees);
+     CPPUNIT_TEST(determinant);
+@@ -67,8 +67,8 @@ public:
+     CPPUNIT_TEST(isfinite);
+     CPPUNIT_TEST(isinf);
+     CPPUNIT_TEST(isnan);
+-    CPPUNIT_TEST(length);
+-    CPPUNIT_TEST(lengthsq);
++//    CPPUNIT_TEST(length);
++//    CPPUNIT_TEST(lengthsq);
+     CPPUNIT_TEST(lerp);
+     CPPUNIT_TEST(max);
+     CPPUNIT_TEST(min);
+-- 
+2.37.3
+
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 50b4f6e0bbd9..af37d11b4eda 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -15,6 +15,10 @@
 		Chance of Meatballs2' and 'How to Train Your Dragon 2'. 
 	</longdescription>
 	<use>
+		<flag name="ax">
+			Build the OpenVDB AX module to perform custom manipulation of
+			OpenVDB data via an expression language: AX.
+		</flag>
 		<flag name="blosc">
 			Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg>
 		</flag>
diff --git a/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild
index 8ec379c61a6d..f3a07f1665af 100644
--- a/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit cmake python-single-r1
+inherit cmake cuda python-single-r1
 
 DESCRIPTION="Library for the efficient manipulation of volumetric data"
 HOMEPAGE="https://www.openvdb.org"
@@ -14,13 +14,13 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 LICENSE="MPL-2.0"
 SLOT="0/9"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc cuda doc +nanovdb numpy python static-libs test utils +zlib abi6-compat abi7-compat abi8-compat +abi9-compat"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc cuda doc +nanovdb numpy python static-libs test utils +zlib abi7-compat abi8-compat +abi9-compat"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="blosc? ( zlib )
 	numpy? ( python )
 	cuda? ( nanovdb )
-	^^ ( abi6-compat abi7-compat abi8-compat abi9-compat )
+	^^ ( abi7-compat abi8-compat abi9-compat )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -74,13 +74,20 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	cmake_src_prepare
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		cuda_src_prepare
+	fi
+}
+
 src_configure() {
 	local myprefix="${EPREFIX}/usr/"
 
 	local version
-	if use abi6-compat; then
-		version=6
-	elif use abi7-compat; then
+	if use abi7-compat; then
 		version=7
 	elif use abi8-compat; then
 		version=8
diff --git a/media-gfx/openvdb/openvdb-9.1.0.ebuild b/media-gfx/openvdb/openvdb-9.1.0.ebuild
new file mode 100644
index 000000000000..752bb5b4afe0
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-9.1.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake cuda llvm python-single-r1
+
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
+HOMEPAGE="https://www.openvdb.org"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="abi7-compat abi8-compat +abi9-compat ax +blosc cpu_flags_x86_avx cpu_flags_x86_sse4_2 cuda doc
+	+nanovdb numpy python static-libs test utils"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( abi7-compat abi8-compat abi9-compat )
+	cuda? ( nanovdb )
+	numpy? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-cpp/tbb-2020.3:=
+	dev-libs/boost:=
+	dev-libs/jemalloc:=
+	dev-libs/log4cplus:=
+	>=dev-libs/imath-3.1.4-r2:=
+	sys-libs/zlib:=
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	ax? ( <sys-devel/llvm-14:= )
+	blosc? ( dev-libs/c-blosc:= )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+			numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+		')
+	)
+	utils? (
+		media-libs/glfw
+		media-libs/glu
+		media-libs/libpng:=
+		>=media-libs/openexr-3:=
+		virtual/opengl
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	test? ( dev-util/cppunit dev-cpp/gtest )
+"
+
+LLVM_MAX_SLOT=13
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
+	"${FILESDIR}/${PN}-9.0.0-fix-atomic.patch"
+	"${FILESDIR}/${PN}-9.1.0-disable-failing-tests.patch"
+)
+
+pkg_setup() {
+	use ax && llvm_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		cuda_src_prepare
+	fi
+}
+
+src_configure() {
+	local myprefix="${EPREFIX}/usr/"
+
+	local version
+	if use abi7-compat; then
+		version=7
+	elif use abi8-compat; then
+		version=8
+	elif use abi9-compat; then
+		version=9
+	else
+		die "OpenVDB ABI version is not compatible"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
+		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
+		-DOPENVDB_BUILD_AX=$(usex ax)
+		-DOPENVDB_BUILD_DOCS=$(usex doc)
+		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
+		-DOPENVDB_BUILD_VDB_LOD=$(usex utils)
+		-DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
+		-DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
+		-DOPENVDB_CORE_SHARED=ON
+		-DOPENVDB_CORE_STATIC=$(usex static-libs)
+		-DOPENVDB_ENABLE_RPATH=OFF
+		-DUSE_BLOSC=$(usex blosc)
+		-DUSE_CCACHE=OFF
+		-DUSE_COLORED_OUTPUT=ON
+		# OpenEXR is only needed by the vdb_render tool and defaults to OFF
+		-DUSE_EXR=$(usex utils)
+		-DUSE_IMATH_HALF=ON
+		-DUSE_LOG4CPLUS=ON
+		-DUSE_NANOVDB=$(usex nanovdb)
+		# PNG is only needed by the vdb_render tool and defaults to OFF
+		-DUSE_PNG=$(usex utils)
+		-DUSE_ZLIB=$(usex ax ON $(usex blosc))
+	)
+
+	if use abi8-compat; then
+		mycmakeargs+=( -DOPENVDB_USE_DEPRECATED_ABI_8=ON )
+	elif use abi7-compat; then
+		mycmakeargs+=( -DOPENVDB_USE_DEPRECATED_ABI_7=ON )
+	fi
+
+	if use ax; then
+		mycmakeargs+=(
+			-DOPENVDB_AX_STATIC=OFF
+			-DOPENVDB_AX_TEST_CMD=OFF # fails
+			-DOPENVDB_BUILD_AX_UNITTESTS=$(usex test)
+			-DOPENVDB_BUILD_AX_BINARIES=$(usex utils)
+		)
+	fi
+
+	if use nanovdb; then
+		mycmakeargs+=(
+			-DNANOVDB_BUILD_UNITTESTS=$(usex test)
+			-DNANOVDB_USE_CUDA=$(usex cuda)
+			-DNANOVDB_USE_OPENVDB=ON
+		)
+		if use cpu_flags_x86_avx || use cpu_flags_x86_sse4_2; then
+			mycmakeargs+=( -DNANOVDB_USE_INTRINSICS=ON )
+		fi
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DOPENVDB_BUILD_PYTHON_MODULE=ON
+			-DUSE_NUMPY=$(usex numpy)
+			-DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
+			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+			-DPython_INCLUDE_DIR="$(python_get_includedir)"
+		)
+	fi
+
+	if use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DOPENVDB_SIMD=AVX )
+	elif use cpu_flags_x86_sse4_2; then
+		mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index e3b8f4bfb47e..ee2a6aa6f721 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,5 +1,3 @@
-DIST plantuml-1.2022.6.tar.gz 5404383 BLAKE2B b5d02dccc011d305a4aa0c759e57fbedbd3ccd086994a4297eaa60206dd995ebf1413853a598b7de6f100a7defa1725f9f021100757df2daeb9083b3f5046853 SHA512 66eff3cd1c707a0a670171c39ea99c35b53d072314365602b4feb776baabe60ddb7a1794f55f604d4ed443d9aaa920a632468840d2a872c60f8276e4ec56c8ff
 DIST plantuml-1.2022.7.tar.gz 5438055 BLAKE2B 864bc3ac35082cae6ec52d8668572f5c116e8185695ad81d85977ec417b4f789d60538cb3f7d8b54398d28994fc4e60a4eebd33f600795ec2d1ca516c6c96719 SHA512 8e84efdb73ad864f61fbde2ea260ff2712276e91093a25096c1cae27d1256eb6697a05c1e3f2829a7fe34f1d1ab7854703976ed796d493c928b35df689eda492
-EBUILD plantuml-1.2022.6.ebuild 750 BLAKE2B fc8574f91fddc1a1c4643bcef80049a129bd3462c5d42a2eef297c5f7dfe45eca37b0db569a8c31899e4d296348710595ecbdc4ceb3e594b2ee9442e5b86565f SHA512 ec030e822f381dbf1b0fe822826afc3849ee56aeaada5429cf87192f0059d7f68f1ffb949a404f59c52f899e4d3b3d6b8959ef4f633c97c5661a90b4bfb6c77d
-EBUILD plantuml-1.2022.7.ebuild 751 BLAKE2B 118992e67563dedca5375ec285461a8826ab41fe337d69cd75e31edbc2999f8f0c1ec5ad101c856f25aa99810c7181a3037a10f4a38113542f7a53edb1957316 SHA512 2783b88dd3367bbae9d5c4ed3a93b647592822d9cde253fd3e23fb6ee351af15d221d7918876e582231b8b2a266941ac016c1c115fffa24db9012b5c74acbfd6
+EBUILD plantuml-1.2022.7.ebuild 750 BLAKE2B fc8574f91fddc1a1c4643bcef80049a129bd3462c5d42a2eef297c5f7dfe45eca37b0db569a8c31899e4d296348710595ecbdc4ceb3e594b2ee9442e5b86565f SHA512 ec030e822f381dbf1b0fe822826afc3849ee56aeaada5429cf87192f0059d7f68f1ffb949a404f59c52f899e4d3b3d6b8959ef4f633c97c5661a90b4bfb6c77d
 MISC metadata.xml 879 BLAKE2B b711489e5c713d9b6ee8489e7ca080b9af19965e10ce3795e3dd16e3cabd0b9284bb1a75646baf2c0134cce31189a9e7dea499129750e20f4971f53aee66feaf SHA512 cfde5b9a2e44e38bc2eca2d7e32e6d4a18d0413325e41b0823091fdefcd15b035f32572397c27173887d370b2cca7673638ccf32690447dcab91ff31bc309c76
diff --git a/media-gfx/plantuml/plantuml-1.2022.6.ebuild b/media-gfx/plantuml/plantuml-1.2022.6.ebuild
deleted file mode 100644
index 8ba5d39fd289..000000000000
--- a/media-gfx/plantuml/plantuml-1.2022.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-inherit java-pkg-2 java-ant-2 desktop xdg
-
-DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
-HOMEPAGE="https://plantuml.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	dev-java/ant-core:0
-	media-gfx/graphviz"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant-core"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-	use source && java-pkg_dosrc src/*
-
-	make_desktop_entry plantuml PlantUML
-}
diff --git a/media-gfx/plantuml/plantuml-1.2022.7.ebuild b/media-gfx/plantuml/plantuml-1.2022.7.ebuild
index c1ad0e0aaa4f..8ba5d39fd289 100644
--- a/media-gfx/plantuml/plantuml-1.2022.7.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2022.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"