gentoo auto-resync : 15:08:2022 - 20:28:49

author: V3n3RiX <venerix@koprulu.sector> 2022-08-15 20:28:49 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-15 20:28:49 +0100
commit: 7255c5d5fcd8fcdd07d2791563dc43bf4e14cf3a (patch)
tree: 515e0e28ee6d81ce42725bd00b369ea0c1130d91 /media-libs
parent: 1c3adf43f1b866276828623dd63f9e10d29421d3 (diff)
27 files changed, 16 insertions, 1589 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index d4dfc0e12d98..42005ec2f341 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 2f6d9aec7c7b..2d9118291ff4 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,4 +1,4 @@
 AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e554fa65342c4c364ba51f13717c3c96806417cc7ae814a34a59137da3a93c442cc436bfe7f4330f0a537ba7ed9579a45a4b8c986b443fdfab3fcb42f2 SHA512 06318e4c019fd02c49f7e3c2cf0ecbf0701ee625607763709b010984fa96f2681e19955ad0538397ac9ee3c1a514840f84423b0fe98bafad5e399c43e619175b
 DIST ilmbase-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
-EBUILD ilmbase-2.5.8.ebuild 1128 BLAKE2B 6f808706804ba9b0cc2f9c07bf35be288708c5d10760a728981d01c1a33befcb108d1eab45060c1fec2361d7aa53f7bed07a063e871da803621ef378b950cd6d SHA512 8c20aee265f5b13427089d8b34e36acda58051c64c34c79e0bb3fee7111ca4af45fd8ee6ad7ed73415c78d089f8b8f287ddca66fcd09e2eefc57ef0bfedbee37
+EBUILD ilmbase-2.5.8.ebuild 1089 BLAKE2B db71f0e4c48d85ec0e36fd31b89d0483a61bfacbef8867f6e3ad0dcdbd3e3f96992913063edf750c17c219c06faaa8bfb7b35fb78306dc5f9fa92eb2deebf99b SHA512 87a06b2ef17431530742c05b34d2475f8658fa8e82f571deb973389ca773f48f1e69258c882b3a9d67308e2dc017b50a36a2f01cbdd5e8ba550991805e5f8177
 MISC metadata.xml 692 BLAKE2B 7127a8f7a09d330611b53333d304a65edc9e97ed0d64ee8c0be87ce14c072f2f58507a84800f0ad1191ff2307b97401611aae00f3406bb197ef08294e2cd4639 SHA512 ab1157b16c56c47ae496b12da23f08670bfcae120a00b6c37f5d93cf82fc6981c7f054dd945a67cff17c8c282a4a3e45dc8924cd2ccce78ba6e232f24fa16c99
diff --git a/media-libs/ilmbase/ilmbase-2.5.8.ebuild b/media-libs/ilmbase/ilmbase-2.5.8.ebuild
index a618fb62ce6e..d83f6bdb4e57 100644
--- a/media-libs/ilmbase/ilmbase-2.5.8.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.8.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="OpenEXR ILM Base libraries"
@@ -18,7 +17,6 @@ IUSE="large-stack static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!media-libs/openexr:3"
-DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 DOCS=( README.md )
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 705ca4ca835c..8329fb13ab81 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
 AUX libepoxy-1.5.10-use-opengl.pc-without-x.patch 590 BLAKE2B cef810cccd2133045a60bb5d6e812f048402f1ad65b3befaca34b14950df60b5b7fa732de09eec1a998782ecf846d6863432713b62a29ee6b6ed25b1c2e1cd77 SHA512 567e3f838e62fb607e3cb4f15a5694ffe2407f575acfc1198b15f042fdaef333a05cd3dda28204fad8224967da13c62d87d2ea073c38f1f239d9e0ac7d520dd7
 DIST libepoxy-1.5.10.tar.gz 332078 BLAKE2B d56b45a8fc38901fdb23c50b569a667fce8ca289103a8d7ca19f96a76c75d3c2ff9d6959ed2ed47bd64806add95dafe42dc85dfc5bc60af14b5500b70070e008 SHA512 6786f31c6e2865e68a90eb912900a86bf56fd3df4d78a477356886ac3b6ef52ac887b9c7a77aa027525f868ae9e88b12e5927ba56069c2e115acd631fca3abee
-EBUILD libepoxy-1.5.10-r1.ebuild 1142 BLAKE2B 2cd6b225f078890628fb496f21e918b7dbaa853a4c5b39cab0b38f455396aa4dba18c178cb8cef25110ea51a2f266b2e6375c9e52304d444e88533f8090abc3e SHA512 c203f00be150d37779f5fe44c87afa9f95308e3759a42b75e1312c604446cfc69e8921b4fe722cbe0bdabb7ffdd75b421c358260c0c15c60c6954b6e80afeebb
+EBUILD libepoxy-1.5.10-r1.ebuild 1140 BLAKE2B e457edd5308070bc6479d86402fe54ea880f9e7f95876a2c4347fb23711f64139aa71bba344eba73bb2999ba9331b875bb29ebae99493498ded39ef52966628e SHA512 5207b27f4f6c3f5cb10bc8b0c84580d88062346eded98a5739700cfd8ec708de8c106ff3fadcb3da59c3f052c78742cd07144a9bc6ffd07a72b92bea7aa1feed
 EBUILD libepoxy-1.5.10.ebuild 1063 BLAKE2B e2cac5cdf0595fd42a33dedf9a04863839187903a36cfb2ea4c414ff0b656b90e73f73db5efcf0029dab2f71cc5f1c000ed75a712bc456ffc42fec9dca0370b5 SHA512 0e4ef5e9214a06e07c3b623f8050a4c8d0617017a1196eb9734e4855a2352650f9496b1f91fcfaf25c317493952c2a5945ab52a27ab1f8ae0a0c01f112de9352
 EBUILD libepoxy-9999.ebuild 1144 BLAKE2B 0b703da689f81eb822d90fc5d1e63f59101270890699cb092253d81960b43c6f0cde1227585738b2c63885cac34a58b95a0a04ded2183f193a1159df1617aa8e SHA512 3fc05fd42d2918abdc782c16367f2d6b7cb7a5884b66a6d93201a9e79742b78abda4bfe4bf5345e1265f0b6f1d5087430b0fc673fe54c44d2a3099f504385220
 MISC metadata.xml 376 BLAKE2B 980a035e0ac8a5a3126ee27c032e8f14353ca5e7f2920769b74a23aa827a1110ff8f55a49a1f3072889ea1fed9f76f39bb3c2fddc6f6e2e736773c961ea4be3b SHA512 d1b9e9349929118e39201157b34e7955b32301ceaea877025fdf929d1039af536618eec5a9b0c638622c390201cd4d3106d981f884cf0c1c6469534fa65797af
diff --git a/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
index e8328735b69c..aff915cb5ea2 100644
--- a/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 7087e8447d2f..2d2bfc6e0b83 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST libgphoto2-2.5.29.tar.xz 5875684 BLAKE2B a0bc48b95ecff3c7f157b7baee18bc3ad86d376c9adc6f7eedd2f8cea40434cc97598cad49ebc1e4683492f9eb3e5b3494de3112bb740d2ccd8e2c55cf4ff1ed SHA512 f8e3dbea58fa6f19a100ee319d5561387a54e8701a19d034bc7d6fe474dc6e4f21fccc4b6c11346df4fdc811666d49ea0b9a2b5b67aab00acd5a1e94d9259c94
 DIST libgphoto2-2.5.30.tar.xz 5890196 BLAKE2B 4da7a650bec695a9d8356d1014081786eb6d31641c4f36f75ba7171b2b395a5e8bf6f59d452adad6d9faa30eea77abeb52e62e645d963bcec2709b3eb5094a4a SHA512 969e5765dc5de9e5fb8156eda679aca069f568e744cc48b643846175eb3cff78bc6ec3a848150a4c636d948018de022f2988da7b94029f103589384f9144b7ed
 EBUILD libgphoto2-2.5.29.ebuild 6191 BLAKE2B a45d63e34a80e3b42b50d51e933d8abca7ae05c1f9feae88f526c39d6a7f17a09a5719bdb8b44d7a1bc7895b0e97b6ccff13d41266cadc5b912e9ed67e17076f SHA512 dc4035b4638815fc56206421493e54ce9ac999e0ce904f72dac53b129fb00316bc7d233626bd9431f8ba72eb35db57f76ed29222ed136b818d9b102675f94198
-EBUILD libgphoto2-2.5.30.ebuild 6259 BLAKE2B 46575a9839cbf106166c72fba937a55ece7f152a733495bb8bf0c48721a3d69cc1d1fe246d1f522063ce8ffa826bd41d616e8083562251c045dbb81f88ec96d8 SHA512 3ab4ed552a95a031016c289cfd50e99be96fad53a73937b07de539dec41fbe38038278a8e6a86f65ddf0614b4cf704927caca9df93befa4a713be58450db0db4
+EBUILD libgphoto2-2.5.30.ebuild 6257 BLAKE2B 7d88fb6fcaa09521657e7f95b06783f32a011e7ec5f94dae14fb94584ace75fe8b41148525c6bcd36c24aeb24282dfa7d3ab85ca2926f2e1ee912ab5ef125a7e SHA512 c1efd5889c21742154e343486e83975e54b1fa96fa943206c23278ea318f6c4a59bd08b2dc643e0caa8736a9a42d0efcf777673ba29255a20b1cbf2cb493ad2e
 MISC metadata.xml 401 BLAKE2B 114b82879f1ab00f4b6b0784a675fc50ba303fee05355f5d6edf32e3f5d3e3015f43e8f300fb9ff45b9dc9100a30431d0458ea8fe1c868090ad739e83587053e SHA512 87a96a6120a0a29c1b05aa43c1548cea9d7fcf0ff3c5815c3369dac7545c8ca05f5a7795f870566bd264cb2873fdf6a79a7dea92d318fca8078d8ec6d8c6a2e3
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.30.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.30.ebuild
index b2d95b02d7a6..56342d7ea7e0 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.30.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.30.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/mesa-amber/Manifest b/media-libs/mesa-amber/Manifest
index a5384cc70061..345c3dadb9bb 100644
--- a/media-libs/mesa-amber/Manifest
+++ b/media-libs/mesa-amber/Manifest
@@ -1,3 +1,3 @@
 DIST mesa-21.3.9.tar.xz 16607716 BLAKE2B 79669f9492c505b1729c526adf5a8261737b6088bdf01db654a0dca8ba22600ec985b574edfeee3a28c76e6e0f815782362973876e1d75b58f4417f45df70add SHA512 4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684
-EBUILD mesa-amber-21.3.9.ebuild 5063 BLAKE2B 6784d4e99bbbd887fdac01b8083200643a6068ca5cb816d68208696358324e4e3f014a835e5926870ecb6c6494b01f337af02818b6e4c2a6650271e319d9791d SHA512 3143013026ff2533fa5c0d27ad2c7376f47951d57d4655e48fa612d85bdcee9675c8d88c94d11e382a52f95dc42bc6afa34956b38d67f6ae42f387256ef7fbba
+EBUILD mesa-amber-21.3.9.ebuild 5061 BLAKE2B 8f9509a75536c6014ba920dccb457d00314f850d69985a467fee20719d14ec91ac73988d170316ef76ac940ada5734edb2e8d718a39238b9c96adcf3b2c471b3 SHA512 767b02ff6934d7dd0f6ddf47d79e8074c98243766e14a0a6f7052b54aaa7a745773b1b9d8f66a6de159155a880d2a5630b80f43f6496ea1503df709ed2c24332
 MISC metadata.xml 613 BLAKE2B ac069a22588af5a3fe4e3efdfd529f324b08632160b08b05696481639aaf0a927670a7b931c8d348c239ce9a7f185cda7d1c0e8f646989f482f64e1a2a3cb1f7 SHA512 f1d38903835b522f0fd40eeffee5f4eac783f25ce3f1f173baa5f3fd60f4104242753cfc63b54d3d27bb19bb952b83e7cf424b1a83c3085327fcade44b1848f9
diff --git a/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
index c5b457417e29..e83298684a55 100644
--- a/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
+++ b/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 42ec7a6eda9a..68a20249b921 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -5,7 +5,7 @@ DIST mesa-22.1.5.tar.xz 16072928 BLAKE2B c182af7855e3e04cdd7f7b25c1df62d13306c17
 DIST mesa-22.1.6.tar.xz 16071404 BLAKE2B 2059aaedba4d74d5250a71a5a25ffb5a6b92314fb0bd2c8a99480459c79c6b7fcf93ee60a0d0baf9c198a3b00dd428060647a6c1a0534b73c6a66a8417bbeaa9 SHA512 3b2a0bb781c3d540401e6f51e3cf0d87d4e22923b6a5a4ea9d8ce5c79b4a2d5e8b1c237a36325d7d7178448ae102470ebefb312644dc09818cce91fd5439cb07
 EBUILD mesa-22.0.5.ebuild 12064 BLAKE2B 51531f4eda83c55fc660e0e0af4ecd56dd27f3a63e4e9edd682c2b59dba3fc9b5d807ba83e58ba72027238c39a8230746aaa8e274181998233b76e0059d6a7b4 SHA512 e07146df6d58f19f336dd9f791d1216394c9ceec2a8d91c78c9948af5071e13bea02c856b8c1f6237595530b471b01640a1abfccbfc658edd7675e2578efca12
 EBUILD mesa-22.1.2.ebuild 12083 BLAKE2B 0098256a7a32c52540258dcc1d531a701ad531891d2f6f4ca2f4cf0c1cdc364c4a8fb6487a6b8f0b6efe46d6fd06ff951e194ae4d64ab0b51d58140d95d1ac93 SHA512 b1f9f47fc0cf720a7be0193c7c11e0ec63dd3408aa284690ced9b58761c94520961b2bcb2b00ec0cf7e2b0d66b0d41b77b886069fd605ab08cfc0cee8ed6c3a9
-EBUILD mesa-22.1.3.ebuild 12081 BLAKE2B f9828aabd49e42d535be46a3b7d67b44de3e37587534b6d72b55cac4c48729c87829a0e642ed755eb08de2d824506bd2deb7e23d34f1f93dbdd2ffe8ecb5c6a0 SHA512 3ef778f79efc8c3f46920e11ec948ab512392873e54c44790baeeefe2bf786a12782640e5344d527ed1ecda7c9b5474a5f0cb9a2ed954229df07f8a375546962
+EBUILD mesa-22.1.3.ebuild 12079 BLAKE2B 9fdeaac6b2a7876784d8ba00ff4c235b3a95f7597b9289d90b5710f8d5a4a0d0a0eb78c7faaba4910dd55967add471f5e64355b4c27361ad7059c181cfe70a03 SHA512 0006630511e0f68805ab4632636967a0692cb8735e7032bbb2b8c9e4fa5ca5601fc8e06f45ae2e5c8529e31425480bd46de0650ae219fc21ca403f52e9f70fe1
 EBUILD mesa-22.1.5.ebuild 12043 BLAKE2B 2c84c59bb325ae48c615f4bcf9383b7e02436221bd1fd189753ca804a7c57a85c54ac99289f52d1fdd01170e17b3301488ad7ebd535f747bc57be86f57c6276d SHA512 d91bfae247e8cf49e0a1a0d4cf821955eef4c5094c595848adbad28ef6127251601e7ccdcef041a4986d8d097094710f530d2244d17a9ea930543e0f2dc4214f
 EBUILD mesa-22.1.6.ebuild 12043 BLAKE2B 2c84c59bb325ae48c615f4bcf9383b7e02436221bd1fd189753ca804a7c57a85c54ac99289f52d1fdd01170e17b3301488ad7ebd535f747bc57be86f57c6276d SHA512 d91bfae247e8cf49e0a1a0d4cf821955eef4c5094c595848adbad28ef6127251601e7ccdcef041a4986d8d097094710f530d2244d17a9ea930543e0f2dc4214f
 EBUILD mesa-9999.ebuild 12152 BLAKE2B c8c46b10699c28cc48a061f088aa99a24b1a943361a5ef794bad0a2575218d79b915c97e25da7a788fbba1553b389d70eb2d5acfd7890621c63c63318459fd3f SHA512 bebc380d05050a8cc072f28c96f008d4454d7614b56f371d6d6a389b4d30189ff84d11f7b1258932b83c6a7aaf21a7d44feb8e8b18b6ee0459620cd5594755bd
diff --git a/media-libs/mesa/mesa-22.1.3.ebuild b/media-libs/mesa/mesa-22.1.3.ebuild
index 65661c795a21..86d50a149f31 100644
--- a/media-libs/mesa/mesa-22.1.3.ebuild
+++ b/media-libs/mesa/mesa-22.1.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 2d3278231515..d742180cf18e 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -4,7 +4,7 @@ AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278
 DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
 DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
-EBUILD openexr-2.5.8.ebuild 2056 BLAKE2B e73f4da39cbadcae890ae51090dbed09704d866cdf9cb87a57aee45a427d917bc2bf839ecccdeb3414e3bd7e71fa0c84657138ba28ca474b8dffa513b10e9190 SHA512 da621c9f9497afbcb5ec57e4e0c2f9bef63db1645143c77a3692f147aea0ab36bad7dbfbf2fc74a44f34cb321cda6e40418e910dc0eaba8b65146ee81383ec81
+EBUILD openexr-2.5.8.ebuild 2037 BLAKE2B 0a934e0f8cf659d3a9209f1c289fcfefca2c08603950d940e24c445a16d056549e4a36bab8bcbbab0f2cea015908e9ecc56b471f73e0d9785b8a6cd9b46597ec SHA512 ca402e055f8ef05a96dc89245af3d675c66c3ac58ade050db66cb8be0132545d467f7d8930529fdbf47d215e53c0b45166b65a9e77fdccccc4b44deffca871e8
 EBUILD openexr-3.1.4-r1.ebuild 1910 BLAKE2B 2eb8cad3ae2a3951a534b5d3173f0788ba8a3792eb0bf4462321fe073580b3b71c04b99669e1a2ab6d599c9e0ed2062ceeb9185d0b48fb8c307c670123272bcd SHA512 b65c849f91b3226cc751052511f517e10607ad2c64eb7f17f80ad4e0cb8b2e9b28767741057095ef661787c327815cae16b1d15dc49c330522203d3b38b41c21
 EBUILD openexr-3.1.5.ebuild 1803 BLAKE2B eb42d6fa4b88568e6133aecc6b41e6f0024e989f0520e1015142720f93e839d54cd5a4f7fc1eb9353451cce8fdc9bf0aaef7470c96fc69b28cc71a0d2fa21132 SHA512 2c7c8df67620d87eeb6c44aa257fdde1de9419a209ef07323a0249c432b80373e37239978dc7144a9e2a818565898a37df77b3ee5bf7d07c97e527551f9b5786
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild
index e5e93f2625bb..fbe8a897d4ff 100644
--- a/media-libs/openexr/openexr-2.5.8.ebuild
+++ b/media-libs/openexr/openexr-2.5.8.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index bbdaa21ff541..eb0ca3d18b28 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,16 +1,5 @@
-AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670
-AUX openjpeg-2.4.0-r1-gnuinstalldirs.patch 15897 BLAKE2B ee5b28985348d9da58d930782420aa43d284efd64574d8f8b250e6d115d6bbb6f4756de2ce6e17251f03c1b6b3dbde2c0fa71b2308724eb84354b15fad650ea2 SHA512 899a112fc8dc65d1c17ec68bf80dc0e892e619bfc67b97784e72c0878ed1a0dc44345b9f5b86e4453df27124b20444ab81511fc66f3e871475a93d8f1f7700bc
-AUX openjpeg-2.4.0-r2-fix-segfault.patch 721 BLAKE2B b26eaa1de6fc64e21477dbf1baeffae5a7df5f78228be117ff48d1d330e58702b516bcb345eddff03e344338c46b0ce66b6ac64198a9bf8a065e036be1e6c19a SHA512 adda72abdf46b9bd2aa0ddf8a653726181271bf1e680cd8caaa28150ee4ef83437246b563f26607b64305a50d68e7f24da81ccba306ad7451375d71fb896c702
-AUX openjpeg-2.4.0-r3-avoid-mult-overflow.patch 2081 BLAKE2B a83ee2926242667dfc0d4dba87a225bf44a5432be9165083d5b371dbbae1b28d171a5ea5b4013f7e05399a2c6910adb76e77dcf3dc88d8e4c0a3dc820012d41e SHA512 7134a62e81d8e7cca3fb714911642e5d5d37db319116104f41d93a2f7d8f1a98ba52bc5edbe89a215ce563e027a012739f1480696ddefff67a3f5735fad88cfb
-AUX openjpeg-2.4.0-r3-fix-integer-overflow.patch 2566 BLAKE2B 01823fb90e763b56eac390b4fb75b57f75e8508baf59ec5e078ce6d36bcf86d58fa9b5ee7327e54526f87a1ae9738fa166adca3af8e1e02e727a543b74caacb8 SHA512 196fa9edfb39e381d17bac0d4aaf2ab026a16bb8a8d3b780118af4395e4f40f8889049cd8ed59db278254adf0b5424bf0c346ae7f271576119aac59b74169451
 AUX openjpeg-2.5.0-gnuinstalldirs.patch 11415 BLAKE2B 9916b82721b9e75dd175d8cf6b85aa9f3b0bbba4d72b5d9c21db853ccf7a40d970db051eff159040fa7b4eb478a5106879044b103e0fb30078704f51c4cb3eef SHA512 d559e1e101b88ea9f391d984e7fe2a28ed5572692f3fbf8c7e79e17105ce83d17ca2a378688c595a8da4f60925de5bf57569424de51a627e629d39479e04c682
-DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
 DIST openjpeg-2.5.0.tar.gz 1867111 BLAKE2B 472d9998a7407574d3bc059d1c0b662a8a553cfe5cb7806a022cb35e14564417a8e06e9970f06d8e65ef149019bab747caefa8e29bc793d07ad86e076909d306 SHA512 08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a
-DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
 DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 34a1c39379d9f8f4caad6c8263a4bc59e62a6a3b8db744eaeaa7047e58813636341b3fb7ee6a121b7dfcd4bc085f9884c3aef86605633ff0d84a1b77cf003624 SHA512 4444225ddb9c548d7753561188cd2d595ae13d7a45471240fac69c3de786a97fb899cd5bbc67cf1b54bfccff0dcd215ec6e83d1bd66982a44c802d163e365dae
-EBUILD openjpeg-2.4.0-r1.ebuild 4478 BLAKE2B 46a5f1d2ea203610cb86b081c34477f1e8ff10d3467cbdecb5c218870d0e74aeffafd0925c90de5650a775f1b6f417df6ec2afbda3591ad6e9d2b044a11fc315 SHA512 686fdd68d37aa2b40a712b1f51711f509653f553e0dc0d3ad232c721e58146150c23f4eb5ec8c61d4fd147b7a32210664c0990035b2027001cd84c2bfe81db12
-EBUILD openjpeg-2.4.0-r2.ebuild 4540 BLAKE2B 4687d9a0481facc18df6ca69fd4f6065186cae265b0dfd187faf312a4a6258dc5ba18c2cebd9bbf16c99b3942476983fa5a47ae3ed5a4242854b75e6fd178a31 SHA512 92c25bce2326243646e2c9d7cf95053dd64f4ca2727e4a4c38fe03c58b08840ce95e0ea52d21d850528e4b8732f63cf07c4003b46a4b93cd2f6eae5aebe98779
-EBUILD openjpeg-2.4.0-r3.ebuild 4686 BLAKE2B 35c49e770b00c471d116348e9cc35b1859e7cf4c3326d89e9b050196d1cd74853625454039bd36ea9ef4ff413416c81b8926db28213857b4691e24a918366025 SHA512 1bdea8bca4bae97679388966da4eec19f5e27d6be3fedfd4b55d0c882028d7165613873e454a6445f50ddd34527845214113fecbccf0dcb2374764583ab1da6b
-EBUILD openjpeg-2.4.0.ebuild 4467 BLAKE2B c1940c9c26d9e010fee76fe1c5c894a0fbffa5be2bc8eba8bb6d1d74b28e37f3a1e1eaad6a9bab60e58ce82942019a7fe796b2672c518c7c519b5cd05d2778fb SHA512 40d63968fb5f16b086ed154ef407a02f1cac452e82ce4fbd853f05ec76ef336db75be867dd1767c2845019eab72e3a6142d0de526b870b1b9f6d8b847441def2
 EBUILD openjpeg-2.5.0-r2.ebuild 3062 BLAKE2B 1a3e6474e6fa8c692af644c3e31a231b8441eec8fa39e10368a4082223fc3cbb55cea457b6e0912ad7e81b63d9978661ab96e0af082a2b624876b7f9d33c9d01 SHA512 742621309ab9d51941a21b64829cad8470c251ed25ee24b0131e83c6649255beab199c1b39fe50d6173516aec11b8df81f69b8d377b99041de626e37230ebcc9
 MISC metadata.xml 551 BLAKE2B 39647e4fca09d2f613785e350aed813dedb0fb109d718a2ab9b08f7d30d55eaeab4abcf3c58b1434ad239548c966aefac7ebcc3a13d50220ad4a2e59054a75d6 SHA512 a2d0283f5b3d97b6d942d865fa3433f007127dbc63e9479bdf06b8e33c8885dfe6c642cb1b1a8595164fa7fe9961ed44a8c8e70086d7b4dea2f75c1816bbf793
diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
deleted file mode 100644
index 82ad4075a942..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,435 +0,0 @@
-From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 11 Apr 2019 13:10:57 +0200
-Subject: [PATCH] Use GNUInstallDirs for standard installation directories
-
-Raises minimum cmake version by a little.
-(Later rebased by sam@gentoo.org for 2.4.0)
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,7 +7,7 @@
- # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
- # e.g.:
- # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
--cmake_minimum_required(VERSION 2.8.2)
-+cmake_minimum_required(VERSION 2.8.5)
- 
- if(COMMAND CMAKE_POLICY)
-   cmake_policy(SET CMP0003 NEW)
-@@ -105,58 +105,27 @@ endif()
- # --------------------------------------------------------------------------
- # Install directories
- # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
-+include(GNUInstallDirs)
-+
- option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
- 
- string(TOLOWER ${PROJECT_NAME} projectname)
- set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
- 
--if(NOT OPENJPEG_INSTALL_BIN_DIR)
--  set(OPENJPEG_INSTALL_BIN_DIR "bin")
--endif()
--
--if(NOT OPENJPEG_INSTALL_LIB_DIR)
--  set(OPENJPEG_INSTALL_LIB_DIR "lib")
--endif()
--
--if(NOT OPENJPEG_INSTALL_SHARE_DIR)
--  set(OPENJPEG_INSTALL_SHARE_DIR "share")
--endif()
--
--if(NOT OPENJPEG_INSTALL_DATA_DIR)
--  set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--
--if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
--  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--
--if(BUILD_DOC)
--if(NOT OPENJPEG_INSTALL_MAN_DIR)
--  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
--endif()
--
--if(NOT OPENJPEG_INSTALL_DOC_DIR)
--  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--endif()
--
- if(NOT OPENJPEG_INSTALL_JNI_DIR)
-   if(WIN32)
--    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
-+    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
-   else()
--    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
-+    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
-   endif()
- endif()
- 
- if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
--  # We could install *.cmake files in share/ however those files contains
--  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
--  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
--  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-+  set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
- endif()
- 
- if (APPLE)
--	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
-+	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
- 	option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
- endif()
- 
-@@ -342,14 +311,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
- )
- 
- #-----------------------------------------------------------------------------
--# install CHANGES and LICENSE
--if(BUILD_DOC)
--if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
--  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
--endif()
--
--install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
--endif()
- 
- include (cmake/OpenJPEGCPack.cmake)
- 
-@@ -366,14 +327,14 @@ if(BUILD_PKGCONFIG_FILES)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
- #
-   if(BUILD_JPWL)
-   # install in lib and not share (see multi-arch note above)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-   endif()
- #
-   if(BUILD_JPIP)
-@@ -381,7 +342,7 @@ if(BUILD_PKGCONFIG_FILES)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-   endif()
- #
-   if(BUILD_JP3D)
-@@ -389,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-   endif()
- endif()
- 
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -27,7 +27,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-   # This is an install tree
-   include(${SELF_DIR}/OpenJPEGTargets.cmake)
- 
--  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-+  set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
-   get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
- 
- else()
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND)
- 
-   # install HTML documentation (install png files too):
-   install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
--    DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}
-+    DESTINATION ${CMAKE_INSTALL_DOCDIR}
-     PATTERN ".svn" EXCLUDE
-   )
- else()
---- a/src/bin/jp2/CMakeLists.txt
-+++ b/src/bin/jp2/CMakeLists.txt
-@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
-   # Install exe
-   install(TARGETS ${exe}
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
-   if(OPJ_USE_DSYMUTIL)
-     add_custom_command(TARGET ${exe} POST_BUILD
-@@ -83,6 +83,6 @@ install(
-   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
-               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1
-               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
--  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
-+  DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- #
- endif()
---- a/src/bin/jp3d/CMakeLists.txt
-+++ b/src/bin/jp3d/CMakeLists.txt
-@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress)
-   # Install exe
-   install(TARGETS ${exe}
-     EXPORT OpenJP3DTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
- endforeach()
---- a/src/bin/jpip/CMakeLists.txt
-+++ b/src/bin/jpip/CMakeLists.txt
-@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c)
- # Install exe
- install(TARGETS opj_jpip_addxml
-   EXPORT OpenJPEGTargets
--  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+  DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
- 
- if(BUILD_JPIP_SERVER)
-@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER)
-   # Install exe
-   install(TARGETS opj_server
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-     )
- endif()
- 
-@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c)
-   target_link_libraries(${exe} openjpip)
-   install(TARGETS ${exe}
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-     )
- endforeach()
- 
-@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
-       )
- 
-     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
--      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
-       )
-   else()
-     # opj_viewer (simple, no xerces)
-@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
-       )
- 
-     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
--      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
-       )
-   endif()
- else()
---- a/src/bin/jpwl/CMakeLists.txt
-+++ b/src/bin/jpwl/CMakeLists.txt
-@@ -57,6 +57,6 @@ foreach(exe decompress compress)
-   endif()
- 
-   install(TARGETS ${jpwl_exe}
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
- endforeach()
---- a/src/bin/mj2/CMakeLists.txt
-+++ b/src/bin/mj2/CMakeLists.txt
-@@ -43,5 +43,5 @@ foreach(exe
-   endif()
- 
-   install(TARGETS ${exe}
--  	DESTINATION ${OPENJPEG_INSTALL_BIN_DIR})
-+  	DESTINATION ${CMAKE_INSTALL_BINDIR})
- endforeach()
---- a/src/lib/openjp2/CMakeLists.txt
-+++ b/src/lib/openjp2/CMakeLists.txt
-@@ -2,7 +2,7 @@ include_regular_expression("^.*$")
- 
- #
- install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers)
- 
- include_directories(
-   ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
-@@ -114,21 +114,21 @@ endif()
- # Install library
- install(TARGETS ${INSTALL_LIBS}
-   EXPORT OpenJPEGTargets
--  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
--  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
--  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
- )
- 
- # Install includes files
- install(FILES openjpeg.h opj_stdint.h
--  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
- )
- 
- if(BUILD_DOC)
- # install man page of the library
- install(
-   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3
--  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
-+  DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
- endif()
- 
- if(BUILD_LUTS_GENERATOR)
---- a/src/lib/openjp2/libopenjp2.pc.cmake.in
-+++ b/src/lib/openjp2/libopenjp2.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjp2
- Description: JPEG2000 library (Part 1 and 2)
---- a/src/lib/openjp3d/CMakeLists.txt
-+++ b/src/lib/openjp3d/CMakeLists.txt
-@@ -34,12 +34,12 @@ endif()
- # Install library
- install(TARGETS ${OPENJP3D_LIBRARY_NAME}
-   EXPORT OpenJP3DTargets
--  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   COMPONENT Libraries
- )
- 
- # Install includes files
- install(FILES openjp3d.h
--  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
-   COMPONENT Headers
- )
---- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-+++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjp3d
- Description: JPEG2000 Extensions for three-dimensional data (Part 10)
---- a/src/lib/openjpip/CMakeLists.txt
-+++ b/src/lib/openjpip/CMakeLists.txt
-@@ -74,9 +74,9 @@ endif()
- # Install library
- install(TARGETS openjpip
-   EXPORT OpenJPEGTargets
--  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
--  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
--  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-   )
- 
- if(BUILD_JPIP_SERVER)
-@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER)
-     PROPERTIES COMPILE_FLAGS "-DSERVER")
-   install(TARGETS openjpip_server
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-     )
- endif()
---- a/src/lib/openjpip/libopenjpip.pc.cmake.in
-+++ b/src/lib/openjpip/libopenjpip.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjpip
- Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)
---- a/src/lib/openjpwl/CMakeLists.txt
-+++ b/src/lib/openjpwl/CMakeLists.txt
-@@ -58,7 +58,7 @@ endif()
- # Install library
- install(TARGETS openjpwl
-   EXPORT OpenJPEGTargets
--  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
--  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
--  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
- )
---- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-+++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjpwl
- Description: JPEG2000 Wireless library (Part 11)
---- a/src/lib/openmj2/CMakeLists.txt
-+++ b/src/lib/openmj2/CMakeLists.txt
-@@ -53,12 +53,12 @@ endif()
- # Install library
- install(TARGETS ${OPENMJ2_LIBRARY_NAME}
-   EXPORT OpenMJ2Targets
--  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   COMPONENT Libraries
- )
- 
- # Install includes files
- #install(FILES mj2.h
--#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}
-+#  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
- #  COMPONENT Headers
- #)
---- a/wrapping/java/openjp2/CMakeLists.txt
-+++ b/wrapping/java/openjp2/CMakeLists.txt
-@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL
- )
- 
- install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
--  DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
- )
diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch
deleted file mode 100644
index bc6771c0c4be..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch
+++ /dev/null
@@ -1,435 +0,0 @@
-From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 11 Apr 2019 13:10:57 +0200
-Subject: [PATCH] Use GNUInstallDirs for standard installation directories
-
-Raises minimum cmake version by a little.
-(Later rebased by sam@gentoo.org for 2.4.0)
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,7 +7,7 @@
- # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
- # e.g.:
- # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
--cmake_minimum_required(VERSION 2.8.2)
-+cmake_minimum_required(VERSION 2.8.5)
- 
- if(COMMAND CMAKE_POLICY)
-   cmake_policy(SET CMP0003 NEW)
-@@ -105,58 +105,27 @@ endif()
- # --------------------------------------------------------------------------
- # Install directories
- # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
-+include(GNUInstallDirs)
-+
- option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
- 
- string(TOLOWER ${PROJECT_NAME} projectname)
- set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
- 
--if(NOT OPENJPEG_INSTALL_BIN_DIR)
--  set(OPENJPEG_INSTALL_BIN_DIR "bin")
--endif()
--
--if(NOT OPENJPEG_INSTALL_LIB_DIR)
--  set(OPENJPEG_INSTALL_LIB_DIR "lib")
--endif()
--
--if(NOT OPENJPEG_INSTALL_SHARE_DIR)
--  set(OPENJPEG_INSTALL_SHARE_DIR "share")
--endif()
--
--if(NOT OPENJPEG_INSTALL_DATA_DIR)
--  set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--
--if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
--  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--
--if(BUILD_DOC)
--if(NOT OPENJPEG_INSTALL_MAN_DIR)
--  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
--endif()
--
--if(NOT OPENJPEG_INSTALL_DOC_DIR)
--  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
--endif()
--endif()
--
- if(NOT OPENJPEG_INSTALL_JNI_DIR)
-   if(WIN32)
--    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
-+    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
-   else()
--    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
-+    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
-   endif()
- endif()
- 
- if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
--  # We could install *.cmake files in share/ however those files contains
--  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
--  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
--  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-+  set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
- endif()
- 
- if (APPLE)
--	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
-+	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
- 	option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
- endif()
- 
-@@ -342,14 +311,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
- )
- 
- #-----------------------------------------------------------------------------
--# install CHANGES and LICENSE
--if(BUILD_DOC)
--if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
--  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
--endif()
--
--install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
--endif()
- 
- include (cmake/OpenJPEGCPack.cmake)
- 
-@@ -366,14 +327,14 @@ if(BUILD_PKGCONFIG_FILES)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
- #
-   if(BUILD_JPWL)
-   # install in lib and not share (see multi-arch note above)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-   endif()
- #
-   if(BUILD_JPIP)
-@@ -381,7 +342,7 @@ if(BUILD_PKGCONFIG_FILES)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-   endif()
- #
-   if(BUILD_JP3D)
-@@ -389,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-   endif()
- endif()
- 
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -27,7 +27,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-   # This is an install tree
-   include(${SELF_DIR}/OpenJPEGTargets.cmake)
- 
--  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-+  set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
-   get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
- 
- else()
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND)
- 
-   # install HTML documentation (install png files too):
-   install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
--    DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}
-+    DESTINATION ${CMAKE_INSTALL_DOCDIR}
-     PATTERN ".svn" EXCLUDE
-   )
- else()
---- a/src/bin/jp2/CMakeLists.txt
-+++ b/src/bin/jp2/CMakeLists.txt
-@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
-   # Install exe
-   install(TARGETS ${exe}
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
-   if(OPJ_USE_DSYMUTIL)
-     add_custom_command(TARGET ${exe} POST_BUILD
-@@ -83,6 +83,6 @@ install(
-   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
-               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1
-               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
--  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
-+  DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- #
- endif()
---- a/src/bin/jp3d/CMakeLists.txt
-+++ b/src/bin/jp3d/CMakeLists.txt
-@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress)
-   # Install exe
-   install(TARGETS ${exe}
-     EXPORT OpenJP3DTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
- endforeach()
---- a/src/bin/jpip/CMakeLists.txt
-+++ b/src/bin/jpip/CMakeLists.txt
-@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c)
- # Install exe
- install(TARGETS opj_jpip_addxml
-   EXPORT OpenJPEGTargets
--  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+  DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
- 
- if(BUILD_JPIP_SERVER)
-@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER)
-   # Install exe
-   install(TARGETS opj_server
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-     )
- endif()
- 
-@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c)
-   target_link_libraries(${exe} openjpip)
-   install(TARGETS ${exe}
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-     )
- endforeach()
- 
-@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
-       )
- 
-     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
--      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
-       )
-   else()
-     # opj_viewer (simple, no xerces)
-@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
-       )
- 
-     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
--      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
-       )
-   endif()
- else()
---- a/src/bin/jpwl/CMakeLists.txt
-+++ b/src/bin/jpwl/CMakeLists.txt
-@@ -57,6 +57,6 @@ foreach(exe decompress compress)
-   endif()
- 
-   install(TARGETS ${jpwl_exe}
--    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-+    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-   )
- endforeach()
---- a/src/bin/mj2/CMakeLists.txt
-+++ b/src/bin/mj2/CMakeLists.txt
-@@ -43,5 +43,5 @@ foreach(exe
-   endif()
- 
-   install(TARGETS ${exe}
--  	DESTINATION ${OPENJPEG_INSTALL_BIN_DIR})
-+  	DESTINATION ${CMAKE_INSTALL_BINDIR})
- endforeach()
---- a/src/lib/openjp2/CMakeLists.txt
-+++ b/src/lib/openjp2/CMakeLists.txt
-@@ -2,7 +2,7 @@ include_regular_expression("^.*$")
- 
- #
- install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers)
- 
- include_directories(
-   ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
-@@ -114,21 +114,21 @@ endif()
- # Install library
- install(TARGETS ${INSTALL_LIBS}
-   EXPORT OpenJPEGTargets
--  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
--  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
--  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
- )
- 
- # Install includes files
- install(FILES openjpeg.h opj_stdint.h
--  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
- )
- 
- if(BUILD_DOC)
- # install man page of the library
- install(
-   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3
--  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
-+  DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
- endif()
- 
- if(BUILD_LUTS_GENERATOR)
---- a/src/lib/openjp2/libopenjp2.pc.cmake.in
-+++ b/src/lib/openjp2/libopenjp2.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=@CMAKE_INSTALL_MANDIR@
-+docdir=@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjp2
- Description: JPEG2000 library (Part 1 and 2)
---- a/src/lib/openjp3d/CMakeLists.txt
-+++ b/src/lib/openjp3d/CMakeLists.txt
-@@ -34,12 +34,12 @@ endif()
- # Install library
- install(TARGETS ${OPENJP3D_LIBRARY_NAME}
-   EXPORT OpenJP3DTargets
--  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   COMPONENT Libraries
- )
- 
- # Install includes files
- install(FILES openjp3d.h
--  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
-   COMPONENT Headers
- )
---- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-+++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=@CMAKE_INSTALL_MANDIR@
-+docdir=@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjp3d
- Description: JPEG2000 Extensions for three-dimensional data (Part 10)
---- a/src/lib/openjpip/CMakeLists.txt
-+++ b/src/lib/openjpip/CMakeLists.txt
-@@ -74,9 +74,9 @@ endif()
- # Install library
- install(TARGETS openjpip
-   EXPORT OpenJPEGTargets
--  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
--  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
--  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-   )
- 
- if(BUILD_JPIP_SERVER)
-@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER)
-     PROPERTIES COMPILE_FLAGS "-DSERVER")
-   install(TARGETS openjpip_server
-     EXPORT OpenJPEGTargets
--    DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-     )
- endif()
---- a/src/lib/openjpip/libopenjpip.pc.cmake.in
-+++ b/src/lib/openjpip/libopenjpip.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=@CMAKE_INSTALL_MANDIR@
-+docdir=@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjpip
- Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)
---- a/src/lib/openjpwl/CMakeLists.txt
-+++ b/src/lib/openjpwl/CMakeLists.txt
-@@ -58,7 +58,7 @@ endif()
- # Install library
- install(TARGETS openjpwl
-   EXPORT OpenJPEGTargets
--  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
--  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
--  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
- )
---- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-+++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
-+mandir=@CMAKE_INSTALL_MANDIR@
-+docdir=@CMAKE_INSTALL_DOCDIR@
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
- 
- Name: openjpwl
- Description: JPEG2000 Wireless library (Part 11)
---- a/src/lib/openmj2/CMakeLists.txt
-+++ b/src/lib/openmj2/CMakeLists.txt
-@@ -53,12 +53,12 @@ endif()
- # Install library
- install(TARGETS ${OPENMJ2_LIBRARY_NAME}
-   EXPORT OpenMJ2Targets
--  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   COMPONENT Libraries
- )
- 
- # Install includes files
- #install(FILES mj2.h
--#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}
-+#  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
- #  COMPONENT Headers
- #)
---- a/wrapping/java/openjp2/CMakeLists.txt
-+++ b/wrapping/java/openjp2/CMakeLists.txt
-@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL
- )
- 
- install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
--  DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
-+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
- )
diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch
deleted file mode 100644
index 86e1c1fe39cc..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream: https://github.com/uclouvain/openjpeg/commit/0afbdcf3e6d0d2bd2e16a0c4d513ee3cf86e460d
-From: xiaoxiaoafeifei <lliangliang2007@163.com>
-Date: Wed, 14 Jul 2021 09:35:13 +0800
-Subject: [PATCH] Fix segfault in src/bin/jp2/opj_decompress.c due to
- uninitialized pointer (fixes #1368) (#1369)
-
---- a/src/bin/jp2/opj_decompress.c
-+++ b/src/bin/jp2/opj_decompress.c
-@@ -1356,7 +1356,7 @@ int main(int argc, char **argv)
-         int it_image;
-         num_images = get_num_images(img_fol.imgdirpath);
- 
--        dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
-+        dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t));
-         if (!dirptr) {
-             destroy_parameters(&parameters);
-             return EXIT_FAILURE;
diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch
deleted file mode 100644
index 3733a1b94545..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Upstream: https://github.com/uclouvain/openjpeg/commit/1daaa0b909aebdf71be36238d16dfbec83c494ed
-Bug: https://bugs.gentoo.org/783513
-CVE-2021-29338
---- a/src/bin/jp2/opj_compress.c
-+++ b/src/bin/jp2/opj_compress.c
-@@ -1967,7 +1967,7 @@ int main(int argc, char **argv)
-                 goto fin;
-             }
-             for (i = 0; i < num_images; i++) {
--                dirptr->filename[i] = dirptr->filename_buf + i * OPJ_PATH_LEN;
-+                dirptr->filename[i] = dirptr->filename_buf + (size_t)i * OPJ_PATH_LEN;
-             }
-         }
-         if (load_images(dirptr, img_fol.imgdirpath) == 1) {
---- a/src/bin/jp2/opj_decompress.c
-+++ b/src/bin/jp2/opj_decompress.c
-@@ -1367,7 +1367,6 @@ int main(int argc, char **argv)
-     if (img_fol.set_imgdir == 1) {
-         int it_image;
-         num_images = get_num_images(img_fol.imgdirpath);
--
-         dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t));
-         if (!dirptr) {
-             destroy_parameters(&parameters);
-@@ -1387,7 +1386,8 @@ int main(int argc, char **argv)
-             goto fin;
-         }
-         for (it_image = 0; it_image < num_images; it_image++) {
--            dirptr->filename[it_image] = dirptr->filename_buf + it_image * OPJ_PATH_LEN;
-+            dirptr->filename[it_image] = dirptr->filename_buf + (size_t)it_image *
-+                                         OPJ_PATH_LEN;
-         }
- 
-         if (load_images(dirptr, img_fol.imgdirpath) == 1) {
---- a/src/bin/jp2/opj_dump.c
-+++ b/src/bin/jp2/opj_dump.c
-@@ -529,13 +529,13 @@ int main(int argc, char *argv[])
-         }
- 
-         for (it_image = 0; it_image < num_images; it_image++) {
--            dirptr->filename[it_image] = dirptr->filename_buf + it_image * OPJ_PATH_LEN;
-+            dirptr->filename[it_image] = dirptr->filename_buf + (size_t)it_image *
-+                                         OPJ_PATH_LEN;
-         }
- 
-         if (load_images(dirptr, img_fol.imgdirpath) == 1) {
-             goto fails;
-         }
--
-         if (num_images == 0) {
-             fprintf(stdout, "Folder is empty\n");
-             goto fails;
diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch
deleted file mode 100644
index 6ceb5be8f6d1..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-opj_compress/opj_uncompress: fix integer overflow in num_images
-CVE-2021-29338
-Bug 783513
-Upstream: https://github.com/uclouvain/openjpeg/commit/79c7d7af598b778c3cdcb455df23d50efc95eb3c
---- a/src/bin/jp2/opj_compress.c
-+++ b/src/bin/jp2/opj_compress.c
-@@ -1959,9 +1959,9 @@ int main(int argc, char **argv)
-         num_images = get_num_images(img_fol.imgdirpath);
-         dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
-         if (dirptr) {
--            dirptr->filename_buf = (char*)malloc(num_images * OPJ_PATH_LEN * sizeof(
-+            dirptr->filename_buf = (char*)calloc(num_images, OPJ_PATH_LEN * sizeof(
-                     char)); /* Stores at max 10 image file names*/
--            dirptr->filename = (char**) malloc(num_images * sizeof(char*));
-+            dirptr->filename = (char**) calloc(num_images, sizeof(char*));
-             if (!dirptr->filename_buf) {
-                 ret = 0;
-                 goto fin;
---- a/src/bin/jp2/opj_decompress.c
-+++ b/src/bin/jp2/opj_decompress.c
-@@ -1374,14 +1374,13 @@ int main(int argc, char **argv)
-             return EXIT_FAILURE;
-         }
-         /* Stores at max 10 image file names */
--        dirptr->filename_buf = (char*)malloc(sizeof(char) *
--                                             (size_t)num_images * OPJ_PATH_LEN);
-+        dirptr->filename_buf = calloc((size_t) num_images, sizeof(char) * OPJ_PATH_LEN);
-         if (!dirptr->filename_buf) {
-             failed = 1;
-             goto fin;
-         }
- 
--        dirptr->filename = (char**) malloc((size_t)num_images * sizeof(char*));
-+        dirptr->filename = (char**) calloc((size_t) num_images, sizeof(char*));
- 
-         if (!dirptr->filename) {
-             failed = 1;
---- a/src/bin/jp2/opj_dump.c
-+++ b/src/bin/jp2/opj_dump.c
-@@ -515,13 +515,14 @@ int main(int argc, char *argv[])
-         if (!dirptr) {
-             return EXIT_FAILURE;
-         }
--        dirptr->filename_buf = (char*)malloc((size_t)num_images * OPJ_PATH_LEN * sizeof(
--                char)); /* Stores at max 10 image file names*/
-+        /* Stores at max 10 image file names*/
-+        dirptr->filename_buf = (char*) calloc((size_t) num_images,
-+                                              OPJ_PATH_LEN * sizeof(char));
-         if (!dirptr->filename_buf) {
-             free(dirptr);
-             return EXIT_FAILURE;
-         }
--        dirptr->filename = (char**) malloc((size_t)num_images * sizeof(char*));
-+        dirptr->filename = (char**) calloc((size_t) num_images, sizeof(char*));
- 
-         if (!dirptr->filename) {
-             goto fails;
diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild b/media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild
deleted file mode 100644
index 554c61b5304b..000000000000
--- a/media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,139 +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 flag-o-matic
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60"
-
-DESCRIPTION="Open-source JPEG 2000 library"
-HOMEPAGE="https://www.openjpeg.org"
-SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.0-r1-gnuinstalldirs.patch" # bug 667150
-)
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
-			die "Failed to rename test data"
-	fi
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834
-		-DBUILD_TESTING="$(multilib_native_usex test)"
-		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	# Cheat a little bit and force disabling fixed point magic
-	# The test suite is extremely fragile to small changes
-	# bug 715130, bug 715422
-	# https://github.com/uclouvain/openjpeg/issues/1017
-	multilib_is_native_abi && use test && append-cflags "-ffp-contract=off"
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		elog "Cannot run tests for non-multilib abi."
-		return 0
-	fi
-
-	local myctestargs=
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	echo ctest "${myctestargs[@]}" "$@"
-	if ctest "${myctestargs[@]}" "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-
-		if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
-			# Should never happen
-			die "Cannot analyze test failures: LastTestsFailed.log is missing!"
-		fi
-
-		echo ""
-		einfo "Note: Upstream is maintaining a list of known test failures."
-		einfo "We will now compare our test results against this list and sort out any known failure."
-
-		local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
-		cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die
-
-		local ARCH_SPECIFIC_FAILURES=
-		if use amd64 ; then
-			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
-		elif use x86 || use arm || use arm64; then
-			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
-		fi
-
-		if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
-			einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
-			cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die
-		fi
-
-		# Logic copied from $S/tools/travis-ci/run.sh
-		local FAILEDTEST=
-		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
-		local HAS_UNKNOWN_TEST_FAILURES=0
-
-		echo ""
-
-		awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
-		while read FAILEDTEST; do
-			# is this failure known?
-			if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then
-				ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
-				continue
-			fi
-
-			eerror "New/unknown test failure found: '${FAILEDTEST}'"
-			HAS_UNKNOWN_TEST_FAILURES=1
-		done < "${FAILURES_LOG}"
-
-		if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
-			die "Test suite failed. New/unknown test failure(s) found!"
-		else
-			echo ""
-			einfo "Test suite passed. No new/unknown test failure(s) found!"
-		fi
-
-		return 0
-	fi
-}
diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild b/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild
deleted file mode 100644
index cecc59d76a7f..000000000000
--- a/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild
+++ /dev/null
@@ -1,140 +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 flag-o-matic
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60"
-
-DESCRIPTION="Open-source JPEG 2000 library"
-HOMEPAGE="https://www.openjpeg.org"
-SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.0-r1-gnuinstalldirs.patch" # bug 667150
-	"${FILESDIR}/${PN}-2.4.0-r2-fix-segfault.patch" # bug 832007
-)
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
-			die "Failed to rename test data"
-	fi
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834
-		-DBUILD_TESTING="$(multilib_native_usex test)"
-		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	# Cheat a little bit and force disabling fixed point magic
-	# The test suite is extremely fragile to small changes
-	# bug 715130, bug 715422
-	# https://github.com/uclouvain/openjpeg/issues/1017
-	multilib_is_native_abi && use test && append-cflags "-ffp-contract=off"
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		elog "Cannot run tests for non-multilib abi."
-		return 0
-	fi
-
-	local myctestargs=
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	echo ctest "${myctestargs[@]}" "$@"
-	if ctest "${myctestargs[@]}" "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-
-		if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
-			# Should never happen
-			die "Cannot analyze test failures: LastTestsFailed.log is missing!"
-		fi
-
-		echo ""
-		einfo "Note: Upstream is maintaining a list of known test failures."
-		einfo "We will now compare our test results against this list and sort out any known failure."
-
-		local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
-		cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die
-
-		local ARCH_SPECIFIC_FAILURES=
-		if use amd64 ; then
-			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
-		elif use x86 || use arm || use arm64; then
-			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
-		fi
-
-		if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
-			einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
-			cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die
-		fi
-
-		# Logic copied from $S/tools/travis-ci/run.sh
-		local FAILEDTEST=
-		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
-		local HAS_UNKNOWN_TEST_FAILURES=0
-
-		echo ""
-
-		awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
-		while read FAILEDTEST; do
-			# is this failure known?
-			if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then
-				ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
-				continue
-			fi
-
-			eerror "New/unknown test failure found: '${FAILEDTEST}'"
-			HAS_UNKNOWN_TEST_FAILURES=1
-		done < "${FAILURES_LOG}"
-
-		if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
-			die "Test suite failed. New/unknown test failure(s) found!"
-		else
-			echo ""
-			einfo "Test suite passed. No new/unknown test failure(s) found!"
-		fi
-
-		return 0
-	fi
-}
diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild b/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild
deleted file mode 100644
index d2b85a157420..000000000000
--- a/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild
+++ /dev/null
@@ -1,142 +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 flag-o-matic
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60"
-
-DESCRIPTION="Open-source JPEG 2000 library"
-HOMEPAGE="https://www.openjpeg.org"
-SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.0-r1-gnuinstalldirs.patch" # bug 667150
-	"${FILESDIR}/${PN}-2.4.0-r2-fix-segfault.patch" # bug 832007
-	"${FILESDIR}/${PN}-2.4.0-r3-fix-integer-overflow.patch" # bug 783513
-	"${FILESDIR}/${PN}-2.4.0-r3-avoid-mult-overflow.patch" # bug 783513
-)
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
-			die "Failed to rename test data"
-	fi
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834
-		-DBUILD_TESTING="$(multilib_native_usex test)"
-		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	# Cheat a little bit and force disabling fixed point magic
-	# The test suite is extremely fragile to small changes
-	# bug 715130, bug 715422
-	# https://github.com/uclouvain/openjpeg/issues/1017
-	multilib_is_native_abi && use test && append-cflags "-ffp-contract=off"
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		elog "Cannot run tests for non-multilib abi."
-		return 0
-	fi
-
-	local myctestargs=
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	echo ctest "${myctestargs[@]}" "$@"
-	if ctest "${myctestargs[@]}" "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-
-		if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
-			# Should never happen
-			die "Cannot analyze test failures: LastTestsFailed.log is missing!"
-		fi
-
-		echo ""
-		einfo "Note: Upstream is maintaining a list of known test failures."
-		einfo "We will now compare our test results against this list and sort out any known failure."
-
-		local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
-		cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die
-
-		local ARCH_SPECIFIC_FAILURES=
-		if use amd64 ; then
-			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
-		elif use x86 || use arm || use arm64; then
-			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
-		fi
-
-		if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
-			einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
-			cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die
-		fi
-
-		# Logic copied from $S/tools/travis-ci/run.sh
-		local FAILEDTEST=
-		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
-		local HAS_UNKNOWN_TEST_FAILURES=0
-
-		echo ""
-
-		awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
-		while read FAILEDTEST; do
-			# is this failure known?
-			if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then
-				ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
-				continue
-			fi
-
-			eerror "New/unknown test failure found: '${FAILEDTEST}'"
-			HAS_UNKNOWN_TEST_FAILURES=1
-		done < "${FAILURES_LOG}"
-
-		if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
-			die "Test suite failed. New/unknown test failure(s) found!"
-		else
-			echo ""
-			einfo "Test suite passed. No new/unknown test failure(s) found!"
-		fi
-
-		return 0
-	fi
-}
diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
deleted file mode 100644
index 2541abf1fe5b..000000000000
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60"
-
-DESCRIPTION="Open-source JPEG 2000 library"
-HOMEPAGE="https://www.openjpeg.org"
-SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.0-gnuinstalldirs.patch" # bug 667150
-)
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
-			die "Failed to rename test data"
-	fi
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834
-		-DBUILD_TESTING="$(multilib_native_usex test)"
-		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	# Cheat a little bit and force disabling fixed point magic
-	# The test suite is extremely fragile to small changes
-	# bug 715130, bug 715422
-	# https://github.com/uclouvain/openjpeg/issues/1017
-	multilib_is_native_abi && use test && append-cflags "-ffp-contract=off"
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		elog "Cannot run tests for non-multilib abi."
-		return 0
-	fi
-
-	local myctestargs=
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	echo ctest "${myctestargs[@]}" "$@"
-	if ctest "${myctestargs[@]}" "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-
-		if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
-			# Should never happen
-			die "Cannot analyze test failures: LastTestsFailed.log is missing!"
-		fi
-
-		echo ""
-		einfo "Note: Upstream is maintaining a list of known test failures."
-		einfo "We will now compare our test results against this list and sort out any known failure."
-
-		local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
-		cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die
-
-		local ARCH_SPECIFIC_FAILURES=
-		if use amd64 ; then
-			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
-		elif use x86 || use arm || use arm64; then
-			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
-		fi
-
-		if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
-			einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
-			cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die
-		fi
-
-		# Logic copied from $S/tools/travis-ci/run.sh
-		local FAILEDTEST=
-		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
-		local HAS_UNKNOWN_TEST_FAILURES=0
-
-		echo ""
-
-		awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
-		while read FAILEDTEST; do
-			# is this failure known?
-			if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then
-				ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
-				continue
-			fi
-
-			eerror "New/unknown test failure found: '${FAILEDTEST}'"
-			HAS_UNKNOWN_TEST_FAILURES=1
-		done < "${FAILURES_LOG}"
-
-		if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
-			die "Test suite failed. New/unknown test failure(s) found!"
-		else
-			echo ""
-			einfo "Test suite passed. No new/unknown test failure(s) found!"
-		fi
-
-		return 0
-	fi
-}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index c558870b5a48..621f96d4decc 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,5 +1,5 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
 DIST shaderc-2022.1.tar.gz 222009 BLAKE2B c6707699a49c130b2669620e11f52862790999954a84b05f9f54d238fb0ae68e2523cc4b86104b3d4bce4528db31be89e441b278a97a375b90d7e0f458075f51 SHA512 21c2462cb434d94da87c71ba660f6cd5b161450d7faeff8789b41db25e64f2baa7c560e78aa856d128c5a73699215d6b1085b5ca19a4640237adf194793ad44b
 EBUILD shaderc-2022.1-r1.ebuild 2104 BLAKE2B 4804181cd83601ecd542de5d80598d9e5066973fd64d5b848d487657185de002aabb3141d7d6779df85899093734126a2f4507eca1d9562fa45cf3cf2ea26e28 SHA512 8386390f27797f855254cf79b81d192e7322e93054b77c3b14ec41645e8b7f75f0b916ecf8f81180a404ef796832a08be5647111899248ec24f111b85687cf61
-EBUILD shaderc-2022.1-r2.ebuild 2107 BLAKE2B 09019dd0d66d341f596b283b96cda333c862d9d7b8240f46b33abf84a2e71de74bb455c585630006585a1ba07058c95dee1572783ff639c320822115eae5a2aa SHA512 673e001db812123fcd89f0cbe3fcdc9e89ed00720c58ac986e246439f867634246ca3e47df9b5bb582096443af2c7c658898faaa7ecfe2783e066b2fc568481c
+EBUILD shaderc-2022.1-r2.ebuild 2094 BLAKE2B 3b8a82039fe33ea31274570098043fd5c01f3eb854dfc4e418643373580380dd8f7b238f49e1610e94eade2e876fd1c6860db5ab8eb73575a275369e7c953abc SHA512 9a4e8f8266ccfd18238fef901cf7a554283a8791f7d525123766f6052611efc5cabab3782566bbb7299f339c50d72b9c3f6d488d730789d3906b16c5be2d12c0
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2022.1-r2.ebuild b/media-libs/shaderc/shaderc-2022.1-r2.ebuild
index 510a9ffae13b..8df706eda6fc 100644
--- a/media-libs/shaderc/shaderc-2022.1-r2.ebuild
+++ b/media-libs/shaderc/shaderc-2022.1-r2.ebuild
@@ -1,12 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-
-CMAKE_ECLASS=cmake
-
 inherit cmake-multilib python-any-r1
 
 DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
@@ -27,15 +24,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-util/spirv-headers-1.3.216
-	doc? ( dev-ruby/asciidoctor )
 	test? (
 		dev-cpp/gtest
 		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
 	)
 "
+BDEPEND="doc? ( dev-ruby/asciidoctor )"
 
 PATCHES=(
-		"${FILESDIR}"/${PN}-2020.4-fix-build.patch
+	"${FILESDIR}"/${PN}-2020.4-fix-build.patch
 )
 
 # https://github.com/google/shaderc/issues/470
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 68b3c6ef9fe5..9c548dfa9d09 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,5 +1,5 @@
 DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
 EBUILD waffle-1.7.0-r1.ebuild 1617 BLAKE2B 76bfbd6a39f365c3e29631a7101322261e56cc3b284ba21b862dc1262009de1588a22be27941e69c74bb5a63a2ba9bb45f0bbc08c9988b7a6bc4f5b0446bfb68 SHA512 4f2c0f90cc06214379ef5a3d95fd352bbebae532c0fd005a3c06a05ded84b3f2905d53d9c2242b57b2fd8b1d05145b9520a738945348ee95c8f94504eca37d97
-EBUILD waffle-1.7.0-r2.ebuild 1607 BLAKE2B 32417ea085b8a52e7b4f8653e642e12411059a7cd95deb852fc27f08890cff837a3442cbbd4465ece5dcc678c00bee2dc8790a73146e04742f215b3b2da7fb42 SHA512 82faf8d7c5320ec0a0700519725ba2b3dce7cf32cefb1f41c77f57e60acd55aeeb59d32359f875c12120bc6d014d9b6fb902d036dcb610acfad6c33c7302f9ba
+EBUILD waffle-1.7.0-r2.ebuild 1606 BLAKE2B e986f97e87ca173d21babe3699a5d56e41aa78c4feb94d97fe7698af76bcdf6ac505f749a5d8c3084279f126d99af1facbdb5b32e19610bbbddd8bf9b21d1f2c SHA512 51caa025dc551ac3928158f477f1241b972b664edc90f5f9278ec67255a51857b347b3a4155cdfb35d72d4da3019d9b4b37b77ab6c0d2360d7572518ac4c1eb3
 EBUILD waffle-9999.ebuild 1609 BLAKE2B 75ed4e25c0946e27fe242c2780fad24798abee77a1a17d915dd39ee1ae427dbfef4b43a1cfea566a14175cb92c07e4583a373fdd40be949246bbe60031838598 SHA512 4342070b5f68bbb227f95a0d4ca6d23891a779255096a8e7150856c4a15e3a33e2bcc802ec741b0b88d937e6278131d920e6bf5fb05b480fdc94faf118b9c630
 MISC metadata.xml 417 BLAKE2B 93ea54a57c011a3488ec75dbb8b93bce0bd568dfc4438cf7c80b3c622513a9be4b3e809e9794646571f9f21afd1572d0b16915dbda35d7345d4ef6afcec4dca8 SHA512 1652ef53bd20fd9c526b77db60affc226920b007c1b1b2bbeb90c0606ae2d4e199cb352a3322e2953ae0b1472e671da516ea3c0fdfcc9aa26cc5a1c348590da6
diff --git a/media-libs/waffle/waffle-1.7.0-r2.ebuild b/media-libs/waffle/waffle-1.7.0-r2.ebuild
index c480c84fbf0b..013a7e9b36be 100644
--- a/media-libs/waffle/waffle-1.7.0-r2.ebuild
+++ b/media-libs/waffle/waffle-1.7.0-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${PN}-v${PV}
 fi
 inherit meson-multilib multilib ${GIT_ECLASS}
author	V3n3RiX <venerix@koprulu.sector>	2022-08-15 20:28:49 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-15 20:28:49 +0100
commit	7255c5d5fcd8fcdd07d2791563dc43bf4e14cf3a (patch)
tree	515e0e28ee6d81ce42725bd00b369ea0c1130d91 /media-libs
parent	1c3adf43f1b866276828623dd63f9e10d29421d3 (diff)