gentoo auto-resync : 19:08:2022 - 14:36:41

47 files changed, 34 insertions, 192 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 90e9259067ab..60fd1fb37836 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 9cba26b72a43..46b5d8295777 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -5,6 +5,6 @@ AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa6
 AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bbc0aa009707e522e1dc3d09540bf1f9fa6350375f7acea942a986304a834964bb20849da4f08ff3f963b86f43c179a9fc2b012ff SHA512 d8960e21b713a24d415704d023443dc09d6a8909d65063a7b55da47228619485fc7e647c5c52e9a9459da027daaebdc19e6c3e56fe618ee5f553fd03c4716bcc
 DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
 DIST allegro-5.2.7.0.tar.gz 7911231 BLAKE2B 9cc588a42d461ce06db94c1dd57642a2e9445c4930fcc164f2da57edfb463552a279a5e50f46740561a88c974c96605bb09fcc596e7bc6afb5e30b18ff7b74d5 SHA512 300bb951c661e7a220d913cca4116aba99afdcb5346af7c57b09bbdfa892d446cd64fde54397c57edb3c5f57d3380fbc2b6c4d9c9e17f48ff8180cfbf59e7d99
-EBUILD allegro-4.4.3.1.ebuild 2977 BLAKE2B cb8b478a8970c24c7fd7c2a6c8650d9263762d3e67971c94e33466ecf95a357a8e9df3de78a8618730c97d48cff6e638b242f55718a2ea66dc07911af966950b SHA512 e9fbde100e978f62058f446378b0514e62e315a8e2a869623168e3bbcd4f057d67a9b7524028d6d1fd8afbb423043486942701fb215d37d7dd35c50e5f2c56ef
-EBUILD allegro-5.2.7.0.ebuild 3244 BLAKE2B ae90976458b74539cdcb9260ebd7195a1912b41e0250abf0525b06d3bcfef02311e47ad65031672c9d777a86e5a287165b54a889e7ac0a668ba4412107304aea SHA512 35371b138febed8ee87b66fdda167bbd84f31b573382e6b648d16d77aa78cb20cf10f7acacff8059577068cc46172167e08d9b015b36848deddbd2f5c3d37a51
+EBUILD allegro-4.4.3.1.ebuild 2958 BLAKE2B a2a5844feb9a7157127fd2a67c2436b94a8b80caa5d15fc0d6780665b989a1887c5dc88f7f10c4a73352359638279ebf7b123e5f6eea406f739d39701735835b SHA512 8daae338653d3e6f333c546f478461a11838abaf24678de7c4a509b2a1b09eafd7509bf9b6016ecec03d86dbce786fe28fac7af7b4d38e3bc979a8152c7b2b74
+EBUILD allegro-5.2.7.0.ebuild 3223 BLAKE2B c45320caabe0e04960d3de915e298836b65ce6296e3e461dcc073ce0a864f9a94d0fc13b6f04567756328b10331b25a9ff25f195740847875d2091ef1842da27 SHA512 96eb8351bb39eb6e6bc05a7e4ed267c92577274432b5b21de3692c3965517cce9e6724324ab19332f9de21f2ff826d29293e6c33915c52863fdff9feeabcf344
 MISC metadata.xml 1094 BLAKE2B 30dbd9ba5a9ac1adebf1eee05ced31ede45b3e3fdecd519a26c073f827af8188137592242c31c42c255d20dd8cc0ec541e8fe48c2748228934bfe98d44451012 SHA512 45d218016b3832602248801701c9c53ba79a82fdd35f776ca7bf845d9862ee62252d3899699b463bf81019823f91d025c9b539f984781e36e08cb4d9226ef0ce
diff --git a/media-libs/allegro/allegro-4.4.3.1.ebuild b/media-libs/allegro/allegro-4.4.3.1.ebuild
index 4c4d839a1c30..9c7964cb66a3 100644
--- a/media-libs/allegro/allegro-4.4.3.1.ebuild
+++ b/media-libs/allegro/allegro-4.4.3.1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib desktop
 
 DESCRIPTION="cross-platform multimedia library"
diff --git a/media-libs/allegro/allegro-5.2.7.0.ebuild b/media-libs/allegro/allegro-5.2.7.0.ebuild
index f577c06555da..00b721055d9b 100644
--- a/media-libs/allegro/allegro-5.2.7.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.7.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS="cmake"
 inherit cmake-multilib
 
 DESCRIPTION="Cross-platform library aimed at video game and multimedia programming"
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index 8d111fba93bf..349babdf4f07 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -1,4 +1,4 @@
 AUX dumb-2.0.3-pkg-config.patch 667 BLAKE2B 1607438fc49682500cdbeb4af8aa2eca5b4a8131505c932b2413404d691ee4a580f564be5290b7063849746babcfba94f7a9dccac9bbeb67c97a8ee68353f440 SHA512 bed13c5369ac951837f41b7bb10b86fa73c871a7ed3b7b9876a304f2ffd31635d4e45093e09cd62ba0b856f58b27ae15a508ad36c773ee7b96c3cf7d90a47660
 DIST dumb-2.0.3.tar.gz 186576 BLAKE2B 0bd2e512b88260e67b11856630aecfdda2f11a8c5f931c1da3451dbfc15cd5e7e38e718d12b99e0598d9522cf259317a98c5d3088dd979c487a8971fd562ee3f SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf
-EBUILD dumb-2.0.3.ebuild 1005 BLAKE2B 096d43cd95b49da42f9e607e4f7454017381716af6b47b5fc724c7b4fab193a4e110c5bfdc948523ec34b720a43e42a48f3764f0907fd6f61c9c3638eea0fa4b SHA512 93abb2de45dc3abab1b9f84613fceb336228a7222e88c19c4cb51ec2ca00d288e4ae3d5809342124b6e800a9a5478d1f53de81184257fcdbd086917a13fe1ff9
+EBUILD dumb-2.0.3.ebuild 986 BLAKE2B fce0ad553413766a5c39c02a8d31da8922a1b072221d697b70ffd8b09531ac0165717a1b67073a6c3e18b76eb283c7aac0c7cec0acde7c816538be26662731f9 SHA512 d38ccfbb732b2df17215135cfb2dbbc2154c24a9135000b99e37e05679b6ff4acfac78e62e045b5dc2c30f05df3378ab373dc3a1ff38e40f6b7417d3791bae5f
 MISC metadata.xml 450 BLAKE2B 44bb41dcf47879fed070edf45db451983871e1a010ad225526cff14f0b4d16de7c340959e33bdfb4d60ca96e9e8c86ae5f18632ce62e9817408510f4f43944da SHA512 b5e53041edd1dfaee742fef323ea5a293220225f847f7c5772a9008edf485ef651b2b1d0adc955e8fe3662eeaec5d9f825121b22bacc6dfb53e002dc8c78eb48
diff --git a/media-libs/dumb/dumb-2.0.3.ebuild b/media-libs/dumb/dumb-2.0.3.ebuild
index 48f6112a722e..60271beffc6b 100644
--- a/media-libs/dumb/dumb-2.0.3.ebuild
+++ b/media-libs/dumb/dumb-2.0.3.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Module/tracker based music format parser and player library"
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index bc216a0e9853..fd3223db4cc8 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,4 +1,4 @@
 AUX 3.2.2-Fix-aliasing-violation.patch 2746 BLAKE2B 37dbcfbebaf7609fd292305b7fdca72439a834b5ca8b525af9a577921851de183a7906fc7d053fcf1fd8616f653fe8ce52a9044cc9c053d68bce83ba0df629fb SHA512 9f56d78528c32218e649243388c63673a2859421029011fcb098a8a792e871532c586924d30ab79a324aa32a9778108ad0499d79ef8663e9fb03d00a8f9b9c45
 DIST freeglut-3.2.2.tar.gz 397203 BLAKE2B e4151d9bd984504edb02fadf2983c750c1c81557f3467c01d4202d34e9e082a62f07d373908d3517f9b3fd3253b7b409f882cfe2187d4ff1787f3cdc09eecfe4 SHA512 190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9
-EBUILD freeglut-3.2.2.ebuild 1481 BLAKE2B d00c6ca7cdb69f3dd3d740a1e32c6737812ac01e254d9f7917453181d5950254072af4b0f470d4c52cc6f913ac1095b6ac4669d487864961afa868a2fbc5e7d4 SHA512 0a2cc714348e75f781d30d2d48efe54a089716dc28f939e8eaa9935d2c5dd0b2d9d6ee99b19aedecf715848ceaf010383eab18a6910939291f4f29048b75830c
+EBUILD freeglut-3.2.2.ebuild 1462 BLAKE2B bfa87569994be7ae1c8a374bcb38e88db905b0a2349268df81d69a54979a80ed6ddb347821f9da6951fdde5fff07d82bc99b8d5c9f3b4136ee179069d2a64d4b SHA512 426d97d6fbf11029d1f9620ce3dcbf5fd503002c967ba70b4071778ca89a498bb5e942b4a87491e44c42150eb2fb68cd80e4848e7d2bd8f8879ace8ef5cf1290
 MISC metadata.xml 594 BLAKE2B 984028f68aa76f8cfe537ea8a9f090af580cbe5ec33007c91b5b95b1f8c5396c779f67155d99fce7708e4fba8ee661f35fb01f5fd714a5ccc08794516df15820 SHA512 159f5756565afb1a55ac874afc42e49591c94519970d10eb7857159262bf4f6e372e5c0584f03ed1ad70e28bb5d328d3f36fdb0208d9de8f22e307973ee38167
diff --git a/media-libs/freeglut/freeglut-3.2.2.ebuild b/media-libs/freeglut/freeglut-3.2.2.ebuild
index 0a46c30d469d..43218afa4d37 100644
--- a/media-libs/freeglut/freeglut-3.2.2.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library"
diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index 2f69c8b1173e..22f0f266b1af 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -1,3 +1,3 @@
 DIST game-music-emu-0.6.3.tar.xz 234412 BLAKE2B 21edd8f5e868231424c56dad6740a5c7cb8e7f503b707dc56ea71d7a75085566b2bd0c2060b0f9e919f858c13821b3810959cff96c41f9248bb3b98f12eb22f7 SHA512 4b20c69ced696bb879c34bcb7ce0f5f276642458d4cebca8ede673eed7d50664e527626e2077f85a3411a26660f1b3f01e43cccd72945e1edb2994421efeb552
-EBUILD game-music-emu-0.6.3.ebuild 652 BLAKE2B 764d5c7593f46f67a88ac88422f47e10fa4da4098772b18d17d3ff70c10753ccc458f9c9bdaab09ba1e34c6cc0ddaaee88b22e27b29178d87f49e3f76932f563 SHA512 42f252ba3ba65fbf9203a3ab04c13f101eec341c620fb493173879865d9889bb6b8e809bbbbac6c3a42957bc5f57622eab6d3c0927439a83266587ad68380677
+EBUILD game-music-emu-0.6.3.ebuild 633 BLAKE2B 6c2c7a6ee340d3c6f70a5ef62f3d4030f101815bf0e4bfb5d7613c96b5f8930e6c495c8749c694c86b5cfbb9e3699fc90ed5e9ca5758dee7ba2a26cde5ca1de3 SHA512 01995c5ac25793ada6b19c0d6ad86086f11c8d07430edaa36637794b427588f963344eb747991208861bcbd0c22259cf66480c725c64f32ae601307b37df5aec
 MISC metadata.xml 401 BLAKE2B 55ad6fa2bd1c0cc363ea58e09c6b58d518782717b244a4bc50d902368b748f17f485e41ad5a81c1671edc4ef635544f5abae36f5978feb3980e7d1909f248907 SHA512 91fd65adf324ae718e5ad19446ddf9b884541358ec49be432108091f7651c73bcb3b33ee50063b9c23401877e9f1ba29e63b447f47668b862e64707a70d7c7f0
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
index d9bff2be7e1d..f41411aeb7bd 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Video game music file emulators"
diff --git a/media-libs/glpng/Manifest b/media-libs/glpng/Manifest
index 4f5002c0f0e5..c5e6116f4583 100644
--- a/media-libs/glpng/Manifest
+++ b/media-libs/glpng/Manifest
@@ -1,3 +1,3 @@
 DIST glpng-1.46.tar.gz 41024 BLAKE2B a0e521ec5ebd3d6b9d62e64b001dfa0aac97be6a72f44222816f5cb2dda3949d33261f66e96ecaa1fc6feaf7ece67721d3606440d760b305fbb7cb57462b24b3 SHA512 82fbd6154a0ca16102b4c31f7fbd907cf8c18b20c1693c60f8dcdd1fe42ebe579f98da2b36c00fc080b2880c720e8099dac0d460a8de1b2bf1145abbf05a20ae
-EBUILD glpng-1.46-r1.ebuild 700 BLAKE2B c49909f97da30967db45f5604a46e02497c82a3a15215054b70a1122f56a901f0dfa523b8ea318f56fad8a86bbc3524a0b0512793d9b479f593c392d8859bdab SHA512 0a889e4313cb19d4c4a8289d4d3321fe337dd09a841b883ad525d19afe8409c6e2f402d069e6ccdcafb2216cb26a03c0a093ed1009edec3a027db0754ad111d2
+EBUILD glpng-1.46-r1.ebuild 681 BLAKE2B 4ee3c9f1a36774befa7d3985a846239291cac46a34f9ee41e5a43421e2a7572bd30ea3e7d7e92ab263dea291327d96f4591b160d40bae5471f706f8c1c871c8b SHA512 ab71c246694bb507bfb4933c27e6f0ef5f5014b90f9307603069ceb73cae50ade7dbbb2e4580c2abc9739054395516189c7ed382d22cba129ea1238922422cc3
 MISC metadata.xml 462 BLAKE2B 3744b4d1779d4560da55261aa85be5bd0ca8c078dc71c9e5f947aa0ea94f765d0a85dc366dc44d521058f976d303d1baa42e599ecff592443eb5db03272f69a9 SHA512 4a68928cdb16267fff40459cfb65faff1e17cc57cda331b76260501c7400a82885ead0a1bf1cd0bfc49d52465b7fc4acab620514e4472d9c2b52f7217b39494c
diff --git a/media-libs/glpng/glpng-1.46-r1.ebuild b/media-libs/glpng/glpng-1.46-r1.ebuild
index dca30f664f66..cc6945248957 100644
--- a/media-libs/glpng/glpng-1.46-r1.ebuild
+++ b/media-libs/glpng/glpng-1.46-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="OpenGL PNG image library"
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index d66fa281fc8a..1d54b1803d74 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -2,7 +2,7 @@ AUX libavif-0.9.3-dav1d-1.0.0.patch 1428 BLAKE2B 51780bdeb22874bb23b8f461da1a98d
 DIST libavif-0.10.1.tar.gz 2085698 BLAKE2B 5be3f9adf7e0a5747e42c90ce2768eba90053c821805cc8e39915d6cbc4cd42554b1473118b41eb25010d20a2b5a3c141b9cbd6ff55c46abd79eb97cdee6b0e5 SHA512 2f6f248c56c983761149d3c201fc2a2ea5072a32516578a7fdb2c66e3cd22491540f400e23581f873b15454250eeec8d433924ae2c1de9371b7924a5d82bef6b
 DIST libavif-0.9.3.tar.gz 2000521 BLAKE2B b9dbaf01e58058a1ab9191081242a0f669b714d319075b6330963bc8ae31f576fb77b108de4745125eb42d39682e74a3174d062a029ccb765b3030f4092a96b8 SHA512 8e95666c784d1badc7e18d27a7c21cae3b8ef3b8da9a762eb8f7216d77fba29b9ca309c01d13bcf4890e03c6bc335ba4baf3f5877396bd0584be9ea60018daa7
 EBUILD libavif-0.10.1.ebuild 2724 BLAKE2B c430145233ed7c7b63b1f7814d9b0cf76a5bed2db060b6de76d2952bca51a64b385affa04cb286653176ca981180c35c8119b8fff7bbf7aeec0b33d804119131 SHA512 4bd4cf5047035114f7fc88aec7fd6383b23bcc7ac37d6cd9a44ed028bac12765715301657c866d600c3cd6301e1a31dff8ffa9d5e9ec7c63d539bb4116f7d18a
-EBUILD libavif-0.9.3-r2.ebuild 2717 BLAKE2B 88dbe135fd388326eb14beb585e57d241760679839433bf7ba8dc6d2a195e4b5e266a50177b77d061d8c3824fa422613bd65b48bed42017592b50ef1582dff23 SHA512 ad18814f39af7148b016341f7a0a88cb343050a2f4c39acb4202999e2753d3921b3651780f4ead68b581c6ffe657c1e69dacab0da37b3e536acbb7611421eb97
+EBUILD libavif-0.9.3-r2.ebuild 2698 BLAKE2B 7adbbc0d25de9032023b9ac2775d385f4bb7a722e64051fdd341d131f5ea1803e50c0cdbec6fc227c1b45ca531ed212acc963fa4103253494ee0193f0afa9da7 SHA512 e2083ecd5a2b39a56dc68828bf4ebb6d9a562107e43eb44ca6bba1bfac37ad6f982f51f96a4fa5fa67646879bf8588fbac850277abfca0eaa6187ce5a185b458
 EBUILD libavif-0.9.3-r3.ebuild 2754 BLAKE2B f6dfc1db692f53625edbe69ae667dd31f1cd99a12d45e5503ea4c226dcc7894e32781923714deef7200f327dc81e4a6672e5ef4145a97adbb808a9cf0142ae01 SHA512 2a232a397fede6063ef17a6886ff3543675d4bd24a5723dd7157f0a41785cab58262454ba421df4a8a5348119f6b3d7184c7623c943b4242a247cb5bab69dd6b
-EBUILD libavif-9999.ebuild 2681 BLAKE2B 929277db0f99ee7b1ccfc46331f5c5febe05be72ecb48b1f94c04edae76be3938f9de2dcda40ddfe237a7dddedab9e9f629af60ee6272ea6523373f28c164118 SHA512 4db77d974fe980c3b5373b6ea37e909f7c20d1ddfae1969d6a76d7126c942f68d9d73ae6e0ec3e81c5d27351c0114ef7fb2bbc56a2db83e5f044582765d67466
+EBUILD libavif-9999.ebuild 2662 BLAKE2B 68435d43e38208d1e9a836c7da8c6aa1545da5d7da271b2d422bd93e41df8298262a6f85629cd8d4327f84efb376648bd6af10f6a5af7452d58439a0fcbff9c4 SHA512 a21ba858eab8456af19751fb00d3776f849d32da8d51f98fb70708e1efdf90fb09191a53c6eb2c4253a66a2f22882d4994790116e87d1297501cb541de619210
 MISC metadata.xml 874 BLAKE2B dff9e32442e51d4a3ef60fc1059cb2303b3f0a8c0d026ee8703086509fbed4205e28f4bf043b90af2f57ccbaf7dc861dcefb633b1f306bea1d3f32a5373a5643 SHA512 9f5c37e9ebe71fe47512a7ccc493559bc46132874dc00f16b0b60ad108fee9eda6c2a2c87b21309505e46cce46776a9917ec587874906d1d62b1c2e28b0ea31f
diff --git a/media-libs/libavif/libavif-0.9.3-r2.ebuild b/media-libs/libavif/libavif-0.9.3-r2.ebuild
index 672f5e5b162d..a763302e0c9e 100644
--- a/media-libs/libavif/libavif-0.9.3-r2.ebuild
+++ b/media-libs/libavif/libavif-0.9.3-r2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib gnome2-utils
 
 DESCRIPTION="Library for encoding and decoding .avif files"
diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild
index 1caa84d6e040..4dab63b81130 100644
--- a/media-libs/libavif/libavif-9999.ebuild
+++ b/media-libs/libavif/libavif-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib git-r3 gnome2-utils
 
 DESCRIPTION="Library for encoding and decoding .avif files"
diff --git a/media-libs/libcuefile/Manifest b/media-libs/libcuefile/Manifest
index 600adf969ead..4689f9c7ce05 100644
--- a/media-libs/libcuefile/Manifest
+++ b/media-libs/libcuefile/Manifest
@@ -1,4 +1,4 @@
 AUX libcuefile-static-libs.patch 1299 BLAKE2B 488f99588881a9b24471b1a4c02b090147125ebe4fc2865ce2bca5e03891d6ea46530a9c265df77c5663e4f99d0a841844c0ccc3c918fc36bfc973fa8bda5fe1 SHA512 efe0d8d04acbb73e666411780283e35567b87233c70c8383404965f1dc6fceed7e1b28ce5f77d8085821df70062eaa153161cd5212dd18246920d2dff2699c94
 DIST libcuefile-477.tar.xz 41676 BLAKE2B 01232ed507386809cd7960f06251139fd5c11a251f68e59513b6b5e482b9b7977e5d3fd8d6147a47e4a74b8e5e320019383a4d69c6c3395ead3cee0d8c5c3b43 SHA512 9cf46f9fd1b178758b2d15fa65d67d069bba41a83354a5aedf7b57ed5752bb68ad1d10208ffbb22f2aac7bd5d938e9395f67d4248441743d45e0099638d60d5e
-EBUILD libcuefile-477-r1.ebuild 732 BLAKE2B 4d31d0b03638882bdcb0eb0ba50b2356fd2da5f66c2995f1f7512b7094807211871e00e6c4f4a6a11d10482660b6c9795703c11f0af64cebc1d4d2037dfbbd42 SHA512 0bad8c12b3724ade3d77c3010ecd196e6010a5e0231649c611ea19fe6cf32717ae33b5d84202891d2e882eb46c7e7292d4ff290d66d9d13abd8927997ec611f0
+EBUILD libcuefile-477-r1.ebuild 713 BLAKE2B 0a28a617f432e0e10f9dd02e56ad1df0f3513f1ac41aeaa81e93d3d9394f78e89629cb05bcbb73950814a236d8ef08911b9e1f19eeb8791c7c5c4769f687656d SHA512 a36d26af171304d9f031b74cea95c311bd270e8f33146ece6364a52c381cae408f1043db284aa6d7ee0eed33b495f49caf4952572b1b86bc14648328dbc35211
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild
index 750d0a43c2f8..39c396d77a76 100644
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 # svn export http://svn.musepack.net/libcuefile/trunk libcuefile-${PV}
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 2338f6b7d58a..553c849d68cc 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -1,4 +1,4 @@
 DIST ebu-loudness-test-setv05.zip 91631421 BLAKE2B 95a345b0700893ab96854c7563ecc9c667db30e8137352226d1f1ac7a666f6b08d1748d88ef11f72056d0a4bd513f365a1336de568ea45917a6ba9af5bc526ea SHA512 60d022fdac47ad0be2688411be9daecbff85da994d6fa4921bba6cffab841b081d8b15d9ce284ad2253efb686463450a84a0d19cb0bad7a934546cc52dd73771
 DIST libebur128-1.2.6.tar.gz 25890 BLAKE2B 8f497091d201f05efc02c423ac3e83e9d056c11ac0dd67cc89d43b7d50f1a28f22ea0f35d329e6f7c8e3df4fb1f245e729fcf7201bdf0c83477211f67472fd00 SHA512 ab188c6d32cd14613119258313a8a3fb1167b55501c9f5b6d3ba738d674bc58f24ac3034c23d9730ed8dc3e95a23619bfb81719e4c79807a9a16c1a5b3423582
-EBUILD libebur128-1.2.6.ebuild 969 BLAKE2B 402f95949ae670cae1c36437eed73eab85bb7372d46d6d259b6c496fa33a9c45b750198e67e9bcb7bb35d2d29acca7be4713a90fa307ab51e9c810990ba234b3 SHA512 84802dc24e51ca609d2c62fb652f399fa2e1a9ab7bd3158a212dd4842321901d2f67aaf8a3017e0cea30f110cec502e2cc99b7d000a67689529899e62954ff0b
+EBUILD libebur128-1.2.6.ebuild 950 BLAKE2B c8da5cb6d50c981f78a940be922ea83d4d3e29d37322babeae4e9ef5cf2ed4ffda0dbe325bf6ee60f410eac3b6351b96fe74b810a3a9ca56cc517b414ca110c0 SHA512 c8f9d7805b9e9c51072bcd0c381905c6c9bb3736a9d9304f3557be6ccbfd7a25f2d0132090e3a54fe17ac8af7b846b4ab89bf02992a391991ff51630a3b19b5a
 MISC metadata.xml 614 BLAKE2B 64b3dd9b7b0614a49e904c9c14e2ed32b817e5a6d8a1a952c3212891dc713a5b872ca139e300f19bddba05c71b1435050adecaaebc5ff336c90ee47eb179ade0 SHA512 796bf4fd1d66fb686e20b4b59fb073beadbe2779f3cdb71cc76e6089fe3794e113efe7e6b495e5476d844701718caa5bcdc567155820255f1fa7f13a909f0052
diff --git a/media-libs/libebur128/libebur128-1.2.6.ebuild b/media-libs/libebur128/libebur128-1.2.6.ebuild
index 54724f97b121..34207dba0884 100644
--- a/media-libs/libebur128/libebur128-1.2.6.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.6.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Library implementing the EBU R128 loudness standard"
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index cc320535618b..d9268b40cb21 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -3,5 +3,5 @@ AUX libharu-2.3.0-2-Avoid-issue-with-libtiff-duplicate-symbols.patch 2867 BLAKE2
 AUX libharu-2.3.0-3-cmake-fixes.patch 6376 BLAKE2B ec14be6aeda6e0e43a40bc2f1d41fcec4b601161cdcf1bdeff3e585bd78d6924aae322ffa5fe48f4fe221b1750b672ec7a80ba0a985368da4e5b00122b7d6617 SHA512 186d36b0b943c811e9fc34d448f58177914d2146a3df5cf8b12fe8c9fe7525046a7e53361052d308164cb99d4ec9a28341e4fe3b6cc69d6cb2c0ea03a49b0355
 AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 15988 BLAKE2B 6cbd9826317e6d1de126dfdcdd3508bfb6351c34cd58fda8f09fe44efead890d78c67f33750223cb2291312b2299ecf16f7b91e4e20a3024bb6007da96753f86 SHA512 94d1377e529d1d96941a90ac82276748f5bf7f0e248a6770d938394151e453aaa082c0d256c0de28f737e7e995bc0ee60a4eb5562aa450af1dfcc1733b403466
 DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
-EBUILD libharu-2.3.0-r2.ebuild 1001 BLAKE2B 9f04bc8a78562e064b218b416dc0cebbad3b6e2f986e484d373fea2daca824ed8d5daaec863795b50fb1eeb5d2aa1fa6ca79584ce7f55c5766e102bcb8ce6aa3 SHA512 82af022912c5bd3a56b1bc656a73502ff7c1ec2d1a60433e78acd00b199111557f4f14d599a0d81669637458cd120c750216e6fde2140bc78f7ecaf42f2f34fe
+EBUILD libharu-2.3.0-r2.ebuild 982 BLAKE2B a49f62832154f5aa2119ad88a27076c795f027dd9e9aa4dbed47c3573805a751af2c3b34a665363404fcf60b6d65f58d532a7326e3f8f160f88ec9850f185b0d SHA512 1f6857ad77257a1574336b0634f4875e9fa4a29e462f33cd53a8465050e4928cb1e72a42f4a260c5aec37b0f8becc5cf9a8525fe41ef1a4a07dd28c7a681dd5a
 MISC metadata.xml 876 BLAKE2B 213cc5850bde1baea0edbedc467ab6d18f7d4f0adabff481c53944a80c0be8de90632d69e4c94e6a304ae9ab85d790de1caeced2cbc52ae1041338f3090d1522 SHA512 608be6225defb9df5af413f0bb23b463a252bd2067ddeb77c4af46b856eb2e698bba684efe6825e47e4087c7123c0f03fead1b980d59fc7dd08d656da1650c49
diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r2.ebuild
index 5e6deb88198f..5e62094e2a17 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 MYP=RELEASE_${PV//./_}
 inherit cmake-multilib
 
diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index 7d04e05e46a1..2ca01d4d7697 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -1,6 +1,6 @@
 AUX libilbc-3.0.4-respect-CFLAGS.patch 1217 BLAKE2B 69e46ed5ee1f9ef082b54b6049d078dfa3a007d63b8d0a79c1f07dd8335eaa0402dcc08bc30c0bf8c9329b1244d638231c10fa46396a9c07cdcdab8539fa6c5a SHA512 7de1bb74f552dadccbe3a31c4a2cef7da7525fae47dc7e5d22c78e59604ac9e07e3f4123acc35e174dcf9fe25f4c7e3b6e51a092f77c4f604b23af1ed724cf4a
 AUX libilbc-3.0.4-support-ia64.patch 1149 BLAKE2B 46980a27938b121867aac4cd2aa2ce7f185367aceb4abfc188b18136afe78813b814ca73855671f210166b09857c3d56f8462b6dee29b1733eec8072fb58f574 SHA512 0e9c409ad067a3295ce9af2ba414dc86182a56dc4218b8281dad41592f3568cbfe0a805a9b6b81c485b8f1fb032ad23cbc830ed973ad43f4d274eb1d13e53b6e
 DIST libilbc-3.0.4.tar.gz 1307591 BLAKE2B a914b79c1134536f45910d367216b1ac27d4acb08f4c9b9dd3f01eaf181ecf0f6dc351b944039b05445217360a7e4b868b3aba9f8d6265eeee62a90ce0641a42 SHA512 2239a915263c2a73d83836354d42c670e4fe1173a38b3d1a9cef169778038ae5f4901d8202d6c5367d00db76e034e72bcdf6ac81bf0188f6a3f928e7d36d5a31
-EBUILD libilbc-3.0.4.ebuild 651 BLAKE2B 27a84ac0caaa29c1cc0c976597fb6ea437e005b160104a98cbdf0faa072f64b0ce605f615c2986127f3e1c4cc395e39148cb8a3836ca4686c4af5da2d6204811 SHA512 fad1eb24a6f5ace6372bdf0fd8dfecb059c9310c59cbabde567842504b17899d28ca4d11064d2b5c61be8a28d6914654ce016a8a012d7796e69df78d6f7e4fc7
-EBUILD libilbc-9999.ebuild 650 BLAKE2B 25147887f39b7c030752ca55ccd23e22ad7566ca3327ab16d6bfab9ce7e51682d13001e6ee3b7fd02958700deee0bd3e76e1547247e1024c2f75a60840e7f421 SHA512 611ba9e3295755d7716772318d247cdac45965afafbcd36835f78d80c26229c7ae03df0b9fb5cfbaec89be2a6d70ef1a5423e2d6449d39e51c0d4c6b07f2b6cf
+EBUILD libilbc-3.0.4.ebuild 632 BLAKE2B fcad9fd732a4144e35928e0d13969a9702934d200d1e1b9c9e770b3548c35361e0d940465c416322bf4b8af256f0a9a24969f0316c9e1ac05175b97d007de7bf SHA512 0f9a352953edc7256760dac375363ffc68727dc0d9a398fad00ef64940498043066f84b0c5d76c898f3a773322a5d145905670a4bd36b5ae89f98b9bf99d2bf1
+EBUILD libilbc-9999.ebuild 631 BLAKE2B 875af5d2386955b9445e2150821c46ae45d32343d288053fc09c0f213fd645b4c7bfdd7f8411e8bea3e634f5beb966bed4bccdc667d179668a3f9225429ddd56 SHA512 f6d90467afdc2f064aed0330a08ea82ba1660c4d9611c04bfcc066f3e5e8331b32162af8c19e2b6b8f0e451f3f995c155fafe25449f02806d1038e4f3186dc0d
 MISC metadata.xml 334 BLAKE2B 19ad02aa58d1a7550369d4cd79342a5c185f0c373359b1ce5b64614b8b40b5458d6f2e19a82ae520410cdd72774d145a474b599e3312fbd0adee9b1f6cc04258 SHA512 ff00ce6e5a637c2ba8e2794429df9e6d9d1142bf8f8f23ae658e4a8b8d7680a9e307a0a18c6d8e95481bdf5946fe7f62ef23012943cbc836cdbb6eea1950c17c
diff --git a/media-libs/libilbc/libilbc-3.0.4.ebuild b/media-libs/libilbc/libilbc-3.0.4.ebuild
index 13ec15608964..0dec75c32601 100644
--- a/media-libs/libilbc/libilbc-3.0.4.ebuild
+++ b/media-libs/libilbc/libilbc-3.0.4.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/media-libs/libilbc/libilbc-9999.ebuild b/media-libs/libilbc/libilbc-9999.ebuild
index afb3f5bc0e3c..1b5199a69506 100644
--- a/media-libs/libilbc/libilbc-9999.ebuild
+++ b/media-libs/libilbc/libilbc-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 34cf02bc7b8a..b76d98595384 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,9 +1,7 @@
 AUX libjpeg-turbo-2.1.1-arm64-relro.patch 679 BLAKE2B f6ea6f311cc05ff960d76cdc49afc1d14bf4d638052d1f6007defe239757002ecad18823d706a2e5f5e51245a2447c237c97daf0862e2e1889c751b52f3890b7 SHA512 56ef2f905fe54921618a0c4f79de67cf74070d1ee595d3b4b41f19b33e23701d8045b250b28b8c53b1bd8911f4179dd3b1594a5e85ac9dbce8c869feef1ad124
-DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673
 DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c SHA512 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d
 DIST libjpeg-turbo-2.1.4.tar.gz 2261822 BLAKE2B 80ffd77d58a37eae0bdc1868d994f34ea52c13e2624c720b1d0b6ec4d6d14b16911163ccd4009c8d6eda214f31e1fff78bb7eb4739ae6589d0fd8c7008c0e972 SHA512 511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
-EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3248 BLAKE2B a2b9fcc4939e064ebb0f73875ce3a4cfa5e3233c0c8125905f66f8f76320fda29cd4ad4c0c08b66844dc7f36e9bce696ece323798c897c7e03243a8982e9117e SHA512 aa15cb2b8f08cd54d590a8ac76d3eb8b512ad8c62235a239cf36fda55f818a71462834b7e3579f4becc8269e2b3bccdbd6f6f809305fb2f6578587e03338a416
 EBUILD libjpeg-turbo-2.1.3.ebuild 3179 BLAKE2B 37956145b92842e3cb754c968795a83f5b9659c72f649226f2ee2ea0a766cc0bfd6f16e17ef7c83b3be82533acc6704f0a023e98ad3fd83ca4245c7e012c20ce SHA512 88bb60999672df2157f40db5e30398f0bd0e040ffb53bc9184d6eadf88412a5d4d6124ddbe29edbcce249ff710eb6020a4afed10d1146a31c13248cd6d49a2e5
 EBUILD libjpeg-turbo-2.1.4.ebuild 3172 BLAKE2B f158f2b3b3951f45e591778d5f07455ff57ef70cee49fc7faf87325b9d7cb94294628e4491ce5470d7174ebd322bf9ddc208d2f87ba11ab524d2560ecfcf780d SHA512 a0329a6c49cea2e572ed1e55c5a8ba8f29cdf5cbc9635dd03487c98b66efb5be7db706ae0ffa9c1f474570700fd5b53fbcab3a38e26ad0b7842a9cbd398ef98c
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
deleted file mode 100644
index 01c7c9afcbea..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG ZLIB"
-SLOT="0/0.2"
-if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="cpu_flags_arm_neon java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-
-COMMON_DEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-
-BDEPEND=">=dev-util/cmake-3.16.5
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:*[-headless-awt] )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-PATCHES=(
-	# Upstream patch
-	"${FILESDIR}"/${P}-arm64-relro.patch
-)
-
-src_prepare() {
-	local FILE
-	ln -snf ../debian/extra/*.c . || die
-
-	for FILE in ../debian/extra/*.c; do
-		FILE=${FILE##*/}
-		cat >> CMakeLists.txt <<EOF || die
-add_executable(${FILE%.c} ${FILE})
-install(TARGETS ${FILE%.c})
-EOF
-	done
-
-	for FILE in ../debian/extra/exifautotran; do
-		cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
-EOF
-	done
-
-	for FILE in ../debian/extra/*.[0-9]*; do
-		cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
-EOF
-	done
-
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && use java ; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DWITH_JAVA="$(multilib_native_usex java)"
-		-DWITH_MEM_SRCDST=ON
-	)
-
-	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810
-	if use arm; then
-		mycmakeargs+=(
-			-DWITH_SIMD:BOOL=$(usex cpu_flags_arm_neon ON OFF)
-		)
-	fi
-
-	# mostly for Prefix, ensure that we use our yasm if installed and
-	# not pick up host-provided nasm
-	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
-		mycmakeargs+=(
-			-DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	if multilib_is_native_abi && use java ; then
-		rm -rf "${ED}"/usr/classes || die
-		java-pkg_dojar java/turbojpeg.jar
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	local -a DOCS=( README.md ChangeLog.md )
-	einstalldocs
-
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-
-	docinto html
-	dodoc -r "${S}"/doc/html/.
-
-	if use java; then
-		docinto html/java
-		dodoc -r "${S}"/java/doc/.
-		newdoc "${S}"/java/README README.java
-	fi
-}
diff --git a/media-libs/libldac/Manifest b/media-libs/libldac/Manifest
index 07618597260a..4037182e36f5 100644
--- a/media-libs/libldac/Manifest
+++ b/media-libs/libldac/Manifest
@@ -1,3 +1,3 @@
 DIST ldacBT-2.0.2.3.tar.gz 75708 BLAKE2B 9f9ec1aa8a9603927067cd01058745db615a89652d16e870d9eb0a4db270a4076b7bb70ba091948249969087e5b26b86e22656314e3d26e43311fae982472347 SHA512 0e42723a1e7d748b28b13d73823fd5378a64100d5e27ae90cf3214494f3e199c526e219efd1329b2ec2b3195e1a6b3c98c8210ab7e4e6b98077199ef0f64c02e
-EBUILD libldac-2.0.2.3-r1.ebuild 695 BLAKE2B bd3fe04a8bc31af08607cc42dcc485867297a17f4c16732505e9740e3a4f8a72f73b4230ffe3d216953d9007b1d58164dffc273008116c4ec02fe395776955fa SHA512 951ed4eab2b886af2ca93d944bbe8e226165845b899a5b3c34b8c413e76294ac4924c6cc477c41339e46c09fcfac330e7461caf75fc77525956c8eafa3376879
+EBUILD libldac-2.0.2.3-r1.ebuild 676 BLAKE2B f24d0a03a15588f63453dff56188fd3332622f6bb9b71e1eb3b3c39474b868f8ed501d75079c69aeca9d53ae93e202188a0a1b0f3eccf566b1a30bbe3f20056d SHA512 d78ce8c438f0f6e3396beec28ada1380b6425108fd472d8e9b1433fe5200a595558e08b1043fa03bd15e31dac3c7aa35aee93f77e5f7ebe4427effcfcb966188
 MISC metadata.xml 295 BLAKE2B 23ffbd8cccd6184716f9d45199f0aeefb4c8629b2b75b0205ee7b76ef4851eabccd9e912f5612a58cd5cc9cc7582d3154efa19a6c3391fbde03b335f81e098a8 SHA512 dff2d678a578497377ce964d374e5690721cf1cf9aa8955ecdfd5acde1a00b987b67b22b78b782b3d9350f01611b81d816f88d00ecd3d00375afe586858c570d
diff --git a/media-libs/libldac/libldac-2.0.2.3-r1.ebuild b/media-libs/libldac/libldac-2.0.2.3-r1.ebuild
index 17ec26c64b25..92d8748f55d1 100644
--- a/media-libs/libldac/libldac-2.0.2.3-r1.ebuild
+++ b/media-libs/libldac/libldac-2.0.2.3-r1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="LDAC codec library from AOSP"
diff --git a/media-libs/libopenglrecorder/Manifest b/media-libs/libopenglrecorder/Manifest
index 802e03630e3c..41cb64ecb886 100644
--- a/media-libs/libopenglrecorder/Manifest
+++ b/media-libs/libopenglrecorder/Manifest
@@ -1,3 +1,3 @@
 DIST libopenglrecorder-0.1.0.tar.gz 101788 BLAKE2B 9fbd9e5acb51c033f533166cf4f55863d97331ca0d506ada7f0e2ffaf790a20b74521668d80dfe4ef230a6bf44466b5f5eda9ab6d4a248db730b0596ce441f6f SHA512 2264b5999870d89ab10366bbbbccfce8ef7c2674bb054005f4e182af2cb10c7553f97402feadc528da94608a47db030a07987b11470044965d70cd69fe47bacd
-EBUILD libopenglrecorder-0.1.0.ebuild 1059 BLAKE2B 748af373624b47c5248dfe9d4eb1e2011123941710de4a0130c16b72002ad7866332fba6987e31a6eb63f2e6d3275691b3d8c56953618d921ce9adf591aa7416 SHA512 68bf6742f794a4b99b06246d26815977888b57631e509e58df1a6c9fef6732231024bfbcae8d243bd16027e2a18920e6078337a68c6679fd1400712e1fb7aca4
+EBUILD libopenglrecorder-0.1.0.ebuild 1040 BLAKE2B 4d4ce9be202aacfcd79e9f8b84631c1d78aa744f56fb0fd1cc9944e1ac64541a637acc740e63d570a7732d6799c4a6890940899f227c1bbde0d60fcb1474953d SHA512 405b0c829f59b80946ac5fca4535306b8dce8aa278819bc29123fe1fffdcc9b77bfa5ed59e7d1c326979bd4eb1d5b1e4c5b86f3a96e77c0d5be20b4cbe70da24
 MISC metadata.xml 534 BLAKE2B fb4423d572a991646d58a54f01910e793b32cdb1a209e54b519b42d8e9853479f62ec555ba3433e15f59590d9722acccf845cac27764b67d52682651b82cc726 SHA512 e03b8a63f4b69c90906afa34ab3c34b0c97426ef9c48c1035c355f80561e1bedbc9ff2eb68e290510bfedd1af7c873063e96f9aacf73f0bc8729c1a9a4072b1c
diff --git a/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild b/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
index ef6bda5c4bb8..0c1fc012d18a 100644
--- a/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
+++ b/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Library for asynchronous OpenGL recording with audio"
diff --git a/media-libs/libreplaygain/Manifest b/media-libs/libreplaygain/Manifest
index 5e6bf76c115f..6bb1ab895da9 100644
--- a/media-libs/libreplaygain/Manifest
+++ b/media-libs/libreplaygain/Manifest
@@ -1,4 +1,4 @@
 AUX libreplaygain-static-libs.patch 1145 BLAKE2B e90da6268c258998ed333cbc89918f62f0cb2d5454c98af700cf6b9b3d62d780e4e4ce931f9d5bfff4a74cce8770c308525b895b3de163725cb8fd07445cd330 SHA512 738b50523dd527781fa7f1df1bf3f0ffe26925684ab3ae1b14b1c7cac9e150384deceab0de70c05cda474f4e3781c83ff0335255471c92dc06edfdfef330e898
 DIST libreplaygain-477.tar.xz 8272 BLAKE2B 6382984643aad155b3e5e0dac8a7ca698320068c62fa87ac7f466e34e850f05df1e823d87f7cb477bd22f59c97f7e5ac8757e9bd6f59c2f5f1852efe9f083d72 SHA512 9e81deb237e35e63d67efabcbfe40f5a6fd34f4a6b0239a21e6ab8ba3c9ca172297cf323fbc4ada749dcfcdf0b711c354e39f12af9a9576900384c441657ff8e
-EBUILD libreplaygain-477-r1.ebuild 834 BLAKE2B 91e5c59d09fe0ee658d770b5c2da7a7329147120d721d39f9298fb8ae68f9b82b9a8b54ec276f0879c6f0c15e1609e11c9c7b8bcb70348559d981064bbe0b7f8 SHA512 09d42938b4356e01f4c151b4bd80bccc4f56067b4a6ddd2002bd7073e0fa5b8f3ea08e2b35fd1c0332d8a1716d96c732628b58300224eb55f95fd87e21d9c4c9
+EBUILD libreplaygain-477-r1.ebuild 815 BLAKE2B 3b4049bc86b31dc2f87a0cd8b89c450899bc1e21741e15560677364d33f0f191a51029c9ac6c911b7369c31e97c257b25df66dfa3c14054ae35bfa52c17351b5 SHA512 7f2e87a4e810243c659b4a32d8aecd9de31d162fa4605d1a12e6bf2231623f33cd1f0c6e9cf893f70b1e88e18f9231ddd827d4b6b3b0a4887d5d8612c7338081
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
index fd24c1040b4f..9fd946d226ac 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 # svn export http://svn.musepack.net/libreplaygain libreplaygain-${PV}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 89bec6b1a114..b62a2c0cbf10 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -12,6 +12,6 @@ DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 4a020824688e379f1d127fb834b000
 DIST opencv-4.6.0.tar.gz 90208971 BLAKE2B f01a907eb4a54fc0795293f1a28bbf3af5a3d237293293f6ef5275646207d48b3d634b2d91e7011407176405b60c7e4383076e520ceb56f92b09c36e97333148 SHA512 93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46
 DIST opencv-4.6.0_contrib.tar.gz 59667769 BLAKE2B 26b454436d943d7955194fd21ad29efc417d5c873fa19a6a200beb319cd75c6ec5766734c478fcd55745a7c200ffdaa92e7b1821f13810bb9d181d263f8fc6da SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-4.5.5-r2.ebuild 21346 BLAKE2B 5c06a61e789705db0514f638101bd90c02048844876fd24f852b8eb67ccffffc2cb58793211b4f4debbe792dd11f4103c0c005219ae0223b3c8ff0596fa85cc2 SHA512 bf23a8b8a2bea4215efe475d8ad3acf973d16a343cb90c20f1e1c6ce34c644a7b98eb0f8acd077baf5591ad73afeba85f49c2da1a1f8eebc968f43ce364044f7
+EBUILD opencv-4.5.5-r2.ebuild 21327 BLAKE2B 3a9388932879709212610503a574b38b546bb534048c66e98f478fd8cebae11cf39b44ef856fb3bf4bccd51c2d579f95ec63079b353f3c466e572d04cc1e8e16 SHA512 d43f970665ff6861f14665e0b1541b2d86b0b5cf4277459209e75e0e43dc76373d160394ad204c8a964833c27a1a95a50a5c1a1df8299f5f696c13de84cd8ad5
 EBUILD opencv-4.6.0-r2.ebuild 21143 BLAKE2B e3902897ca5eb8f2857e8cb31732d05c17f8b5bab963d4f771ff2a6c554b320cdd1a5d3f4ce2ef82497510b4f9005a663ad3fac7508fe27508a943b14b54b42b SHA512 83822a0ea21787514005f004ef1254a8720c8fb385c26ad7a5cd612feb895fa7f1befb68a8f3ef6bccb0df00a9c8083dc5796851126a65ffd273784d18c6cf2e
 MISC metadata.xml 3110 BLAKE2B 56215511d99a98894fdb70f5db8423b307b4a487acbc88a836a78cf48e249015856e33b85ce741a4cde9d55fbf8d653d1197a9a4abb692284ab03457e14453ff SHA512 93df09d61b5be54d8d14ec15a3274326db1bd7de9cc56c876d788d5e5d94b62de311b30cb46a9d864f3c8b0974c5a9e59418519de7a9d28666ffee33572bab23
diff --git a/media-libs/opencv/opencv-4.5.5-r2.ebuild b/media-libs/opencv/opencv-4.5.5-r2.ebuild
index 3685fb5fc3c5..beebe9a9313f 100644
--- a/media-libs/opencv/opencv-4.5.5-r2.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r2.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-CMAKE_ECLASS=cmake
 inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
 
 DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
diff --git a/media-libs/soxr/Manifest b/media-libs/soxr/Manifest
index 330d38f3b533..985902b4df9b 100644
--- a/media-libs/soxr/Manifest
+++ b/media-libs/soxr/Manifest
@@ -1,5 +1,5 @@
 AUX soxr-0.1.1-nodoc.patch 480 BLAKE2B e7e31df74004b58e584964eed26acb18717faa912fa5eae84d03a62f40d2260e039595c33518ff6fdcf2c5db7fe0bc7f73680bc64418e387ff30f2488d0ebae1 SHA512 6c585eacc6919bfe6f158f1ab45fe5dd0b3a0b3f534ff5d2f5e07e3e8e505a7c7da3bb16d2d4b6dc2f0a361190bd21639f74ae09abd3e0209b33ae2174726017
 AUX soxr-0.1.3-fix-pkgconfig.patch 595 BLAKE2B f35e4c8ca382db0d05b9c50c3a02c568befc1dbf671fb503c610f2b4fa05dd7361d6b8184aeb4be050d224bc534e87ae760130e1e3ce1c36e6042ff4208411fe SHA512 45206a00747d387e4bec62edf93e9fa19b04096240f567773070b7c87667713ca7bcfea2e2df665f128b6b4d4c53fdb87571bdf018e2066ff6e6acf39870b762
 DIST soxr-0.1.3-Source.tar.xz 94384 BLAKE2B 5b7078f71404b9ef83917dcabc0c99cf17fd625d3e033d1b934382a7b60e55e359931a6ab53f8adaf955c0d811d6cbf231cd6a226549560b3506a3867e845607 SHA512 f4883ed298d5650399283238aac3dbe78d605b988246bea51fa343d4a8ce5ce97c6e143f6c3f50a3ff81795d9c19e7a07217c586d4020f6ced102aceac46aaa8
-EBUILD soxr-0.1.3-r1.ebuild 1099 BLAKE2B 278af4319f9566aecb3c3d894d528d72d1e41eb5b124606f618f5947072d4ad57bc736aeeb078d1b0695d463e87728a3581a384c513bc4787cc4ad1eecef2c23 SHA512 db0f6c3739e3b6d8311e2231b3d2fc225972297628992798a4d21c5b61636007e950feb6abfa0545dd12c1479b176d77b7971781dc19ff2063a1c1d129692cb6
+EBUILD soxr-0.1.3-r1.ebuild 1080 BLAKE2B ad506203d2a374a092d60ccd7e62bd2b4ba709e804231b982a09fa21edf223c09691fc539f9512d590b673565afa3b4442160d29215a35d67ffe2a2964f15ae3 SHA512 8abf10b8a09a2fdb610772d2ae14da6a34532936d865746a8c7cc0e779f97de9568925a96ec81d159ed8e5ceccbe90097d0e9cd933fd60d43622fbf931dee31e
 MISC metadata.xml 338 BLAKE2B 610b19531a091e9f9ceb02380ecf472d437cc8887c9760779b98809c13b8135d8402119d2baf334c97d695fec4b683dd2ea027122b1c20909b4c2014f8e7feff SHA512 d72bc9a073d082d8e56ae0a2792d48b2a3e919c4194d8738e83f66adafafd144aaf9ebb16d337edffaf4388aa20bcbf789ba9a6d869382a3cc43111fc218f426
diff --git a/media-libs/soxr/soxr-0.1.3-r1.ebuild b/media-libs/soxr/soxr-0.1.3-r1.ebuild
index 651d5c18da8c..c90a71ea99a2 100644
--- a/media-libs/soxr/soxr-0.1.3-r1.ebuild
+++ b/media-libs/soxr/soxr-0.1.3-r1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 MY_P="${P}-Source"
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 2774910d2b45..b277b536415c 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,4 +1,4 @@
 AUX taglib-1.12-cmake.patch 18074 BLAKE2B f4f9dedd614d7bb2f981f7e4e8dc0b257847e9627e1fdc24d85a615cac7d894402b6901e39297a5a9473d9b1eecb6bc0be6183950abc3196245c1c8921f930aa SHA512 2003f02a843c3982c7c50db77bbda9ca75c36f25a371df03cca5139bd78e2efd7b083672bb06c5f9b0d114253fdaf6adeb995304877ff84085d8d1b07ef2c779
 DIST taglib-1.12.tar.gz 1364231 BLAKE2B 414a61a302fbdd1af8dae70fcec96311023d3ef85a659b8dc598c8c73cf31142b4a254c843f4d415eff0fda84e62e18f1bb63921f1868400990f023aa01b1a41 SHA512 63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6
-EBUILD taglib-1.12.ebuild 1308 BLAKE2B 9aaf0784352acb4477b4f7fbd8cfb303371516f132133c3584ea683faeed6771f4a1e0a6b1e19b728ffa91eb3d08c226c6dd98a248c84826743d5376904c7c00 SHA512 34701c9ba2d82601b530f3accf8bb2a9a5b30213bcee41110f3753a1cf18b735dcb6e48eb96ab80a7c6b5e62fcefaaf0c4507a09634c3fd9578312d742b4e850
+EBUILD taglib-1.12.ebuild 1289 BLAKE2B e13628a06db53095e5433f2c05f8956cc2cadfdfd75e15d5e8860f9d70625225c7bd19198e10f075177975286a7361f4e3d61c08b9cf1cdc12942caf634e5708 SHA512 2bb8a166bb244835b257cd8aff9514a836df62d0068391a1dd9c9e62d853c4983bacc66da2c03bc2a176e8e826c55c191e74835b21b86a4bce579c86b0a7998b
 MISC metadata.xml 328 BLAKE2B 47bc8baf9408ca27fcea9e5c0d2583418941688f90009187bda42a24d7328b624f5a111e43f49df8bd49e115bb4a9211f9739e3ae94400c68288728b30153188 SHA512 43f4be054032ddab6493db659bd59443dfb5465e76a58d5a0dcd39061c3d1353a08633bfca75897c0993a878b5f4b1449f660b7848d3f613286293176499470c
diff --git a/media-libs/taglib/taglib-1.12.ebuild b/media-libs/taglib/taglib-1.12.ebuild
index 428db82d776f..379bca96fce5 100644
--- a/media-libs/taglib/taglib-1.12.ebuild
+++ b/media-libs/taglib/taglib-1.12.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Library for reading and editing audio meta data"
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index 508086d2a0b8..1a7dec988c86 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -2,6 +2,6 @@ AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLA
 AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
 AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r2.ebuild 1866 BLAKE2B 54729dbe330533f432076a764851917aa96d7603f923ec06585b091d5f2b2e5670c39b996c832ddc45ecf9a1007f32b4238a9703a31090de147d61d5366d74d9 SHA512 e8d2e7372a74fa51b6ef70af42df70a567c7148284a681871b0daed6360690564aa71a80b7ab312ff3ef9bd156fbc5a86b230f0b78dd53b5db9b7165fbf4d9cc
-EBUILD vidstab-9999.ebuild 1622 BLAKE2B cd7eef31d047d909afe539bfb5d4addc1023eaff0af40114076b01d47099908d5767850f179f31e5e5632c0f21a8e642728f19f6e5965778e5f859760ea8f799 SHA512 ca8753e33dd9a37c9d7fdbb23ac9d7425fdb68ca694204bda1323b16f064936832b32651b759b8f4a212f8ce48f09d664a2323099fc7e4f1a2cd1ec4408215d9
+EBUILD vidstab-1.1.0-r2.ebuild 1847 BLAKE2B 4ca7f7f3c3571f36c6fb5ea242a75a5f737dfb95de79b393be5fd7e0a09992dba56f84640e750f7033fd62a7d69ad08926c2b00fc6d139706bf21916c9f4cce1 SHA512 e5d96542d2cf373cdb5a5b3b10c8ea9c10fa5f372555b03df71ad89b8dc57df967f6c33758ee7efdcd880eccde81348309f1e7d2945c691fefb3baa837a522de
+EBUILD vidstab-9999.ebuild 1603 BLAKE2B b3f41c2cc1ca3fe9e003950fc1ef16700a96fec8951dba9778862f6fd5666ad265108a64e457b6167d04b6bd987389958215a81d3428029126a48e8c6f001f87 SHA512 678dacbb18f044241acf2511b181ea3c67e0d54306e0ee3fce281a4501f2e244c2c1946a2d11fa652ffd59117fa7e40116b8a0c53858a7737d7ba946fcda3c79
 MISC metadata.xml 615 BLAKE2B 9260db65c08e6d6284fff960a229259d5d62672b5014697e0503a39f7e48b82955396fec6f608611306b2c586a39532fc61ebde8fe06ad0e9fb8c150f6d914f7 SHA512 8ffb575f589d09954230457a7d7b100a6f5fa9886a0a99bfb6813c0174c74817a3670957b09afedeaf9afe74451e8dd8da55bd1eb6d6fce36c655bce14fb21ac
diff --git a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
index 10d1d124b60d..0c7fbce76b7c 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib toolchain-funcs
 
 DESCRIPTION="Video stabilization library"
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
index 09028637d1da..2f0351785041 100644
--- a/media-libs/vidstab/vidstab-9999.ebuild
+++ b/media-libs/vidstab/vidstab-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib toolchain-funcs
 
 DESCRIPTION="Video stabilization library"
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 3072c0df66b3..b525282349a1 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-layers-1.3.216.tar.gz 4036109 BLAKE2B 03772c0c34fb531366ad3f0e5610c21af013ed05b50f37eee20220385f3525f5a3ae0fcca5ab28b1cc0650057faf7a22db3f17b22187e09ddad7bd8425903ce4 SHA512 c3e3f44ddec4a440c759a5773cf8cabdb79e35152fd912b75ba7ef80126184fab7d0cd93e55e6f0a1b3fa5379295bf60dd21cbba97b3c24e753cd7b6ccb78f72
-EBUILD vulkan-layers-1.3.216.ebuild 1516 BLAKE2B a35ff1d9040ff0590fff177803333305d4e9eb8d900122f6905fab780ecc3c16384a552db5573e2409bdb95aba2537e7656c376672d2a3f1eed54efb5ec4d7ef SHA512 717cbd44b55ce4db5f04353c3812635548550584ffe33cc4e7fed30351be1e1b17f1383cff2793b45e3e1caf1356aa145bdfa2c1955a338bb7f5ba38541c584d
-EBUILD vulkan-layers-9999.ebuild 1587 BLAKE2B 6b75f50a21271f2fcf704616f35c5d8e07991cc3c14fd45bcc69d365ca90295a971f53be4479d8a75aeec06186760e8bfeda8ec30dac87e23bfabd3afc81b434 SHA512 143e71edcc9eb2fa307967b2739517925b1037f29c52bc77f1efd0536b4d78fa34dfdc6855da8fcbe9574610b8778e23edab04a6419e723395fced26a2dafb8e
+EBUILD vulkan-layers-1.3.216.ebuild 1495 BLAKE2B 36a564ae87d74cea6ccb1290799061ccf719377d489c74489fcfb92583956d3b0fc833212fc96d14384e08497ac887ff57be74d27ffadbcdb1202ce10d40bb23 SHA512 f5c8bb61e30baa93fe96fba65b60f6dec4116610ca1ccb85e53b8f31129a333d22d2ef6ccaef7581e6be62832923aba81b9230a2a1be64e258563a315e3f2999
+EBUILD vulkan-layers-9999.ebuild 1566 BLAKE2B fc055c417e7418009316fba9c9528b6238bb4aa66d98169a7f85d14399130a69821780f51c0998291c454d35366ae315368b576fe30c4a3568bbcf6f655215e7 SHA512 d8e30d5336fa269f029a78f4d2aa90dddcc75fed1465b398e6e04d992e046d31c2249e0c4876aecd47b82cd51d5b5860b753de8302f3168e9c30f11aef137114
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.216.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.216.ebuild
index 184ab1935455..2de51b8d228d 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.216.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.216.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake-multilib python-any-r1
 
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 83b3fca4460a..c71475bdd661 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake-multilib python-any-r1
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 598d1492778f..0fef38eae5b8 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,4 @@
 DIST vulkan-loader-1.3.216.tar.gz 1587902 BLAKE2B e51b3b2d49b2beb6272988d7a821dcbadd6e0c162a258c214dafe52b9ea041ad1e1bc014a72a86f2212c97ae5f6fd635fc649311c1437b7ffd110b02c7b8218e SHA512 92e2de415ae4e94b8c02abf77bbb41d2887c2fee6bb4fee75415bbaf7161cef2bfe245665acc47027ae08706a83e8aeb01656ded3d337252b5c84852ca94c9cc
-EBUILD vulkan-loader-1.3.216.ebuild 1743 BLAKE2B 8db3c4289c8cfc3cbaa5586c4586f2d2edd5005bcf01961f0614c91059facf6bc81980bff9180ddf60af9e5bed5cdd834081f515b2a97a92d6f0ebc89627e57e SHA512 ae4d132806a13aa80dccb88533c2701df68f1ae5880afb44525fdeebb494b8a51db08cb495c1b1f518f3f54aec131cfb2f16164407a8095857764067563dc93a
-EBUILD vulkan-loader-9999.ebuild 1773 BLAKE2B 700b68c6ba62da787c7749fdb7e7f959bb1bab344f8faf36f443a017a91d13fde0fa0e0a47ba19aaa4b892f93328ac655313c059de83c1886e6a97d6c1ccaa7e SHA512 c5d27b2dcafa1976cb6fc7ba6371b8d71480acb5cfe262a4b1009e978c0e6d189659902517a4d982259771061552ff2d8aacc444d597802857652d7da95a19d5
+EBUILD vulkan-loader-1.3.216.ebuild 1722 BLAKE2B c63c31356baef1b2a547f183d4be776b8c8826426b7ada3d2b17dd9583936f102917fbb082b398c929bdc54b87e01749308996ddf8ec80ac9efd6785c2b15eea SHA512 27b112a05d865d20cdd766fb46395967ee22966bfb481194636c340a8657bebc77f696d4d5a826d9b212c4ae6a1612ecc4e357634b4b4174269ac402665af89f
+EBUILD vulkan-loader-9999.ebuild 1752 BLAKE2B b388bec1cfcb652262cd3da49722be05f8905a251949e8a69dca7dd29562bc77c1cd0dd95b1c100b7e30a6f242e88283bc1c159df284886fdd91052e4bfc059d SHA512 2a7b8d50a8317dd4ea7c454ccd5aefc3995f49a2e1c794161331c7fc8277d7dbe64b8ffcee3acc7b49675c9fe44994c91063527696aae137a52b59f3978d8ec3
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.216.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.216.ebuild
index a85ab251c074..e20950a2937c 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.216.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.216.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
 inherit flag-o-matic cmake-multilib toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index e15e388008d8..6c8c92090b8c 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
 inherit flag-o-matic cmake-multilib toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then