gentoo (valentine's day) resync : 14.02.2021

153 files changed, 1426 insertions, 2350 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0a1bf778f198..26e298742a8a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index f0e364c4570a..a05c302672ce 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,4 +1,3 @@
-AUX bcg729-4.3.0_beta-cmake-build.patch 135 BLAKE2B c3379f4327ab4f1d2a12ec31f3f0c0a3a15b0c2945da0d707d2d1b308c1860d52914b875504c0967c4b75ae42a4f7766611563c150cd0afb0acfe1369cc72116 SHA512 97fa2a52456809b2c4bac66c4c309b0d95a7a12d43eb102857339e729ede84f9a2cef9050a7232090e7b4e2f3817890d94e565051553f4cec3b7e83e69b2481c
 DIST bcg729-1.1.1.tar.gz 122475 BLAKE2B 6774f6af439c9308db856be9d4bbb6db5c73e7a807b51dca6338d1506d896052a7830ade7767b45fd5a9ded0a6a0057e207bc1d5b0e33adbaed9dafb13a7bd3b SHA512 e8cc4b7486a9a29fb729ab9fd9e3c4a2155573f38cec16f5a53db3b416fc1119ea5f5a61243a8d37cb0b64580c5df1b632ff165dc7ff47421fa567dafffaacd8
 DIST bcg729-tests-20210101.zip 33438219 BLAKE2B 93bf1538f905f2fb67d703a6275ac7d616c005efb709f4d11e838be8b06e7f87429c4114dfc3e393b7b635dca51bf75a09d676188e9e11facdf7ec45ec5e4e50 SHA512 bd97521dc620e857dc3956ffc8a0b23da86ab2dd00621247ad91f05f04a9df7ce19bda426a307188f9271341332a393cb6e85c5c7e04b85c6e92496b6ffad5fc
 EBUILD bcg729-1.1.1.ebuild 1221 BLAKE2B 9d7bb232f5b2a2c159e74b6aec66d61566e893a16e9558868089f950e152d6310d75268866ac31f8de996e7fc249e33b108341eb66cef1355dba6bc8726372ff SHA512 199dc4599680259e836f86af3ed94db724dfb7bddd62d84ed249e588ff4a1e6ace63ef4c9929c21565e1b1f81e64656606c48650279c856c2c93b620740d66b2
diff --git a/media-libs/bcg729/files/bcg729-4.3.0_beta-cmake-build.patch b/media-libs/bcg729/files/bcg729-4.3.0_beta-cmake-build.patch
deleted file mode 100644
index 9efcf0fabe8c..000000000000
--- a/media-libs/bcg729/files/bcg729-4.3.0_beta-cmake-build.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -119,5 +119,3 @@
- 	DESTINATION ${CONFIG_PACKAGE_LOCATION}
- )
- 
--add_subdirectory(build)
--
diff --git a/media-libs/flickcurl/Manifest b/media-libs/flickcurl/Manifest
index d47daa948029..c9ccbe9520c8 100644
--- a/media-libs/flickcurl/Manifest
+++ b/media-libs/flickcurl/Manifest
@@ -1,3 +1,3 @@
 DIST flickcurl-1.26.tar.gz 1870073 BLAKE2B 2e14565ee076b5fd83987fc4aadc00ef1561714ea30cefef9d79260ebefa4856eca18ada5afdf6b02ad6e8ed293dd0872927346083d9eb8209bece1f456ea6bf SHA512 5ffdef58e67cbf99da2e8eefad57e845627703d5b22c85d5635557cd2df53e47e74d8e3387523495708c5cc8952c290da5c4d5f1e86bd482312fc7e46e9af6cd
 EBUILD flickcurl-1.26.ebuild 968 BLAKE2B a054359ff97a9c20ed3e4a85c6129954273ce4a24879d3b86a9af2f154e5b2ebadddf40d7f3ff09c9804e70bbfd35fc019ceaa48b231da93fa40ee08b719b919 SHA512 2b3421ca8f224cf178640e4a22b242c0f0d4590d501888713a5d8c892e9e0cd5be1a8b53586a3a184a7ae9085f458a20000f54bbddf8bffd85d6204f45f936c6
-MISC metadata.xml 271 BLAKE2B b0687fe8ae2ec88c72e0ec255e0dd5f58947e593412c57d0c43e22614cdddc7cb0635a1c9f945d23e46dfc16876a45a6068b3be4dc35f71ce889e31dfc039515 SHA512 a479526f4526d3f6a474021c2226731726a8af01aadbae851a6cec31d32ba5a8e861109e9134a3dcef273512d098b8c13a5f34012573329745e780e2811ddf2b
+MISC metadata.xml 352 BLAKE2B b6f3d74efcfaf4e6dcfbaa16d9d85cec8969314e8cbb35803b8b47d2767ec8f5270377a4168a0142b1d19be15f46103bc6aff5b61d3529903b8bb694995b53c4 SHA512 70c66b003401b481e348eb3d94d9d6ac1d3961b1fb4e8a964b93dbf6806ac9f888076b8b3de5f0b5905d1185c044a078b0510377087056e1c3c9957ec58874ed
diff --git a/media-libs/flickcurl/metadata.xml b/media-libs/flickcurl/metadata.xml
index 99e9214388df..3aab4c2deeee 100644
--- a/media-libs/flickcurl/metadata.xml
+++ b/media-libs/flickcurl/metadata.xml
@@ -5,4 +5,7 @@
 	<use>
 		<flag name="raptor">Use <pkg>media-libs/raptor</pkg> for proper RDF serializing</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">dajobe/flickcurl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index e85c9aee6731..74acf6074296 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,5 +1,3 @@
-DIST ganv-1.6.0.tar.bz2 377068 BLAKE2B f78c4783f0188fd163b087c789d50eb67a54a77d26d261d3557fba46a7bee09fc3326204273ad496d6b2ae262368015c3f186c290f2b85e6d5297eeed7596677 SHA512 05900aa63e65646e75f805dfe6ae5901efb19ae31a3f0a6730a713bfaffc47bb93f683879ce2a75093ea09e84a9d3137966b68b4ad307707753dead1df439a09
 DIST ganv-1.8.0.tar.bz2 382822 BLAKE2B 4936b7f87fa7cf17ed86b8165558684f0f59387c9673144d57d8505e41f367735117e9f5b08508dcecb831b77b6bbc6559323417824a9f8defc43c81cc91d469 SHA512 00969879592af11d211ad790b970a8a3765ec0591515af856230e3fc9371b1611f2a4edc73d1fc59371a4c4a49c7479f279dc6f298d843296e6707cd2d495af4
-EBUILD ganv-1.6.0-r1.ebuild 987 BLAKE2B 228b9642a9eaf93b06f90ef12c3aadce32fa4e493afd901c5c9ed1279d3714753cc283565cbb822b728834a0d432c0f9a59fbb67e841de324d8c9acf222535fc SHA512 8ac137065435e1e5ceb7a5be97cd8bbd7682869e848c4307b78c2a15b94559613189b68a63197c16ba2e132b564093b87e561a85084ac87ac9e9448f61da302c
-EBUILD ganv-1.8.0.ebuild 989 BLAKE2B 61b0c5760462c2c51edb417f2ad02624f60563e735b95f5e6dc68610e7e1ad8e2c89147792dabcac6fbf084e7c1706ede8179569be9b806603afcb7b9d07a18a SHA512 805ec99663db18953bb323f00bf5474d378ad46e125d90e51af836eab94ee667a59d8825b7bcaf5e12c52c0c45b80687db8d67605a88c47ae9f18768aaedb084
+EBUILD ganv-1.8.0.ebuild 987 BLAKE2B a019168597a0f53d2bcc7622df85573f09865cf533b2f50c2f03c718a5b6d57907511081d258d794de197aa2ee1af5a32bc344d7d958f32be71e7c179abf76df SHA512 b775cac5f042ba88699175e7bf61e64eda654c7b32b5ca7ab7146927c1bd16b9d1c124ca29c44a42a53659cd6e91dea8f5cdca874713dbc68b9acf39f78c2055
 MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/ganv-1.6.0-r1.ebuild b/media-libs/ganv/ganv-1.6.0-r1.ebuild
deleted file mode 100644
index 28aa4c0f5514..000000000000
--- a/media-libs/ganv/ganv-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-inherit eutils flag-o-matic waf-utils python-any-r1
-
-DESCRIPTION="A GTK+ widget for interactive graph-like environments"
-HOMEPAGE="http://drobilla.net/software/ganv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+fdgl +graphviz introspection nls"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	x11-libs/gtk+:2
-	graphviz? ( media-gfx/graphviz[gtk] )
-	introspection? (
-		app-text/yelp-tools
-		dev-libs/gobject-introspection:=[doctool] )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	nls? ( virtual/libintl )
-"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	waf-utils_src_configure \
-		$(use graphviz || echo "--no-graphviz") \
-		$(use fdgl || echo "--no-fdgl") \
-		$(use nls || echo "--no-nls") \
-		$(use introspection && echo "--gir")
-}
diff --git a/media-libs/ganv/ganv-1.8.0.ebuild b/media-libs/ganv/ganv-1.8.0.ebuild
index a71cd3506df1..58367e54c0b2 100644
--- a/media-libs/ganv/ganv-1.8.0.ebuild
+++ b/media-libs/ganv/ganv-1.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+fdgl +graphviz introspection nls"
 
 RDEPEND="
diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 7ab3bea9344c..660ecbbab322 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,5 +1,5 @@
 AUX 1.4.0-x32.diff 759 BLAKE2B f122756759da4cb2a122ff702b688c63bf878801e75080d0482bd8583a935448bee42fe00f50bbd99679e5cc5a3e96b01854dad2882a12a64432782b368750c6 SHA512 4c4408ec7d42e81f4e5913ec4d97cc88290a3729d5990910f0c7d2a86da511cd496bd20574f340ff8786e533f09687c0788ba790746cba56a43403e11b638a3f
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
 EBUILD gavl-1.4.0-r1.ebuild 1090 BLAKE2B 09ecaa97c26e2fd046c6cb35eabcffa67f768977409e57c13103e452964afaaf20125689006a766f507af0ca3fd7d57624492de492a7a531624ca5236608d5f7 SHA512 33408ccd8f78d4e2c4d6dfbfda3fbd350bdc65ad5ab5836feb7cad9453ce51fd20b4c5ce8669bb5c040f5951eb7fd9157012dccd8ee853414f7859896fb979ba
-EBUILD gavl-1.4.0-r2.ebuild 1365 BLAKE2B 8ca3082c11cf88f7aca766ba98fcd0f6920e3e7a21d501a5c80aa01fae03102bdb6b76ea760ad41d90f489a15811e9c7b80fb1d52f5d3f9d49996e4bd0989046 SHA512 1d09dbfb300546447139d8e130704a107b973339c25b9b9bd3204196b43cd84b87871e2b683e4634255d2eb692acd09255fec7ba0fac1ef69bd2f67d5dfd4bfa
+EBUILD gavl-1.4.0-r2.ebuild 1364 BLAKE2B e167b7d76166a6b54eb1c4a2fea97cd16d772022402328a4741f91b62b267a742524568455507ad70ad467096e9ad550bdf482cde0a5650d3f275b9cfbc4e657 SHA512 bb115b2b88ab3245556380af677b92503f73d74f6d2ce09e7b6dd1f2247467c3deae3edfe179daac788f9b0faff8550293a3217ed08ed50278f6f22aa11de827
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/gavl-1.4.0-r2.ebuild b/media-libs/gavl/gavl-1.4.0-r2.ebuild
index c314b13cff40..ccd9c0e8c0f1 100644
--- a/media-libs/gavl/gavl-1.4.0-r2.ebuild
+++ b/media-libs/gavl/gavl-1.4.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index a04fc6c46e5e..7d7cb37c4b47 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,4 +1,5 @@
 AUX glm-0.9.9.6-simd.patch 427 BLAKE2B 9f6e4637ff526497ba9a77247125d1fe5f06eda9bb689b5c42661deb72703b004e2c18f7236503f0673b354ba0e6fa7b13361606ea64fc0e7b9e55eccead91a2 SHA512 72f46827cd6651dd6fddc7ba548f8d9132fd74b9799a8eca6e94435141e96f752917b4343d4c3f37536bbc7713e978e4d85842da6d262c086019eb85f351a431
+AUX glm-0.9.9.8-big-endian-tests.patch 3463 BLAKE2B 4a71bfd885de6cbd715dfb4eefff0d6e7795001de2f418085455609b3a53be71e22e895236a7a20b8a38e886621cca758aa489522c4514534182890d33586d9a SHA512 6b5432bde02f57251203a40b52991c9b41422683740f3f2138b5adef96d47ec9123e4caee3b27be4c38cc3f0418ca821e1016966a5370b6df433b8e05fdd5eab
 AUX glm-0.9.9.8-clang.patch 712 BLAKE2B 1bd883548efd33e33759828979f9d62be0576b76ae187ea0ff52a817b58262e5e7859d99d5405e87ebef1fa30bb70f712636acb4bdf12e61b54536b363074b69 SHA512 be04ae74a3466516a284dd159dae0c0e063f2b5b424b3552888d36adbd24a937c7beb27bd0bbb917343bb9746198ae14b39fdad5ff117e408d89b4bf00badd1a
 AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e602da1d49126cffbd28c2aab2e2dbe711d047d482b4aead45d1e8770ab571e23e895201b4d SHA512 c875971c208bac82c1a326ebcd327ec9dd92a5b86981d26bf759516107204876a401ac9c57ca6c9965021364678ebbffcaaca6a3b4ee0e532d468d7b03b3ab9b
 DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
@@ -6,6 +7,6 @@ DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d609
 DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B 41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a SHA512 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
 EBUILD glm-0.9.9.5.ebuild 888 BLAKE2B 8b24c2462309c9ee9447cb55e443f6b02971e62b038ba3147b33a66a3324c94f056acfd690c412cacaf009c21296ffe002ce1c84879dab029d3f48c3d6bfce65 SHA512 79bbe88e3487f1ea637272e74c4e81f0037c5249aead813e4ce3060adcfa3040efa2340a3fb3fa7a31fa6f8a0ae129e0b64bf8d1e5ef394d91b8fca614d830df
 EBUILD glm-0.9.9.7.ebuild 1211 BLAKE2B b567e64d07b301f9290e7ab533145497307185050b3ffea4de9fc8c27ba6c3d2f6eb3356d35b2aa1517aa1495cd2632de8afdbba0d157186246789841950f5f6 SHA512 c7ff576f73564277be087ac108e255699017ede17ead85ea50074b08bcacadf25f1bcdd6286f046893f3f4afc514ca03c7612462707cb170d8c982f409225a0a
-EBUILD glm-0.9.9.8-r1.ebuild 1383 BLAKE2B e57cd610f7e1e65b46ee1136cc2ebe564c913a69ecf5cdb811e6b8cb02acef56b89b5b7b111b118dea7ebac2866c353eedc984bab123b14dd8c8c7a0ccefcedd SHA512 ac646d109b6ca9aaea463b3c76925b6adc46ed96d81345ee7542e6e53f5e0775ca0ec7234d20fabe5fc2558c2192bba56fbd391356735ec91e1adc5db057e513
+EBUILD glm-0.9.9.8-r1.ebuild 1421 BLAKE2B 1177ffedc90816dcad867b30ddfba2ea9027034a6b626728641b2015dfc695b8a06b2cde88eca33658e1736bef00326fa1105bbc03bdb505e6bfa9b68bf551a8 SHA512 90296879eb843e4cdd2dfc4f0e5c96086bff74cae0dc3f01dbac8b205c1738e7d639f5215652c4428d6a5b3fffbddfbfc93ddc8068f1ea8ab595933ec45f78be
 EBUILD glm-0.9.9.8.ebuild 1229 BLAKE2B 137b4407d122ed1cabce0a0083216499fd4cad705fcc0f66bc14191b5abdac188b58746c9272f7ca316311547410d9f0eb297b437adf98f36b7a5d05d80d2d22 SHA512 3b103f7db0bd6df218109da65d17f1f323aaae481dea170ae6fc34e51aab7f802478abeba6bf5d40c848b02068f7217d4c0de5adae7667f78e98420e531b80df
 MISC metadata.xml 544 BLAKE2B 1b51ba07aff67e963ef1fc1e9e30d40352c7f04c7c3996db73a5877aa2cb9e7150fa52017ac3a5100f1bdbc400f0ec6a392ac4352531e5a8ff893ddfcc271325 SHA512 144dfba609da46e7b7757b9173bf06248efd764e4246564321cb8c60bb9504d99cf0da62ed3d2bdc78bcc81648353c9c507aca6defff9299e3f9f99b4c3fe902
diff --git a/media-libs/glm/files/glm-0.9.9.8-big-endian-tests.patch b/media-libs/glm/files/glm-0.9.9.8-big-endian-tests.patch
new file mode 100644
index 000000000000..cc8b1b637a83
--- /dev/null
+++ b/media-libs/glm/files/glm-0.9.9.8-big-endian-tests.patch
@@ -0,0 +1,186 @@
+https://github.com/g-truc/glm/commit/06ce42e72324b32b1f4c37c646e99950c2bd5f6b.patch
+https://bugs.gentoo.org/673972
+
+Not yet applied upstream because <endian.h> is not available on non-Linux platforms.
+
+From 06ce42e72324b32b1f4c37c646e99950c2bd5f6b Mon Sep 17 00:00:00 2001
+From: Max Rees <maxcrees@me.com>
+Date: Sun, 15 Mar 2020 15:13:27 -0400
+Subject: [PATCH] Fix test suite on big endian platforms
+
+---
+ glm/gtc/packing.inl      | 55 ++++++++++++++++++++++++++++++++++++++++
+ test/gtc/gtc_packing.cpp |  3 ++-
+ 2 files changed, 57 insertions(+), 1 deletion(-)
+
+diff --git a/glm/gtc/packing.inl b/glm/gtc/packing.inl
+index 8c906e16c..b1c99a507 100644
+--- a/glm/gtc/packing.inl
++++ b/glm/gtc/packing.inl
+@@ -9,6 +9,9 @@
+ #include "../detail/type_half.hpp"
+ #include <cstring>
+ #include <limits>
++extern "C" {
++#include <endian.h>
++}
+ 
+ namespace glm{
+ namespace detail
+@@ -183,9 +186,15 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 3;
+ 			uint y : 3;
+ 			uint z : 2;
++#else
++			uint z : 2;
++			uint y : 3;
++			uint x : 3;
++#endif
+ 		} data;
+ 		uint8 pack;
+ 	};
+@@ -194,8 +203,13 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 4;
+ 			uint y : 4;
++#else
++			uint y : 4;
++			uint x : 4;
++#endif
+ 		} data;
+ 		uint8 pack;
+ 	};
+@@ -204,10 +218,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 4;
+ 			uint y : 4;
+ 			uint z : 4;
+ 			uint w : 4;
++#else
++			uint w : 4;
++			uint z : 4;
++			uint y : 4;
++			uint x : 4;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -216,9 +237,15 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 5;
+ 			uint y : 6;
+ 			uint z : 5;
++#else
++			uint z : 5;
++			uint y : 6;
++			uint x : 5;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -227,10 +254,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 5;
+ 			uint y : 5;
+ 			uint z : 5;
+ 			uint w : 1;
++#else
++			uint w : 1;
++			uint z : 5;
++			uint y : 5;
++			uint x : 5;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -239,10 +273,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 10;
+ 			uint y : 10;
+ 			uint z : 10;
+ 			uint w : 2;
++#else
++			uint w : 2;
++			uint z : 10;
++			uint y : 10;
++			uint x : 10;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+@@ -251,10 +292,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			int x : 10;
+ 			int y : 10;
+ 			int z : 10;
+ 			int w : 2;
++#else
++			int w : 2;
++			int z : 10;
++			int y : 10;
++			int x : 10;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+@@ -263,10 +311,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 9;
+ 			uint y : 9;
+ 			uint z : 9;
+ 			uint w : 5;
++#else
++			uint w : 5;
++			uint z : 9;
++			uint y : 9;
++			uint x : 9;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+diff --git a/test/gtc/gtc_packing.cpp b/test/gtc/gtc_packing.cpp
+index df5b3bb1a..fbaaa5bcc 100644
+--- a/test/gtc/gtc_packing.cpp
++++ b/test/gtc/gtc_packing.cpp
+@@ -4,6 +4,7 @@
+ #include <glm/ext/vector_relational.hpp>
+ #include <cstdio>
+ #include <vector>
++#include <arpa/inet.h>
+ 
+ void print_bits(float const& s)
+ {
+@@ -156,7 +157,7 @@ int test_U3x10_1x2()
+ 
+ 	glm::u8vec4 const v0(0xff, 0x77, 0x0, 0x33);
+ 	glm::uint32 const p0 = *reinterpret_cast<glm::uint32 const*>(&v0[0]);
+-	glm::uint32 const r0 = 0x330077ff;
++	glm::uint32 const r0 = htonl(0xff770033);
+ 
+ 	Error += p0 == r0 ? 0 : 1;
+ 
diff --git a/media-libs/glm/glm-0.9.9.8-r1.ebuild b/media-libs/glm/glm-0.9.9.8-r1.ebuild
index 10f370ff15e8..9f2a239e9940 100644
--- a/media-libs/glm/glm-0.9.9.8-r1.ebuild
+++ b/media-libs/glm/glm-0.9.9.8-r1.ebuild
@@ -11,15 +11,14 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 RESTRICT="!test? ( test )"
 
-RDEPEND=""
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.9.6-simd.patch
 	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${PN}-0.9.9.8-big-endian-tests.patch
 )
 
 src_configure() {
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index f3f2361d20cf..4142802bb309 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -2,6 +2,8 @@ AUX gst-plugins-bad-1.14.5-make43.patch 7736 BLAKE2B b0b1b85e7bce7b267c382bd853b
 AUX gst-plugins-bad-1.16.2-make43.patch 7494 BLAKE2B f3207f46b7bb4a56acb70ca5a337eb326e47b9b16fce36938ccfea0b1dbea09213190899843bda338063cfe38589b9badc2676826bcb463cb1c1d90f5dbc19f9 SHA512 ccfd579039d2696e268f7b6fa17930383a765ad472f1e6b5ccc90ee26cbaf9006b584aad3009d8a7882ebbf1533533ae001b4335c781decb0ac93591056c8c30
 DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
+DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 EBUILD gst-plugins-bad-1.14.5.ebuild 2681 BLAKE2B bc85aecf70149241ab47bf8fe6dc2f4a172feac1a445d713f7dd8a948efd0e2ab1c216c972e744c16f058aaa70b5c6641b49ccc8a2e598462dfeec57a31be9b5 SHA512 b4cbdeea64bbb9f86eace388008b5102a32e1101629a5dac7cd049dbb2c6adf021b91becc4ae6abed9ca6e58b7d66e3f11c94ff4780cc8e836034da552f3b9c0
 EBUILD gst-plugins-bad-1.16.2.ebuild 2303 BLAKE2B d2a38f50c1ee5806ffb1be74b1ce92e532521624457b69284b334ba728cb3b4c97180e07bb69620f413a635cd52c78d8ae7fd9a3fa028eb7b68a25396e032b67 SHA512 c5e7d28c33f5b146aaa979999c4c2b2e4b827977d0f342f7bc5b4a7350c459020efdbbcdaf2791aa4303b1ed67a500db639f1c08a4eb423615639a3c6633293c
+EBUILD gst-plugins-bad-1.16.3.ebuild 2210 BLAKE2B bbaa52ce245c0cb0542ceb033c9dd0ca03c97972c1a6562c8a6528ae8e6c01590e0e7b1197bb154c95aa02e0cbc0249ca4edade7178bced7f0d46195af900913 SHA512 15c474b89d9444dac8fbabc62ef6ac2d00099b651a2e2b70894be74f75fd3efb772dc34e7f13d839d7127f0c8091def5a850137a446b216edb70e0c5d25b220c
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
new file mode 100644
index 000000000000..c7d3b2537f67
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit flag-o-matic gstreamer virtualx
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="X bzip2 +introspection +orc vnc wayland"
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+	wayland? (
+		>=dev-libs/wayland-1.11.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.15
+	)
+
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
+	gstreamer_multilib_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable bzip2 bz2) \
+		$(use_enable orc) \
+		$(use_enable vnc librfb) \
+		$(use_enable wayland) \
+		--disable-examples \
+		--disable-debug \
+		--without-player-tests \
+		--enable-shm \
+		--enable-ipcpipeline \
+		--disable-gl # eclass probably does this too, but be explicit as it used to be handled in ebuild here; all parts now in gst-plugins-base instead
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	unset DISPLAY
+	# Tests are slower than upstream expects
+	virtx emake check CK_DEFAULT_TIMEOUT=300
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index fda50141f78e..0fd304f82d7f 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -2,7 +2,9 @@ AUX gst-plugins-base-1.14.5-make43.patch 10992 BLAKE2B 19db9e3d90100863262f2fc63
 AUX gst-plugins-base-1.16.2-make43.patch 12403 BLAKE2B e99167bbb792c5815e8bb726559b63734fcc7489dbde65ab4de48ff17c069b8295059f002d130d5a970461e7333a2bbbd4ac3e20c2a4809e7282b5a13a981964 SHA512 9d65537814310059f21afe43390c858d52d9390b54b6de590b3fd3541e333a7954f9aa9c44a91bcd01b6232dd01f0711c8a19462f9a2cbff82851b4366871502
 DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42
+DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
 EBUILD gst-plugins-base-1.14.5-r1.ebuild 6025 BLAKE2B 0b7698e494efef8651973fb3ad48af145c9d7c94afa9964aa5598beacbd64d4e85147caa3b2d89d34925851bcdb3a6558f7e515fd3430c6bc35cf6a82b9adb46 SHA512 e19f197d53cc5758645db08e32e336004433270f897f8253200eac634480ea41ccfe162b625e27a0722e005e35ea05bf6fe9943ab9317803d91de21f6f225bb6
 EBUILD gst-plugins-base-1.14.5.ebuild 5939 BLAKE2B ee15054730e0119af1d6b0203f5b6e0f479bfa5f01be60f2956c0431ba26692a4814c723b33b049e6d692ddeb29505889f52d5eb1003739fa1a0e907d8a1c1bf SHA512 b7c4d12d8c029a184711e54d7eeee23e6427d79d36f18dbf5f15a8b26dbe078a057a312930b708684808f31b1a519d57a94939f602754ffe012c2730fb4fd95a
 EBUILD gst-plugins-base-1.16.2.ebuild 6046 BLAKE2B 1925848df988f12d58b5da0963744b5304654fa88acd78c84fd2d7a5da6c4300e368e91753e095cba4acfca0bad97a7355af87a22a148c6a4f081d55cc06d9c2 SHA512 7cf8736921c8ea16058fa84c796ab8182ddb60e90c01851cea41cc5d33de0bdd31d142192536a0925287a33a625cff7e856aeb835d391e798e5cf78646c0c6bb
+EBUILD gst-plugins-base-1.16.3.ebuild 5953 BLAKE2B e5799a848023f74fef8cbfd0acc38d2e79952cc70bb77cd9817e014d8c824da8f9947301fb1175ddfd0cc2d31122ee833e63a7fdb29dc785885b6ba607942e51 SHA512 4fc5cef8b21d42736ce81d9805842b02b2de3e4f51f9d8ed0a03f348cb4adb633a7d060e4507f8e5d36e920832f1d96ce2c0bf2f4dd634c47778a89b3d796fc1
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
new file mode 100644
index 000000000000..165995426bfc
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+	)
+
+	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.15.0:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	X? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
+	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
+	default
+}
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	local myconf=()
+	# FIXME: Automagic gbm and x11 wsi
+	if use opengl || use gles2; then
+		myconf+=(
+			--enable-gl
+			$(use_enable egl)
+			$(use_enable gles2)
+			$(use_enable opengl)
+			$(use_enable wayland)
+			$(use_enable X x11)
+		)
+	else
+		myconf+=(
+			--disable-gl
+			--disable-egl
+			--disable-gles2
+			--disable-opengl
+			--disable-wayland
+			--disable-x11
+		)
+	fi
+
+	if use opengl && use X; then
+		# GLX requires desktop OpenGL and X
+		myconf+=( --enable-glx )
+	else
+		myconf+=( --disable-glx )
+	fi
+
+	myconf+=(
+		--disable-cocoa
+		--disable-dispmanx
+		--disable-wgl
+	)
+
+	CONFIG_SHELL=${BASH} gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--enable-iso-codes \
+		--enable-zlib \
+		--disable-debug \
+		--disable-examples \
+		--disable-static \
+		"${myconf[@]}"
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+	unset GSETTINGS_BACKEND
+	emake check
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index bf77e08431b9..5a2487833cdd 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -2,6 +2,8 @@ AUX gst-plugins-good-1.14.5-make43.patch 1869 BLAKE2B 93bf7ca4bfc14461b71dab9a45
 AUX gst-plugins-good-1.16.2-make43.patch 1927 BLAKE2B ff38be465f3300f8b6821b37878e0beeee471d359362b9f26f2fa74b9f91cb5d3afd73de5d13f3015883915f21eaf3cfe2c5fb06b7d387e4e268a577c1afb48d SHA512 8c3432a402cbc2bffd617a294a356c3f0bb0dc88593267db82b308817d07f0c0a9e30b205868ad9c7937aee8864420240c4a16cb019b26cce2dcbfb10337e0fe
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 DIST gst-plugins-good-1.16.2.tar.xz 3897172 BLAKE2B b6341bb2f2456e2c558f71e9f18726eced88cbc703fa017067415297cc7ccdf70b4ceb18e9e3c7c64fc7c55806c7373d9a05eac582067ab764a02c1bafef4b33 SHA512 ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4
+DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
 EBUILD gst-plugins-good-1.14.5.ebuild 1506 BLAKE2B 4f7fa9ec216eba6ba101b8ffdfa9d35151f2c6956bb40fdfbacfc88fe8b800a0cdc5e645fc662f183d41eb569885da7036e5a82cfdb370d15485efc47110c212 SHA512 54bebe46bbede74adcb733677f92f4694cc770edae5cd1e45fe7aa0056cd67e4838a7612215f0ccee160eaa51d274d2fa0a38513cb695805966549d495767b32
 EBUILD gst-plugins-good-1.16.2.ebuild 1506 BLAKE2B c55b6d76f96fd092f316a507f8623f45db960b3f630660c39a4fa664f88a80938d3afcc46330e807e5b83df54c2dc6e6be6c713d6d922b514b0def2b66cd32ac SHA512 c9a04a15948cc29977c6cf6faafc7e0d13cb068decdaee0807fc06b771f9f11497e02c1e49b2bdbf4c2b5184ebd3582656750408535c1331b0eee503498cc5d5
+EBUILD gst-plugins-good-1.16.3.ebuild 1413 BLAKE2B f975d21df39043eee9252dbc054777d91e6fe28e462c9ebeec1622c9aac7da05f66823d2a382a6c6dadf5666787bdf2e9b505af67ee252af98bd3a412b877f55 SHA512 8e16c9ab5cf8c672f4bdc524f80463bf96fe8134e1812648959b4a184a95503a64ecfbe93d89332bb274cb8f8f4ec9660763259a3db3fcaa31ac77b7c7ba52e5
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild
new file mode 100644
index 000000000000..d0532e13c92f
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	# Always enable optional bz2 support for matroska
+	# Always enable optional zlib support for qtdemux and matroska
+	# Many media files require these to work, as some container headers are often
+	# compressed, bug #291154
+	gstreamer_multilib_src_configure \
+		--enable-bz2 \
+		--enable-zlib \
+		--disable-examples \
+		--with-default-audiosink=autoaudiosink \
+		--with-default-visualizer=goom
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index f4af060ff80e..de3561fd9db7 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,6 +1,8 @@
 AUX gst-plugins-ugly-1.14.3-make43.patch 540 BLAKE2B 13b53beb26c0f70233178c974337bde725316fbca2540dda38568935a67e4114e775d53f5c37390ab574caf8a4748dd039be04d6b8c935d1cc17dac8931e2ee8 SHA512 7e3dddb06522dcb031296ccbdc1b09315d30ca974d63c8e552983213d5d11bdc258ca7c659ec874f7c6fa2b81925707805c91a8928085b3950c5eb62fe336e61
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 DIST gst-plugins-ugly-1.16.2.tar.xz 893964 BLAKE2B c607a7aa3459625a930021d247705f00e418e57557c57b8f9793bce74cb5c4d708b253250f0bbebd9698e9ff80d5636d578dded8c360ca2d34e3d43c9a722416 SHA512 9f393043f51b12b376607e68b3b86437af86e321e3a3566e59c7f3507ed26622211df87e30a23bcc927f37bc11f53ca3b29f1b12bf58e623ce18edc88a9cdee3
+DIST gst-plugins-ugly-1.16.3.tar.xz 899124 BLAKE2B f848c7bbf36cdfca6e3dec4893b9b1bdc363feb697ee7cc89f4c664aa7aa700b76678873e5dae23f277ad99d6034c1e3617d760acc9cd075e0044fae3f4bb88d SHA512 0223f4ceebd1482329cfc7c3faa094d9f3b1d3eaa51eab3ff42da781f0aede8e838221bdc8d1a3ffc43318fb424421447d5548ebaf9ecaf8a290975d178df9ca
 EBUILD gst-plugins-ugly-1.14.3.ebuild 1040 BLAKE2B b407e5fd151f84fdad9b7b15fcf3a26911a741fb38fe7e87cc8f85e983b7a98628bfc41ab1db9ebbd72542b0232f268b58c3bd86f90bf384de6ea4728fa1d98f SHA512 2dea55696ecad8c8e71dda5f882908a41eec0b29f127235eda786721052d28cee41a8fadd5b0bc44145b1b71a64829f053a8f45284e1c17854b6ea11c8e92945
 EBUILD gst-plugins-ugly-1.16.2.ebuild 1040 BLAKE2B b407e5fd151f84fdad9b7b15fcf3a26911a741fb38fe7e87cc8f85e983b7a98628bfc41ab1db9ebbd72542b0232f268b58c3bd86f90bf384de6ea4728fa1d98f SHA512 2dea55696ecad8c8e71dda5f882908a41eec0b29f127235eda786721052d28cee41a8fadd5b0bc44145b1b71a64829f053a8f45284e1c17854b6ea11c8e92945
+EBUILD gst-plugins-ugly-1.16.3.ebuild 947 BLAKE2B 5d1575dee8b89c3b68457480e0cb15a56faec5ffa46327c3d72217ceab1a187c553c797e4017cd92e62da8e1bf9d2e40fa54df8a35e1c425d9de0d047527f5dd SHA512 c24e5153f0c238622faba345bac767b5e39ed3c00c62175b0b18dad8725a14330957a621f2acfb867b5c4b15332e3d331f54cd6f41b81b61f35ee463c8781240
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild
new file mode 100644
index 000000000000..12578b75f6ed
--- /dev/null
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-ugly"
+
+inherit gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index c662e3797259..a13cb529076c 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -2,6 +2,8 @@ AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5c
 AUX gstreamer-1.14.5-make43.patch 3176 BLAKE2B a221894affd68da53d475c65544cfe825b9ab947fb6b7b13c2b409b71f7fcd7224f94835d293d4ea10da9a7cd271284449c97ebd475166fdda6d54929b816e04 SHA512 89de24659fe954e483d62f938b01dc2de25cbcc039eb6c12e8a0dd1681071a567f4799f0cf615738173304e6d103afc2b569fa81cbbbe61bbca1b0a1e849b9bf
 DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
 DIST gstreamer-1.16.2.tar.xz 3328600 BLAKE2B 9bc12330fc5a7fa3a65e2c03f9d06172d787e9aadb4c2cb7d98f8f7c5850e05535cf23f747bf89514a609447f3894942bcb2fa4a6d3d3406e129e1eb67b49158 SHA512 a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f
+DIST gstreamer-1.16.3.tar.xz 3338692 BLAKE2B 79eb08bc446073fadf881adea0f60a2caf6384836df975f80ce0e57db6469e6a016cab38413d3de00d11b491a0281f95dcbcd1f782b31f2d1a07b866c1ed7dd5 SHA512 4a879e71f65c89609c2e106dc79222853e6f37830638d5b9624c436fc9d8974cc6474d399eff02cdc13ff7189fcd13e9450450d36c3a6092aa53cb97056f5854
 EBUILD gstreamer-1.14.5.ebuild 3028 BLAKE2B ef82e9743fd2fc3e3a58e440898923cd95a25b522834d16f8f8c7aa54e94b482453e4eee356f38b84f8485cc7dff771909305dd304da18e45fe288d38ba9792b SHA512 a8fc136c373baa98d9ff27ce5edc1bb95fbd5f43de35468d13cd4b071cb1696523737ed5926dc00c5930ae3836ff4323eb43a508c40a4976f9899867c8a297c6
 EBUILD gstreamer-1.16.2.ebuild 2946 BLAKE2B 00ac2a8067a0847131146f7c74ebdfc9a4ace5091eb8a27c31913d08cbc08685602ad6c2dc1836a5566b7aa8d40b126962b019021c3f32d35b632b6716468441 SHA512 25b99b349aec91c480fbb18425904463d034936d22747d9e5f7ef96937791ad46b76ab4b308f6db46a408f4f4e74935d1609b260f9fb3404ad033b291dd4eeb4
+EBUILD gstreamer-1.16.3.ebuild 2853 BLAKE2B 428184b8359c5d82e183493d159f205123d29fe284604cc0ddadde4673378d3d05acdeaeeb9fad5a61d911586f0138853b5c38a05ec104ae49a53730d8f97ddf SHA512 aefa024ad1716f7bc182c5244e26396840fcd29e1865aea672b3f95a787f492d9191c6a16c9d15b10fedbfce2a4353b8668c6c72633a19bb27be87a6fe3c7d44
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.16.3.ebuild b/media-libs/gstreamer/gstreamer-1.16.3.ebuild
new file mode 100644
index 000000000000..a2493d6e8ff2
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.16.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 multilib-minimal pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+caps +introspection nls +orc test unwind"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	unwind? (
+		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+		dev-libs/elfutils[${MULTILIB_USEDEP}]
+	)
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local completiondir=$(get_bashcompdir)
+	# Set 'libexecdir' to ABI-specific location for the library spawns
+	# helpers from there.
+	# Disable static archives and examples to speed up build time
+	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--disable-benchmarks
+		--disable-debug
+		--disable-examples
+		--disable-static
+		--disable-valgrind
+		--enable-check
+		$(use_with unwind)
+		$(use_with unwind dw)
+		$(multilib_native_use_enable introspection)
+		$(use_enable nls)
+		$(use_enable test tests)
+		--with-bash-completion-dir="${completiondir%/*}"
+		--with-package-name="GStreamer ebuild for Gentoo"
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
+	)
+
+	if use caps ; then
+		myconf+=( --with-ptp-helper-permissions=capabilities )
+	else
+		myconf+=(
+			--with-ptp-helper-permissions=setuid-root
+			--with-ptp-helper-setuid-user=nobody
+			--with-ptp-helper-setuid-group=nobody
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		local x
+		for x in gst libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index a4e1d9e043f8..7312535d563d 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -2,7 +2,9 @@ AUX hamlib-3.3-format-security.patch 738 BLAKE2B 896d6023f68979400ba8782956da86b
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
 DIST hamlib-4.0.tar.gz 2242857 BLAKE2B 458a5cadc36f8f434fefc73b6230b08c858a741a685805e8d8ab1e2bd74aef9667d6b3d006aa493516830a6fc8af19e77b4d92736198bb920797aecfac605f41 SHA512 6c097f503d1050dca4e5ab9091cd9885f8db8b0e4b2fb26af570f1871f2da713ac3fe10e3629d20ebfc2927768555ad277e68cc38821f4a905900b8d3a5ba8c9
 DIST hamlib-4.0~rc2.tar.gz 2188867 BLAKE2B 02df21910266e47c99e3cd72fc815ed75b9b5f50b29b9a94aa6fc5ddac73b1a09d16caa0d5e4be71bfe44e1940b853a0a8e1303f23fbacf003da18eed198531c SHA512 6d192bbb1c98e76fdfd1dd6bde1d0fd8b668243332827ae609e7bb4a93a3fed9fda0b12363638f5e9df65d65fd2305dfd493bd37a99aca2f2bd5b0861e948d5b
+DIST hamlib-4.1.tar.gz 2260629 BLAKE2B e53249f476005f3ec8afcbba6d875d913cdc45eb741fdb8b8718c1c5bda9cf8d50087165b72055600bc9ff364117f7d72235a3d68a9fb0882a77a6fdbf366605 SHA512 a5fca5dc89a7408628bc77fe22c6d8c77474b3dabee7b2b6d0b280becb6cb63f5619e4a620ad11aeb81b8412145b0f8cb0291a2d4cd3751c643cb1709b2dfa78
 EBUILD hamlib-3.3-r1.ebuild 2095 BLAKE2B fc8447042f8dfdaaf44a3a41bb6d0421fe16d6e7931d3f45bf2e583e1b086d4df69fc13eb2f936d736ba9099eaee3a3c1c83b6e61d91e05e1f5c85810edb65f9 SHA512 bdc9205557895c1b91ac3cdd740ac558f6e5b665f863e362c24a1cfa54770c631c8c469f9c70f466753a426aca4f1d873ac2c6a5b7244eaf6d9a5103814b99e7
 EBUILD hamlib-4.0.ebuild 2042 BLAKE2B 85eb4910782ccad90bdcd0361a7df1fbca5614cc9ac70a7a0fa4436f5f2b5662e63a4f16819a905f308137f860b5673af6bbfc9bcd26f54106915a6723319a97 SHA512 cd02f20205904e8e745c1a4face3c1ac8ecf6acfa7b654999dca8d3f48326a5ab579e7137c9efcab0aaf7ba8d8511b3380f73d9dc82ad3b1bd38bf342c8e9ef2
 EBUILD hamlib-4.0_rc2.ebuild 2062 BLAKE2B ae28931887b38c1d76b2887400912bf2ed36510d89515b3457cccea08ad31035ef927c46ca9ecd28823fbe498359f8d1490b1d6434b254db814c9cb90ecc0a21 SHA512 0e383c2449a97aa0d8e0e8b2fe10cae2da174fbd8fde7d268065ce87c203cbe6a8fdfd5a7c4be68a3f3c85eb4d776d686f1efd7f95c11b27b47af26e46d36797
+EBUILD hamlib-4.1.ebuild 2057 BLAKE2B 7bf5bcee83869eabe6dbe90cb17647e7684f587ac8ef6b13a7d6e95cbeb220be02dde958cf8c875474bb2a5395b20c7dac9181499d12a7ca05536d1206097607 SHA512 b866afe7a42c8fba1de7d7c04b68a8bc7c2e05d57a78e62ce5d59f9e116280f0a20eba63cd8b30a94e8caf430cbd9295ab95640d2b094cae26591ffa89dae352
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-4.1.ebuild b/media-libs/hamlib/hamlib-4.1.ebuild
new file mode 100644
index 000000000000..d5550a87ae9b
--- /dev/null
+++ b/media-libs/hamlib/hamlib-4.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+MY_P=${P/_rc2/~rc2}
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Ham radio backend rig control libraries"
+HOMEPAGE="https://www.hamlib.org"
+SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc perl python tcl"
+
+RESTRICT="test"
+
+RDEPEND="
+	=virtual/libusb-0*
+	dev-libs/libxml2
+	sys-libs/readline:0=
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )"
+
+DEPEND=" ${RDEPEND}
+	virtual/pkgconfig
+	dev-lang/swig
+	>=sys-devel/libtool-2.2
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# fix hardcoded libdir paths
+	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
+		-e "s#fix}/include#fix}/include/hamlib#" \
+		hamlib.pc.in || die "sed failed"
+
+	# Correct install target to whatever INSTALLDIRS says and use vendor
+	# installdirs everywhere (bug #611550)
+	sed -i -e "s#install_site#install#"	\
+	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
+	bindings/Makefile.am || die "sed failed patching for perl"
+
+	# make building of documentation compatible with autotools-utils
+	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
+
+	eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)/hamlib \
+		--disable-static \
+		--with-xml-support \
+		$(use_with perl perl-binding) \
+		$(use_with python python-binding) \
+		$(use_with tcl tcl-binding)
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	use doc && HTML_DOCS=( doc/html/ )
+	einstalldocs
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins hamlib.pc
+
+	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
+	doenvd "${T}"/73hamlib
+}
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index a3161e8f6bec..5a066e9a1e5a 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -7,5 +7,5 @@ DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf1549
 DIST ilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
 EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290
 EBUILD ilmbase-2.5.2.ebuild 1326 BLAKE2B f58d3ad532feb4f6b285b4ae66102aa7426b66c97c2d96f8adf594301df833e8d2e9877a35dae22b508ac3a3728030860e3df2e257b170fa1ba664fb7e515f3c SHA512 31b8c62f4c271c275a9e45b7852d75bb84035f82e9f43951f7f5ab34367783d7257f6148b1c593ab9ce51d565a240962d19df023a1ad30b93595813c7b991363
-EBUILD ilmbase-2.5.4.ebuild 1069 BLAKE2B 997f8797c66364f7bf2007128b0010c7561c011b42cb1eeb1bfe3225ba6a5a921661c9405787122aa65df6e033156c831baeafa12accb16f2dd1c0de22b6fee4 SHA512 dd4878bbc6bbe31f39e2102a0bb42d809627c211d544292ee07e4b18ea77643cb680e1e18592c3f223058e1312f0af85734fc867c1505266cf683f0a23f361b8
-MISC metadata.xml 653 BLAKE2B 355a987fbbb2073049234f241a5574b0f023b82c8b7597145bc4242eb084a7499fc13d5a4dff56cc5c608fc56d8d264affa2045bf8f35875a7dae54828a51143 SHA512 bde3f1221e1cde98af0137b166c41b39f0342875217ee002e0c754f66fbb921ab4fc9657befa62ddfc97ee07fd9b53fccc3c12fba2a5ab7788bdf0120109f9d2
+EBUILD ilmbase-2.5.4.ebuild 1067 BLAKE2B e67250c33c6a71e67868382cd1348bcde9b6d0e033b0c8db4058d19c4b93505ebb52fee00ada46d7a651764144b94e415a20c7b7a11eb4ec7b2f28f491acb6dc SHA512 787d029ece0615e6e7d3ab32d78d9b9229e70c2bb2a743bf063ccf0ee238e4300074c0d73210ea432fc86a04ea6a74c8293c3e3978b3a68d8632380ae670da02
+MISC metadata.xml 661 BLAKE2B 3392b45aa602d98cd1f9403766c7829cc2744893629489e267d2a6c568a5d934114012f8b6ec84acda5bd42f06c3b2ebad8bf25cb540a27b80485696c82c7469 SHA512 6a0773377471b23316f73e7aba924a7421432a1d75da858354c72685eb6602cce7c7e16a5232ca47df3d8f9f3465f1bc5c1f58259733fcdfaeeeaa2b0327bdef
diff --git a/media-libs/ilmbase/ilmbase-2.5.4.ebuild b/media-libs/ilmbase/ilmbase-2.5.4.ebuild
index f7961017b7aa..f840cd379ffb 100644
--- a/media-libs/ilmbase/ilmbase-2.5.4.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="large-stack static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/ilmbase/metadata.xml b/media-libs/ilmbase/metadata.xml
index 454b3da09a54..3c2a8e7fe57c 100644
--- a/media-libs/ilmbase/metadata.xml
+++ b/media-libs/ilmbase/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>waebbl@gmail.com</email>
+		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index 57f53085d71c..294cd7c94a1d 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -1,5 +1,9 @@
 AUX lasi-1.1.0-cmake.patch 421 BLAKE2B 39ebb3759e055f045f406f59d9408c09f70a5496a76881f6a16621f3aa24364206360811f70f7db4b5a85f4583a525d1dd9de4fc28f45056bc8c4148cdfd6fd1 SHA512 f4218f6ed42c149dcbcefdee55e0332b83f5a6e039571cf9e0f600a60408071f9bd0d32fc0ea3286157719e164ec49221f84451353c1d3af7df5e58d7cae284b
 AUX lasi-1.1.0-pkgconfig.patch 701 BLAKE2B 50c59743897a07974e5329d1b0c039707533c4f3b0d51595b93faaf9abec034ae0407db59f4e112996210398fdabad4b4a0812f6888c1c6b83fe4b7bcb4a3854 SHA512 81b62d5491e19b6602bc622c5d1ed856a0950e209033de31773812815d221d741c78548edfc3fdc32230dca97de6e02ede79414aba1e803019299278d8c4e7da
+AUX lasi-1.1.3-cmake.patch 365 BLAKE2B 9e3944665e416a157c8cb5fa029723db5b551d7690fe6c7471f9e589093e5c136b17ec339ba0a93f96ce463be7fa1b01d734c361b3fe5061a445e13d64b036a3 SHA512 b1d6b6cb1d1f2d0006e1cac26d42f3b024f86687de87043208ad4a6c8cb94f9cd1b36d62df10bedd20729081d944c52645323420016cbf0d046c633f46f1b7cf
+AUX lasi-1.1.3-pkgconfig.patch 400 BLAKE2B b15c712c16bd70e92f80d0ab9b48edeadca75382191b54a34ac6c6dc2e0929491a7104e09c21c816b108e946f842d38f4506b71a62435785cf55acbaad13065d SHA512 fa7286b524163a6d2783758f368d60a2385012a10567ae30843daa9b72a22ddeb1fe767c24f271463bc60e27a370cd5292a6f35e6a5b5cf6f17b185f0797551a
 DIST libLASi-1.1.2.tar.gz 260948 BLAKE2B 044d906abadd902f91726c0e07e6ec364a3419bcea855a58cfeb44be30b2b9e0334c61931d3210750167ebc7599d8d4022960c40b0be68727385cf01b65780bb SHA512 5a03890b822946805025157497ce5f29fdfbcf5f2941bcd07841d9865cac9653697dbbba426f8527528affd4157e49d0f31a6dad79abdd52222dfcccf135ac91
+DIST libLASi-1.1.3.tar.gz 726769 BLAKE2B d8d06fb56e82b78f4342c959965de3908d70d1cec6147a6e3cc3d58ab4e9f978b7966c8e4507c0ff69e4ba3716270f38f3cfcafdc834001e3a0069a3495eda31 SHA512 036fb0ea1536d4ae04c0d9b5bd193ca6828228afe2cba6c1c7e12febd9b936bf3ac677711c122c44d3b12ab2f7b67f5e9dd18f44a4938ceaa2fbcc430a5748ac
 EBUILD lasi-1.1.2.ebuild 1296 BLAKE2B b5d56d8377396591ff84f093723001dabf498b1b70258092305ea70054eeebbab72c5ef2b79ca91da517131f936fa4caacb0fa11a67315c3f219da882418799c SHA512 2d2c91e1eae07f4776ddc86f228e1edda4358fb9ebb60a6c896a98c8731bf4b592fc1a11f49f346a6ce2df6156286feebe0f57dee9e11f4222e283127b72e12d
+EBUILD lasi-1.1.3.ebuild 1271 BLAKE2B a3600e94e1c380dfd0ed12c250ba5eb4cd5402c6bb2ec4716ba5ea4e792ac90864761dbd71e27fd50363b36ca17ec8e6c01a85ec9b03891a16f04c13c7c51e63 SHA512 75813b4a827626eab9d1821cc0e91364f93e64f64cc4d6676744c896219921d581e282262319e0549160ee84b21210519cf8b5050b7d498e8030475be028be16
 MISC metadata.xml 1218 BLAKE2B f6a5085f03d1bc69e88727d15754965b6db817bda61be0e71a7e7eb39262f3836de56e44498263f7c55ebdc2d58f7914e364fc23d11a1988a0ef4ca2883529c5 SHA512 c9688f2a9e74c81d7906d6609db72a7f29463c12800fb9e7922f1a4cd41db001722e5c5b102642464541e02d3a3f678fe0dd7013df9c8eace959dba3ba49ed71
diff --git a/media-libs/lasi/files/lasi-1.1.3-cmake.patch b/media-libs/lasi/files/lasi-1.1.3-cmake.patch
new file mode 100644
index 000000000000..87ff82e0ba7f
--- /dev/null
+++ b/media-libs/lasi/files/lasi-1.1.3-cmake.patch
@@ -0,0 +1,11 @@
+--- a/cmake/modules/summary.cmake
++++ b/cmake/modules/summary.cmake
+@@ -30,7 +30,7 @@ WATCOM:				${WATCOM}
+ 
+ CMAKE_BUILD_TYPE:		${CMAKE_BUILD_TYPE}
+ CMAKE_CXX_COMPILER:		${CMAKE_CXX_COMPILER}")
+-if(NOT CMAKE_BUILD_TYPE)
++if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "None")
+ set(_output_results
+ "${_output_results}
+ CMAKE_CXX_FLAGS:		${CMAKE_CXX_FLAGS}")
diff --git a/media-libs/lasi/files/lasi-1.1.3-pkgconfig.patch b/media-libs/lasi/files/lasi-1.1.3-pkgconfig.patch
new file mode 100644
index 000000000000..dbc831d4a27f
--- /dev/null
+++ b/media-libs/lasi/files/lasi-1.1.3-pkgconfig.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,6 +66,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/config.h
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lasi.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lasi.pc
++@ONLY
+ )
+ 
+ install(FILES
+--- a/lasi.pc.in
++++ b/lasi.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=${exec_prefix}/@libdir@
+ includedir=@includedir@
+ 
+ Name: LASi
diff --git a/media-libs/lasi/lasi-1.1.3.ebuild b/media-libs/lasi/lasi-1.1.3.ebuild
new file mode 100644
index 000000000000..e2e42d403fd0
--- /dev/null
+++ b/media-libs/lasi/lasi-1.1.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN=libLASi
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="C++ library for postscript stream output"
+HOMEPAGE="http://www.unifont.org/lasi"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/freetype:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-pkgconfig.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i \
+		-e "s:\/lib$:\/$(get_libdir):" \
+		-e "s/libLASi-\${VERSION}/${PF}/" \
+		cmake/modules/instdirs.cmake || die
+	sed -i \
+		-e "s:\${DATA_DIR}/examples:/usr/share/doc/${PF}/examples:" \
+		examples/CMakeLists.txt || die
+
+	if use !examples; then
+		sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt
+	fi
+}
+
+src_configure() {
+	# doesn't like CMAKE_BUILD_TYPE = Gentoo
+	CMAKE_BUILD_TYPE=None
+	local mycmakeargs=(
+		-DDOXYGEN_EXECUTABLE=$(usex doc "${BROOT}"/usr/bin/doxygen '')
+		-DUSE_RPATH=OFF
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/lastfmlib/Manifest b/media-libs/lastfmlib/Manifest
index 9572f0a75837..fef57f36cb69 100644
--- a/media-libs/lastfmlib/Manifest
+++ b/media-libs/lastfmlib/Manifest
@@ -1,5 +1,5 @@
 AUX lastfmlib-0.4.0-string-conv.patch 510 BLAKE2B 088c8deb83ad96450b21e1d7a8e99d34a5421ccaa72ad75e102f89f011d494ee4e54c9799a1a6296543f7d230dcb41dec48a083d4c0a09a8a52f87744c7256ab SHA512 cd212e173559822586c97fe175791b7ca2ca7239cc511d5b4d07ff7dfc9ec87b5f3a126acf58c4bd95a7cb19cfc04b067ecb99fab6cb1815e59f56fe9c70ee4f
 DIST lastfmlib-0.4.0.tar.gz 333224 BLAKE2B 2e38adb90a468eccf959950d89e2e0b903e7e96c871b4d20216ee233933392fda7cd3bd86d90472e0f305922dc11e1dc998206c669a13be76eab7fdd07e6b45b SHA512 88e26bab04eda06f77f4684a5fe14aa9761acfcb5d7d8726c4d3ae5e1a4acd73e6b0c9bedff5d51bce07afd7b883085f1adba98714e8ebfc5bbd20b8aca66748
-EBUILD lastfmlib-0.4.0-r1.ebuild 712 BLAKE2B fecfceee16dde08655022b339759fb2f3eafaa6aed378338a908eafe1390c18335d7fbb930bd617ad048d4637e63b161a06b97ed4de13b4bc5de1932dabec3f0 SHA512 1c4bc366ced22aee90212b7e7ea79bfa69dd761b450fa2ab77d235400e6424710acd6045c9025947e2fa4cdc7c8a46fb8db36164c02ba529860530825562c103
+EBUILD lastfmlib-0.4.0-r1.ebuild 711 BLAKE2B 6c28c50e9c74b3ae1248073210fab0366072d4750d8db46dac198b6c30b6447ef512b2c634884d88ab5f068f785c64dffd5ef6dc935b0ac0ad022ceab50dcd0b SHA512 2cfe0f60ac54bd863ab6beded4d7590bcfb90e33d8bdbe6d7317286018e891ea776297bd389ab49e930d0ce9103229eb98b76647d7b7498c9e423fdd0e08a240
 EBUILD lastfmlib-0.4.0.ebuild 659 BLAKE2B 66b6202bd89d9e8053e998080c978ec5f7ac2406964e19817051c06f17670a8a60d9166d4a108292ef9902d9b9b6fe26687f4cd1b5f2888b7413b029224bed34 SHA512 a46ef097334b5520a3dc5cd76857af5fa6560de31cdac835a215d96aca920f59bf95f1c9c64cd0aa55bc44b1a4f8f1e61c936f6d8101995a304ec91772deef21
 MISC metadata.xml 335 BLAKE2B dabbb4b4997e73611fb77582fbb5b2f07bb0f41106dd68de366039342d2d1de1021e5d2133dc606baa6cc7f0510f7e532a955740c1735377d122f2387883fb9d SHA512 ecbb5547e38a68d686192d03224578355575915d90db53615a0b9aba928e4e2d1eec4b40a08da2eb8fb8e1a26a8b06e861cbad9b31a6af61087fe048e98b814f
diff --git a/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild b/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
index 877bb72bb059..a8aad24e884f 100644
--- a/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
+++ b/media-libs/lastfmlib/lastfmlib-0.4.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/dirkvdb/lastfmlib/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug syslog"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 4649cc0ae9c8..885bed090b37 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,3 +1,5 @@
 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
+DIST lcms2-2.12.tar.gz 7419126 BLAKE2B ee75b1ec902b61683d0f157277fb7732ce2ec6aa8fa0b87d52f03029758ed11c2369db322f98d6ce06f62e8bf6235b8b96db9067ef448b87eab236b80c5d175c SHA512 967e8ac9a1d1aa3be45dc82362b9bc71c555e8577441efda57dc12d0bf84ed9188460c52eb8542d399ce9ab43bd4191988ed22b254ef34c6c1877bbb935952ed
 EBUILD lcms-2.11.ebuild 1160 BLAKE2B 31a6b342cf59fee0faa0b1788f3af0ddd9c5b3a3b4c5a76774ff0818fa27a3213dc8c8171a5c2b1dcae6989001a79ec7749c0648f83190c14dadf4dbef7e7d7e SHA512 1a0b36d07060d269dd2f7a613683e1930a362489f48680351bfdcc1ae9c8d29e6d0428b3d2fb342a2f5a7d9f4ccc3b36d4ff3debf16a05f6f3bd79b9f469c5e5
-MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43
+EBUILD lcms-2.12.ebuild 1244 BLAKE2B f115e34474e0f16a9c998ea2608faded1903802b46721bfc0d51c62155d2491c1ebab2b162b1bfb9277760f195ec4debfec5ca64e667f24e897289358a6e838e SHA512 a97858aff1caad42c283ac4a99152260f9f18667377731fe6d6f2f0affd5067cca9df45dfbca199a041401f854fd75023ec927442eda091137bbedc33313df4a
+MISC metadata.xml 464 BLAKE2B 83de84dcbe1b9e2997c7334eb55ae601e80a4cbb8c1fd0e5f5fb5c95470354d1657d8c5fe6f5b895a6071e39bcaefe4d3216385ad70ed6e42ac58a90bd5f33b8 SHA512 c63a193bf5607356c0d48e4e840355553f4fcd61f7d1269e7cf6cb198d462b786777ef46dd1e07c8edff0ea5311c42b3e5a2c8e709adb3e0b40dd538d7f3a60d
diff --git a/media-libs/lcms/lcms-2.12.ebuild b/media-libs/lcms/lcms-2.12.ebuild
new file mode 100644
index 000000000000..6a1b118ac059
--- /dev/null
+++ b/media-libs/lcms/lcms-2.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV}/${PN}2-${PV}.tar.gz"
+S="${WORKDIR}/lcms2-${PV}"
+
+LICENSE="MIT"
+SLOT="2"
+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 jpeg static-libs test +threads tiff zlib"
+REQUIRED_USE="tiff? ( zlib )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	elibtoolize  # for Prefix/Solaris
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with jpeg)
+		$(use_enable static-libs static)
+		$(use_with threads)
+		$(use_with tiff)
+		$(use_with zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	use doc && dodoc doc/*.pdf
+}
diff --git a/media-libs/lcms/metadata.xml b/media-libs/lcms/metadata.xml
index a42c089bd592..a5502a6a8e78 100644
--- a/media-libs/lcms/metadata.xml
+++ b/media-libs/lcms/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:littlecms:little_cms_color_engine</remote-id>
+		<remote-id type="github">mm2/Little-CMS</remote-id>
 		<remote-id type="sourceforge">lcms</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index d8cb5b3be67d..cb61349017c5 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -5,4 +5,4 @@ DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd
 DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
 EBUILD lib3ds-1.3.0-r2.ebuild 640 BLAKE2B 3bfb11f5a8c068985efa79b1383ba2fb064d1abb292d296896c20cea4ef82c70adeea74c7cc088c0059c35610efd6ff6f54f03b1f693a10e8e8d162e0e9be651 SHA512 b5e009cf9ba4510b6802b72e61e8de44cbea936b610c875bccfecc1e7f65f2249930aa4da7047b0834dc0d490d0c1f54eae2a0d1221a48ce1e58c12162bd12e4
 EBUILD lib3ds-2.0.0_rc1-r1.ebuild 699 BLAKE2B c7ed09eaa47b6efe577f63dd0048411a86e0d71b4b3fdd31c8fc9065542365b412c6b9f82d39cc05d30ce5ce4ba61c660d65a318e59ddce58ebc3cc99fabfd53 SHA512 9c5cb3890adc65efddc6f80cf168a92c03b5b24552f811e1815aee45f052758e29aa317b3222bc86deab6f8c35963d6b1269554ecc5788fa9e6e7dbbc5ee01a5
-MISC metadata.xml 431 BLAKE2B c469c1c5f88e5e3014221c85aa47b95ac8720257705c35e79a76945aaebbe075d559696e6941d64c9237e849969c9a369c7a8db96d24965bef78b88b85ace7d5 SHA512 09ba499ac33f3a9162ac15c23d0c262a32606c731a775579a0c8d6d2a24137687e1306aa17e4f66d4aba57d141d991ab4186716e2b7a55ace4ce7526b37680f3
+MISC metadata.xml 596 BLAKE2B e9452f740b765cd11da41f9ae41656ed0db4a3994ee8d871fe7d074973c47938494d224cdc9b927e4fa69c3893af2383315962c6f10952c66a82163d74a32951 SHA512 0090513ed5ba8b3855a64d27e4a84e1e6ef340f178899e03ea7b43cb983ead98c64d8129559203403313c102efa93104be841c635245f02bcec350f0cb91fb11
diff --git a/media-libs/lib3ds/metadata.xml b/media-libs/lib3ds/metadata.xml
index a5cdd6731a66..7279deaa80a4 100644
--- a/media-libs/lib3ds/metadata.xml
+++ b/media-libs/lib3ds/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>amynka@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>3dprint@gentoo.org</email>
-	<name>Gentoo 3D print</name>
-</maintainer>
+    <maintainer type="person">
+        <email>amynka@gentoo.org</email>
+    </maintainer>
+    <maintainer type="project">
+        <email>games@gentoo.org</email>
+        <name>Gentoo Games Project</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>3dprint@gentoo.org</email>
+        <name>Gentoo 3D print</name>
+    </maintainer>
+    <upstream>
+        <bugs-to>https://code.google.com/archive/p/lib3ds/issues</bugs-to>
+    </upstream>
 </pkgmetadata>
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index ed5eefe56660..07a2426afd11 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -4,4 +4,4 @@ AUX lib3mf-1.8.1-0003-Change-installation-include-dir.patch 1737 BLAKE2B b6ffd36
 AUX lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch 1172 BLAKE2B d6e27b935d0a7644ba6a56e9da2159fd24a9f42831befe2acd0f9b26fa5c1266ac87de34c7ef2d709dfb12048f52a1a27232307a4df1c12ec099e5cb45d37c57 SHA512 f514ad5f37e6da0a45c81769ead73c6ef4c04d368dc6a129d3b3547147c3b47db2182bf630457c02fd67951c5c97ef43db2c770d4a0864003ebbc207c4974fe7
 DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a
 EBUILD lib3mf-1.8.1.ebuild 1076 BLAKE2B 3bb98e5e52aaeeb101469619e10e01da43fe2f9da661075b44042aab351e9db8a65b34d156c360df6ee8aef3ffe15b07d2a935630903be4b22482e5f51a72141 SHA512 ddb2f6e90b2cbcc048efb496577e14fe4c6600ba3ed311e8b8a9910c808c105ed46f9847a6af725b18423032957627c13cdfc5f658337a1242d4b38d88e4f247
-MISC metadata.xml 685 BLAKE2B 7b7536c5194d917ca2f84ba3086e72fab27c6b0432b735e3f9fa49d66389727865eca0c8fbed6596ae8f2d4f90e736ecd7e2023d272581f91c0896bf430d42ff SHA512 c3ba47f888cd0a649734cc6d27e2f295fcd915c2173e8dc9350c29ae718e3be748258b93ace4753c43b50663ce6c1ca691de9f36a44e414ca4875d06b8daaa2e
+MISC metadata.xml 693 BLAKE2B 9b222dffbdd2718cdde2fa6b3ac9b53a4b353900e63fa90af886705a5b1667aa5ac38d9d7b026ee45c6a0f90c7264676476f7ed95b4f2e030842f53a48c8eb73 SHA512 bf0c3889b8c7ea456c3132eb182cb9fa46270ec632114e71f94a818dd1916770aa63627677778e7e4456c94500eb7b4227e03ba44191f34ec8c8a7736b6432d4
diff --git a/media-libs/lib3mf/metadata.xml b/media-libs/lib3mf/metadata.xml
index 8d7147cc063d..0e6ade406c88 100644
--- a/media-libs/lib3mf/metadata.xml
+++ b/media-libs/lib3mf/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>waebbl@gmail.com</email>
+	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
 <maintainer type="project">
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index a5f39e1eb75f..d6829aef6922 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -1,8 +1,6 @@
 DIST libavif-0.8.1.tar.gz 2915941 BLAKE2B 40030a5a002e68231adf48ecc6e8012f7ec53506770872fc79dfd73496fa3a214c10cf5fb5826f145fe1f881adf2a3ecca13c33989b2f048aa72e455ab6950e0 SHA512 03692fbba49fde08d76cebb847d0404a81113824e9e65edc6a0977f323d060c394d111e2a7647788fa3115f3ae80b0fc92d4fe5be53852e6734b96a8f1c1a078
-DIST libavif-0.8.3.tar.gz 2948213 BLAKE2B 985c18c86eb7d2049bac21111ba861b141806504b38d2fe0828745f6112c254633dc27fc7257fab5dadb866991085776bd9beeaceca15f33d216eb9337db42e9 SHA512 d8624cd63489f7c17dbafe1a91d01dca21143be073295f2bed9491d5e7899ec0163881e16f3331e5653cdf447e7fb56fb52b9260264cdd7c7ad0e3aaf5695b6c
 DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d9f82e1b7ca5876cb9859b96ac5b60ad86c2345654f85e97cb6d920f286b683d0bb588ce7db04f50322b158678c SHA512 92c5df26da70ca113ff3b217a4a09e3dea0b7c4737e0924bd2b232502cfda0c79f4f0785bc7992c973491af7660338cda481bae7b999632815142564bf3275ba
 EBUILD libavif-0.8.1.ebuild 1664 BLAKE2B 4d23f517dfb7afe074b36a3aef30ffde2ecddc49c0570e69aa54cedf31ae5dc2a499dd1e8f944fa44b606fb6302b49231ed8337d81f6e4fa6fde503794d80844 SHA512 32cb7970ba5fc28330c6b9575e693417c36116b7a57ff5aa1c4f88d6db039b3d14ec36b325d8df0f09bc56581b928725ed33f9093a46c39151409b103ffac9f6
-EBUILD libavif-0.8.3.ebuild 1694 BLAKE2B 2c78f19dd03937d006bedc88142134a6e44932d706b9d7e48d4bf634e1887247aed5fb13d9cec1561240bba6a5a854f1a212b29f2946da15571a6a67013177d6 SHA512 df76aad645ed8f3b56db9aabd953920210ba6a9ce77cc376b30da25dad60f3b487e0eaad58137ef651dbdba3dc315834d3d8f297d8b3b5db6cc9a8dc34af3a64
-EBUILD libavif-0.8.4.ebuild 1694 BLAKE2B 2c78f19dd03937d006bedc88142134a6e44932d706b9d7e48d4bf634e1887247aed5fb13d9cec1561240bba6a5a854f1a212b29f2946da15571a6a67013177d6 SHA512 df76aad645ed8f3b56db9aabd953920210ba6a9ce77cc376b30da25dad60f3b487e0eaad58137ef651dbdba3dc315834d3d8f297d8b3b5db6cc9a8dc34af3a64
+EBUILD libavif-0.8.4.ebuild 1697 BLAKE2B 9705a54ae8ea790bbdb4f5449efebefa4189fb3ef4288a3b8481ca59969cc0057ce349440365ed7a9e02399921b24abad07931da4b1ff7559641a5270ce844ba SHA512 b7a1371247ea03a5d92aef835243fa9e15f4e677f940dc4ff0feac19f7fb5e038f4d54c00b33e9a9fa308c4e8467b03aa644a2a8796f379867a15e853a2b8440
 EBUILD libavif-9999.ebuild 1728 BLAKE2B b05566cc98406688badc4551f3fb8be04649b768d0a03ce093d3cdc94dae7df6909fd4b030ac8d7cae557a32e630bcf8eeae0e02a8ca470d4b0cf23ab83f81f0 SHA512 82e73423d625c76c7199d6e6afce22c99f4bf82485da39e148448493a8cdfbd4fc6ce6c0af98ccca374b80e2452eb44ba748e47bcd0a921bfc67770c6448581d
 MISC metadata.xml 843 BLAKE2B f95582a72acc4b86d02f246fca2a8c080ee96be8e649008f4b684cbf616c8201c3f6df1e258beb2e402add6da06fb3203254c902cf3613c4fd8d867f7f62b3e9 SHA512 80a0962deb24701c3b920c287875f26f4cdd8d282f0dc1af60039190833097bcdb78dabc0f82283035746a85a9a7b2d95241819fe6e0d36f3194bb2c62ea98e3
diff --git a/media-libs/libavif/libavif-0.8.3.ebuild b/media-libs/libavif/libavif-0.8.3.ebuild
deleted file mode 100644
index 3af174f791af..000000000000
--- a/media-libs/libavif/libavif-0.8.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake gnome2-utils
-
-DESCRIPTION="Library for encoding and decoding .avif files"
-HOMEPAGE="https://github.com/AOMediaCodec/libavif"
-SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+aom dav1d examples extras gdk-pixbuf rav1e"
-
-DEPEND="media-libs/libpng
-	sys-libs/zlib
-	virtual/jpeg
-	aom? ( >=media-libs/libaom-2.0.0 )
-	dav1d? ( media-libs/dav1d )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
-	rav1e? ( media-video/rav1e[capi] )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="|| ( aom dav1d )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
-		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
-		-DAVIF_CODEC_LIBGAV1=OFF
-		-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
-
-		# Use system libraries.
-		-DAVIF_LOCAL_ZLIBPNG=OFF
-		-DAVIF_LOCAL_JPEG=OFF
-
-		-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
-		-DAVIF_BUILD_APPS=$(usex extras ON OFF)
-		-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
-
-		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
-
-		-DAVIF_ENABLE_WERROR=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_preinst() {
-	if use gdk-pixbuf ; then
-		gnome2_gdk_pixbuf_savelist
-	fi
-}
-
-pkg_postinst() {
-	if ! use aom && ! use rav1e ; then
-		ewarn "aom and rav1e flags are not set,"
-		ewarn "libavif will work in read-only mode."
-		ewarn "Enable aom or rav1e flag if you want to save .AVIF files."
-	fi
-
-	if use gdk-pixbuf ; then
-		gnome2_gdk_pixbuf_update
-	fi
-}
-
-pkg_postrm() {
-	if use gdk-pixbuf ; then
-		gnome2_gdk_pixbuf_update
-	fi
-}
diff --git a/media-libs/libavif/libavif-0.8.4.ebuild b/media-libs/libavif/libavif-0.8.4.ebuild
index 3af174f791af..ce1a11a44f40 100644
--- a/media-libs/libavif/libavif-0.8.4.ebuild
+++ b/media-libs/libavif/libavif-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e"
 
 DEPEND="media-libs/libpng
diff --git a/media-libs/libbdplus/Manifest b/media-libs/libbdplus/Manifest
index c20ddbf87ebb..92c6b7a9c93d 100644
--- a/media-libs/libbdplus/Manifest
+++ b/media-libs/libbdplus/Manifest
@@ -1,5 +1,4 @@
 DIST libbdplus-0.1.2.tar.bz2 319828 BLAKE2B bdf8868dc511b22fd6926b4b29cfae513ca5c9f30433314c99bf31aefb5842eea1042e514383d1c1ff96ee6c62f3220a542973eb1017df8dd48aecd7f81237ac SHA512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b
-EBUILD libbdplus-0.1.2-r1.ebuild 1051 BLAKE2B e0e6f77dbd8041bf1f40acdeccf7bb9d10898e48dc8c3a7b6f2336bf944c39f0742c7f6c0bbe6df796a72a74fdfa8adafeab8874e252dbdcca2a92e9d61aa7c5 SHA512 3975cb7ae80e1f8e82f7f80e57edc02f49ac4641dc11b58c9645dd6cc8350d8007b81a1a5cec47afc5d15ce35e8acb5ce7e23d87a3584cf2f7d54eb4f7c7ea03
-EBUILD libbdplus-0.1.2.ebuild 878 BLAKE2B 831c09aab8f391d25826ca803514f464f02c516e45bcb056b22f8abd09eb3d19f00295a88d1b911942a5698d23ac856e2c24abe5c88cfcc6d1052cd752005f06 SHA512 52a573e72e3f73be093a99582cdd4f5b1284f140502b9fffeea3d625483e89db0eb23cbcd9e17450dfd3c30c7d4f1aaac380faf8aeb099a72a25be5a5d5d514d
+EBUILD libbdplus-0.1.2-r1.ebuild 1050 BLAKE2B 10a40ea3e988f632026a315dbde1d4527578fe6ce681b3b12af65aa90473bec0a6829150a9f736721f261c0c73e890b654dce2cb496982261ac770e85952fb33 SHA512 b9066a5d1a0d9833e8b466375906e0f23b685ad91493f5c5e6b8a26bf03241e26f3864512591915990a34f2960eccb345c6fdea08ca6cfa101a5dff6f911bdfd
 EBUILD libbdplus-9999.ebuild 1055 BLAKE2B 7ab0d4a78535a37eb69577e0bca7af7302928fb37badcbc95d8ae2f3e3ffa632ff2492f3da201e0c586233db3daf06bf26802391dfd6c876b50f0e0cae8b1969 SHA512 18bc5be6402b1dae1324f0f2b7999cbdd502964f307d89add25e42d660f534bb01ee9c403f5d36ebf09f85ca653ef4509d82f2b7e3218ab01af9124f2e8b0b87
 MISC metadata.xml 346 BLAKE2B 7a42d692f3ccc8badbed9bc2d06f4b06891f0fc46d53501de443dbff04b71c6db74f78a310cd484945be3b2035ae001804443bff1a18dcd5b0ef24474453910e SHA512 c45e738ea1fa2ff40738465bcafc8b6c89e7d5dfd3c89250118bc3c531120ee14022c04fe0a2bd5cbe950dd66935be35254239fc61eb947b597328809735693f
diff --git a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
index b956259b6818..443d7d1199e3 100644
--- a/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
+++ b/media-libs/libbdplus/libbdplus-0.1.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+	KEYWORDS="amd64 ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Blu-ray library for BD+ decryption"
diff --git a/media-libs/libbdplus/libbdplus-0.1.2.ebuild b/media-libs/libbdplus/libbdplus-0.1.2.ebuild
deleted file mode 100644
index c14911011433..000000000000
--- a/media-libs/libbdplus/libbdplus-0.1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git"
-else
-	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Blu-ray library for BD+ decryption"
-HOMEPAGE="https://www.videolan.org/developers/libbdplus.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aacs static-libs"
-
-RDEPEND="dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-	dev-libs/libgpg-error[${MULTILIB_USEDEP}]
-	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-DOCS="ChangeLog README.txt"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-optimizations
-		$(use_with aacs libaacs)
-	)
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libbs2b/Manifest b/media-libs/libbs2b/Manifest
index 071b59cacf0e..a98da86e0979 100644
--- a/media-libs/libbs2b/Manifest
+++ b/media-libs/libbs2b/Manifest
@@ -1,4 +1,5 @@
+AUX 3.1.0-configure-ac-use-dist-xz.patch 515 BLAKE2B 577998bdd3192e998f7859b3e16d9ecb228b82deddce58ef02214622756520e0dc9ee12928e2601eba4cd52dd72eaff76d259900e87e53fcec84eecf0ccd3ec2 SHA512 1e1d910ac30150e48420c56a77e0e176c2fc4b03bc8626d555fa1925d39888b238d34231bc03e1bf3321f9d015f91ffcce3d1a01cac8632980a2f9e3197cdc2a
 AUX 3.1.0-format-security.patch 369 BLAKE2B f64d562fca5b305abbb3abed2c431fab6b3daa961406c83db5bfc39e2316dda288c6d6045e9a4f6fd045f8c05308744f7e01b2616a161a0f22aa5097c7a91c49 SHA512 77a803c030c4b6ce782584c9163299289e8a8cc748d08e5040ae912651ebdff92884be70f1efa1db9df4eba3f0060c77d430062dbe1143682685df3c7e7b1fbf
 DIST libbs2b-3.1.0.tar.bz2 606283 BLAKE2B e70becc06078ff72a4a4fb69d9ad4e906f1ca2062cd770e36fcf1ad2a6c58e6284afa7958fca89573ed83cf9a76b42f0c8367942075eb6c77ab12fa6c2e741b8 SHA512 50cf477ff9ce6adf26fa8a696831c3a4f219c80a21ec4c93be8ec3f67f077447c17abbd9588a9de5eeb3ddacac1564a7138807468fc80e853bc78f193b4afbc4
-EBUILD libbs2b-3.1.0-r2.ebuild 710 BLAKE2B 9dbdb14546577689f4b530b193a72686da9e34c217d6a3ffbd384a9b6f6f8660d04d43d298edb97caf367016ca5891bc06e5f915e21a442a241bbf551f2d1612 SHA512 502ca5844e971f5b80cb0fbc584215652098d975bd56a29c1cc0904e4c7c2c5e9b942cd9f5108e22e4c0ae25af9040c913419e2b6efe6566bdd740b2e582b983
+EBUILD libbs2b-3.1.0-r2.ebuild 822 BLAKE2B e9181d168cfdc9b41080765cd9dbc40d5922293e1c5b2c8f9b18cd60b4771c9f047aba90f2dc880c7c14042408e06bf34c0ea9fe08e52648341f2f22d108fd93 SHA512 4791a831b2b20d545dfefd008acf9f8edd4f6262d918e64cea59548398b26829b53e9011f5c4d57a086e7a02de9640bc5072aa75e3829cf8bc55003fbb7ed051
 MISC metadata.xml 449 BLAKE2B 05ac186d158a3c9ee695b8af52de5f695170ad925c0136422233df9e94010cdcce5224b8938d8b71ff260f4a468ae93898c7999163c8648d10987cdac17f289e SHA512 f9178657883acf1844ac273eaa5af2380f06fbf23641e76f6a32b08f54b410a5be6d6b0d82888637a51ad4ce13396dcdd04907cb1194eb5539be2e6d3c02e99d
diff --git a/media-libs/libbs2b/files/3.1.0-configure-ac-use-dist-xz.patch b/media-libs/libbs2b/files/3.1.0-configure-ac-use-dist-xz.patch
new file mode 100644
index 000000000000..a2f26a67e343
--- /dev/null
+++ b/media-libs/libbs2b/files/3.1.0-configure-ac-use-dist-xz.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac	2009-06-04 18:17:02.000000000 +0000
++++ b/configure.ac	2021-01-08 00:54:42.622907620 +0000
+@@ -4,8 +4,8 @@
+ AC_PREREQ([2.63])
+ AC_INIT([libbs2b], [3.1.0], [boris_mikhaylov@users.sourceforge.net])
+ AC_CONFIG_AUX_DIR([build-aux])
+-AM_INIT_AUTOMAKE([1.10.1 -Wall foreign subdir-objects
+-                  dist-zip dist-bzip2 dist-lzma])
++AM_INIT_AUTOMAKE([1.11.2 -Wall foreign subdir-objects
++                  dist-zip dist-bzip2 dist-xz])
+ AC_CONFIG_SRCDIR([src/bs2b.h])
+ 
+ # Checks for programs.
diff --git a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
index ab48410eb3f9..d4f26c28ab28 100644
--- a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
+++ b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Bauer stereophonic-to-binaural DSP library"
 HOMEPAGE="http://bs2b.sourceforge.net/"
@@ -17,7 +17,15 @@ RDEPEND=">=media-libs/libsndfile-1.0.25-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PV}-format-security.patch )
+PATCHES=(
+	"${FILESDIR}"/${PV}-format-security.patch
+	"${FILESDIR}"/${PV}-configure-ac-use-dist-xz.patch #526712
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 2dffd8001e4b..ba8d7d45591c 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,10 +1,5 @@
 AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
-AUX libde265-1.0.3-use-new-FFMPEG-enum-names.patch 933 BLAKE2B 50f4f65a7c73365bd6f803c4fe85e029188a184dfe8dce5768e47af15cb489705129a5054aaf6bb12d8822de588c6ed10cf8384db7baeb2b4a6fee1a8a96494d SHA512 cf88bd2d40d9726dbe8bd8c3cddacccfef065635cf20751efd30dd30ac706d640be3b06a284a5bc11b457de63206d699405a6da8fb39cd0d5425371f5d538549
-DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4
-DIST libde265-1.0.5.tar.gz 381041 BLAKE2B d561a0e5f308bed557237b88317985912537f76701783bc30d81305cf9026a853746449ece5b3092534466ea13d67bac10b3258580c8de07489844bbef0395db SHA512 3ff7310fc4621cac0ef1cb9bbc4df61724f8943d57f5263a3663a77f4d90d84716b2a708ee9fec306e909dc8b5e7fe645a641b6a6db795a89a01799be910831e
 DIST libde265-1.0.8.tar.gz 381963 BLAKE2B 0577623de2ef86e1122b5b5c3642a750bb222c4988a996168e060e8ffd9f5c0787d31331cc8738362d3fc3fb31e8eb659629cab068f0ff1c71de9d15ed1f2ceb SHA512 0007138cb5da0d4cad1e118c01de249580f39c387a11f490d1e1f63ad0968ee2f7951e54580f298b3dbe31e5a3d1a7fa04454e11cbb82beaf8a9aaf56f5532ed
-EBUILD libde265-1.0.3.ebuild 1590 BLAKE2B 48de41d7133072b75f48b2fb954390915085931ec6f90daa56d6d437d130795039c682f36a8b053783e29bdbd4faedda8e15d48f0c50df57ba6b754462ca0360 SHA512 431fdd0871422199e7d9278fb21857e5a9a27cb34ba949767526d9f9ada57e65efe5abe3c4fae464e2bf3f021981a786cdeb84a9917032528cf08de4e30b8ac1
-EBUILD libde265-1.0.5.ebuild 2498 BLAKE2B d001976ca0ac8a6e043d282b673365de75992b25bff06ace079745782db15a94333e3a0a650b4cb23d33710d3e3a49b6ef1eb8dcf24578cc8e107ff58d94ed93 SHA512 c13211859fc8dd695c6e9effd04d15f4771c1be321fb0f8b09c64b8a9c3cdd03c84ab9169a82b507936d76bfcab577906d6c7776fd1c4764e11eab26a3236a87
-EBUILD libde265-1.0.8.ebuild 2355 BLAKE2B 2b0701a6f2c9c2bb24e08fe76844c613befdc9bf16c81695b3ae2e4dc8db3bf58225ad5897e5072ad1ad3e30126e89ca829338812decd31c663ca0530b501d82 SHA512 2605125ee6c33605f6a03282e3c51b1577eb9bc124e348f8a9b197a5dfb5a4698fa3752baec7baf44c592f998b48bcc8125423a83d45e648a577ab8f2505c337
+EBUILD libde265-1.0.8.ebuild 2352 BLAKE2B 52b9cb1a63fb38b4ee07f2bf085597948a7b93bd3e2b05a62823164babacccf001dcfa9913178c4b21b6c13dc3193753497bd45e7bd1fd9725d70e1624bc3523 SHA512 080e03a4541a6e1e0934f8f49793b2f679bd6ac3662a1ef0e2ba00bc0ca95bd146275bcb95a4282fc4b10296fe1e9b3ab4803993ce0783def4c42f4d129f4263
 EBUILD libde265-9999.ebuild 2355 BLAKE2B 2b0701a6f2c9c2bb24e08fe76844c613befdc9bf16c81695b3ae2e4dc8db3bf58225ad5897e5072ad1ad3e30126e89ca829338812decd31c663ca0530b501d82 SHA512 2605125ee6c33605f6a03282e3c51b1577eb9bc124e348f8a9b197a5dfb5a4698fa3752baec7baf44c592f998b48bcc8125423a83d45e648a577ab8f2505c337
-MISC metadata.xml 691 BLAKE2B 24cf4f5585ca49df6aa5fbed6ab8daa55451446b1ab2d47953e05ce726b22457f1f2adc18774b745206a2f7342996b210edf83867578f86049e23823e43c1788 SHA512 c121ebe35ce66deb54c5d046fb74fb8096d134348b15607f7bc7f0b7239ce76a2ecc43ecee72382adb6078ac6f50859d0ac3a60bd8a3daf52f6cd04c9a56ecf9
+MISC metadata.xml 660 BLAKE2B ad29eca8291fd1d09bc3964b23fcadb61d952be12dc54ea451e1b420ce158cc05b97a549bc2d98e62747d3d26765785be1e3249cfc86838fe04f2a62553ab335 SHA512 bd446c5bc5317e7ecce0a0f910d23efc65fe61f6ee81d13e7c2a813e09c773e2d35b3d8deb57b89ee171feb88b86e64251c4680010461313f9e135f7af95cac3
diff --git a/media-libs/libde265/files/libde265-1.0.3-use-new-FFMPEG-enum-names.patch b/media-libs/libde265/files/libde265-1.0.3-use-new-FFMPEG-enum-names.patch
deleted file mode 100644
index 33e73c15a93f..000000000000
--- a/media-libs/libde265/files/libde265-1.0.3-use-new-FFMPEG-enum-names.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/575554
-
-From e5b8e2e703d608777afadc54955bd396e4211da0 Mon Sep 17 00:00:00 2001
-From: Dirk Farin <farin@struktur.de>
-Date: Thu, 19 Apr 2018 13:15:18 +0200
-Subject: [PATCH] use new FFMPEG enum names
-
----
- sherlock265/VideoDecoder.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sherlock265/VideoDecoder.cc b/sherlock265/VideoDecoder.cc
-index 119f6152..b829e1c7 100644
---- a/sherlock265/VideoDecoder.cc
-+++ b/sherlock265/VideoDecoder.cc
-@@ -237,7 +237,7 @@ void VideoDecoder::convert_frame_swscale(const de265_image* img, QImage & qimg)
-     }
-     width = img->get_width();
-     height = img->get_height();
--    sws = sws_getContext(width, height, PIX_FMT_YUV420P, width, height, PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
-+    sws = sws_getContext(width, height, AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
-   }
- 
-   int stride[3];
diff --git a/media-libs/libde265/libde265-1.0.3.ebuild b/media-libs/libde265/libde265-1.0.3.ebuild
deleted file mode 100644
index 7eec974a733b..000000000000
--- a/media-libs/libde265/libde265-1.0.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" )
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Open h.265 video codec implementation"
-HOMEPAGE="https://github.com/strukturag/libde265"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cpu_flags_x86_sse debug qt5 static-libs"
-
-DEPEND="
-	media-libs/libsdl[${MULTILIB_USEDEP}]
-	media-video/ffmpeg:=[${MULTILIB_USEDEP}]
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES+=( "${FILESDIR}"/${P}-use-new-FFMPEG-enum-names.patch )
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# without this, headers would be missing and make would fail
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable static-libs static)
-		$(use_enable debug log-info)
-		$(use_enable debug log-debug)
-		$(use_enable debug log-trace)
-		--enable-log-error
-	)
-
-	if ! multilib_is_native_abi; then
-		myeconfargs+=( --disable-dec265 --disable-sherlock265 )
-	else
-		myeconfargs+=(
-			$(use_enable qt5 dec265)
-			$(use_enable qt5 sherlock265)
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/media-libs/libde265/libde265-1.0.5.ebuild b/media-libs/libde265/libde265-1.0.5.ebuild
deleted file mode 100644
index cd979e8c83fb..000000000000
--- a/media-libs/libde265/libde265-1.0.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" )
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Open h.265 video codec implementation"
-HOMEPAGE="https://github.com/strukturag/libde265"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="enc265 dec265 sdl tools debug static-libs cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb"
-# IUSE+=" sherlock265" # Require libvideogfx or libswscale
-
-RDEPEND="
-	dec265? (
-		sdl? ( media-libs/libsdl )
-	)
-"
-# Sherlock265 require libvideogfx or libswscale
-#RDEPEND+="
-#	sherlock265? (
-#		media-libs/libsdl
-#		dev-qt/qtcore:5
-#		dev-qt/qtgui:5
-#		dev-qt/qtwidgets:5
-#		media-libs/libswscale
-#	)
-#"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dec265? ( virtual/pkgconfig )"
-
-# Sherlock265 require libvideogfx or libswscale
-#BDEPEND+=" sherlock265? ( virtual/pkgconfig )"
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# without this, headers would be missing and make would fail
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		ax_cv_check_cflags___msse4_1=$(usex cpu_flags_x86_sse4_1)
-		ax_cv_check_cflags___mfpu_neon=$(usex cpu_flags_arm_neon)
-		$(use_enable cpu_flags_arm_thumb thumb)
-		$(use_enable static-libs static)
-		$(use_enable debug log-info)
-		$(use_enable debug log-debug)
-		$(use_enable debug log-trace)
-		$(multilib_native_use_enable enc265 encoder)
-		$(multilib_native_use_enable dec265)
-		--enable-log-error
-	)
-
-	# myeconfargs+=( $(multilib_native_use_enable sherlock265) ) # Require libvideogfx or libswscale
-	myeconfargs+=( --disable-sherlock265 )
-
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		# Remove useless, unready and test tools (Why package ever tried to install them??)
-		rm -f "${ED}/usr/bin/"{tests,gen-enc-table,yuv-distortion} || die
-		if ! use tools; then
-			rm -f "${ED}/usr/bin/"{bjoentegaard,block-rate-estim,rd-curves} || die
-			rm -f "${ED}/usr/bin/acceleration_speed" || die
-		fi
-	else
-		# Remove all non-native binary tools
-		rm -f "${ED}/usr/bin/"* || die
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/media-libs/libde265/libde265-1.0.8.ebuild b/media-libs/libde265/libde265-1.0.8.ebuild
index 29c28d991c82..b5e48bb7b823 100644
--- a/media-libs/libde265/libde265-1.0.8.ebuild
+++ b/media-libs/libde265/libde265-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
diff --git a/media-libs/libde265/metadata.xml b/media-libs/libde265/metadata.xml
index 524e76641f5f..17a74bc85a56 100644
--- a/media-libs/libde265/metadata.xml
+++ b/media-libs/libde265/metadata.xml
@@ -3,13 +3,13 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
 	</maintainer>
 	<use>
 		<flag name="enc265">Enable build of enc265 tool</flag>
 		<flag name="dec265">Enable build of dec265 example program</flag>
 		<flag name="sdl">Enable video output of dec265 example program with <pkg>media-libs/libsdl</pkg></flag>
 		<flag name="tools">Enable installation of varous binary tools</flag>
-		<flag name="static-libs">Enable build of static libraries</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">strukturag/libde265</remote-id>
diff --git a/media-libs/libdmtx/Manifest b/media-libs/libdmtx/Manifest
index 389fcabfcae5..544feb2cea9f 100644
--- a/media-libs/libdmtx/Manifest
+++ b/media-libs/libdmtx/Manifest
@@ -1,5 +1,3 @@
-DIST libdmtx-0.7.4.tar.gz 370999 BLAKE2B 7c87d1b1ca8a1466aed6dbd8b60b31c1acacbff46d99855a2366c89a0998acbc8e0b3d3e70612d6bfc736b48e2001d8de14b9169920e802490623009f3395ea9 SHA512 307aeb30506e60fc44550d1bb86081634f0718d53e7b878b45b0e704e75c5996e27285a16881b7c3a93cafa9a9b125175dadc0f0c2c2f976878666eb652108ae
 DIST libdmtx-0.7.5.tar.gz 790944 BLAKE2B af94a998e6ab0b06c17d64d6c720e874540830282fd1219260aa1e5fb44159b59f63fcfd1fbd750333ae50b080c341ec02b81216c2e975a8ef85628b23d4fb55 SHA512 c4bccc9eff4a93b6bb417ed23ed46e82cc98b650a94be40479d192af8537ee02a16700fbbd8f2271035ff8b804c40ab6461825d94bd80a3081d3a4b3988ea22a
-EBUILD libdmtx-0.7.4.ebuild 545 BLAKE2B a652c7ba1f0bc395581510b58fd9ed9b2ac4059a0f2636aac42655693950bf5a24bbe8e9d67cd3c7db3815e7ba3593ba3c3064ed001c00c9fe35121e7b22dff4 SHA512 ae786eef5934488ee79d96d6eae5871d27cae72db072926a44285f86f9c90eaffb923cb1e5c43bcb1983ac55b24048d5770dc11c5087dd3c3eab15aa3c9d5212
-EBUILD libdmtx-0.7.5.ebuild 623 BLAKE2B 3b3797413f1f92bd104523cd3af61bd093077637fc33efececd056dc6a25bc042826b37a7d70a03e83d95491669a34b6ffba85e35482cc219b1ee0c57067dcbb SHA512 4c2ab07031785aef3fb82f5c4f38d1ff70e59fefaa0a2e685e5a7b84408862cb7ab771ca825452f1c803a3cd6dbbc1c6e3ff74c174d4f6f22ae3c0f18f95a113
+EBUILD libdmtx-0.7.5.ebuild 622 BLAKE2B 38242aa68047223c54be8ecd27578a5d84bcae44c5b712eda89c33ea2a4ab1b9676f46564309230cd007c97bd78255f8423f0b8f6e4387b1fde1dc86bf2abc1e SHA512 96475719ee014356ac41cf294c404d434b0204fb56cc46e98006eebd5ac08564f9e2d972dc23a61f3f0f7acd8eaf8af854ab47baf91e63da567d7cf663788884
 MISC metadata.xml 378 BLAKE2B 9dcdc2a67e0836e73a48174390263c6344f329beb3682a92ffc52a11856b87ce5a4338803ee67f07f9d2337b4292433727c3edca55b155ebd93200351231113a SHA512 f4374bbe8333e1e1700cedd7482667159e5c2e31d8b0f6e52074c9261a11327ca9eab2c857f768cdccd287728b3ab3f52628733e4d91725230fedd985d376a7d
diff --git a/media-libs/libdmtx/libdmtx-0.7.4.ebuild b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
deleted file mode 100644
index adce86c7d674..000000000000
--- a/media-libs/libdmtx/libdmtx-0.7.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Barcode data matrix reading and writing library"
-HOMEPAGE="http://libdmtx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libdmtx/libdmtx-0.7.5.ebuild b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
index 250f89d2d4dd..cf1b9d39fd7b 100644
--- a/media-libs/libdmtx/libdmtx-0.7.5.ebuild
+++ b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dmtx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index c30021bffc5c..4a15bd076e8b 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,5 +1,5 @@
 DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
 DIST libdvbpsi-1.3.3.tar.bz2 488020 BLAKE2B 923d58012dfdbbd5d2807a186f36c58826199f27a89b750669273b741333ab5c23781b7e992a380ba6e283c357d4e3081d397a1980c21b7568e12ecfb2a3cac2 SHA512 70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69
 EBUILD libdvbpsi-1.3.2.ebuild 936 BLAKE2B a174ce8218ecb469431fc2b1bb1795b47c328c193814ef230ff65977134d64bbf50ede8220748709f90d805668a8a07f4fba6b31ce1a196f7fc845357901e4a5 SHA512 7c0f8ed4a3d19edddd8e0d971b84aa83d50fe6f920333a9dd99395ee5357fdc789464914271719ab41772bc371a84c5be7da3a521d9dddb0b69ef3845d206948
-EBUILD libdvbpsi-1.3.3.ebuild 934 BLAKE2B eb05d01e96faecaf3d97d2c557ed683d5f3dee5a54956871640ef0ad766d0ce8199211d8a80e6f5a8178120387c2b3866dfee4b9eac2e5f6ddf6847cc8a34214 SHA512 abcf8d3a951bbaeb48c7eea62c25d300b0998ca68e47e73ee3dba2ba08426ae844d5a69d99adee70973e976ef96accb78d4a02349bf43b92c3bad187faa4983e
+EBUILD libdvbpsi-1.3.3.ebuild 930 BLAKE2B 5b0f20046bbbeeaaa892c30bc3f88cfe456ab51feef8494f1632aa33165571b5097c0ad98396c291222c2e9a18acd1afee8617bc69531585a9e92fc1b0da47bd SHA512 8db7eed595da863ca3ba3a132796ffa473228a4cc7dab1879279870f2b4edb36bf5aca0b3602c5e3c6b0c89a587ddd91dd51bdcae653cbe9cfb35bdc5d96c014
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild
index af4b712cddf0..8545df6730c4 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index b003c931fc1d..77287c292363 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,4 +1,3 @@
 DIST libdvdcss-1.4.2.tar.bz2 366824 BLAKE2B 106ec0f46eeb4969d0c878ef1e2ad05ac9c0b0ce0d2781c0d68d9d5e08f9c6154b43c4b2e0cd2db0d530eb0a94914161384e788b307af4c4fca3351d270cbe9a SHA512 e46ccded1951046ec481604c5b533c435be14cd0e734cd5315b61868836a20edf4cdc7c1466c2f4ed374de4382c5e758ace700e84aadcb29513001d696f1049c
-EBUILD libdvdcss-1.4.2-r1.ebuild 766 BLAKE2B a5b64a5f8742bef6e51c450a024521a830edc484663215a8754f6dfa7df1fb3f5a9982cbd7fc21c7dcf287c8282093b88ce501129049c33ba58f73482f426989 SHA512 4e8249b8283d5cf973858a5f6657ad397b706053d0419b5855d86ab33b82ffff38dafe221dc255e1c777ac645e734c93171e5b35844c21f44e8a61a0ebebf887
-EBUILD libdvdcss-1.4.2.ebuild 770 BLAKE2B e32f48709f4d5af4b13a95dcea63a9504363fd30442b701d95c102e040b77c9325b9009c0c8e5abc1f899b8957481b9cc1454ac610c2a1705c11f111c0da2fd9 SHA512 03140bd23c096faad202ed0623dd84793b1fd3534dfca80f01b8a93a2dfadc49da610674a1506a3ce637da3f51eace9e2e4735ca9febe88cbe0b8a6a80228ad2
+EBUILD libdvdcss-1.4.2-r1.ebuild 765 BLAKE2B f4b85c73b1ea1633927f92e91f95cb10297094ed27808418624cc21f2f4b35e683a128ea47c32216476f109c1beb05361a726b4f0ab362677b73b92ee0e2e19a SHA512 cf7f224e80f7a945ed71547df5441467b7bb2b0b9c5072f23cd8c8411fff0108f39d118afb4aaa81eaf72a84adbb6546771b5b5c99c2298b36caf7a2c4e21d48
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
index 2a7cf74fadea..6de638d90341 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
deleted file mode 100644
index 300bb5732c91..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="A portable abstraction library for DVD decryption"
-HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
-SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-#DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-		--htmldir=/usr/share/doc/${PF}/html
-	)
-
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index 46d0dffee889..fdf5b2c91e6f 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -3,5 +3,5 @@ AUX libfame-0.9.1-mmx-configure.ac.patch 1003 BLAKE2B a775cdac594a6b30b78cbaee88
 DIST libfame-0.9.1.tar.gz 296837 BLAKE2B 2c3b2b1c90baa2363ea17ab308070e130a15e2f58efcf00166e724dcf55175179012ffa9874dfce7c9179dec01e0c63ccb0b051d744a326636acf70e796f2483 SHA512 511e7be0bac81482edbe5357b982ad1f4adf2bc784a9f52a3f095269076cd1e42866d2ae24a31b17c38acefc03e2c9d868b17074931e5d320ab5eb52271c4345
 DIST libfame-patches-2.tar.bz2 5324 BLAKE2B 03768badf8a3b0cc5546fed200fa71850c1151223b6b0e2301b56f396e9a71ec495ab2bfbb1ab5bd2c3fbc6f4813928786edfae8876e15c4f742bb09162a85ca SHA512 e4f67b137c3397dd00f8a4d5835a180963c3109c0d239d8f0fe616983a5187f6eaad9f4097cc9eaceb5b9c42de9d9e7518a4174247665a8203a4f69b3383abc4
 EBUILD libfame-0.9.1-r2.ebuild 995 BLAKE2B 2d8cb993ad1778c6afcd18470a9e7deeab240370cf3ba0ba6611a57965aca656403977e74ff2c8437423c91586a42a59efda6f69cde2b2bee4823fd37f52172c SHA512 77373224e5cef3416b8350bfd294d9b5b6bb4a6b0d7dc848dd1a05c8369a5de247e076d6ecfdc3ab9d26442a22fd7efac5734dbc4fad2896850deec27bdbd849
-EBUILD libfame-0.9.1-r3.ebuild 1039 BLAKE2B a8c711b38f9495e836b9302f408d29eab116796a20b3a14ee09d0fec9659e7c3e297cb196de4623984ba2593ca9c6c024d7b23b8c9080b85608a0e1af8d30714 SHA512 ca4e736838650ab4e40859cac79e2c784bdd3be5a8d5f04bd3d03999092cb71380f6456a6c6d72c3d17f59e53984a05cd0ad4b3b6c292fea0b700153d3680a80
+EBUILD libfame-0.9.1-r3.ebuild 1038 BLAKE2B 471dde380cb7fb6d31f92c4600656e5de5f992b7f966300ac01453dcfb0929f687d3cf0fb77a53f1eb020f33273366311cc6cc53b2f9b486bb3033edd8ce6534 SHA512 584adbf9fc0073fd5ce822f5b757796a80dec6d5bd03c71c4012e25d400062b71dd93244d032fc57e72ba887001e0edae2fc4df3376d111a9ecc431d7f2d437c
 MISC metadata.xml 297 BLAKE2B 11f51d49c6584b02011081cb8eaaa00441c9bf623bbd068fc731d0352c568e891654b18ee0c50d6722c31cdd966351cf58ce18947beee1410138b29c1d1c9b08 SHA512 6fad09bf8ac2d08c4e255fc2ae8a95afd410a7dbaaa91fc7467a78ace5a9a9a9cef1ec25ddd676a3c696a5a2714bb3c3f5b180cbfb0fd8a254bab9a5e310212f
diff --git a/media-libs/libfame/libfame-0.9.1-r3.ebuild b/media-libs/libfame/libfame-0.9.1-r3.ebuild
index 443646e1d40c..71650acdb21d 100644
--- a/media-libs/libfame/libfame-0.9.1-r3.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fame/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="cpu_flags_x86_mmx"
 
 PATCHES=(
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index 59b8ede05ad2..b4df71846212 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -1,5 +1,4 @@
 AUX 20190621-use_shared_library.patch 524 BLAKE2B 51fa3fa3e8be71ce255b714f4c542e57384751ee9b708960a2a471e32c68cd5acf71fa2c649a00c9dcc4f7c5322e1a51b0ceadd793dfaf0eba0a3840485e38e2 SHA512 49f2c44f8b565edb65b625f4ca21f4751ad3b2ec8c636d0cfda4f65db75cc0382d0e06ebd7dbaeb71fc7bd478b9ffa126e13786809f8e882af0478f6a814caaf
-AUX dont-strip.patch 596 BLAKE2B 166f289c8e6027ce5c57accf6e2644afe6a275849b178993a37260dfee463b67bd7969e4b2b0365d27aba9da4239a4dc821fe4b9beb0846821312f3f04f29079 SHA512 58906ab0d472f3186f99c14d9fd3c6104b7df1ef9b20f5bb3a334ed357d6cc808ec04609108cc7aab6a1b6ed781624e728bb4f9a14cdc59a5cf84ace591268c6
 DIST libhdhomerun_20190621.tgz 50817 BLAKE2B 7d4293e38be5283fba5d46cb162ee19d90c30ed63481cd94445a055fa0f80597fdacedd59e35ba4edfb53934ce339e967eb0c42d0ae72289ce7d39eb1f91cd50 SHA512 d15c5b0703bf8ca1f3979a8cad93fc33d87c1309367ad5117354c60112a5505d90e80d4bf9055d16b0eef2b892015c5f4886e6544178090b3550c3a8dbd86576
 DIST libhdhomerun_20200521.tgz 51014 BLAKE2B bca7c09afd16dae9177cf8b8c828827818acf8bc24eff404591178519bd1b568bb8689721b452bf23ae5b37143cf85aa6fbce52177fcfbafcd5e30e6f1ceafce SHA512 ac253923b531a8e1f714b7fb98da5a2a062144c045117a63e5bb16b33a49ccafcffd24f5520d412d15ca55bc1810fc0ecb9ad05e2d7f5a196b5439b4e28d5c23
 EBUILD libhdhomerun-20190621.ebuild 742 BLAKE2B 4b318d87d60e18826d853bc92451f2d4659af5ed915aeb3c596f7fa33e17cb6e7a0ea2b45d53e2f9ed4237b2ddcfeb05a19afe882166c4596ccdf5c531838275 SHA512 d3ae13a413af9e8ad508d1f5834295dfedadfe1047b65fd360d4997c7b58d6c3e533bc66c09738e57261698c1c5630df463e4a063a92bc649acc7a6420d5e72e
diff --git a/media-libs/libhdhomerun/files/dont-strip.patch b/media-libs/libhdhomerun/files/dont-strip.patch
deleted file mode 100644
index 62aa00af3f07..000000000000
--- a/media-libs/libhdhomerun/files/dont-strip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur libhdhomerun/Makefile libhdhomerun.fix/Makefile
---- libhdhomerun/Makefile	2012-08-30 15:46:27.000000000 -0500
-+++ libhdhomerun.fix/Makefile	2013-03-24 14:47:08.740937164 -0500
-@@ -42,7 +42,6 @@
- 
- hdhomerun_config$(BINEXT) : hdhomerun_config.c $(LIBSRCS)
- 	$(CC) $(CFLAGS) $+ $(LDFLAGS) -o $@
--	$(STRIP) $@
- 
- libhdhomerun$(LIBEXT) : $(LIBSRCS)
- 	$(CC) $(CFLAGS) -fPIC -DDLL_EXPORT $(SHARED) $+ $(LDFLAGS) -o $@
-Binary files libhdhomerun/hdhomerun_config and libhdhomerun.fix/hdhomerun_config differ
-Binary files libhdhomerun/libhdhomerun.so and libhdhomerun.fix/libhdhomerun.so differ
diff --git a/media-libs/libiec61883/Manifest b/media-libs/libiec61883/Manifest
index 9284ed571645..726ca4a902c2 100644
--- a/media-libs/libiec61883/Manifest
+++ b/media-libs/libiec61883/Manifest
@@ -1,5 +1,5 @@
 AUX libiec61883-1.2.0-examples.patch 1140 BLAKE2B ab448e0a4941fd87ac8d0cd2cb6f21e3fc784b956ff2d8a1b81cad50a91ac0e60469eb5341d7ff3d7bfb7093fe424a51b63246292b52a62dcd773370fd6a7445 SHA512 b022bd213e82ae0f6ac206512a6764784720ef4e5caf349e39e729ec2a7c6b84c70af9ef02753b76e431707fc36fe1cc076b87367ca3c89250bcc1a0660d4eb7
 DIST libiec61883-1.2.0.tar.xz 233640 BLAKE2B c1fdd4d6fbfd96eea9f1c22b20a1e71e4cafbe064091ef6211d097342f8751955f2d8a68cb3e5235d733f7ecd3725144abb329331bfa3497be1911bb8773d4a9 SHA512 817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23
 EBUILD libiec61883-1.2.0-r1.ebuild 943 BLAKE2B 172fa1dc69fae176b893f8f489c756c5535000a572e7d2a580e1f3e65e326e05c43d9c9bd6cd3f0ac540605dca68ce4f341fe25a205d5fba72c087712555065a SHA512 8bde8dc265aa718ba5354bb9a5eaf7151298158bd052f946efe6a2ebc2171b314c911b238556616c04c54de61f8fa06e1895b564bcdaac720b5f13be5dd163ec
-EBUILD libiec61883-1.2.0-r2.ebuild 851 BLAKE2B 60fe73e75f03c0a9af45fe4279f8a15ebb89871adac57813e1d875c3792d4a851f965664f57cafc7e06db63e1cec5d056992dbe71cd9d54bd819072ffbc601d5 SHA512 fa23be3f6f0a009af39d946f52068622e153a9aa7be4a220c08c8d107c6877c58583f91c2da67de91e06d4350eac278bf0b9ed836b2d56e65cc4dbc703ae2785
+EBUILD libiec61883-1.2.0-r2.ebuild 850 BLAKE2B f7e0c426ebbdd3288a8b0fd7269d469acb8189b71a260ddb8dc571e355114df39a6689ae5f98216680c648a14068158cfdb366e3bd682545b940708863c9c14b SHA512 54974d4b4771fd9eaaf0747ec94c0a740deff27f9197e82f4c69fd318841bca8fed9c3aaaa2a42a4a342e5d5658ba287ed32a5165c709fc674fd8f0a70a9de38
 MISC metadata.xml 531 BLAKE2B b3f4a2efce5fb0eb30e14c02ab34a58d4dd4e38b7b5a8b799816fa4ac50fec6e2656652629f351388519f6bf05275448f22fd10b4565884c12bdf054130639d1 SHA512 bbf4b45023f2a7f1ed7769fa4513cc13ec9697eeb677fde7ec882f5f787e00d0b291ef6be1c2d0ace4d35059782d85678c9ac38f8913ffd63f35a82ebfcab933
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
index 6cd2901e5869..13dd6ab4543e 100644
--- a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="examples"
 
 RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libilbc/Manifest b/media-libs/libilbc/Manifest
index 8b1bab1566a8..09f8cb24aa97 100644
--- a/media-libs/libilbc/Manifest
+++ b/media-libs/libilbc/Manifest
@@ -3,6 +3,6 @@ AUX libilbc-3.0.4-respect-CFLAGS.patch 1217 BLAKE2B 69e46ed5ee1f9ef082b54b6049d0
 DIST libilbc-2.0.2.tar.bz2 392643 BLAKE2B 1b1772c415a823a63c2fdb64913eeee8becdda0438c3942e74dc0be5dc6e000538c8f0feb796d23eb815e792d9b9e695f598869a31dd69a90c1fb12823a09e28 SHA512 ad0ef3326144fa1e9b6983be9aeefcec0064930a0124980f0fa2b38967f145e4cef7be75d8eae72f4a9650f297f15968944e73ef256e642116125dea326d8ba8
 DIST libilbc-3.0.4.tar.gz 1307591 BLAKE2B a914b79c1134536f45910d367216b1ac27d4acb08f4c9b9dd3f01eaf181ecf0f6dc351b944039b05445217360a7e4b868b3aba9f8d6265eeee62a90ce0641a42 SHA512 2239a915263c2a73d83836354d42c670e4fe1173a38b3d1a9cef169778038ae5f4901d8202d6c5367d00db76e034e72bcdf6ac81bf0188f6a3f928e7d36d5a31
 EBUILD libilbc-2.0.2.ebuild 887 BLAKE2B 823f2b98b090736d98a07eb2ad8e1489d02f12f33de72cfa2749058c499ae71098dfac05b875a02a2d9fac09e33fa6e4009ceac866162a168ff6e5a70156509e SHA512 eb28d8e92974fb0b2367bea26bae5443838f45e84535ce2a1890fccf1ecfbafc661a7baf3bf96bf64e89ee375adde735b3965fc11c4b85aa1cd17e8d31790d90
-EBUILD libilbc-3.0.4.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
+EBUILD libilbc-3.0.4.ebuild 601 BLAKE2B bbf6689f567a203ac35391a2c04eade1ef5b1249f032e287eb666dd5e1369ce5695f9b6dc3e71892883671fbd8c8e65f903663c791a0cd22e6fe3210c3bc9f7a SHA512 d47330ee4ffe67d47a29886ae72feb30e527b202ae4167fbb6f797f549a00e3205887028b3f3c6f505f513010e6812b4b2fe879a810404041e2c4aa2056ab660
 EBUILD libilbc-9999.ebuild 605 BLAKE2B 08f27610431b3c863541e0d4c51f0e8d3116ec42785327a81da682c8a1fa45a90580f78d8a76d796572bda0db142873287c9128b92e1381cb62a8bc8eed58956 SHA512 d10afec68a9394333f48804c2844d217f9d774b645b0d32950ad3291c30efc303c54f3ef495a86141af67015c1e17c74740657215a773e944c0e76c36ca1f66b
 MISC metadata.xml 333 BLAKE2B b0f35100492df931d4a504ea070e7c5df977bb452e013cdbcb6b82d949b42d9b751862c5b9462b67d3669bc401f843eef664e5e1612400cb9418f22b208b2f3a SHA512 9081154d8e099e7b355ef3b11a49e7580bf1ef2a62dfe3f183694041a0a1ef247a111a982af1ba9cefb3a64dc26a4b0edd45b374087e4bbf044f468eff7195ec
diff --git a/media-libs/libilbc/libilbc-3.0.4.ebuild b/media-libs/libilbc/libilbc-3.0.4.ebuild
index 9f2f31bf171f..9d95e85d4879 100644
--- a/media-libs/libilbc/libilbc-3.0.4.ebuild
+++ b/media-libs/libilbc/libilbc-3.0.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/TimothyGu/${PN}"
 else
 	SRC_URI="https://github.com/TimothyGu/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Packaged version of iLBC codec from the WebRTC project"
diff --git a/media-libs/libmms/Manifest b/media-libs/libmms/Manifest
index 4a950d5c1933..84160011960c 100644
--- a/media-libs/libmms/Manifest
+++ b/media-libs/libmms/Manifest
@@ -1,4 +1,4 @@
 DIST libmms-0.6.4.tar.gz 356217 BLAKE2B 2b0029cde3e985b1a0310e7d00acafb54a53606c656fee1b87a086a31ecc1e488aec31e86880959f23a077a20594a6c939efea3e08545a3d47f804ed762395a4 SHA512 9771c697515f5232eaeaff79e68fe15e34d8aa38aa5d3d68525216357223f314c544d71b5fe18d79a77682f41b1b5d9fb5e7c3c99d0cba5723d2e3de31faec96
-EBUILD libmms-0.6.4-r1.ebuild 688 BLAKE2B d0a0323e50f833e32af4963a5c8fc4e812b0368c735397af78312c5335638579f315d79b51161e5463270172b422230091c518f09a2509eecf7bb2d086289dba SHA512 6c62b0f7369d4eb710a87781a97754d9fd4db5ec541dcf576a1b7fe16b9c9c77cc8925a6a0ea34d2731dca13f1c7070384b2c9e311bef76ab2c24fa8b2315f37
+EBUILD libmms-0.6.4-r1.ebuild 687 BLAKE2B 572fe7f67fb62fa39a0d3e3b50c0e9e6e927b79370e1c9f27052046f3768699de5521e06678f3f853e34daf5355b709710495a80eb3912b0c4afed9fc9786800 SHA512 87b269d52b44adde51055ed940153f72f29a93bc9f06b56d2e5a6ef83a1270e444021bcd792025c563cca942034ded713f973f8f88e4c1975940e43bca8c6f9b
 EBUILD libmms-0.6.4.ebuild 636 BLAKE2B 10e4eebbdfa1b21b0b1883a76b95535e840c09bca39af8a0283ad86c604add9a815c7f48178f73c18e2f46a5a3f0fbb8a76cb03bd87b72bfd47a16a45d3ba88a SHA512 bf4fbba5e64f588fe5624a359ca654be47fd047368a94d793df63512823afe30f9161a02a9472e0c484320afb2b36b949421d8f0fc2389d37e65133a44fba1b5
 MISC metadata.xml 358 BLAKE2B f61ee71ee2acfcaf289a33d28efed96cae45933a0a0434f53e2fd2196722eb3c2f4d2f75a39f31bbbb630d11b67bca1f6d43c95349d3f97560f6260bbfa50082 SHA512 c9c5cc18c8b1ea6dcd96d280d74a811f19f7a93a866b95263454d46975f876791559799dd2e036b24f41e8c10d8130e2a4b200aa71f087f44044ebadd5d9aa95
diff --git a/media-libs/libmms/libmms-0.6.4-r1.ebuild b/media-libs/libmms/libmms-0.6.4-r1.ebuild
index cf67f02beb88..87f7331674f3 100644
--- a/media-libs/libmms/libmms-0.6.4-r1.ebuild
+++ b/media-libs/libmms/libmms-0.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 8699d82182ba..bfa44c185085 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,6 +1,6 @@
 AUX libmodplug-0.8.4-timidity-patches.patch 557 BLAKE2B 4c26c285bb2f23057dae320ab3488e13dbbfb420f8185fd615732912e17f416537b4d210cf8cf48745a3b6dc2df8be49274904626e9db432f2f347dacfbe99a6 SHA512 4fa8bfe0665713b65b0b3f9be59589c98c7fbe5aa278ee95107fd1b91ba1a25fbd20a86bf91ab7eb7e160f522e04dc78838ada6298d4f5c1905b528c1fd7a57e
 AUX libmodplug-0.8.9.0-no-fast-math.patch 437 BLAKE2B 7b4f449d4906480b392b2ea93260c816a2418678a6f5209c6d00939830c977161c6d481a34830e0e0b39400adcf7af8665df63091580bd3db84841f7ee8158f1 SHA512 f07f8e3efdb4d15dc8916c5f62429f2d51a0342743a2bc881b44fcc8cb689fe973f9089815c2eb3ba469e622e9c4f86a7c4f5b6e5bd78d506aa7c69b80426653
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
-EBUILD libmodplug-0.8.9.0-r1.ebuild 834 BLAKE2B 53227aada07bb24f80e2a0b11d99ad787f40c20f5076567b3b9114bac311dac2cb61ecc5751d847536a2793450d14cd89f51ac7522d34399b985cbd58375d151 SHA512 36358b5c545d22a58bef32b198fe4fa62f8421b05d40851903b7aea56af54202147b22dea77d720fb521c6958d3e53bea7b81dcecbaff771c82c30f28e242c98
+EBUILD libmodplug-0.8.9.0-r1.ebuild 833 BLAKE2B 753e00b596fe381746019feeab969da083b71db86ced44288e1b7b91a7a65ca6f52e2ac042e4020bca345777f87c506ee8fdf330a48dd9da944c0e5a40fe82a8 SHA512 33a708974974aa5b028d7e9fb85538bf992b45c0ca550208fec515cf03ec93cbc1c0f4b0838965dcbda17acdd1d7b358be1dd4750beff948df30a57744706f61
 EBUILD libmodplug-0.8.9.0.ebuild 741 BLAKE2B 109d2ddb2adf9b398114dbc7e8fedf82584c089ff7513e3a8a559971727f731fb734974f42ef548a691edcfd2fc43490aa68073bbbeedd074ca14dc35d662db2 SHA512 b9cfbf0f1b9b2ad38795df9242a8e47cfd240529520561db0f884af7843a8796f4f14fea84d0bb9edbdc94285b3e189adada3962f0d39c4a67341425db784856
 MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
index 464179a35ebb..5609e526ea88 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index 005cce1a992a..d0488ce4f3d9 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -1,6 +1,5 @@
 AUX CVE-2017-15185.patch 1088 BLAKE2B e823a30ec18735deb5ba22592165e7828266888d4cdb435ddb88b606b6312c18444e2b3395c3f155fb12d6749a3371baa9b18d7972086c19e750deb253b17162 SHA512 d5ef327e47681bd74ef7488965805727d8e905f65ee46698b06f88d971003c65c309fc8b6714e07c7a12803657db302b15522d6e4f4a75c0dce1217deaa07439
 AUX libmp3splt-0.7-libltdl.patch 676 BLAKE2B 144528812f340517d4da52eeefb35054b31363d5c24eb0fc1fa74be7c39008a9d27fd61a9c412aeddf5698df1469975101fec74de5f65b17bdc2a9d727017cf0 SHA512 50e9c6472b79b2dfcb43764828e26ddacc3b1b747a6264291385d6173de51608188d4fd865ac20dd2ad63ddb9d3191eb62f872ddead15564d7400b31dc5bca66
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
-EBUILD libmp3splt-0.9.2-r1.ebuild 1252 BLAKE2B 7743cafa4f00af8ac3ad23691e18b74b0314a017d433bfea07bc045d1ac67fa079b358701881fc6866a674ebcfa4a5a185ea26f72e0480cf90206aa39e534469 SHA512 94668060ca959377fdda7d65f179141b5b6e29f30e4ada17e4af18c3e3a569ea3681671c99bc8a1db82ff2b56614f232999f33a156acab44f1e2c4e166d34bf0
-EBUILD libmp3splt-0.9.2-r2.ebuild 1296 BLAKE2B 651cf7b1e2a36045b5c510b22c2a8e9b2075e7e53ba6de173a7ab3bc6954e86071a4bb257bb05e43e43566756eb9c866a2e5b0badaca14521079c77a08f75b55 SHA512 0445bee289b3eecaeaaa732059b28ac57af86e29bcce2897593fe0a45d60d41674f748b5b79ac68c14b784477d898b0613efdc6eb9aaf2ffe5e3f94493c966f7
+EBUILD libmp3splt-0.9.2-r2.ebuild 1293 BLAKE2B d841d43e3703728e26bd7034a84669eb9fe925e1208f7ae7f22d86f4d98833a428056e0b28eab11001c82f45e1ccd8d576dab6cb197e0ec37fef6d9251ec4e66 SHA512 4a4d5eef497cb2572e186c62c12fd8466b8a3405ef1c41259ffe6e7fd7b928e607f205aefc74dfbb9a9d2dc873e6c17e29cdd6a225ab0c684157180f302ec21f
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
deleted file mode 100644
index 8c7d738565f9..000000000000
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator autotools eutils multilib
-
-DESCRIPTION="a library for mp3splt to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="doc flac pcre"
-
-RDEPEND="media-libs/libmad
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/libid3tag
-	flac? ( >=media-libs/flac-1.2.1 )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.8.3.1 media-gfx/graphviz )
-	sys-apps/findutils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
-	epatch "${FILESDIR}"/CVE-2017-15185.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable pcre) \
-		$(use_enable flac) \
-		$(use_enable doc doxygen_doc) \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimise \
-		--disable-cutter  # TODO package cutter <http://cutter.sourceforge.net/>
-}
-
-src_install() {
-	default
-	use	doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg
-
-	dodoc AUTHORS ChangeLog LIMITS NEWS README TODO
-
-	find "${D}"/usr -name '*.la' -delete
-}
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
index 32c19c64fdbc..dec4b03a7c8d 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="doc flac pcre"
 
 RDEPEND="
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index ebbf041652d4..0d812e67a8b4 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -3,6 +3,5 @@ AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 BLAKE2B d4f3102461c76167286cbf
 AUX libmpeg2-0.5.1-armv4l.patch 566 BLAKE2B 3c3c87dac145bb4f447cc0657da3eb703c61c8be2cc84623808b6ec48f9a4a3d334cfa92b53c4fccc7fa09fb0960518a350c8ca354af0cdd450f4aac1e0ad22b SHA512 3705438a1aed3a5f30cb04f4a5b6c128b22b9e4d6af949c6ad1244ec26e2302807c99e81866d08349ee2056ec66ce820747d265bd41cd0e300cd5ef667dfd53a
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
-EBUILD libmpeg2-0.5.1-r2.ebuild 1479 BLAKE2B 71e2d52780f78bf9718f0f9b4912bd90b8f8a69073abb6f09acfb221653f24e17e2033a64127fa28a8b25150535cec04964e0daa37abad2c85d60cc02c1ff0f9 SHA512 6f4b0fd8d2554e94820016584308247c32a17d311feacf5527b708af22876bf47ae6e336cc84ac4211528300b1d93abfa5fc76f77fa9a0641199901d9769792b
-EBUILD libmpeg2-0.5.1-r3.ebuild 1320 BLAKE2B 3936f3938d686c569f52c05414f38a44cfe0d1d92744fe1f15f69d1b18570327c775469fbb79ea7b4147517f206980dabe116aaac1c99e2b6a6a5a0419e099b9 SHA512 0e24bf88a4d4a5eb40042e52d73f01a70193a1d192569ce9ed83f0058c7556f3189960ecdfedde127254f1d96caabc76d941df59747857f600455651f00cbb35
+EBUILD libmpeg2-0.5.1-r3.ebuild 1313 BLAKE2B a4e289a342f06985e89c36790535f9098c8dc36a5a2088bffba3028d8727266f8117c4e10e404ef3b142f83f04f10d30c512734fdae080363b31320a147cf755 SHA512 6e3df51013b0a5b9acd15d03e432d4dd1943225b242f97e877db6397ff18728f6dde84695c11c4edadaea6a648e662c8abe11bde1db55cdd716cfec2144500e4
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
deleted file mode 100644
index a19f50792e15..000000000000
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils libtool ltprune multilib-minimal
-
-DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
-HOMEPAGE="http://libmpeg2.sourceforge.net/"
-SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="sdl static-libs X"
-
-RDEPEND="sdl? ( media-libs/libsdl )
-	X? (
-		x11-libs/libXv
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-arm-private-symbols.patch \
-		"${FILESDIR}"/${P}-global-symbol-test.patch \
-		"${FILESDIR}"/${P}-armv4l.patch
-	elibtoolize
-	### PowerPC fix for altivec
-	epatch "${FILESDIR}"/${P}-altivec.patch
-	eautoconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}"	\
-	econf \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		$(multilib_native_use_enable sdl) \
-		$(multilib_native_use_with X x)
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ libvo src//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_compile() {
-	emake OPT_CFLAGS="${CFLAGS}" \
-		MPEG2DEC_CFLAGS="${CFLAGS}" \
-		LIBMPEG2_CFLAGS=""
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
index 19f464944a6b..869573184e56 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl X"
 
 RDEPEND="
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 6f5ffff892b7..ca2d6e2d3b6f 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,6 +1,6 @@
 DIST libmtp-1.1.17.tar.gz 829529 BLAKE2B 7e7393aaf0e988029382d30e260d651ad1166a89a2af32a3da544cdb85eeec1a026eaa40d131096eaec0686b92c4e25663ec5cfbe3916a522ebafd38f107744e SHA512 f2648e259529bd3dfe74a7049a79c4b0042bcaf63cc1fec8b232b66312d62e9620280e4f725312c9ef8207f1f1ceac19f460a0a8772a3cc6c7f0b00ead01add2
 DIST libmtp-1.1.18.tar.gz 832463 BLAKE2B 136033e9700fcce6d5092f8f5f896ce40b2ef659d638bd2e432fb7522c1c4e7e930171198ada5c67c0f5dc7c94ed36ec7d2ac8f4faa3bb335d4a8abb032ae2ef SHA512 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8
 EBUILD libmtp-1.1.17.ebuild 1582 BLAKE2B 6598ad68e51ea6071dba3cad5a51944277301b30864400eb9803b9259a2715360b9d7ed6241fc6f59142d5ccbf1c4d33595067e22c0151354f04ba35e3a86fc3 SHA512 1ccdb125a2fc6f0cce2e3a087db830a7559c094afc87cb11f291834eb42b9719cd4da57e0c41ab61e34b0dca334fd5d19fdc33282806752a052e7701759aab70
-EBUILD libmtp-1.1.18.ebuild 1605 BLAKE2B 5323e0b427108d356bd879a991f4e6d03c897d4fdff985c22ffccebd458a81c69a2492d69592f28774aac82540cb0999cd12061558592d16eac7685a84597cd4 SHA512 63a027b8b143608dbe555369d131798b5b7298f49d814265b5499af15bfaca8ebb860399fda2e8366e57793bab00ea6db5a2a842ce3741134d9fe25952914c43
+EBUILD libmtp-1.1.18.ebuild 1601 BLAKE2B 365ba8eddd73d828277b69bdf3b7ae5321df1cc7eeb31ddce71d20b9859df734a3f9d5abd22e06f4b987ff71a9b83679ba2104c2b53fa7ebdede11092dea420e SHA512 b8247b6e49d2e63ed82c0cc8c83fa99fccaa6df4fbefb3301b8ea23f0d8d42f087d6b43ba49bb78c9aaa8a45f0ef91e19b377e8a0ef15e3a2d8e2a4ef409cf8f
 EBUILD libmtp-9999.ebuild 1587 BLAKE2B db65f8bbe716f8ecc2b2700c56b430fe239230e2950acca1f6f732d3d92c25e2f2d8a77f55735ece0b31075b1e131d9704f39d1e5865ff60de6edd37791c8218 SHA512 c35a6b0fc775992d78b84e6028c6480e7744e400b1543c25f64936c4b46816aa63104f82602e00f7af25705e9d7832b7f049a36ea6edc739e672ad57649a837c
 MISC metadata.xml 447 BLAKE2B 93dc7722951975ded85fabe8f53c75317b6981561f8848ff52ffa277a93b31ed626e9c97fbce4ce62d40fc186f473059cc036398f218abaecf692e0683e2f439 SHA512 4ddbe48062ced53c6ce5473a837e449251933ae248d04c14c2008d35ce8f290bfcef67aeb31a9d29e53bb54377df5043e89c98ea2744896c1f106785e3b4c212
diff --git a/media-libs/libmtp/libmtp-1.1.18.ebuild b/media-libs/libmtp/libmtp-1.1.18.ebuild
index e9755bfc4201..a7c0f68898fb 100644
--- a/media-libs/libmtp/libmtp-1.1.18.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.18.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index 4460982d6c73..5f82e314f7ea 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.4+release.autotools.tar.gz 1470690 BLAKE2B fade97324b350a4c6191b21f6e87cb1f04ac010aaf3c52ce8e66b3382e27e46bfaa99cdd044a7bc8859ea355a5ca82c53844272345439961ef50cf7a5ac1a233 SHA512 2acb5f04bbca84dc01e0aa0e002924e3cd41c0d3516d3f896705c2906d8b2f8646c45d3dca609ffc94972629b887fd63da383e3d0127b2420731de20e4590b5a
-EBUILD libopenmpt-0.5.4.ebuild 1536 BLAKE2B 2f59ecb70c771eed92cd902cd663a8ffd0449e8d4f9b28a22d26a2073d54abfa825500f3a46f581ec9ba85667f75c5a05c867197ecd6e321db4146ebf9b438c5 SHA512 0e30994bcbe5413137f0ee080162f1d57a0b69b0e110d27c4b8653c184737ab23ea548a85df5aae037e8f88cd92910c86c3b60cac167124d8ed2779e58b2ed84
+DIST libopenmpt-0.5.5+release.autotools.tar.gz 1471537 BLAKE2B f79c27a376cb6dd01957f7c53e4844a08936c6fc34b26bb582367bbb745ac82e5e51f93769f668661532e7518173d2e4797c2f9ac20bc81052e0f923cf1cefa8 SHA512 8a56fdd0994b6db3567ea81d6cbd6ab69caceb82e7b0eb1dde017eb5c001c291384e7ab4a5a8a3ddbed3df4ac6b073a4d26e66f493926f582d198fb6810f9890
+EBUILD libopenmpt-0.5.5.ebuild 1536 BLAKE2B bc62cfa3a457ea8f6210af58dbb5f524207e1c9d5e3903bf92ee78585ccca0f7eaf1ca8fa64da81648fd84404041a1979e60cb9c998b389aa6f715e6fd405541 SHA512 1b529981ecfa0352e6c58dab4fb5fd4f654a05688eaf5232bd39edc4a8c45199797c10f3a1b9d6fa5765ee531c5d62dee1ab0d583a5cb62d4d7ea0d0d0229fec
 MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-libs/libopenmpt/libopenmpt-0.5.4.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.5.ebuild
index cfb89e4fb8bc..04304cf5ed15 100644
--- a/media-libs/libopenmpt/libopenmpt-0.5.4.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 7ab172ec7c5d..eb2eaa20ad09 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,6 +1,5 @@
-AUX libopenraw-0.0.9-jpeg-9a.patch 590 BLAKE2B e43ddad7d7c3e48a633bc8e8acc480ac610b505052e267a175acc56c2036d9d2bc2b9127184d30924661243c3a595c2caf3a6eb6443102890d3620095b84108d SHA512 555a4ae729fb4163d7a26bc577fff9257bb326712d8c59f4c4d36c1398bb7ebac26a2f961d22676d9c97812a9fd6433f802ba2d9fc94a5c07e18de60e59c682a
 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
 DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029
 EBUILD libopenraw-0.1.2.ebuild 1123 BLAKE2B 4cbed60099d06ae4a7743a1e0b51ec96cb46056c9c6edd297780ea1e2b381d5a982d5eead5638e427af6915e159637997f5779e1791a9ce0d55b69e1103a55b3 SHA512 22d5fab05fb48453bcb7af6b752d4aca51e6574369795b8188fc0375476b82e7953aab98fedc87756175a96b98ea267d779fc68c87f32b662deb2f1048a31835
-EBUILD libopenraw-0.1.3.ebuild 1129 BLAKE2B 0cc1afa57570ff5844d593e70f387b15da8a9c6ce736ff903040b144840757aa3937dbc60d7a4a9d86dc71533731b4066f2b8c9efdfa4797f674b1434d0be48a SHA512 e72348c0051972daf41d9b96bb6afb6f16049c18ed2cffbb4f338fc2c9a642ccd2be4e1aadd559736ef5a6107308d89f24a2d0ffa7f0d1beceb649b4748ae4ed
+EBUILD libopenraw-0.1.3.ebuild 1052 BLAKE2B c28a0abcc23ff14ab20bd6c255a83a477696a0e164b0937fd36d9c1537b39e5f90410852a5a41ae704b2081615f550b11471f9627750271d8937f6036e94d46a SHA512 a2ec47772e7c9360533e7b44b8d8fe28a7a426435ddb8a8b2d4930c96566e99db04befcd78fe8056c9dd4f7f5308399ada24a02ad781ef2c4ae92e9dcb569f2c
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/files/libopenraw-0.0.9-jpeg-9a.patch b/media-libs/libopenraw/files/libopenraw-0.0.9-jpeg-9a.patch
deleted file mode 100644
index dc8f0931dad0..000000000000
--- a/media-libs/libopenraw/files/libopenraw-0.0.9-jpeg-9a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/520888
-https://sourceforge.net/p/fink/package-submissions/4336/
-
---- lib/jfifcontainer.cpp
-+++ lib/jfifcontainer.cpp
-@@ -145,7 +145,7 @@
- 		{
- 			int ret = 0;
- 			if (::setjmp(m_jpegjmp) == 0) {
--				ret = JPEG::jpeg_read_header(&m_cinfo, TRUE);
-+				ret = JPEG::jpeg_read_header(&m_cinfo, JPEG::TRUE);
- 				//Trace(DEBUG1) << "jpeg_read_header " << ret << "\n";
- 				
- 				JPEG::jpeg_calc_output_dimensions(&m_cinfo);
-@@ -181,7 +181,7 @@
- 				src->pub.next_input_byte = NULL;
- 				src->pub.bytes_in_buffer = 0;
- 			}
--			return TRUE;
-+			return JPEG::TRUE;
- 		}
- 
- 
diff --git a/media-libs/libopenraw/libopenraw-0.1.3.ebuild b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
index d3072df54c97..5112dfe394de 100644
--- a/media-libs/libopenraw/libopenraw-0.1.3.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome2-utils
 
-DESCRIPTION="A decoding library for RAW image formats"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/"
+DESCRIPTION="RAW image formats decoding library"
+HOMEPAGE="https://libopenraw.freedesktop.org/"
 SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="gtk static-libs test"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,16 +25,16 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.35
+"
+BDEPEND="
 	virtual/pkgconfig
 	test? ( net-misc/curl )
 "
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
 src_configure() {
 	econf \
 		--with-boost="${EPREFIX}"/usr \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable gtk gnome)
 }
 
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 29c571826c8e..fd2063cce57f 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -4,6 +4,6 @@ AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf91
 DIST libprojectm-3.1.8.tar.gz 55482686 BLAKE2B 226cc62ce84932e81c650dac8dcf89eed4d71513324b3bb3a7250c450cb002870f2c2c2eaf6947f6056b35efa5159ea7956bfec420e9f545df445f7654a76d05 SHA512 efbcd5e867ab9e710d11018d580ae6c3bc7aaba46e3ce2a3d682e9ec341756db6ecf613deab0a9d13ed6ace3d05dcf19a384c00ee21832acd5b6ebfe2b806f44
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
 EBUILD libprojectm-2.1.0-r2.ebuild 1462 BLAKE2B 02bd1446c7250f0313805c051814ea9114b881ab8cfa7b5ccde11c88c636826600660026935bdbf7a9a283c540c220080f98b28bce7f626ea21dce830723e73a SHA512 b82ecdef0da92c14e0993d099cad1741ff5f7d5407c2d31c275ce3a9664929001ed3099b554767ca49626a2e104bbb5c4ac90a68689f20f1e0e9e3f58b66c40c
-EBUILD libprojectm-3.1.8.ebuild 1361 BLAKE2B 6f7877e12b001b2c77de5659989533dee96557512bf0caffdfcdf4b8e7f3bc3a24f163afffd1221ef2956e2a64ac0e2236221d9a080c0369b3ad00706ee1b7e1 SHA512 8faae2c779d66b63bf33aec82aafdde8e930ce7dadbbdd2da020e2963d2af10295ca611c9e93085b7b809138721ac7ef671a71be46f36ff599f403fe402e8070
+EBUILD libprojectm-3.1.8.ebuild 1359 BLAKE2B 35125d135a787204760525a533d86d8b49b9c2006ce1e067460d68a61451cb9bd4ce96e71eb1ef02e5806d09b2d1c1bd05724af05e6abad55773deeed3c1df19 SHA512 5250de2e327f8f411273a819881d158fa28e93bc3f1f8d993b197892277bf436568eb946185ca740c974324501b4e39e76d918c92eff97034de253dd261deec9
 EBUILD libprojectm-9999.ebuild 1359 BLAKE2B f68f5127f00e1f011c1be28b64c013ea655f2d0f8b47bd790b3a9878737a09098633902697f2c5a802c193157137f0c52fe89dbfde9860c80173ea4900c4aef8 SHA512 76da921f433287a3a46c14f8dd766239c084516f913768440bb465e1d6a3acb081cd469eade3127f6b7314875961cd28c5a822126cd1981f6eb3b460c41b6e12
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-3.1.8.ebuild b/media-libs/libprojectm/libprojectm-3.1.8.ebuild
index 6756ac988c2c..12835ffd75a1 100644
--- a/media-libs/libprojectm/libprojectm-3.1.8.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	MY_PV="${PV/_/-}"
 	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86"
 	S=${WORKDIR}/projectm-${MY_PV}/
 fi
 
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index a3ffc6ae75b0..4c4f998bb687 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,5 +1,5 @@
 DIST LibRaw-0.20.0.tar.gz 1431412 BLAKE2B 455649b600926a6a53924e4cfea33143fdd8658804cc5c19f0bb6ff5bc4a0f73ce6e45385a0edd5c78e290c8a1e32a6e3cb5a2a4c53318c046b6c4c5e6476acf SHA512 98c1d61b01fd8d408297960f63ba56d23f170ca820db7cb2c2ad5f0c9494ce79d4d615d76a6835e046589e76031a553d6e1c692e7e3e66655bc96f4d4847d7ac
 DIST LibRaw-0.20.2.tar.gz 1432141 BLAKE2B 6e41d91b560951ad4595c41a1d089505ca91337f4fc6b98bafe44211971bee143709482a070bacb7daebbd643bbbf17730f544d791c0237bf1689a7a59133079 SHA512 96b1aaf09e2d46448d1b3619270c1f1c32e9bcbd866567cec67d5b1f889362f0fae3f3533ea9bf6a11a917be3b61ee6c9938bad09209d93453039ed04eaeae4a
 EBUILD libraw-0.20.0.ebuild 1382 BLAKE2B f37c63dcdbbf7bdd93af2fd7bf67d04c02d0c5c3d95b9b89c30ae806f6a5c31ab8862f4a7cc1c4851584e46f76a2805e6981f0a088f672e609ed1424ebdcf2ab SHA512 4941a712d519ac88903e1912de2e8bea816339fce8695af416a6229b627df14718576d43d30b715775eb26c5f5ba5d9bce152293cce96ea3289682f367d302cb
-EBUILD libraw-0.20.2.ebuild 1389 BLAKE2B d2394632a9affe6be4a55570935986d7bf1da5c3621e77077358c30931b1697ecd489ee19756266640bc6f23bddc685c3507617c23d0164d33c95826cf47411e SHA512 6889a4c0cdde5d3a77a43cb82148b090be6151e526c230ddcaee1d8c2d21a9a55e8f081309f1ca84ffe7f8270cbbeadfb4915aad9641701b95803a1d1e3b9e69
+EBUILD libraw-0.20.2.ebuild 1384 BLAKE2B b0a3620b3dadcdabd977e38411ab2fe83728f18a86f66e3a47b47c2a3694566fd61f86036b9a72686dcd8d65b3eb11cec6e3ecadca1082b73466be7eb218cd77 SHA512 00070cf429d62c66916840e8e88a4af4d40514eb53374f2e0daa09535ce5c313aa03f2959c6ce62e2beab8872138193d9bebda24181d458ff76bc1f7ddcd42fd
 MISC metadata.xml 383 BLAKE2B 3e4195c6cba775cc80e977738b81f527ef45c4fdde631a9c0591b26500cbda7c09267e993d4a21b72b98ec681e1a80d7d99e3d6ce0e48d0d2870abbb1ae64add SHA512 710ff0b177c64460965225e90584cddbf3bc439aa5cc900bb5a3877207fd5ad8f275cca03330366357eff9e08b4effec9d29271e90fc1bdd7befac4eccf56c1b
diff --git a/media-libs/libraw/libraw-0.20.2.ebuild b/media-libs/libraw/libraw-0.20.2.ebuild
index b25b30eab84f..b2174bace6b6 100644
--- a/media-libs/libraw/libraw-0.20.2.ebuild
+++ b/media-libs/libraw/libraw-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/20"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples jpeg +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 1f219c415b02..a3a131edebb6 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -2,5 +2,5 @@ AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe
 DIST libshout-2.4.3.tar.gz 529563 BLAKE2B 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5 SHA512 fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34
 DIST libshout-2.4.5.tar.gz 543991 BLAKE2B a3ceabd150413e9d1cee2118fe9576959bfa05d86e261b2574969a9a665aba3da4ac1c39db2b27d033fe587232a69a569d80362f856bba667277b5454dd170ca SHA512 290844185da16961f03434d3e341573dd6cb0139e5fa81902903021b641382d2629302d7c356bc591b35656754e07f4e44a8d9e782e092b17a051b9ae8f54341
 EBUILD libshout-2.4.3.ebuild 1312 BLAKE2B e409e9f703a351d6e0df5dcac4beb3ae9de6c4773257e0d2ef541ea5d3120822f7ddc7938d0f123e250c38669aa6596928c8329b15a620a67b2a422dd40a3358 SHA512 e2b159724aff657070e9fe692981e94cd73d00b7f8d57110364154575ddbf27a111953f04dbec4c2479b3db88f1806afbb5bd201fa1dd95e05547247a3945fca
-EBUILD libshout-2.4.5.ebuild 1236 BLAKE2B cfc49e52a5730f3a58b14c31931b12f1ed58981556facfed59f22f37567d204d1fedafed6bda7721f72993b5e6d2b6bfd5b8265195ef69dd16879cff3eb9df06 SHA512 f9a54c08a5c2b6497c6ca180e5b5fefc3b06975888f15a02fd5f2b3e99fb1331b2c371ea366be6166d257d5bdf618434705f44321ec508ff3a93bbafc323db50
+EBUILD libshout-2.4.5.ebuild 1233 BLAKE2B d7db0b2fd29286e7c0fd6aa0e23cfdad2a9a99a5daa1510f96ee087ace066b43d2ea2484603a1d71b3131931b918d86f25c54c885864c2aadd5c493f71770069 SHA512 fe6d0ef23491b20202c2650d4ca7402d2555e7a5a5d1a1937f82fee5be1f4123e164abe64a8102528e7ee121213c8fa784f2ce9265138d59dad7d093ec5cfdc5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.5.ebuild b/media-libs/libshout/libshout-2.4.5.ebuild
index 8fa273442a74..802fe33ff774 100644
--- a/media-libs/libshout/libshout-2.4.5.ebuild
+++ b/media-libs/libshout/libshout-2.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index b4e4bcae2fd1..9a69e6d81864 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,3 +1,5 @@
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
+DIST libwebp-1.2.0.tar.gz 4092120 BLAKE2B 213b2385f646dd0fbaa7c9103b0d33a9cb5e7285d9df91107db722f514428ab8cc896704d71a3913ca1aedffeb706fcda4c7a59a3960ebc21c74ca9422632605 SHA512 c46b41899a543cc80914c89646dd607dbb5d025a9727dd83ef70994b9310eedc697666bd812141a90aa16632a9a354a031d9360a9ee1112295c7e154e69f0b74
 EBUILD libwebp-1.1.0.ebuild 1837 BLAKE2B a112fcc370eec9a5a69d75101b0c6e3b27f1553a0a9bf07297c2f840e8ba179a80a0cb4b8879ec89433a3fbf00b291c5aaf5ab43b26d285fcf60615c3c2451d4 SHA512 46c5b6ec590c13f48d9667fc89dea65ebe93fad63a80a4f807106b271dd0944a80d492d4d7d201972999dbef082e5dbe6b633b5b49ffb5cc2924414085091185
+EBUILD libwebp-1.2.0.ebuild 1846 BLAKE2B 251fdfc4a1b25cc1ebd333199709d3f70335393c7d86602ccc6ed7626ba41babe7a512b075ac81e3102dcb50de0f47e91628c894f95af9716e11b75a8a0e6fee SHA512 a54f5f102f1e539088872280ca43bba45070eb9ee060ebf8245d0a04b69810a3a86e2a671f65005562683006d11907ad0ddf998be099db87de16e1c3d6b77cc8
 MISC metadata.xml 431 BLAKE2B 657047e71cd8f3ab7791af317c5a3581b3815d96d7b0bc9dd049fa773e5bcf0d88703f1e4c54c5417c4c40f74a9ee2037dfa503a9a66931f662868ef8f5a32c0 SHA512 61ec4c77d9c47b17a2ad64929b1f9eea891bf463ab74a05c2beae1f0cb631ad47e707b8414ddc62fc355b1d7140de145d209d556b6e45bad4d3d25fcad5a1af4
diff --git a/media-libs/libwebp/libwebp-1.2.0.ebuild b/media-libs/libwebp/libwebp-1.2.0.ebuild
new file mode 100644
index 000000000000..958ddc327555
--- /dev/null
+++ b/media-libs/libwebp/libwebp-1.2.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool multilib-minimal
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A lossy image compression format"
+HOMEPAGE="https://developers.google.com/speed/webp/download"
+SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/7" # subslot = libwebp soname version
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
+
+# TODO: dev-lang/swig bindings in swig/ subdirectory
+RDEPEND="gif? ( media-libs/giflib:= )
+	jpeg? ( virtual/jpeg:0= )
+	opengl? (
+		media-libs/freeglut
+		virtual/opengl
+		)
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Fix libtool relinking, bug 499270.
+	#elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local args=(
+		--enable-libwebpmux
+		--enable-libwebpdemux
+		--enable-libwebpdecoder
+		$(use_enable static-libs static)
+		$(use_enable swap-16bit-csp)
+		$(use_enable jpeg)
+		$(use_enable png)
+		$(use_enable opengl gl)
+		$(use_enable tiff)
+
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
+		$(use_enable cpu_flags_arm_neon neon)
+
+		# Only used for gif2webp binary wrt #486646
+		$(multilib_native_use_enable gif)
+	)
+
+	ECONF_SOURCE="${S}" econf "${args[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+	dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
+}
diff --git a/media-libs/libxmi/Manifest b/media-libs/libxmi/Manifest
index 700f403fc925..cf7a40ad9b87 100644
--- a/media-libs/libxmi/Manifest
+++ b/media-libs/libxmi/Manifest
@@ -1,4 +1,4 @@
 DIST libxmi-1.3.tar.xz 258672 BLAKE2B 7eb50a9a7804bd37fdacd238e41241d54e9b0ee00aac9267e9d6a62a1a61338522c26df56021821fd7af74123550f99305a233dadb55a6a9514feb124fd70d32 SHA512 f54b0925e2b848f7cfb31bd0f9eed27df6fd6e704ffeeb58eb490d49e7ca76f46e03eee6ed89d6644f6a3bad05c7b0b986f9634d0cd23c49f31ee80f23ff8262
-EBUILD libxmi-1.3-r1.ebuild 703 BLAKE2B de320e0eceb4e8e6048c068041a29d28f729ab1ef4930486ae7032dacb7b3b63e7956c2a155f589d9ffbbbaa3f0561484cecb7c43d46e070035916663039e027 SHA512 9b010f71ea7967ce494d984876729cd44286ef944df24a8b9c4739243b23d8d4ec1ffb7caf6cdb710b183d6b7d47a85062d86e350aac2310b8ab4e66449b909c
+EBUILD libxmi-1.3-r1.ebuild 698 BLAKE2B a5ddbd4ec9b6a6775ce89495aeee36ef28ea8c1093a81bc9adcc8f3546620f36438b44c79e7449cb6ff94d943a27efb33d1484ca3c50e3f0a25dc031b0df3950 SHA512 1961c838b2bd9bde597caa618b7f7b32d454718267ea8116b5a289443bac5d69c42f4062fe2b51405c8c2b206b7ce78ca6a442f51c27ad8a2558b59277b9767d
 EBUILD libxmi-1.3.ebuild 614 BLAKE2B 14b43337437614721d4ce91bf120dce2df33efef6c1fe2330a627e3a09d0e4e530959f8bda76382a94f310f77fb661994c3e0ab26d87af5389288ed6858f1293 SHA512 d95bc3984fcccf56c3135381203084d80eceafc72104aee623371ac5a82589245bd96e1d04e07417f86f1d000c64c115d7630d9be981859fa3700d3609baf0bf
 MISC metadata.xml 1174 BLAKE2B 9dae17714124bc3fbb5625b58a78353eb64aa9131e541943819b35ec6231fc1009d11bf90219fab08e34187eff0c0902d5e6a2a6ad64e586bc8e7cb464edef62 SHA512 0fc60c658a5e56b8d6d49c0251b2678c07d19e9a32ad59f08ae98120f28b412642030692f8c51bef994c14b4d01d9979f3286b22cd417c8a1b1211a27355b03a
diff --git a/media-libs/libxmi/libxmi-1.3-r1.ebuild b/media-libs/libxmi/libxmi-1.3-r1.ebuild
index c4fe4373feed..8492b22697ad 100644
--- a/media-libs/libxmi/libxmi-1.3-r1.ebuild
+++ b/media-libs/libxmi/libxmi-1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
 	default
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index ad06d2da8c50..0321ab31e623 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -1,12 +1,8 @@
-DIST lsp-plugins-1.1.10.tar.gz 53837323 BLAKE2B d890e80d2c6bf871053bd53994af597e653c19894b64df8396c54e1b70bd716adacb8ff7ce7946098d96ca64fe0e03aafc7d4d52af342b67b2551fb0dadaff42 SHA512 aedc6a6a421bfb1ad964f6963793cdb2616456044736745a1c3dc27e947b1d6395de1942c2525bc983e654df5335d35466eed16b8f31612119284b024bdce6c2
 DIST lsp-plugins-1.1.22.tar.gz 61694018 BLAKE2B 5c14140af797624cf67d61618d22a006c4b02232cef92533244f36b108b58461c56c28379cbdefc8d967de34c3bae91450bc787a0e6ab2ae41f53e4e431a17ff SHA512 6004136b55a990033d22e60af6c418a5ee708aaf0f4263fc3af8097876f7eea6e125a44392468ed8e30a92c0fa44eb65f40d80b25a5f243d3fd4f1c0f3af70d6
 DIST lsp-plugins-1.1.24.tar.gz 63809276 BLAKE2B 3d623d4a5b21f2b4dbd7263805b50c9cd9bf19733aeab774983d7a79695015d1e30201f3de46dde950adadcced347f878a272c1c3da9c5f0721c6effda05d9b4 SHA512 20a82594aec51877255ca2808b6c8af03fcfc2f393fdbc6ae6826dd0da17c4a5cb14f02658c1f102600477d7d4d4fc9e24ee3c6a6ef704afc443499a43bd65ec
-DIST lsp-plugins-1.1.5.tar.gz 51911033 BLAKE2B ec9b6f3715f1043537ebe35d14abda85b8dfe23d52d335c54c02eb2867753c9b256a5acd71537c95d6da273d054f0e0c9439fe2f81f6d6ced3087de93bfaef60 SHA512 42b9cd102247a0165a32f82a5a7ce05928a9703c80f215783ad67020d1f975d1c334af1f86c9f17e76bea3fd90bcf5c47fff5618875038b3655621880b60a699
-DIST lsp-plugins-1.1.7.tar.gz 52408312 BLAKE2B 1763d7aaff60c4bf3185325789925dc7e5ea1052907f0d1ee3af7c09d39d1f49dfdda537c29d1d2e1ed2bd041345fb3f32a444aa403521f6d4fbd7a952f9f7cb SHA512 e98000c98464abc1db75e044bc1b7adb535b94fbe1025a52baf0a2c92bcd21039c9b330e790f0607b4747356aff3f7d4ae20e666a9135108e875057c5459c8ae
-EBUILD lsp-plugins-1.1.10.ebuild 1039 BLAKE2B 64e776c1d6f85a46e5cd56ea13bf8ca83a02d32f18ca38a9e513debb2b12d4f57ef8e630f029cf9106d947d760fdad306edc959b31d2101ada7aa797cdb8c4ca SHA512 5eb65e6bed53b41f42528787a44100313064fee96b64309d8a12fe6563feb0280af9aeb8d70a1024b6fa4f51d1c375f9eaba8ff295dfdebc032038e97da44079
+DIST lsp-plugins-1.1.29.tar.gz 66143142 BLAKE2B 6fa6943d8cdf3aedc9f671c64b433ffd5c4f6c7ca14f6a75578300240971e7c9e8546b9a7df7a13b8cd6e0844724c064daa7e249aba70636f47a622e73ed264a SHA512 b8c3804ad583322bce414d6beb079afa5b98a111126bb4507642376fcf1f82b31525b4959c6388b02cc1d14e0ec25de3596794895f2860f492a5fbf87f6e88b7
 EBUILD lsp-plugins-1.1.22.ebuild 1037 BLAKE2B e3f7c25cfbd4938ee04bc88f3026b24ed254d6e6f68a4262dcca59e5f99ef61c91c16293763aa4e53c42633da9db7416947d36c2de4fffba6c0407c86de11e99 SHA512 2d8042b5a22dae0e3e9df23a639184562f3623789e44d1a02d58d3b8bde5b6d136e4e74874c0c3a5656ae28f108eb177ec295c03afcac5764281336b58c1e617
-EBUILD lsp-plugins-1.1.24.ebuild 1060 BLAKE2B ef1bc5e9dd6e1c5cb9ac4db76fbb51ad50825a77137951782233d708a69e904c43ceff1545b3447dc30c6d70c0f892b731b282c9f53c6d6b713898efeed43aae SHA512 d9a30e986c92e0afded3abac9bb1340e53ba20412318f9c139170c911b3bb3d1cdde0241919728e7a79223a6720a9fbe5560bb07ff17bb9068e70cdf31340955
-EBUILD lsp-plugins-1.1.5-r2.ebuild 1260 BLAKE2B 31d54fbcb2d2a175e8ab93eff26535f9e62c151d4e9dd0d22f1092d7e83fccd11da864aa89a95df86da9eccd8434c623716b48d27cf6f3990d326e554543304e SHA512 2d09fc21ca51ddaf084461b664139a2855dc23a8863ea73c58da57e808fcd1d29a47054a0c83adbc4c10b0bff006239f5a426bacdf8b8bc1007262c2eeee2b8c
-EBUILD lsp-plugins-1.1.7-r1.ebuild 1037 BLAKE2B cd70d7c20ac3e6abc074780b15dc24a5c7f0f19eb8dbc54239e6ae4977fc5ac04ffdeb29f105cbf1b71975a029f5ffaefa182903820c8ae1f57754c2256dc7e1 SHA512 cb9256462b87742bc44663d6888f385fec69f4ac8776434574e305ef3526a0befcc8b737ca94d5d931b4337682195a2f4ee8990e86e4254266230896ff0a1a61
-EBUILD lsp-plugins-9999.ebuild 1060 BLAKE2B ef1bc5e9dd6e1c5cb9ac4db76fbb51ad50825a77137951782233d708a69e904c43ceff1545b3447dc30c6d70c0f892b731b282c9f53c6d6b713898efeed43aae SHA512 d9a30e986c92e0afded3abac9bb1340e53ba20412318f9c139170c911b3bb3d1cdde0241919728e7a79223a6720a9fbe5560bb07ff17bb9068e70cdf31340955
+EBUILD lsp-plugins-1.1.24.ebuild 1076 BLAKE2B 399febc0f6dc791d765d16c3455469eafe5a5ea76934b4475993d9758e3ce0a3c00540995e7719c94cdc849cd7dc7208fb86eff9094af139be70ae5625d1d184 SHA512 2dc5383e1da3ccaebf80a8a5edf092db87177a2590dbf7e96bfc1862ebd9a4567f1dbec95c2e35ec38c5603a2f5d691c67c6f4836bf0c568873b04483aeef0c6
+EBUILD lsp-plugins-1.1.29.ebuild 1065 BLAKE2B 57234488746b4b43a1b71b89491a74540646b074b13276ad84bde7398c02a2a2665197a953d2a5974f9eb4f9402585d7fa681e9f55fdb233ec6dc7d94d255ba3 SHA512 48b0fae3be3abe2c80cba542553886fb8e850694b00b1d3c7154466647ff2a20e4aa6eb466a8cdb4ddea4ad2371f7d2cb70319866e92fa958281df53913981e3
+EBUILD lsp-plugins-9999.ebuild 1065 BLAKE2B 57234488746b4b43a1b71b89491a74540646b074b13276ad84bde7398c02a2a2665197a953d2a5974f9eb4f9402585d7fa681e9f55fdb233ec6dc7d94d255ba3 SHA512 48b0fae3be3abe2c80cba542553886fb8e850694b00b1d3c7154466647ff2a20e4aa6eb466a8cdb4ddea4ad2371f7d2cb70319866e92fa958281df53913981e3
 MISC metadata.xml 492 BLAKE2B 6550b2fe0e0a6bc5bece22d51b36d920284f662f1da5dbe2551fbf82ebc3416262339436ce2eddf9efbee49e57d5a28139f6ac3f1f86e20b5a74e5c4fb3bc37d SHA512 681338f3f8abbd1c103ef72c176595e10ca6bc0e6ca309e2f4d39166309329d8176aa9025056685d67d708ec1732d023c773a1e2a4cce7f019945ea112ab8f84
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.24.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.24.ebuild
index 51871cd000f5..e261700b430d 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.24.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.24.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit xdg
+
 DESCRIPTION="Linux Studio Plugins"
 HOMEPAGE="https://lsp-plug.in"
 
@@ -25,7 +27,7 @@ REQUIRED_USE="|| ( jack ladspa lv2 )"
 DEPEND="
 	dev-libs/expat
 	media-libs/libsndfile
-	media-libs/libglvnd
+	media-libs/libglvnd[X]
 	doc? ( dev-lang/php:* )
 	jack? (
 		virtual/jack
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.10.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
index 3e66062b835d..6e275d247806 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.10.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit xdg
+
 DESCRIPTION="Linux Studio Plugins"
 HOMEPAGE="https://lsp-plug.in"
 
@@ -12,8 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="https://github.com/sadko4u/lsp-plugins"
 	EGIT_BRANCH="devel"
 else
-	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
+	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -25,6 +26,7 @@ REQUIRED_USE="|| ( jack ladspa lv2 )"
 DEPEND="
 	dev-libs/expat
 	media-libs/libsndfile
+	media-libs/libglvnd[X]
 	doc? ( dev-lang/php:* )
 	jack? (
 		virtual/jack
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.5-r2.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.5-r2.ebuild
deleted file mode 100644
index 2d9141c1d36e..000000000000
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.5-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Linux Studio Plugins"
-HOMEPAGE="https://lsp-plug.in"
-SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc jack ladspa +lv2"
-REQUIRED_USE="|| ( jack ladspa lv2 )"
-
-DEPEND="
-	dev-libs/expat
-	media-libs/libsndfile
-	doc? ( dev-lang/php:* )
-	jack? (
-		virtual/jack
-		x11-libs/cairo[X]
-	)
-	ladspa? ( media-libs/ladspa-sdk )
-	lv2? (
-		media-libs/lv2
-		x11-libs/cairo[X]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_prepare() {
-	eapply_user
-	sed -i '/install_.*: all/s/ all//g' Makefile
-}
-
-src_compile() {
-	use doc && MODULES+="doc"
-	use jack && MODULES+=" jack"
-	use ladspa && MODULES+=" ladspa"
-	use lv2 && MODULES+=" lv2"
-	emake BUILD_MODULES="${MODULES}"
-}
-
-src_install() {
-	use doc && emake PREFIX="/usr" DESTDIR="${D}" LIB_PATH="/usr/$(get_libdir)" install_doc
-	use jack && emake PREFIX="/usr" DESTDIR="${D}" LIB_PATH="/usr/$(get_libdir)" install_jack
-	use ladspa && emake PREFIX="/usr" DESTDIR="${D}" LIB_PATH="/usr/$(get_libdir)" install_ladspa
-	use lv2 && emake PREFIX="/usr" DESTDIR="${D}" LIB_PATH="/usr/$(get_libdir)" install_lv2
-}
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
deleted file mode 100644
index 5807ec304fd7..000000000000
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Linux Studio Plugins"
-HOMEPAGE="https://lsp-plug.in"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/sadko4u/lsp-plugins"
-	EGIT_BRANCH="devel"
-else
-	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="doc jack ladspa +lv2"
-REQUIRED_USE="|| ( jack ladspa lv2 )"
-
-DEPEND="
-	dev-libs/expat
-	media-libs/libsndfile
-	doc? ( dev-lang/php:* )
-	jack? (
-		virtual/jack
-		x11-libs/cairo[X]
-	)
-	ladspa? ( media-libs/ladspa-sdk )
-	lv2? (
-		media-libs/lv2
-		x11-libs/cairo[X]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_compile() {
-	use doc && MODULES+="doc"
-	use jack && MODULES+=" jack"
-	use ladspa && MODULES+=" ladspa"
-	use lv2 && MODULES+=" lv2"
-	emake BUILD_MODULES="${MODULES}"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${ED}" LIB_PATH="/usr/$(get_libdir)" install
-}
diff --git a/media-libs/lsp-plugins/lsp-plugins-9999.ebuild b/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
index 51871cd000f5..6e275d247806 100644
--- a/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit xdg
+
 DESCRIPTION="Linux Studio Plugins"
 HOMEPAGE="https://lsp-plug.in"
 
@@ -12,8 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="https://github.com/sadko4u/lsp-plugins"
 	EGIT_BRANCH="devel"
 else
-	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
+	SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -25,7 +26,7 @@ REQUIRED_USE="|| ( jack ladspa lv2 )"
 DEPEND="
 	dev-libs/expat
 	media-libs/libsndfile
-	media-libs/libglvnd
+	media-libs/libglvnd[X]
 	doc? ( dev-lang/php:* )
 	jack? (
 		virtual/jack
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 3654a95c5102..7901593a8b25 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,5 +1,5 @@
 DIST lv2-1.18.0.tar.bz2 530172 BLAKE2B 2d9c7fe6e4de1d68762445061907873ff98871277fe0e423c34b0e9586cc8bfc7674787c020f3c01731204e80262a52902676f6cec8c8a6c18a97953cc626d3e SHA512 9e8dd9c1f30371260d21efc105b1d4d4ad03d9e332d4d3877d873f20b9527bcd0e917ff23fc6e0a9cc4337bda85882c742f225f7cf4fbc8a8a0964565c91f9d9
 DIST lv2-1.18.2.tar.bz2 538345 BLAKE2B 824c7bc2ce62de858308d856d0f89c6285c183764be3727eba5074f42543a1bb8a5e1cdd8a85bf0a4ba1103e1243c843013bd516d2d6e7ade09c46380bca3cee SHA512 d5bdcf94d3cf9a569e29964002a038ae73cd6ae7f09f7d973f8fd74858c8cf9d01bbed85ae8bf0a00efcb2b3611357a64571222a89972091941449c36d76b0ef
 EBUILD lv2-1.18.0.ebuild 1364 BLAKE2B 257076159121287c575f5366b5473df431f941366ccefa8057127c903a4b4b299a932f4046ff54c0f2eed92330a45831d04288a800a8454857f96758cfa2ecf8 SHA512 dbcaa0e94b0b8533ed5efc73c37139262ce46c5bec88427fbe4fe5b7155a5cbeb7a7f0561fb188b7c8a12c4d39f57190acf6c9122e767c4d6dcd5bfa6c84ac10
-EBUILD lv2-1.18.2.ebuild 1370 BLAKE2B bdc9ead907338c571718831c7f880fe84f015d3fb67c2f6bfcad1c8177a56f64bb1a2d6e0dbb7cded2c7ee7e8cfa0f14bf913672bda86979ba4226e76192c30b SHA512 be79588c88bb1f27c8095caf1f2560325dbd7c5a840128d0c43cb50562744c403185a13990b7c9b4e68aacd6e7561a75c26e9bd05819633c2f2d912dc08b2d83
+EBUILD lv2-1.18.2.ebuild 1367 BLAKE2B 6f376d337de517f0c248c2d6e3e6775d82f47e03553ab85881c8fc1ef5e5f18bb42da4087f7b29b28fe1c647746506c6cbebb8f5d0546ad5406c0d8b6624752c SHA512 dc6601f199936c87f1f3e2fa29491d2e1d659e7670fe597855de54c54d2f89cf4c8649b094a82c5077036ba14163094570506382bdf8509c68bf45c1dae24770
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.18.2.ebuild b/media-libs/lv2/lv2-1.18.2.ebuild
index b18357182717..834996898bdb 100644
--- a/media-libs/lv2/lv2-1.18.2.ebuild
+++ b/media-libs/lv2/lv2-1.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 65933ae87bd2..5de239418b3f 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,5 +1,7 @@
 DIST openal-soft-1.20.1.tar.bz2 512971 BLAKE2B be0abb32698d5ea77e8667e1b00fb123673325b0361c711d6c232d96d1add6d5c9a3e2ba7a3d04afcad27fe4f18ae803f690b14c98d198b77c75f1865679081f SHA512 a8a03a2162b5d35e66adc079e81d7fa075b83a3ee1cec3412cb40f7789263ed8bd005beefb7ef995f464dfa43aac22ea0f547b752dfc7533ed9120a95fb92513
 DIST openal-soft-1.21.0.tar.bz2 525483 BLAKE2B 28d44cfddd93bf6637b476cdcc44c5f69a1a8036c17d63be2defdce47d038bf54c29c9248070a65e7c6f86497ed3b79fd5548832bd67a1ebb67ffc363e46de9b SHA512 12e7dca4040765e06658d2945e984af01f21c65b7d44f9daee3a55457c27bd050bf74665e91ebfefdac09739774ace3e7a4bfc02870778cd65268941314aeb3b
+DIST openal-soft-1.21.1.tar.bz2 524787 BLAKE2B ca052ee3ba18188a9b8342540b8a9ffa95a0c19c137f5e799fa69768d51ec30da55afa46bddf3d9b65e589b94423bc5b23f2090e07bb9fc2a34937f9c199ee89 SHA512 420eec18149a9b784daaabe8a2865de3b87d5550cf2e8e06569464d0b5ba6e51d904c18f1461af08676bf8c8b76ef270e860008d79545a5f85131299e89bffd4
 EBUILD openal-1.20.1.ebuild 2092 BLAKE2B e3d8a78ee57873a648aa998fae198327fc903717cea53a0fc4caba1ff407df3618049d8911898edad6b90c546242c32afb3e71858ab54443495d92e459dc7e14 SHA512 c900f925cb5895ce903541043890e2c8289b520c2ebbbd5727da01f166712e6b27ac74513d5322180db2bbe3a134b0c2ebd3d3aeb3206b680324f54a1ecce421
-EBUILD openal-1.21.0.ebuild 2099 BLAKE2B d4886ca2095016d92081ceb4e65cdb0229775726960536e34235825a541eaf703be3f86922d0c46e982b14db925e5a5d889ff93b6e87942d8af68e5972f1309d SHA512 c284b17706eba849ce9827d5649e8f208994947913783d1f95cab2cc2f814f8cd8b4f7ad0cdee263e3ef1c35077714ac84fcfdd5e03323f04c389bdb0af98e7e
-MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
+EBUILD openal-1.21.0.ebuild 2094 BLAKE2B cb05c70385c7b4cbfd1a4a64e30471cf5f31aadb8a1144c870f65c99b23f13ace01cc7f4e3f61ff8ba7a70fbabae6d36e7a8b2db75681148365ccb34f9689ea2 SHA512 6af14cfb26780ca6ae0d516b73c7216f4ac656708485da17bd61afb8502399e7ca0f3ceb7baaf39b2e98cbf8b78e3f8b2ebbc0a370c8bac714092215cdd7eea5
+EBUILD openal-1.21.1-r1.ebuild 2464 BLAKE2B ad7eb12ae49bed75b6bce15b685782ca28512b93841e985fae51f225f95d102bab9512b9da5824a217626c1e92b35f215313be5962f29c2b63470e8f979167aa SHA512 3e1f15a76985ffb0dc42110ecfbe956fcacd2f72e067ab62f101304c8918d095078bda23c7584757ea55260b289eaf79b6bba9801810a97288bb64e9d2fe3300
+MISC metadata.xml 437 BLAKE2B 9f220770b5df968956b8e4deb86df9a6ddbd58494978992dfc2169f8066d8799f36d8e4df6f5870276af9f51f73fd485582c0d718e51cb39049697854b4fb94c SHA512 0e54e8d8677dc4a7a21bf4488a5db6345a394f9602de367e263d1ed4d309e54ca8c1e2406e635aa13ed9d2dff5557a2e0270b591fe07d8f4093796f5f57b5ff0
diff --git a/media-libs/openal/metadata.xml b/media-libs/openal/metadata.xml
index ee7258ac28eb..a80658a8279e 100644
--- a/media-libs/openal/metadata.xml
+++ b/media-libs/openal/metadata.xml
@@ -5,4 +5,10 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<use>
+		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">kcat/openal-soft</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openal/openal-1.21.0.ebuild b/media-libs/openal/openal-1.21.0.ebuild
index 049cee97b811..715c546a8ece 100644
--- a/media-libs/openal/openal-1.21.0.ebuild
+++ b/media-libs/openal/openal-1.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/openal/openal-1.21.1-r1.ebuild b/media-libs/openal/openal-1.21.1-r1.ebuild
new file mode 100644
index 000000000000..abc96492de7a
--- /dev/null
+++ b/media-libs/openal/openal-1.21.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+MY_P="${PN}-soft-${PV}"
+
+DESCRIPTION="A software implementation of the OpenAL 3D audio API"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+
+# See https://github.com/kcat/openal-soft/blob/e0097c18b82d5da37248c4823fde48b6e0002cdd/BSD-3Clause
+# Some components are under BSD
+LICENSE="LGPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="
+	alsa coreaudio debug jack oss portaudio pulseaudio sdl sndio qt5
+	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+	cpu_flags_arm_neon
+"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
+
+src_configure() {
+	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
+	my_configure() {
+		local mycmakeargs=(
+			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
+			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
+			-DALSOFT_REQUIRE_JACK=$(usex jack)
+			-DALSOFT_REQUIRE_OSS=$(usex oss)
+			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
+			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
+			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
+			-DALSOFT_REQUIRE_SNDIO=$(usex sndio)
+			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
+			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
+			-DALSOFT_EXAMPLES=OFF
+		)
+
+		# Avoid unused variable warnings, bug #738240
+		if use amd64 || use x86 ; then
+			mycmakeargs+=(
+				-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+				-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+				-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+			)
+		fi
+
+		if use arm || use arm64 ; then
+			mycmakeargs+=(
+				-DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
+			)
+		fi
+
+		cmake_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 8a8a26c54202..9333d52cbdb3 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,4 +1,3 @@
-AUX opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch 2786 BLAKE2B 91747af3ceac6477d6847c1f87fa69cd77e2cdaaced18cc038ca231af006d453ce4382229b642e8c38ae1642c1f4788c7e9062951e867881bd20012c26a6dcd4 SHA512 2338e1b0994486a7be896d4edddcef67b3b84df9d609e7aebe7a87172163b5f6e7636341e0bfeb0e45d7fdb663932c273ca0568a49ac9d4aa2b827d3808493bc
 AUX opencolorio-1.1.0-remove-Werror.patch 473 BLAKE2B add95a92f243df8abe26f51dbde7992ad398748ace899ead9346e6d640e2142ec895f9abe4601d5c5310f58b411d6fe0902720ba0f1319c027efd53361b39b33 SHA512 6eb2ee8567ba0c0cbe3be5468136834e8b8a62d6f2358f792d05fbf35aaebc17fb62b4bcbfc2f131ea6166236b6ea7b9951faeb916d61e09e5ce8636a18bdc35
 AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd13c22cdcf23e7af75b0c92dd1b85f86e9046c76eadb22b0c1b2bad06f1937bc0d2220a4e2c9a85c0b1b5e6d356b9257fd149ba503944d1bd1356b3d0d51bf SHA512 e14370a15e3e6fc5e3dc70fa52d4e11cf7ac35c2dbc8635e94c52cb02a47f10936e57b1b713f8ee2ca8481ed467e2e6835bf392468bd82d1236a50289df6584e
 AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch
deleted file mode 100644
index b5455d010b42..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 8d38317f68d0e4663abbccdceca0bcd41f3dcf4a Mon Sep 17 00:00:00 2001
-From: Patrick Hodoul <patrick.hodoul@autodesk.com>
-Date: Mon, 27 Nov 2017 17:29:57 -0500
-Subject: [PATCH 1/3] Fix compile error with Lut1DOp.cpp
-
-Fix Linux compilation
-Fix gcc 5.4.0 build breaks
-Fix the temp filename for Linux
----
- src/core/Lut1DOp.cpp                 |  4 +++-
- src/core/MathUtils.cpp               | 23 ++++++++++++-----------
- src/pyglue/PyAllocationTransform.cpp |  1 -
- 3 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/src/core/Lut1DOp.cpp b/src/core/Lut1DOp.cpp
-index 404ee0b..180e30f 100644
---- a/src/core/Lut1DOp.cpp
-+++ b/src/core/Lut1DOp.cpp
-@@ -188,7 +188,8 @@ OCIO_NAMESPACE_ENTER
-         {
-             return simple_lut[clamp(index, 0.0f, maxIndex)];
-         }
--        
-+
-+#if defined(OCIO_UNIT_TEST) || !defined(USE_SSE)
-         void Lut1D_Nearest(float* rgbaBuffer, long numPixels, const Lut1D & lut)
-         {
-             float maxIndex[3];
-@@ -218,6 +219,7 @@ OCIO_NAMESPACE_ENTER
-                 rgbaBuffer += 4;
-             }
-         }
-+#endif
- #ifdef USE_SSE
-         void Lut1D_Nearest_SSE(float* rgbaBuffer, long numPixels, const Lut1D & lut)
-         {
-diff --git a/src/core/MathUtils.cpp b/src/core/MathUtils.cpp
-index e1a26c0..3881eb3 100644
---- a/src/core/MathUtils.cpp
-+++ b/src/core/MathUtils.cpp
-@@ -327,17 +327,6 @@ OCIO_NAMESPACE_ENTER
-         GetV4Sum(vout, vout, v2);
-     }
-     
--    namespace
--    {
--    
--    void GetMxbResult(float* vout, float* m, float* x, float* v)
--    {
--        GetM44V4Product(vout, m, x);
--        GetV4Sum(vout, vout, v);
--    }
--    
--    } // anon namespace
--    
-     bool GetMxbInverse(float* mout, float* vout,
-                        const float* m_, const float* v_)
-     {
-@@ -372,6 +361,18 @@ OCIO_NAMESPACE_USING
- 
- #include "UnitTest.h"
- 
-+namespace
-+{
-+
-+    void GetMxbResult(float* vout, float* m, float* x, float* v)
-+    {
-+        GetM44V4Product(vout, m, x);
-+        GetV4Sum(vout, vout, v);
-+    }
-+
-+}
-+
-+
- OIIO_ADD_TEST(MathUtils, M44_is_diagonal)
- {
-     {
-diff --git a/src/pyglue/PyAllocationTransform.cpp b/src/pyglue/PyAllocationTransform.cpp
-index 20bb50e..06b418a 100644
---- a/src/pyglue/PyAllocationTransform.cpp
-+++ b/src/pyglue/PyAllocationTransform.cpp
-@@ -53,7 +53,6 @@ OCIO_NAMESPACE_ENTER
-         ///
-         
-         int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds);
--        PyObject * PyOCIO_AllocationTransform_equals(PyObject * self,  PyObject * args);
-         PyObject * PyOCIO_AllocationTransform_getAllocation(PyObject * self);
-         PyObject * PyOCIO_AllocationTransform_setAllocation(PyObject * self,  PyObject * args);
-         PyObject * PyOCIO_AllocationTransform_getNumVars(PyObject * self);
--- 
-2.15.1
-
diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest
index 1cd121102346..46604cc4174d 100644
--- a/media-libs/opencore-amr/Manifest
+++ b/media-libs/opencore-amr/Manifest
@@ -1,5 +1,5 @@
 DIST opencore-amr-0.1.3.tar.gz 881105 BLAKE2B e9e1d40b90aa819d1b4fce328ae8ff199c7656f3326199c005e8f0a47e4e3282ae02f93826e923c5128c4ec4cebc3f35b6f5ca9f3f49c7dd15d541fb77383d28 SHA512 f67e84604fe3fbb87d608343e595503e2057272fa0b3bf9158a176e88a96d272c35149483c3ee47ba2b064bd6b17cdb315888a5285aa82edc0401f17d2ae761b
 DIST opencore-amr-0.1.5.tar.gz 929581 BLAKE2B 4943a27f0df3d874720c87f48c523d9aa4cce849dd0a3c9183466416a0629aa02dac8f01646e469e8c45438bf3c57047eb11e69f3f1b261449a0989a36639e59 SHA512 c324db9dcac5a31bfac633153bc054bfe42d5ff98202c4adb3c75a3fae9792f07f60d48cd659acf106dacd307174a62b2aeee22a4af53caa20d2bfba46488faf
 EBUILD opencore-amr-0.1.3-r1.ebuild 526 BLAKE2B 3d06bda1b612ac43dd04ef723c46ce15a8237dbecc901b170b2446cfb4448a697ee5881818b1b6b21f628c4f088ba6f7e79f98cb9671df7b27102fc2aa4f7696 SHA512 33d1cd7e49e92b536bf9b0a1fdc35c2aaad733d2342af0a675b96ef25896a32231250343378b30be4e9ddda010f163f312eb722344b75635462be23117a3232f
-EBUILD opencore-amr-0.1.5-r1.ebuild 628 BLAKE2B dea01ef2f7f5ed940b2f8de00960e46dffa45a10527f4dd22eb51e6f1c2e2193dabca84e8549e25fc3e2e8b1f01733f46396c583efabcd4e2ea610afcdf6b3fa SHA512 c93f369e4f35f18aae0f68969f001039c9b41ad8efc573ab257144565bf97a7b3d9ff4f0861b2e86cd74799386a35804b92a78ff89dff568ebecf2f376a7fdc8
+EBUILD opencore-amr-0.1.5-r1.ebuild 627 BLAKE2B 84ddc8192012c274710f23ed4788f1e234ee2aa2d6c22ad9ab6a0ff6c414fcc41efcb86610612ccc5bef8ef291d7fe6cf47c48f9509060c787f9a412a9c6f1c2 SHA512 a202aea9b5396d4f1482b873793d33a34261804b510800bbe3027990d6b3b9cf5d3c105c6669decc13479770f0313ad0a8b670b3018b9857a88c0e2ea72c400a
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
index 6a392d10cd7f..92234a069898 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~ppc-macos ~x64-macos"
 
 multilib_src_configure() {
 	ECONF_SOURCE=${S} econf --disable-static
diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index 5491f9d41206..862d435d9a7f 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -8,10 +8,6 @@ AUX openctm-1.0.3-link-ctmviewer-with-libGLU.patch 747 BLAKE2B 9f2599e9cbe0dc8fd
 AUX openctm-1.0.3-no-strip.patch 1272 BLAKE2B 78cceaee9185d913d06bcd4ca61447c45cab782388401ff71842fe093bc1f0ef76ec90d0e27a752d3a78f2782ef6cf7b8fdbd773016e465acff6aaf4430ec69d SHA512 a808a499b5a3162831d7b7d67433ef71f1f31e634e2f5057f4f19b59ee962e0379eadad57342a3a24f9891809c2b24adc83abcc311fef990d97446d4baa318cb
 AUX openctm-1.0.3-respect-flags.patch 2931 BLAKE2B fa6b99c7fa46ce5a0f1790cbf89ac45ac19ea939ff165cece87e419f1c902de8d3528c82ad800da079aa07b4f03fd33df47eed07bb61cb60d3326146f91e6153 SHA512 a6d6efa9df63835cb0990906a5755cc6d673a48377af1f28b880384051e4cb2380deae13eff864c179e7e98b3e0319e993c639609bc8b482e3ea37fbf4cb21cd
 AUX openctm-1.0.3-use-system-libs.patch 3289 BLAKE2B d0402954c36ea42372fd65858ef1166fd519e133b3f2f4e5770fd5a76f9f8dc31354749df7af97b7bf050b47c6327f7aa6253eeb7cd4225c55c1dc6e1ac3aebd SHA512 a12e45f703373749e1c71ddfb11576d056b2970de32800bf6fa46332cb23c8e6c5e3e741bc30468599b7a66918e9bd1140e50d5963fba5c71dfaa6649d64a66a
-AUX openctm-fix-makefiles.patch 6672 BLAKE2B 5cc7ad6b882bd4bb3cb05d112dd953807c029b39524bcb17c0f054b99fdf4bd3363d1807d0979c55cc6c746020236f99e48db2cf59b9ff62684e4e7963eb0681 SHA512 96cbe3775632d5b86ba5bb08b283707b5e89ffb0b837b2366f88955eb35341e02ea33de1b2562f87692b359d1b28a96833a163ec1d29f6f266cd641de972a527
-AUX openctm-no-strip.patch 1654 BLAKE2B e284556eb0d7866e527002bdbf291701654dd99a8353592c1dd5f93f6f74bbe4797da4bbc7960d4d7b875734fa4edbff68032c6835cbb26c0bb6f9cf0a471df3 SHA512 a38c4647a0113892d2294efec96efb073cec4d5771c383cd7454422195f230b0326610905534e758fb1f1bf36a6dca1810005f603f70d73584093b8895a99ec0
 DIST openctm-1.0.3-src.tar.bz2 1507603 BLAKE2B 379dad88ef3b069ee4167bdee8c1e86c6f1250c0db7bb108d12b6005f0cd19a4cafcaae51a8e1eddde7566fc9c8e361472268edb1806a5383f536d070ea4354a SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e
-DIST openctm_1.0.3+dfsg1.orig.tar.bz2 179792 BLAKE2B 446fedc14e646b7cfc0aaac2d4f9b224482d74bf4faadd866b7121392e3863e3e42fe57f35654d4e9d7c056b3b8069dfb4668660d97ce7266d7850026654a88c SHA512 4ea8c9230e01b57fce4d741df77713df8fb0493fbb20c8d4b183e3e8cec16f97e8003d2569b1c7cac07a17d334711673c0fed0c6c050bbdb901028ee9f6c32f6
 EBUILD openctm-1.0.3-r1.ebuild 1408 BLAKE2B 58ceaaf66b0e27e567ea1fa03e2733df059fe3c2460c270315aff4d78d4e5431c84bdccf87f97770c32f3ed9eccd9185309a72c5b4c8ecb2ad2ac4a4cdd0f7d0 SHA512 383cad1ffdbdbd7238d5be19299a82dcca03a52764e7cd452dddf86579234106fadcddd298483058291695558f6e630c79a3c734ae0dd05aaaf3745200b846b7
-EBUILD openctm-1.0.3.ebuild 924 BLAKE2B 1cb9e32be2a294baa203a10675fa9b33321625a7c5129af388f906a96e3de4762d83146197b835032f9d78a511cd42f0920d27e5b7ecb4f035a934863d8cf6c5 SHA512 a75a3bb34941102b35be2c17023c5af6dba7851b322969bfa3fdf698fd20c6b4b632cd1c7e4c761046f4744616163ffbea45be80f71eee9bbe3c988d3ee92f0a
-MISC metadata.xml 665 BLAKE2B 04fec51f9d81997088613e4ca3b4d1d12643e597bbd91896d78a06c90886abaa857785895e8b29b8284afb975594a68c0a046b050360ad971bf964e596398bbe SHA512 79591a66512551c42e4d28d9abaccd3a564b0fb89fb12b52bba9b130704bc6f04d13565f7b0ec41f7b7b79454d49c2002e0aebf48e7e71665c78f8de2f9cb201
+MISC metadata.xml 733 BLAKE2B 7ea0e6029b6d34f1ebdd762fc2e20a331df83e8bcf34a37451c7f18dd261127795bc59d6eb91bd6479d6a10034cf046c1b08b6eef2412be25403ffa27aa3484d SHA512 26ecfbe9a152237fc20b9355781fdccb9e9bfc5a52382e6b4c242bb89d55b5f16f6f4eda177606a3f826a43e6d54404df8bddc1862d9f9c4dc73d045dbcf038c
diff --git a/media-libs/openctm/files/openctm-fix-makefiles.patch b/media-libs/openctm/files/openctm-fix-makefiles.patch
deleted file mode 100644
index 540b3cfa84fc..000000000000
--- a/media-libs/openctm/files/openctm-fix-makefiles.patch
+++ /dev/null
@@ -1,191 +0,0 @@
- Makefile.linux       | 18 ++++++++-------
- lib/Makefile.linux   | 23 ++++++++++++-------
- tools/Makefile.linux | 64 ++++++++++++++++++++--------------------------------
- 3 files changed, 50 insertions(+), 55 deletions(-)
-
-diff --git a/Makefile.linux b/Makefile.linux
-index 24ca137..51fc88c 100644
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -47,19 +47,21 @@ documentation:
- 
- 
- # Installation settings
--LIBDIR  = /usr/lib/
--INCDIR  = /usr/local/include/
--BINDIR  = /usr/local/bin/
--MAN1DIR = /usr/local/share/man/man1/
--CP = cp
-+LIBDIR  = $(DESTDIR)/usr/@GENTOO_LIBDIR@/$(DEB_HOST_MULTIARCH)
-+INCDIR  = $(DESTDIR)/usr/include/
-+BINDIR  = $(DESTDIR)/usr/bin/
-+MAN1DIR = $(DESTDIR)/usr/share/man/man1/
-+CP = cp -P
- MKDIR = mkdir -p
- 
--install:
--	$(CP) lib/libopenctm.so $(LIBDIR)
-+$(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR):
-+	mkdir -p "$@"
-+
-+install: $(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR)
-+	$(CP) lib/libopenctm.so* $(LIBDIR)
- 	$(CP) lib/openctm.h $(INCDIR)
- 	$(CP) lib/openctmpp.h $(INCDIR)
- 	$(CP) tools/ctmconv $(BINDIR)
- 	$(CP) tools/ctmviewer $(BINDIR)
--	$(MKDIR) $(MAN1DIR)
- 	$(CP) doc/ctmconv.1 $(MAN1DIR)
- 	$(CP) doc/ctmviewer.1 $(MAN1DIR)
-diff --git a/lib/Makefile.linux b/lib/Makefile.linux
-index 7643127..1e622ec 100644
---- a/lib/Makefile.linux
-+++ b/lib/Makefile.linux
-@@ -27,13 +27,18 @@
- ###############################################################################

- 

- LZMADIR = liblzma

--CC = gcc

--CFLAGS = -O3 -W -Wall -c -fPIC -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM -std=c99 -pedantic

--CFLAGS_LZMA = -O3 -W -Wall -c -fPIC -DLZMA_PREFIX_CTM -std=c99 -pedantic

-+CC ?= gcc

-+CFLAGS += -W -Wall -c -fPIC -std=c99 -pedantic

-+INCDEF = -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM

-+INCDEF_LZMA = -DLZMA_PREFIX_CTM

- RM = rm -f

- DEPEND = $(CPP) -MM

- 

--DYNAMICLIB = libopenctm.so

-+VERSION = 1.0.3

-+SOVERSION = 1

-+LIBNAME = libopenctm.so

-+SONAME = $(LIBNAME).$(SOVERSION)

-+DYNAMICLIB = $(LIBNAME).$(VERSION)

- 

- OBJS = openctm.o \

-        stream.o \

-@@ -64,16 +69,18 @@ LZMA_SRCS = $(LZMADIR)/Alloc.c \
- all: $(DYNAMICLIB)

- 

- clean:

--	$(RM) $(DYNAMICLIB) $(OBJS) $(LZMA_OBJS)

-+	$(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)

- 

- $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)

--	gcc -shared -s -Wl,-soname,$@ -o $@ $(OBJS) $(LZMA_OBJS) -lm

-+	$(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm

-+	ln -s $(DYNAMICLIB) $(SONAME)

-+	ln -s $(DYNAMICLIB) $(LIBNAME)

- 

- %.o: %.c

--	$(CC) $(CFLAGS) $<

-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCDEF) $<

- 

- %.o: $(LZMADIR)/%.c

--	$(CC) $(CFLAGS_LZMA) $<

-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCDEF_LZMA) $<

- 

- depend:

- 	$(DEPEND) $(SRCS) $(LZMA_SRCS) > make.depend

-diff --git a/tools/Makefile.linux b/tools/Makefile.linux
-index fa3e6e5..46276d1 100644
---- a/tools/Makefile.linux
-+++ b/tools/Makefile.linux
-@@ -26,49 +26,50 @@
- ###############################################################################
- 
- OPENCTMDIR = ../lib
--GLEWDIR = glew
--JPEGDIR = jpeg
-+# Use system libs if possible
-+#GLEWDIR = glew
-+GLEWDIR = /usr/include/GL
-+#JPEGDIR = jpeg
- RPLYDIR = rply
--TINYXMLDIR = tinyxml
--ZLIBDIR = zlib
--PNGLITEDIR = pnglite
-+# rply in libvxl1-dev is version 1.1, we need v. 1.01
-+#RPLYDIR = /usr/include/vxl/rply
-+#TINYXMLDIR = tinyxml
-+#ZLIBDIR = zlib
-+#PNGLITEDIR = pnglite
- 
--CPP = g++
--CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(JPEGDIR) -I$(TINYXMLDIR) -I$(GLEWDIR) -I$(ZLIBDIR) -I$(PNGLITEDIR)
-+CXX ?= g++
-+CC ?= gcc
-+CXXFLAGS += -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
- 
- MESHOBJS = mesh.o meshio.o ctm.o ply.o rply.o stl.o 3ds.o dae.o obj.o lwo.o off.o wrl.o
- CTMCONVOBJS = ctmconv.o common.o systimer.o convoptions.o $(MESHOBJS)
--CTMVIEWEROBJS = ctmviewer.o common.o image.o systimer.o sysdialog_gtk.o convoptions.o glew.o pnglite.o $(MESHOBJS)
-+CTMVIEWEROBJS = ctmviewer.o common.o image.o systimer.o sysdialog_gtk.o convoptions.o $(MESHOBJS)
- CTMBENCHOBJS = ctmbench.o systimer.o
- 
- all: ctmconv ctmviewer ctmbench
- 
- clean:
- 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
--	cd $(JPEGDIR) && $(MAKE) -f makefile.linux clean
--	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux clean
--	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux clean
- 
--libopenctm.so: $(OPENCTMDIR)/libopenctm.so
--	cp $< $@
-+ctmconv: $(CTMCONVOBJS)
-+	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
- 
--ctmconv: $(CTMCONVOBJS) $(TINYXMLDIR)/libtinyxml.a libopenctm.so
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
-+ctmviewer: $(CTMVIEWEROBJS)
-+	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
-+	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
-+	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
- 
--ctmviewer: $(CTMVIEWEROBJS) $(JPEGDIR)/libjpeg.a $(TINYXMLDIR)/libtinyxml.a $(ZLIBDIR)/libz.a libopenctm.so
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) -L$(JPEGDIR) -L$(ZLIBDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lz -lglut `pkg-config --libs gtk+-2.0`
--
--ctmbench: $(CTMBENCHOBJS) libopenctm.so
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -Wl,-rpath,. -lopenctm
-+ctmbench: $(CTMBENCHOBJS)
-+	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
- 
- %.o: %.cpp
--	$(CPP) $(CPPFLAGS) -o $@ $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
- 
- ctmconv.o: ctmconv.cpp systimer.h convoptions.h mesh.h meshio.h
- ctmviewer.o: ctmviewer.cpp common.h image.h systimer.h sysdialog.h mesh.h meshio.h phong_vert.h phong_frag.h icons/icon_open.h icons/icon_save.h icons/icon_help.h
- ctmbench.o: ctmbench.cpp systimer.h
- common.o: common.cpp common.h
--image.o: image.cpp image.h common.h $(JPEGDIR)/libjpeg.a
-+image.o: image.cpp image.h common.h
- systimer.o: systimer.cpp systimer.h
- sysdialog_gtk.o: sysdialog_gtk.cpp sysdialog.h
- convoptions.o: convoptions.cpp convoptions.h
-@@ -91,22 +92,7 @@ phong_frag.h: phong.frag bin2c
- 	./bin2c phong.frag phongFragSrc > $@
- 
- bin2c: bin2c.cpp
--	$(CPP) -Os -W -Wall -o $@ $<
--
--$(JPEGDIR)/libjpeg.a:
--	cd $(JPEGDIR) && $(MAKE) -f makefile.linux libjpeg.a
--
--$(ZLIBDIR)/libz.a:
--	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux
--
--glew.o: $(GLEWDIR)/glew.c
--	gcc -c -Os -W -I$(GLEWDIR) -o $@ $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Os -W -Wall -o $@ $<
- 
- rply.o: $(RPLYDIR)/rply.c
--	gcc -c -O2 -W -I$(RPLYDIR) -o $@ $<
--
--pnglite.o: $(PNGLITEDIR)/pnglite.c
--	gcc -c -O2 -W -I$(PNGLITEDIR) -o $@ $<
--
--$(TINYXMLDIR)/libtinyxml.a:
--	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -O2 -W -I$(RPLYDIR) -o $@ $<
diff --git a/media-libs/openctm/files/openctm-no-strip.patch b/media-libs/openctm/files/openctm-no-strip.patch
deleted file mode 100644
index 5e31d4017b68..000000000000
--- a/media-libs/openctm/files/openctm-no-strip.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN OpenCTM-1.0.3.old/lib/Makefile.linux OpenCTM-1.0.3/lib/Makefile.linux
---- OpenCTM-1.0.3.old/lib/Makefile.linux	2014-08-20 09:39:00.614744990 +0200
-+++ OpenCTM-1.0.3/lib/Makefile.linux	2014-08-20 09:40:09.782667989 +0200
-@@ -72,7 +72,7 @@
- 	$(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)

- 

- $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)

--	$(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm

-+	$(CC) $(LDFLAGS) -shared  -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm

- 	ln -s $(DYNAMICLIB) $(SONAME)

- 	ln -s $(DYNAMICLIB) $(LIBNAME)

- 

-diff -urN OpenCTM-1.0.3.old/tools/Makefile.linux OpenCTM-1.0.3/tools/Makefile.linux
---- OpenCTM-1.0.3.old/tools/Makefile.linux	2014-08-20 09:39:00.583745025 +0200
-+++ OpenCTM-1.0.3/tools/Makefile.linux	2014-08-20 09:40:09.751668023 +0200
-@@ -52,15 +52,15 @@
- 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
- 
- ctmconv: $(CTMCONVOBJS)
--	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
-+	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
- 
- ctmviewer: $(CTMVIEWEROBJS)
--	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
-+	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
- 	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
- 	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
- 
- ctmbench: $(CTMBENCHOBJS)
--	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
-+	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
- 
- %.o: %.cpp
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
diff --git a/media-libs/openctm/metadata.xml b/media-libs/openctm/metadata.xml
index 770fe31ee810..89e9808ac2d2 100644
--- a/media-libs/openctm/metadata.xml
+++ b/media-libs/openctm/metadata.xml
@@ -15,6 +15,7 @@
 		OpenCTM - the Open Compressed Triangle Mesh file format - is a file format, a software library and a tool set for compression of 3D triangle meshes.
 	</longdescription>
 	<upstream>
+		<bugs-to>https://sourceforge.net/p/openctm/bug-reports/</bugs-to>
 		<remote-id type="sourceforge">openctm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openctm/openctm-1.0.3.ebuild b/media-libs/openctm/openctm-1.0.3.ebuild
deleted file mode 100644
index c257f62436f5..000000000000
--- a/media-libs/openctm/openctm-1.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib versionator flag-o-matic toolchain-funcs
-
-MY_PV=OpenCTM-${PV}
-
-DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh."
-HOMEPAGE="http://openctm.sourceforge.net"
-SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}+dfsg1.orig.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/tinyxml
-	media-libs/freeglut
-	media-libs/glew
-	media-libs/pnglite
-	virtual/opengl
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PV}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/openctm-fix-makefiles.patch \
-		"${FILESDIR}"/openctm-no-strip.patch
-	mv Makefile.linux Makefile || die
-	sed \
-		-e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 69eddae0a37d..d7e05be922af 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -14,5 +14,5 @@ DIST openexr-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf1549
 DIST openexr-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
 EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382
 EBUILD openexr-2.5.2-r1.ebuild 1673 BLAKE2B 6cb66a92a938e9e6878fa2550a9dba69afe2dd70853ca1fd1e0278c8dfdc774b4f164bb8c61b578210fe9183bb37fda5803e6b36c31d1a4f44f6492328a98bd5 SHA512 6731b8406a8b454366e96774003a1da4640fb6261c665d8327a4bbc83ab3fd8f59c1dc2b3d9ec3d3e148f4162de46c7a44ef034b073d55e3c472809ae570b18e
-EBUILD openexr-2.5.4.ebuild 1698 BLAKE2B a0e3e116800767c03b5eecb1afdd4bc543701edbd88d8a35a14c034fa0eb8bd9e3098d87e0674b2a9404553ebcb9a7fd3166600f88920fc91e0e895adcc0be19 SHA512 51bd2ed3daddc725f595209ff505421914a3bc312b727b6af19200f47fab209f03eda95269573e8a6d27bb29b657772ab920e4f819f88f0854c9c214459f575a
-MISC metadata.xml 666 BLAKE2B 0faed6c1a1dfecdea8436ef7890af82b565dc9dd1bcc93b5e961ab53939cf6b62d6903e7f9a15ed6e8891de8e6f429cf5811cd2a2126105d71c9fbcc4fdadb2c SHA512 f81d6266a7af651a1e76aa60e3d40107b940548f6a34f4a47b08bc32e37aad32cff31a85d7c58c414b01d54835d224c2ca387f9a0dd1025e1bd5ddc7207281f2
+EBUILD openexr-2.5.4.ebuild 1696 BLAKE2B 6090335e9c7eb793c43642efcf7ca9158ee6589c7752cf021d457c1b037cbd95d73f0755739822311a386e0c907e1d291710056de85b23b32bc56081194f817e SHA512 fb64443451b2ca0d8df6a31053ee3ee9a1ba70cd60855122ec5e0ca7059f388dd39eb51a4e1db75a4b12c53254d0e22db8ef563346c8351d608e237041ad0366
+MISC metadata.xml 674 BLAKE2B e6f57d2c1adb7d004da06cd8667031bcebbd1dbcc30dc4e8e7238fc6dc9a57dc5277c8b94e66510533933fe57610c5899e1e1ab82679c66c4c705a35052cc240 SHA512 027357eccaa8494c0a79b19f14a3e7356f08255d7c62b227701d98d770b3d58f0dea1bc71bb87989e453379bd9eba7ecc658ac7d02a44b6e983db7767864ac5e
diff --git a/media-libs/openexr/metadata.xml b/media-libs/openexr/metadata.xml
index f72a455316a9..451183e24bfa 100644
--- a/media-libs/openexr/metadata.xml
+++ b/media-libs/openexr/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>waebbl@gmail.com</email>
+		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/media-libs/openexr/openexr-2.5.4.ebuild b/media-libs/openexr/openexr-2.5.4.ebuild
index 888a4b92902a..56d1fff0c5b0 100644
--- a/media-libs/openexr/openexr-2.5.4.ebuild
+++ b/media-libs/openexr/openexr-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 5a4970a352ac..3a0e12181d8f 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,9 +1,11 @@
 DIST openimageio-2.2.10.0.tar.gz 29215970 BLAKE2B e35e1bf19dce23c9b1067ace21c2878c58ca005eef5fdc4a0c60825ba5c29dd37a543551e9427fda99d859d3cf3cab9cb8c459b47e2b8935e8b7730a09e19de1 SHA512 79f412bd3f7ad4cf6cb57d99293c02fa71478ece102478a6b93a8c5b8c4c56d1313595d24753f9ae1714039ac6aa1be4ae37461233203bac217fe6c0667fbf3b
 DIST openimageio-2.2.10.1.tar.gz 29215445 BLAKE2B ac45bcbd89f023aac7ae063ebbcf9d26375af2d370d18569cd0b4571640d446ceb639b871c107c6727aa92ad05ebea662bc8c34231bfd99a1c18215920ad3089 SHA512 6178a0c7acd870e22bffc8749282f0d1bd7475602bc63dd022b859a9ba3862b9925685a2765ea3604ba9c1ec4c0d8c3961a789862f82077ff261a7ae4e1d166a
+DIST openimageio-2.2.11.1.tar.gz 29250377 BLAKE2B 90184bbc8db97b4486f4af076ad6c37f235b2b8cfd463ee6290fe73fb267771325c6cc3db40b9bcedb56926b79f61587f11766c9eca00c6feccfb2526a4477b3 SHA512 73809587dd405e64e593d6223ef37d4b94c4f1e1d9682fd1bf09e8e4ee8bc9928ed500b7dcc03036e138e45e65ea1f43c11c53d1cb6436a34eb8d15b2415ada5
 DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
 DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5afc1258018cef98e671977fb706c3fe1e80c30416fff89ff1b9936f0f1426eab0136e130efb4a41d7378d3f1eb77eab193a SHA512 d03500c5a9f4f1417c5629098254d1bbf032a17228898e5f087e4a5d0988f806537d3ab538366e64c51172568c3688389ab29b641fdaaf7208bf939cb859e06d
 EBUILD openimageio-2.2.10.0.ebuild 3688 BLAKE2B d5a87f880c41031f38540db419869546471b0bed383a198c05df6af55c4b21b087f9756be98ac3095b6c0fa1b9ba9cd0658821ff0442c0f4894b6deaf4ccba43 SHA512 8161c32a21d0f5b1b288b02884ce80a2f1d95a4ebd7bd76cd7e087d4435df51b66653d57b7ee081b13425fbe3640c44e46eeadb901228c8d513a9e3c0fd62be0
 EBUILD openimageio-2.2.10.1.ebuild 3688 BLAKE2B d5a87f880c41031f38540db419869546471b0bed383a198c05df6af55c4b21b087f9756be98ac3095b6c0fa1b9ba9cd0658821ff0442c0f4894b6deaf4ccba43 SHA512 8161c32a21d0f5b1b288b02884ce80a2f1d95a4ebd7bd76cd7e087d4435df51b66653d57b7ee081b13425fbe3640c44e46eeadb901228c8d513a9e3c0fd62be0
+EBUILD openimageio-2.2.11.1.ebuild 3688 BLAKE2B d5a87f880c41031f38540db419869546471b0bed383a198c05df6af55c4b21b087f9756be98ac3095b6c0fa1b9ba9cd0658821ff0442c0f4894b6deaf4ccba43 SHA512 8161c32a21d0f5b1b288b02884ce80a2f1d95a4ebd7bd76cd7e087d4435df51b66653d57b7ee081b13425fbe3640c44e46eeadb901228c8d513a9e3c0fd62be0
 EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 90500e5e8bd4c94ac24506b2049a1f875961834f1822aec9cda7067b425a6f2f55df02be32c8e6694a5986c11edd4789aa04bf0622dd66f7e5193706e2d0682f SHA512 6fc5f91ef2eef33934dd7a151383fc2fc165ee97fb77133308641031309bfb96871b2ef5a8b5cbc9baa563b21c3de834378d651ded46cecdda4d11d72eaa53a8
 EBUILD openimageio-2.2.9.0-r1.ebuild 3686 BLAKE2B 95bcd6666bba47874bb02eec536c1dd6d22b821cba96106916276fb9dbaad5ed592d78363bd44bf39e146cc9c753b0dc7b7a333fd0cfc5572404d3e3861b6c39 SHA512 ee932fd014b3ecc44e0cc208613b3e9e2ce9df9bc4b0fbd516232ff52ea94239da42fc057a42caee8c6e546a19b12c49a64c6286b96ca6b3407781b11462825e
 MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/openimageio-2.2.11.1.ebuild b/media-libs/openimageio/openimageio-2.2.11.1.ebuild
new file mode 100644
index 000000000000..ceb522b9b67a
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.11.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 28719311c7d1..54e957dd44e6 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,12 +1,5 @@
-AUX openjpeg-2.3.1-CVE-2020-6851.patch 1240 BLAKE2B 440efbd4960def0c98cc5d1874c2261ae263d3a398bf1ed14cb1bdc151ba2351c8d9899d498ea4c103acbbfb85924f6e1ba1690c7d6be46b444946f18710b82b SHA512 c8ffc926d91392b38250fd4e00fff5f93fbf5e17487d0e4a0184c9bd191aa2233c5c5dcf097dd62824714097bba2d8cc865bed31193d1a072aa954f216011297
-AUX openjpeg-2.3.1-CVE-2020-8112.patch 2156 BLAKE2B 2a5177faaad8d5d1d32e9ddabdd372b625bcddb01e532cbe418b718560729a09e332eefc066da05b1169feda056d9a518858cce4b252b28a2005ca6763d5b3d7 SHA512 9659e04087e0d80bf53555e9807aae59205adef2d49d7a49e05bf250c484a2e92132d471ec6076e57ca69b5ce98fd81462a6a8c01205ca7096781eec06e401cc
-AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B 263542dad18e40fca5e890da50c6ff756cbe1f5318fa142eda05af9ab7b65c7616c25505e0ef36047665f82b6498e5621cb6fe5dcbeaa0f7349fa641b50d6cac SHA512 5ef0dd098c00ab02284731999e5448997364e84e6b1a85028358b8a6cd8c8ba7cec08c9950d78e7cd7c4ac1ec6f0d09e178082a1c34de3bddfc9909c63f10a1f
-AUX openjpeg-2.3.1-libtiff-4.1-compat.patch 12014 BLAKE2B 1ffc64b81a59abce759bac18c3aef600df21dab3cc135598223d7338f76ab0db690c612c1e955275db02f55392d58864b594c601707136d107879ad55474f79b SHA512 5f3a7632f8792fdb6b202f7613537a519d77239f9fa5c6791362b5cbf4870587d4698a2f44b9556dc550f659dd1f9ad02a76726acd2a2f80b6bbb211823716e1
 AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670
-DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
 DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
-DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
 DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
-EBUILD openjpeg-2.3.1-r1.ebuild 4303 BLAKE2B 956343edd893fa16c00d6d4306f8a74453af590ce932c78f9f0e7b72a0b95ef184c897ce850840b03f9dabcc984321ac38f93ca9ca36b9a95e00fae0bb24dbed SHA512 6ae0ef7e1380aed0d218d933e8d4fa0e43208bdaf45da43198964f1cafa72f8a0eaf70f19ef7199ef4a2157a8f59684d8e4e6b1ed500e3f6eb150fc50ae7dc3c
-EBUILD openjpeg-2.4.0.ebuild 4461 BLAKE2B b79a28655f492c4e0762ad50a8c44e1ba96476d8d575df9f14ac1811cb5aeb142aeac4beb1d652a5772c2a15ed6ea58d5ecd80f827e63d578c763208c804d931 SHA512 a6b3397492243f211427ef62ebd01e1632e25a96dcbff9fc01f8dc8050b9e50450c3abd4b050aba8b76ab93b3b424a62c200c0e542716517239819fe35d3e15b
+EBUILD openjpeg-2.4.0.ebuild 4460 BLAKE2B 71797deef49f3ed4df64f61089de426f0d8b35d874f440e8a24307bc3706469033f39f5ef954a7140f93dfe4b1dd51ca02def0ff4a2ddbd9435c21e6b2466ed6 SHA512 8b972f658d4b3fadf5cabae721e1c2386bb72b19aecb678ec48c406cf6a63b9b78e97bb44148a552f3ca6e8f253f2572458e7aab1d471c7ed718e7824e3cd730
 MISC metadata.xml 363 BLAKE2B 2d62e4b26da75477163ad31097d1e5cd7f287341e2074905928563eda9a3c9fc4d274d75c48949abeb29ea0a4bf5fcd20037b9a9cf3d3372f6760eda9ca11324 SHA512 e446a1f8697819653f6ded68416140c56e6714007a73a897d60b92b8c785ce612096b0f044caa39adfab399a889d1b68856039f768105d0a5afa0835d18d8663
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch
deleted file mode 100644
index 9a70291f50e4..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-6851.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 11 Jan 2020 01:51:19 +0100
-Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
- coordinates are beyond INT_MAX (fixes #1228)
-
----
- src/lib/openjp2/j2k.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
-index 14f6ff41a..922550eb1 100644
---- a/src/lib/openjp2/j2k.c
-+++ b/src/lib/openjp2/j2k.c
-@@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image,
-     l_img_comp = p_image->comps;
-     for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
-         OPJ_INT32 l_h, l_w;
-+        if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
-+                p_image->y0 > (OPJ_UINT32)INT_MAX ||
-+                p_image->x1 > (OPJ_UINT32)INT_MAX ||
-+                p_image->y1 > (OPJ_UINT32)INT_MAX) {
-+            opj_event_msg(p_manager, EVT_ERROR,
-+                          "Image coordinates above INT_MAX are not supported\n");
-+            return OPJ_FALSE;
-+        }
- 
-         l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
-                          (OPJ_INT32)l_img_comp->dx);
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch
deleted file mode 100644
index 95cb8095f562..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-CVE-2020-8112.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Thu, 30 Jan 2020 00:59:57 +0100
-Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow
-
-That could lead to later assertion failures.
-
-Fixes #1231 / CVE-2020-8112
----
- src/lib/openjp2/tcd.c | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
-index deecc4dff..aa419030a 100644
---- a/src/lib/openjp2/tcd.c
-+++ b/src/lib/openjp2/tcd.c
-@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
-             /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-             l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx;
-             l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy;
--            l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx;
--            l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy;
-+            {
-+                OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
-+                                  (OPJ_INT32)l_pdx)) << l_pdx;
-+                if (tmp > (OPJ_UINT32)INT_MAX) {
-+                    opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
-+                    return OPJ_FALSE;
-+                }
-+                l_br_prc_x_end = (OPJ_INT32)tmp;
-+            }
-+            {
-+                OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
-+                                  (OPJ_INT32)l_pdy)) << l_pdy;
-+                if (tmp > (OPJ_UINT32)INT_MAX) {
-+                    opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
-+                    return OPJ_FALSE;
-+                }
-+                l_br_prc_y_end = (OPJ_INT32)tmp;
-+            }
-             /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/
- 
-             l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
deleted file mode 100644
index 7eb393b8922f..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
+++ /dev/null
@@ -1,495 +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.
----
- CMakeLists.txt                           | 61 +++++-------------------
- cmake/OpenJPEGConfig.cmake.in            |  2 +-
- doc/CMakeLists.txt                       |  2 +-
- src/bin/jp2/CMakeLists.txt               |  4 +-
- src/bin/jp3d/CMakeLists.txt              |  2 +-
- src/bin/jpip/CMakeLists.txt              | 10 ++--
- src/bin/jpwl/CMakeLists.txt              |  2 +-
- src/bin/mj2/CMakeLists.txt               |  2 +-
- src/lib/openjp2/CMakeLists.txt           | 12 ++---
- src/lib/openjp2/libopenjp2.pc.cmake.in   | 10 ++--
- src/lib/openjp3d/CMakeLists.txt          |  4 +-
- src/lib/openjp3d/libopenjp3d.pc.cmake.in | 10 ++--
- src/lib/openjpip/CMakeLists.txt          |  8 ++--
- src/lib/openjpip/libopenjpip.pc.cmake.in | 10 ++--
- src/lib/openjpwl/CMakeLists.txt          |  6 +--
- src/lib/openjpwl/libopenjpwl.pc.cmake.in | 10 ++--
- src/lib/openmj2/CMakeLists.txt           |  4 +-
- wrapping/java/openjp2/CMakeLists.txt     |  2 +-
- 18 files changed, 61 insertions(+), 100 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3ea2424a..1f70226a 100644
---- 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)
-@@ -103,59 +103,28 @@ endif()
- 
- # --------------------------------------------------------------------------
- # Install directories
-+include(GNUInstallDirs)
-+
- # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
- 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()
- 
-@@ -339,14 +308,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)
- 
-@@ -363,14 +324,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)
-@@ -378,7 +339,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)
-@@ -386,7 +347,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()
- 
-diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
-index 2925108a..702e2790 100644
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -29,7 +29,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
- 
-   # We find a relative path from the PKG directory to header files.
-   set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
--  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
-+  set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
-   file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
- 
-   get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index d4f3ddbe..ed5cb44c 100644
---- 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 share/doc
-+    DESTINATION ${CMAKE_INSTALL_DOCDIR}
-     PATTERN ".svn" EXCLUDE
-   )
- else()
-diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
-index 4d4bd952..29b4dd20 100644
---- 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()
-diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt
-index 3cac1a8f..ed62b4f3 100644
---- 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()
-diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
-index 301d885b..ddd867dc 100644
---- 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()
-diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt
-index 5df225de..8a798e61 100644
---- 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()
-diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
-index 5d3e288b..6669c502 100644
---- 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()
-diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
-index b2714858..9cbc4c3f 100644
---- 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)
-diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in
-index 62159b00..ebad9578 100644
---- 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)
-diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt
-index b0469af1..6e251984 100644
---- 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
- )
-diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-index e9b6c404..866a0174 100644
---- 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)
-diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt
-index b3cb8ce8..aace36d4 100644
---- 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()
-diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in
-index 7c3f29af..4cfa6fce 100644
---- 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)
-diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt
-index 1b33adbe..bb90c87c 100644
---- 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
- )
-diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-index b1244197..8acc1457 100644
---- 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)
-diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt
-index 25294b20..dced53f6 100644
---- 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
- #)
-diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt
-index eb3da0ed..4504da5f 100644
---- 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
- )
--- 
-2.21.0
-
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch
deleted file mode 100644
index 53985b190933..000000000000
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-libtiff-4.1-compat.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From b5cb419faff300fdbc0b4e98dab5c9010db6f39d Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Fri, 7 Feb 2020 21:53:10 +0100
-Subject: [PATCH] tests: add alternate checksums for libtiff 4.1
-
-Fixes #1233
-
-libtiff 4.1 slightly modifies the way it generates files. So
-add the new expected md5sum.
-
-Not super elegant solution admitedly.
----
- tests/nonregression/checkmd5refs.cmake  |  5 ++
- tests/nonregression/md5refs.txt         | 86 +++++++++++++++++++++++--
- tests/nonregression/test_suite.ctest.in | 16 ++---
- 3 files changed, 93 insertions(+), 14 deletions(-)
-
-diff --git a/tests/nonregression/checkmd5refs.cmake b/tests/nonregression/checkmd5refs.cmake
-index 75afbed05..76e2f245f 100644
---- a/tests/nonregression/checkmd5refs.cmake
-+++ b/tests/nonregression/checkmd5refs.cmake
-@@ -46,10 +46,15 @@ foreach(pgxfullpath ${globfiles})
- 
-   string(REGEX MATCH "[0-9a-f]+  ${pgxfile}" output_var "${variable}")
- 
-+  # Search for variant md5sum for libtiff >= 4.1
-+  string(REGEX MATCH "libtiff_4_1:[0-9a-f]+  ${pgxfile}" alternate_output_var "${variable}")
-+
-   set(output "${output}  ${pgxfile}")
- 
-   if("${output_var}" STREQUAL "${output}")
-     message(STATUS "equal: [${output_var}] vs [${output}]")
-+  elseif("${alternate_output_var}" STREQUAL "libtiff_4_1:${output}")
-+    message(STATUS "equal: [${alternate_output_var}] vs [libtiff_4_1:${output}]")
-   else()
-     message(SEND_ERROR "not equal: [${output_var}] vs [${output}]")
-   endif()
-diff --git a/tests/nonregression/md5refs.txt b/tests/nonregression/md5refs.txt
-index a33e82a12..95d3d74cb 100644
---- a/tests/nonregression/md5refs.txt
-+++ b/tests/nonregression/md5refs.txt
-@@ -180,6 +180,7 @@ dacaf60e4c430916a8c2a9ebec32e71c  issue458.jp2_3.pgx
- d33fb5dbddb9b9b4438eb51fa27445a3  issue495.jp2_0.pgx
- 27db8c35e12a5d5eb94d403d2aae2909  issue495.jp2_1.pgx
- 97da625d2f2d0b75bf891d8083ce8bfb  issue495.jp2_2.pgx
-+
- 86729c5f2b74b2dfd42cb0d8e47aef79  a1_mono_tif-1.tif
- fa9b7b896536b25a7a1d8eeeacb59141  a1_mono_tif-10.tif
- e1f194f69d1c58ce8bed62cd4f1d5b6a  a1_mono_tif-11.tif
-@@ -196,6 +197,24 @@ de53251a33356e206a793fbdbaf90db2  a1_mono_tif-13.tif
- e164a6c0219737ee05a3d55d6e3a3104  a1_mono_tif-7.tif
- c3ebfcf478b1c4fc786748813f2b5d53  a1_mono_tif-8.tif
- 67adb084f1fe234f240a1d0b2698507e  a1_mono_tif-9.tif
-+
-+libtiff_4_1:fc19057ff2d65c24daf9c9e25e34a48a  a1_mono_tif-1.tif
-+libtiff_4_1:66246b6bbc83c06962f034235acb9924  a1_mono_tif-10.tif
-+libtiff_4_1:ce1e07bdafe83a84a5df87fce2ffde6a  a1_mono_tif-11.tif
-+libtiff_4_1:614f1ab59ca8473f5f8b1772b7a19d24  a1_mono_tif-12.tif
-+libtiff_4_1:941bdcdf9103a22f7b6f66aaca3276d1  a1_mono_tif-13.tif
-+libtiff_4_1:38df45296861df2b44879e8a0787d43c  a1_mono_tif-14.tif
-+libtiff_4_1:387575ff38bed3d177776891e1b2804e  a1_mono_tif-15.tif
-+libtiff_4_1:ee4838fbd88ddcb73ef26df523a3bb5d  a1_mono_tif-16.tif
-+libtiff_4_1:6de7e8cbd95e2c465b587f2273daf9dc  a1_mono_tif-2.tif
-+libtiff_4_1:e1e026d7ed26e8f3334cf25a8884abbd  a1_mono_tif-3.tif
-+libtiff_4_1:c120fac03d1b3756a2deb9b92ba519d4  a1_mono_tif-4.tif
-+libtiff_4_1:3a7b84ed9061e0b13996660fc2910e8a  a1_mono_tif-5.tif
-+libtiff_4_1:7ac8316261d54f22e6c847fbac01542b  a1_mono_tif-6.tif
-+libtiff_4_1:d714670f6746931c4e7defbfbe38b249  a1_mono_tif-7.tif
-+libtiff_4_1:b28f4b92be5e3481d44f50f2cd7626aa  a1_mono_tif-8.tif
-+libtiff_4_1:2a12dcda3e9927384e7344c4ecabdcf1  a1_mono_tif-9.tif
-+
- 31650ec40241737634179fff6ad306f8  basn4a08_tif-1.tif
- abf884080bcfbf58c044a9d86bfa5e5d  basn4a08_tif-10.tif
- b0d82c12aa2c9b3ecd96c6a5b5663a8c  basn4a08_tif-11.tif
-@@ -212,6 +231,24 @@ fb5cf848d63c61dc485c87c9246ee9c7  basn4a08_tif-16.tif
- 18a59ac6036ee64e92af19b7e3cd3d64  basn4a08_tif-7.tif
- dc40cc1da6de28e7e973c8ba796ca189  basn4a08_tif-8.tif
- 824b776a5aa3459b77894b5f77621311  basn4a08_tif-9.tif
-+
-+libtiff_4_1:4c50df5b25e006041b05e8a6fb77c95e  basn4a08_tif-1.tif
-+libtiff_4_1:68cc9a9bc5f95474744d06ea4efb2cf3  basn4a08_tif-10.tif
-+libtiff_4_1:f643c00bd0673c8f6092125e38759a35  basn4a08_tif-11.tif
-+libtiff_4_1:cfcefece2fb08a437876d85941cdaa27  basn4a08_tif-12.tif
-+libtiff_4_1:1c3850831691aa8b565e4cd0d13166f9  basn4a08_tif-13.tif
-+libtiff_4_1:06059e0429956946ecd3b1893ad39d18  basn4a08_tif-14.tif
-+libtiff_4_1:71557ba6728e6641ad289b1d142acade  basn4a08_tif-15.tif
-+libtiff_4_1:150c663277b43d0331112f24d47fd34e  basn4a08_tif-16.tif
-+libtiff_4_1:9b43011e7a19079c21d65318b4a1139b  basn4a08_tif-2.tif
-+libtiff_4_1:125ca7b2e45fafa4e003f5adc9f11da8  basn4a08_tif-3.tif
-+libtiff_4_1:9fbc1a8f4d12c8152cde3e004cebd191  basn4a08_tif-4.tif
-+libtiff_4_1:51c6b54e9d8b53355c3f73ad813bdeef  basn4a08_tif-5.tif
-+libtiff_4_1:604ac42b1a9e7a75d63e97ce40e43442  basn4a08_tif-6.tif
-+libtiff_4_1:360d1ce74faffa1a736d5f30c22976ed  basn4a08_tif-7.tif
-+libtiff_4_1:2059aaa9e54c09f36d16107870c1546a  basn4a08_tif-8.tif
-+libtiff_4_1:07496859507882401d66d70dcf392505  basn4a08_tif-9.tif
-+
- 59e32c45591fd3bb44fe99381a116ba1  basn6a08_tif-1.tif
- 630e6fb6deba0b3efd93b610561d607a  basn6a08_tif-10.tif
- 5419fec92f0e0e5907d838dacf9712b4  basn6a08_tif-11.tif
-@@ -228,6 +265,24 @@ d60864a6a5c8a49a202d98ae6f5165c7  basn6a08_tif-6.tif
- 086fd12fec963995fe2e405dcef7e477  basn6a08_tif-7.tif
- c3e93f61125f82a9832d0b9440468034  basn6a08_tif-8.tif
- a9723dcc0732e74c9e8cd2bf93474a7d  basn6a08_tif-9.tif
-+
-+libtiff_4_1:98f777ca80a132d8ab820d4533daa5b6  basn6a08_tif-1.tif
-+libtiff_4_1:9c5873a1fa5571aad9e73d36d5a4206a  basn6a08_tif-10.tif
-+libtiff_4_1:c05dac7d4c19bc4b78cea426e5e52430  basn6a08_tif-11.tif
-+libtiff_4_1:0223432f61df2508d0195f696988ddeb  basn6a08_tif-12.tif
-+libtiff_4_1:ccc64d14279063ed9daf371be62077f7  basn6a08_tif-13.tif
-+libtiff_4_1:ace0bab2c2fbb5f92a8214600df9159f  basn6a08_tif-14.tif
-+libtiff_4_1:9b54bda92a09bcac9870fa02b428b7e6  basn6a08_tif-15.tif
-+libtiff_4_1:178665d070f54f2920521c4e1cb9d5d0  basn6a08_tif-16.tif
-+libtiff_4_1:c4b1e96d19429137cd8871833af2ea5a  basn6a08_tif-2.tif
-+libtiff_4_1:44e8b5591740289d0ca52a3e19f19c22  basn6a08_tif-3.tif
-+libtiff_4_1:70b4f469dd29c8e99d3f0525301286b8  basn6a08_tif-4.tif
-+libtiff_4_1:bf7c35a2b05eecb406aab7959431a842  basn6a08_tif-5.tif
-+libtiff_4_1:7d2ecb1c35869ddbafd11b4896357b81  basn6a08_tif-6.tif
-+libtiff_4_1:2cd6ec32a0256806f46706c0ca564d9d  basn6a08_tif-7.tif
-+libtiff_4_1:116b611b7a358bee2c4f2695732ec357  basn6a08_tif-8.tif
-+libtiff_4_1:ed9ca54d25fb5b0cd5339eedfa16cbea  basn6a08_tif-9.tif
-+
- cfe04d15cf9d615fc36357dcb3b3956b  p0_14_tif-1.tif
- 9ad87e7fddc77ac85e2e92509bee2365  p0_14_tif-10.tif
- f144e26d6d5aa24d98f0415f10751025  p0_14_tif-11.tif
-@@ -244,6 +299,24 @@ b6f71c941e3a5b8d2547792ccec58d54  p0_14_tif-4.tif
- 951c99efbd922d8f3feb015e9ef8e350  p0_14_tif-7.tif
- 6808377b760b4ef3559ba8b14ed9b91a  p0_14_tif-8.tif
- 96aa7dafa873d0ce33f84bb1ff78fa9b  p0_14_tif-9.tif
-+
-+libtiff_4_1:5f97d4bbab138f99b6b125e5a5bf96bd  p0_14_tif-1.tif
-+libtiff_4_1:686c7a1561d73e53c000800ec0c5fa0a  p0_14_tif-10.tif
-+libtiff_4_1:a8585d901cc1b7cbbda6e524ecb5db35  p0_14_tif-11.tif
-+libtiff_4_1:17b5497c9b8a0c68739c0beae90aa432  p0_14_tif-12.tif
-+libtiff_4_1:a024a04b96ccb13c81cd57a5ee6ad07a  p0_14_tif-13.tif
-+libtiff_4_1:aabadca3f87437a32878fef7e265b23a  p0_14_tif-14.tif
-+libtiff_4_1:5390a77296962268b73a793467092633  p0_14_tif-15.tif
-+libtiff_4_1:47dc7cc71832e5739c32794a713966c3  p0_14_tif-16.tif
-+libtiff_4_1:1a9247cd1fb26f5fffa870e8543f6d30  p0_14_tif-2.tif
-+libtiff_4_1:e4c0c9481d4032ea6b7e6a08a39e9030  p0_14_tif-3.tif
-+libtiff_4_1:c7d6ec9b235aaff146228875e69edbaa  p0_14_tif-4.tif
-+libtiff_4_1:d3b8110b2284a09cfb7d5c4ffd451aff  p0_14_tif-5.tif
-+libtiff_4_1:6189ee17c4a276f99302ac7e296b3daa  p0_14_tif-6.tif
-+libtiff_4_1:b4a3b9b63681448abb7c460702de4df9  p0_14_tif-7.tif
-+libtiff_4_1:04deb4e9679e7971c2cd0449fcd255b7  p0_14_tif-8.tif
-+libtiff_4_1:254443e438ed6a5b0631d6188cc84789  p0_14_tif-9.tif
-+
- dd15b3d487d36a3682be0679300a4319  issue235.jp2_0.pgx
- b9cd6dc76b141fb1fec15f50c1f70e01  issue235.jp2_1.pgx
- 3edef2ae197ef30b08deda1b28825399  issue235.jp2_2.pgx
-@@ -288,6 +361,7 @@ fc2844a9f3c8e924e349180ba9e122dd  p0_14_png-2.png
- 8d7685f1569d446787476c0a56c93750  dwt_interleave_h.gsr105.jp2_1.pgx
- ddfff2ce2df4a9102518c92a362e6d25  dwt_interleave_h.gsr105.jp2_2.pgx
- 63bf755af5a1f8a478d65079dc7c8964  issue205-tif.jp2.tif
-+libtiff_4_1:f9678a9e12d540f768ebebaee2af8f14  issue205-tif.jp2.tif
- b01ed87dbac424bc820b2ac590e4884e  issue236-ESYCC-CDEF.jp2_0.pgx
- 2635cc00b1e18ef11adcba09e845d459  issue236-ESYCC-CDEF.jp2_1.pgx
- f9c95d0aec2f6e7b814fa1d09edcdbda  issue236-ESYCC-CDEF.jp2_2.pgx
-@@ -310,11 +384,11 @@ d1bb7f93f4c0eb984b2e9c54e544b7e9  broken.jpc_1.pgx
- b704ad4c0cfefffd78c20a54f5541265  dwt_interleave_h.gsr105.jp2_d_1_1_33_33_0.pgx
- 9d7fe43cd7a50b7bbaf712926ee11980  dwt_interleave_h.gsr105.jp2_d_1_1_33_33_1.pgx
- 0960b580f991ff10f693b24aa41ad58b  dwt_interleave_h.gsr105.jp2_d_1_1_33_33_2.pgx
--fa7382fd8b2e788b28b807e200dd95b9  file1.jp2-c0.tif
--ed79b7fe443955cdefba2b039ddc846a  file1.jp2-c0_1_2.tif
--ac8f6ab3acc9c692ed7c41bd62a0e1e8  file1.jp2-c0-r1.tif
--fbfcf662b6f7549574b2885490fbcf12  file1.jp2-c0-d10_20_30_40.tif
--fa7382fd8b2e788b28b807e200dd95b9  file1.jp2-c0-t0.tif
--ac8f6ab3acc9c692ed7c41bd62a0e1e8  file1.jp2-c0-t0-r1.tif
-+6e23ded7d3ca0b1dd8405448e3ff931b  file1.jp2-c0.png
-+5acabea0ef6d09d2c1f681773e886935  file1.jp2-c0_1_2.png
-+1150acbee2c1e33c57592c05c76e565a  file1.jp2-c0-r1.png
-+1b8ab42d8ee4e28d2868c04a815fb569  file1.jp2-c0-d10_20_30_40.png
-+6e23ded7d3ca0b1dd8405448e3ff931b  file1.jp2-c0-t0.png
-+1150acbee2c1e33c57592c05c76e565a  file1.jp2-c0-t0-r1.png
- f31bcb01c771f829054cdb013575e86a  issue1043.png
- 62bc654c830efddf1b23d6e208447dab  tnsot_zero.png
-diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
-index c42bad162..bda0681f7 100644
---- a/tests/nonregression/test_suite.ctest.in
-+++ b/tests/nonregression/test_suite.ctest.in
-@@ -612,22 +612,22 @@ opj_decompress -i @INPUT_NR_PATH@/issue979.j2k -o @TEMP_PATH@/issue979.j2k.pgx
- opj_decompress -i @INPUT_NR_PATH@/dwt_interleave_h.gsr105.jp2 -o @TEMP_PATH@/dwt_interleave_h.gsr105.jp2_d_1_1_33_33.pgx -d 1,1,33,33
- 
- # partial component decoding with opj_decode(): one component
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0.tif -c 0
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0.png -c 0
- # partial component decoding with opj_decode(): 3 components without MCT
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_1_2.tif -c 0,1,2
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_1_2.png -c 0,1,2
- # partial component decoding with opj_decode() and opj_set_decode_area()
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-d10_20_30_40.tif -c 0 -d 10,20,30,40
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-d10_20_30_40.png -c 0 -d 10,20,30,40
- # partial component decoding with opj_decode() and reduced resolution
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-r1.tif -c 0 -r 1
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-r1.png -c 0 -r 1
- # partial component decoding with opj_get_decoded_tile()
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0.tif -c 0 -t 0
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0.png -c 0 -t 0
- # partial component decoding with opj_get_decoded_tile() and reduced resolution
--opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0-r1.tif -c 0 -t 0 -r 1
-+opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0-t0-r1.png -c 0 -t 0 -r 1
- 
- # try to map the same component several times
--!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_0.tif -c 0,0
-+!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c0_0.png -c 0,0
- # try to map an invalid component
--!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c10.tif -c 10
-+!opj_decompress -i @INPUT_CONF_PATH@/file1.jp2 -o @TEMP_PATH@/file1.jp2-c10.png -c 10
- 
- opj_decompress -i @INPUT_NR_PATH@/db11217111510058.jp2 -o @TEMP_PATH@/issue1043.png
- 
diff --git a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
deleted file mode 100644
index 07ed6a38acd1..000000000000
--- a/media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,136 +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
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="25632d6deca2e567d30ef476b4abe63916c36f6e"
-
-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_20180620.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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.3.1-gnuinstalldirs.patch" # bug 667150
-	"${FILESDIR}/${P}-CVE-2020-6851.patch"
-	"${FILESDIR}/${P}-CVE-2020-8112.patch"
-	"${FILESDIR}/${P}-libtiff-4.1-compat.patch"
-)
-
-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)
-	)
-
-	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
index 58bad868b8f3..d14c44cab8ae 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 )"
 
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 937ecb68a0d1..0e675b60d40c 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,3 +1,5 @@
 DIST phonon-backend-vlc-0.11.1.tar.xz 65064 BLAKE2B 2380d31f574b71e2552b37e5c2a8b22239268aac9c2875417486fd77496c89820b5b4c7e94d39bfebad62a5175a35767945e3f57830e69041ed7c58be4b978cc SHA512 4a068478eb1467477cf5c21813723779742eb15766aee2df8184da8c0b58598c5eff8aecefdcfed8e6136495f3caf7691c99d43e98226ab477c162ff19e1fa4e
+DIST phonon-backend-vlc-0.11.2.tar.xz 66096 BLAKE2B 342a13377807d97c5da89c5f341e2dcca9fe0ae41ff0408a5789195ec18b5914b3fefe68be519674c412f70690aaf0c27a97e236fbc0317b82fb093baf041d7e SHA512 14ec3ef91aa4ca8275bc92f9cf5bee181ad57b4c2bf696120c8931e34c950d360c58d935f4a9298b2fae6e4ea5fac4b025df697a1bbf270da71a2151f0954949
 EBUILD phonon-vlc-0.11.1.ebuild 718 BLAKE2B bcbf42bd4e10829152e90b2a0a72a9f5c9268b04c32de53c5490ac606ac9796ce4cabde9ea0e62d32c35249d9d534287d5d33764bb53ac4c33b1fbc39f695523 SHA512 2a8d082490d0e2477a6804baf4c38da1a91ae89243107023a4f8b0ac55cd17ad0f22127d69ed0bfb4bf27aec5eac0d86502e1950f7630472d5d8c3f3e486077d
+EBUILD phonon-vlc-0.11.2.ebuild 720 BLAKE2B 7e0e0d1c676069ad19eff86148c2102148c00e59ae10724539108f4679cb922e4b3a4a915cb10997440f97fbea457fa2fd2c44051734a6bf5b3919879be98b39 SHA512 40e3cc913a0cc0c47354ec6081afbae6cc77a12ba9db4128ec564ae0204a411e394a2a3a61111ed74e0fe0cbd94089e79da01eb5403b02d4eb7b34007fb24d38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.2.ebuild
new file mode 100644
index 000000000000..b92df18e6896
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.11.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="phonon-backend-vlc"
+inherit ecm kde.org
+
+DESCRIPTION="VLC backend for the Phonon multimedia library"
+HOMEPAGE="https://community.kde.org/Phonon"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=media-libs/phonon-4.11.0
+	media-video/vlc:=[dbus,ogg,vorbis]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index 92ae5fcc121c..9f7b6dbfac77 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -1,7 +1,6 @@
 AUX plib-1.8.5-CVE-2011-4620.patch 415 BLAKE2B a6a059765551313653b0eb8d060d88cd9a61df9f57456f97b37f610cb3253db3cfc9855e958077d1a2383f65a99c2edc43732fbda50ca18287fd34f00776d943 SHA512 c046cf65e80629f238aaba724f522c31b434f5c9687ea02b019846ce3469c6b074bd014f81a7a4e6b43db7b084f4dcd9d4c04b557dbc1b8b8ca00f2d782fdf1c
 AUX plib-1.8.5-CVE-2012-4552.patch 1322 BLAKE2B 384a50a970012b7dd41bcb0362ee88ee373a4cf77278eecda1b26b6c02f8971d92f85b974e9fccbf7ff10af13ff4e54af6d7377140010f9a3113c86a6018bf0c SHA512 a09462ecb085703aae7cd3b77954cc800410aa37a9616255cca2f21456e6d5dcf8ead3f684c98236deb1455c6a034dc8ec874bafdbab003f7a63517ea1f8350d
 AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1613e0cbddcfb90ae250d87b672d1738d854c9d546ec1d5d8ebf78b501e3dca9e41dc7e1f891b101e3c0ca23c SHA512 3222424f668ba4267d150034fc3ac67770501c543cdd7849c8eda4d491d7cb4d3120101c7d548a20d3122561f0f27e8fb0592773c736d7fbf4bc500121bf9dc3
-AUX plib-1.8.5-X11.patch 341 BLAKE2B b8d42813ff29c233c29183764d3d99ddafa123d418055014333713ac778951d0c671b196b35c7b1ac74fdabc29fb9f3bf87adc4f1b4f806d8e898d7f99802331 SHA512 1a605336ed46cdb7dca8b6f9eab488fd8fcf20a2beadcb70fc449d0ee6b2519b1658a9ca23b6c6a8285732dd4830bbf14ba2fb2ae47cd15a7ac431071e42d560
 AUX plib-1.8.5-shared-libs.patch 9520 BLAKE2B 1bfb85c5065e33a9c8be14861f4fd8978e1dcacf4c045c9b1e30dfd2715873ac1b953bfeed5e298e1140264f8c0d191bef28b6631e2bb98f4d7228c7576aaf9c SHA512 0fb342e726412885531188a05e3b05b2076398b1ec8eaaf22ba3e20f48248351917d5418a7086b1b8eeb0bfccae049e8cfa0f5d05cbd4bb7c20c3e69685065b5
 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
 EBUILD plib-1.8.5-r2.ebuild 829 BLAKE2B ccf66bea4824b818c08a421975d5b89dfc9403e36504dddd66b41b0119e47b70b30cc1727464ff9545e591b0a3cbf679dad89048f634173e15ef190d5ac31c86 SHA512 9c2810449ce8aa529a360dabbaf7d8bff92dccb9def0bff12cf3e580517e0c297391e3a32e0009d93bfd2b806e895761b96b4fbb94adc521b56294c5bbbc6105
diff --git a/media-libs/plib/files/plib-1.8.5-X11.patch b/media-libs/plib/files/plib-1.8.5-X11.patch
deleted file mode 100644
index 1d9e05360d37..000000000000
--- a/media-libs/plib/files/plib-1.8.5-X11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.old
-+++ configure.in
-@@ -276,7 +276,7 @@
- 
-         LDFLAGS="$LDFLAGS $X_LIBS"
- 
--        LIBS="$LIBS $X_PRE_LIBS -lXi -lXmu -lXext -lX11 $X_EXTRA_LIBS -lm"
-+        LIBS="$LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
- 
- dnl =========================================================
- dnl    if test "x$x_includes" != "x"; then
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 139d9b28499f..55b81c8b3ef1 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,6 +1,7 @@
 AUX qhull-2012.1-64bit.patch 1509 BLAKE2B d5f50bfb5229109f13ac88f46eff36d130830339c43265981b00a8e5defaf3229cd50870e379e13a2726312efd8a15e99a2683c3b3a9b1eb9bf1503b7f6b1fbe SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5
+AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654
 DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4
 DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
 EBUILD qhull-2015.2.ebuild 1021 BLAKE2B c123f9b2fbf062da2aedd57bda3610dd13a48d772944082a5f56dcb2b9337ddc9a824587240ee52e237d990182ffa7a1d255534ee7c1e692ddecae5001e8c3c0 SHA512 bb1fae2412eb9359ae384019ab0388b951f0a3cd97ae9e7520a219fe41c417828edc30f2d8fb519b10e994f5ed199eb6d94dee89db65207274302351cb9af8de
-EBUILD qhull-2020.2-r2.ebuild 993 BLAKE2B 4ed1de690460bd343503f1086b5e624f61a882d839d4f9dcd114bb74032e464dbbbbee150ed0759807bdd6eca8f264faef9efc85115bf727527400ad5948fe34 SHA512 8c20dc26b55b436409857a2d992d432de5045917171c72ef0659104a274db78c32407ee4362596f38d9e8fa1e6889f599ed3bbf01f697c2bbde4b81858d7e0eb
+EBUILD qhull-2020.2-r3.ebuild 1494 BLAKE2B 9c5e2a9725f73662bf65582703e287a730a2fa297a4e09a1805b8edcdf0f06e3830f24d31c8e9771c3dbd07672a2103c76e2bc43d5003c8cb5735de5b628c6e2 SHA512 fc8e794675a2c5c513956ef39e60747f996f4f7018f82962e7434f1df45cc29e3a5c243aa5dfa8306110a7aef948a71bd0cb056cbe20e83944ba872ba2ee709a
 MISC metadata.xml 1094 BLAKE2B 9667f9f89fc9717129401070888401f0db493c01e4fe73eb8168efae9c1c2d7f1a7aa234fe72f3beea7feb385dc920418a6affe4d99679736cc6a1aef212e4eb SHA512 b1e13904fe69b4535806a871cdda79fadbf294c30654fe119e7e3be0ed481dc926a9dfaffd75c2849e3eb91ebad671a6b7eca293b40a249c8ccbee6264cfdaf9
diff --git a/media-libs/qhull/files/qhull-2020.2-deprecated-pkgconfig.patch b/media-libs/qhull/files/qhull-2020.2-deprecated-pkgconfig.patch
new file mode 100644
index 000000000000..c83a807e2888
--- /dev/null
+++ b/media-libs/qhull/files/qhull-2020.2-deprecated-pkgconfig.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt	2020-09-03 22:33:16.000000000 -0400
++++ b/CMakeLists.txt	2021-01-08 14:38:26.299273173 -0500
+@@ -731,4 +731,5 @@
+ set(PkgConfigLocation lib/pkgconfig)
+ foreach(pkgconfig IN ITEMS "${qhull_SHAREDR};Qhull reentrant shared library"
++                           "${qhull_SHARED};Qhull deprecated shared library"
+                            "${qhull_STATIC};Qhull static library"
+                            "${qhull_STATICR};Qhull reentrant static library"
diff --git a/media-libs/qhull/qhull-2020.2-r2.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
index 1c60a003a251..59f96d53709c 100644
--- a/media-libs/qhull/qhull-2020.2-r2.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -12,10 +12,14 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0/8"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
+IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2020.2-deprecated-pkgconfig.patch"
+)
+
 src_prepare() {
 	if ! use doc ; then
 		sed -i \
@@ -24,14 +28,19 @@ src_prepare() {
 			CMakeLists.txt || die
 	fi
 
+	sed -i \
+		-e "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" \
+		-e "s@lib/cmake/Qhull@$(get_libdir)/cmake/Qhull@" \
+		CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=OFF
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DLINK_APPS_SHARED=ON
-		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
 
@@ -39,11 +48,18 @@ src_configure() {
 }
 
 src_compile() {
-	cmake_src_compile
-	cmake_src_compile libqhull
+	cmake_src_compile all libqhull
 }
 
 src_install() {
 	cmake_src_install
 	dolib.so "${BUILD_DIR}"/libqhull.so*
+
+	# fix double prefix in pc files
+	sed -i "/^libdir/s@/.*@/$(get_libdir)@" "${ED}/usr/$(get_libdir)/pkgconfig/"*.pc || die
+
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)/pkgconfig/qhull"{static,static_r,cpp}.pc || die
+		rm -r "${ED}/usr/include/libqhullcpp" || die
+	fi
 }
diff --git a/media-libs/raul/Manifest b/media-libs/raul/Manifest
deleted file mode 100644
index 54bb008fd4e7..000000000000
--- a/media-libs/raul/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST drobilla-autowaf.tar.bz2 305372 BLAKE2B 1457ceed5e80c5077ddacbfe14ef565865997440795800e1fe2dc9af0be9aee89f3a452de1af8c46d8b0e87475592417bf94b1ce1e1004dab7ee4b3b88ba36aa SHA512 324b0e431ee905619ff85d4f3b3c3ba644bb7c10abf89cc2b27af2f871f454c8010326d0c6cd9e7d72538d32a608f10dea5951ff29a8dde2aa9ba5c2e0567d87
-DIST raul-1.0.0_pre20200718.tar.bz2 58775 BLAKE2B 3383c5c2a1c4f1156137c90807bc70d0fb05d5d271855ea1490bc216df8f2036049aee0fc49309b22db9a82f19670eb2ec29900bb9766d0270f5ba0db60324d8 SHA512 33de61b47bb0bf9cd8ccc15ad3249ec76f3fe3ae9e0cb9af6a45ef6385b2b777af6f775abc00a1f7f7ad930291529a48cebddd455e54b8fe5887749dfb0b47a4
-EBUILD raul-1.0.0_pre20200718.ebuild 1473 BLAKE2B 39f25140f9bebfa6e2051f219ea0c0f1ea657e40b36fc3b415f88f4d926dc2c5e18f446cf120d72ed59973f67b4a2359d2e315b19cef808dc7b97fd88cfb9e6f SHA512 db6eff9ff1c635d0a2eeeca26fdc1114e88a562806eb5d4820724c4cfe945178af1ec2acc15d21310ed1f400b4bc7c11ca590726f641a07616ae396372c094f1
-EBUILD raul-9999.ebuild 1070 BLAKE2B 1622b081c0615bc512cc7c77feb0105af0f4672eeb8b6f9b085325a96f5e59e48af2ec40319da20fd75a8b71e1f476f09f1b6ace512f3d89f4c383ecb916e06c SHA512 207525f55ca8ba5b59aaade29fa2924b275f7616b7d4979f9dc5c21516d8ba5744a6e54bcd0e0e1c5b94ed6de26d581f63c9633ae1da283f29540f3da0ac3cde
-MISC metadata.xml 415 BLAKE2B 602cc66e3d57378c7e2b62d3104dfc85e1d058832f93008d2f1e93a43421f1598a93cd82b5a636f143e0c3ef9e555c2340abc9d43e8a04e8242a6e77f506555d SHA512 88de311ef1dc5590377c173508b1ad36346f9c69d518e8705c89af8cb3642fd9f838038489fe6f0a429370417db013b3df5f89e97ba9a67ff1f34df0ac4b359d
diff --git a/media-libs/raul/metadata.xml b/media-libs/raul/metadata.xml
deleted file mode 100644
index f87c0c1d7bd3..000000000000
--- a/media-libs/raul/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>proaudio@gentoo.org</email>
-	<name>Gentoo ProAudio Project</name>
-</maintainer>
-<longdescription lang="en">
-	Raul (Realtime Audio Utility Library) is a C++ utility library primarily
-	aimed at audio/musical applications. 
-</longdescription>
-</pkgmetadata>
diff --git a/media-libs/raul/raul-1.0.0_pre20200718.ebuild b/media-libs/raul/raul-1.0.0_pre20200718.ebuild
deleted file mode 100644
index d95d82839705..000000000000
--- a/media-libs/raul/raul-1.0.0_pre20200718.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit waf-utils python-any-r1 eutils
-
-COMMIT="496e70e420811c7d744a8bcc44a2ac1b51b676b5"
-COMMIT_AUTOWAF="6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d"
-
-DESCRIPTION="C++ utility library primarily aimed at audio/musical applications"
-HOMEPAGE="http://wiki.drobilla.net/Raul"
-SRC_URI="https://gitlab.com/drobilla/raul/-/archive/${COMMIT}.tar.bz2 -> ${P}.tar.bz2
-	https://gitlab.com/drobilla/autowaf/-/archive/${COMMIT_AUTOWAF}.tar.bz2 -> drobilla-autowaf.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/boost
-	dev-libs/glib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-RAUL_TESTS="array_test build_test double_buffer_test maid_test path_test ringbuffer_test sem_test socket_test symbol_test thread_test time_test"
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	default
-	rm -r "${S}/waflib" || die
-	ln -s "${WORKDIR}/autowaf-${COMMIT_AUTOWAF}" "${S}/waflib" || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		$(use debug && echo "--debug") \
-		$(use doc && echo "--docs") \
-		$(use test && echo "--test")
-}
-
-src_test() {
-	cd "${S}/build/test" || die
-	for i in ${RAUL_TESTS} ; do
-		einfo "Running test ${i}"
-		LD_LIBRARY_PATH=.. ./${i} || die
-	done
-}
diff --git a/media-libs/raul/raul-9999.ebuild b/media-libs/raul/raul-9999.ebuild
deleted file mode 100644
index 3c51df5ccbca..000000000000
--- a/media-libs/raul/raul-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit waf-utils python-any-r1 eutils git-r3
-
-DESCRIPTION="C++ utility library primarily aimed at audio/musical applications"
-HOMEPAGE="http://wiki.drobilla.net/Raul"
-EGIT_REPO_URI="https://gitlab.com/drobilla/raul.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/boost
-	dev-libs/glib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-RAUL_TESTS="array_test build_test double_buffer_test maid_test path_test ringbuffer_test sem_test socket_test symbol_test thread_test time_test"
-DOCS=( AUTHORS NEWS README )
-
-src_configure() {
-	waf-utils_src_configure \
-		$(use debug && echo "--debug") \
-		$(use doc && echo "--docs") \
-		$(use test && echo "--test")
-}
-
-src_test() {
-	cd "${S}/build/test" || die
-	for i in ${RAUL_TESTS} ; do
-		einfo "Running test ${i}"
-		LD_LIBRARY_PATH=.. ./${i} || die
-	done
-}
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index 676f9c809077..4002581edeab 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,6 +1,4 @@
 AUX sbc-1.5-ifdef-builtin.patch 871 BLAKE2B a63b5d5ce0e00723d8492a83e403d926eb16091b8eaf9c426cc24444a041949a6747fe134020261131f0681448111d2558b85391308157c828a96ea1b046c7d1 SHA512 bc1116ff941c88418e79bb35e1f08828d637e4d2d3192c1e808b1d5adc02e1942f968f49805365cb7a34817f119e24d8d9c3baf2133c77b91ba79a3e4446d249
-DIST sbc-1.4.tar.xz 250656 BLAKE2B a5b59a0ac209b44843af49e63f7b6a6b397b3905f0efc52c18a3b92785d297d39dad80f5b124e97c50a9535f892f1451bf0a2945ba223a522eafbcad46eaad9d SHA512 f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f
 DIST sbc-1.5.tar.xz 264472 BLAKE2B 421a4cb5ab0e282255f8bdb810384e0a4d6d66835869489c22d51d2a0cabd7ef834bef3756ff887b9d9166dcfe88f4d661c26cb804e2868fb6106cc4886f9dcc SHA512 0243586188acede595317f2afbfdb41be5850d2a6133c374edbe5cbcf59a2a0fd4570d0b8f2d13ce9637ce48b2f1910c3e4ab1c0354dbf273ee67b09db8c4915
-EBUILD sbc-1.4.ebuild 875 BLAKE2B 42fddd2460c78eb9f19ad8d9f8bcbb8c85445aba1047f74e31280650058d30cc8446bcaecca6f2580c0d8645939bcdc858e59e9eefd15d093a0e864a1a633328 SHA512 f079230625d2221aa87ba9ab43ef564052916ed86ca9be200b71739c472818272e497129cc3bfbb351cc49f03731ddaf3baa7a4f0d57e596a6d240fb25e8d45d
-EBUILD sbc-1.5.ebuild 890 BLAKE2B 92b5e730e17a343fd6e8523ebed0a0c903ada5589bd14abb909ef6c583b1b35f40e550e47e92e002161f5c153ab4d5c44e75f5e573305e5c1c3d2a7dfd86d29d SHA512 51faa79e0060f4abbc2f1a33cbcfd00efa56c0c893df0614bee6c1b08d140ab599aaaa9b5f69db6dd88718f965aa8720ffe85619c9d12e99e3d5c8315da21784
+EBUILD sbc-1.5.ebuild 889 BLAKE2B 0f0e9b336e7aa1bc61140522395576ea7d152de959dff049e7c7e64e4a9924131c7bea430396bb1836084c2ecaca37888915cee818daf3378669e56e750d6e59 SHA512 dc406c812aa1a50cc4100e349fbd4b151311bf6641a089dd3781c4c4cf8b886f77ac01ded449c1c52b66cb9250e34abe9dfb125786d95be5ae599483d4aa5304
 MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
diff --git a/media-libs/sbc/sbc-1.4.ebuild b/media-libs/sbc/sbc-1.4.ebuild
deleted file mode 100644
index 9b8ceb6391fc..000000000000
--- a/media-libs/sbc/sbc-1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib multilib-minimal
-
-DESCRIPTION="Audio codec to connect bluetooth HQ audio devices as headphones or loudspeakers"
-HOMEPAGE="https://git.kernel.org/?p=bluetooth/sbc.git http://www.bluez.org/sbc-10/"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-# --enable-tester is building src/sbctester but the tarball is missing required
-# .wav file to execute it
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--disable-tester
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/sbc/sbc-1.5.ebuild b/media-libs/sbc/sbc-1.5.ebuild
index f7a58b3af69c..61e8809d6939 100644
--- a/media-libs/sbc/sbc-1.5.ebuild
+++ b/media-libs/sbc/sbc-1.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 # --enable-tester is building src/sbctester but the tarball is missing required
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index 71545a1de1ba..63171bdfe2ae 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -1,5 +1,5 @@
 AUX svt-av1-0.8.6-fix-c-only-build.patch 5078 BLAKE2B c26a13dba8ac62ec2951d43d1419d6cacebbbb185841636845fb20a6aecb1c6fe4cabc1ab53748c3df0a4b2fcb8e25ff7b63447c486655fc8ec23144ed8388d4 SHA512 41f3c400bc6ff0c8df529cc5db125538367bc36468bc000936e76f58bfaff15d3fbf322ec2705ac20281753273ab834a1691e7852ede6baaec003b1d46285e1f
 DIST svt-av1-0.8.6.tar.gz 6416120 BLAKE2B c30d3bfc2dba6d7964625c4505bb135aa335adf195df91ad058fb02496276cabdc651b09854a2d14136352a434e08f4974148e03e7d54bde0924d25a1c4524cd SHA512 07e7353e35bc581b23c71913e65f5fd27566f4bf1d317d474d57d5bb2b82f380f713a00be19bd3f703935da50f81f3abf1d4ae38fbdf253385edf423737c0543
-EBUILD svt-av1-0.8.6.ebuild 1122 BLAKE2B f0f3d148a69c3a95d622d165a6091f77b6c3ce5c67ff42d1ed7875bb71192541c35c8c96476171dbbe572eee1ba3c651509cf52dab98399626bd5788b0eb962f SHA512 2ba17f2c63f9f9c746e32e93de6e692fcb12c86fbf5d684804258ca20c76159e6324e30e8cbc8a9f374acc3953627caca730a4e2278e1e22fe03e80dfa8ac46d
+EBUILD svt-av1-0.8.6.ebuild 1146 BLAKE2B a8cf2fd22ef19ee6ec7bdddf5fdf863d2df97a73b28c0e4cb8847d5b2d9130ad3e7d8d31a631335c060930867e0e6f3ca5a8a8a5fdfe0b4d1919703067c4fb02 SHA512 f6e4432e9d9db6f0ebf22e4e24a42a9745ff200b21534224491cca5ec427a0a7e13f50746fe56c6449672a8fa9f428117978c2817d2e798a078abb63e4835195
 EBUILD svt-av1-9999.ebuild 1055 BLAKE2B af96eb94a47185ddf01ef21ccb5044ecdaa5ea3eee428a05de6bad22022d8777d4dfa31a6de1290200504d01b27a5129fa92b02832eaeadc653b8043b98be589 SHA512 45326879f4d0069b712a1ab85a5fa4b1ab4324f7eeb21c7735821dced5e638bf7430e4f2357511cbc2f596d7364316268194a406981e6c7fa617cfa8d077535d
 MISC metadata.xml 531 BLAKE2B b276b87582bf66d16429b34b3c55c522b459700dd11010c85210ba8377538bd91b74fe65f6464dddef9f3aca809b9d2e836ce67875574960a6dbdfea34fb9172 SHA512 99100bbfcbe32caa3d5a80121a512802cf01da9b439b5baae5ca88a694658a50783d42bd047e349367a42dca2c724684bbe216fdc8e433d8aa4a58ac9cfae2c6
diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
index d7d8df53a362..ee38d183fd1d 100644
--- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild
+++ b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
 	S="${WORKDIR}/SVT-AV1-${PV}"
 fi
 
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index db99fdb7ce6c..d455ad362feb 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,5 +1,3 @@
-DIST tiff-4.1.0.tar.gz 2421581 BLAKE2B 1f9b92d08dc95633bb005a635bbcecd8fa5e4f30c14f059b42aafbb4a52b4fb1b84b1e97cea33f3102f5808cb28f93bc8fcbae2b041c6227c97f90b4f9b8e631 SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
 DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
-EBUILD tiff-4.1.0.ebuild 2056 BLAKE2B e6c3f2878ae89232c7b47eace14c36641a0609cfe4766e171c87c0355a0f989ed66e9b8271b57f23fe152c29f892be849a6296bc364387d3536e823a6b26d46c SHA512 85ad2d18abecf9a69c8e757663736697a0ea8fe0c16e967058ae2c59930535b1a53a43af79baf90fce0098e77f40c7407261f19ce369704bb7e2811d72e02f6f
-EBUILD tiff-4.2.0.ebuild 2058 BLAKE2B a9025eb795f2d699b7e8483f76ca1e767bb795350c139dea789f5cb2b3878a55f04a271c173a660acb95d1f229b67882dbd04bd08ff9fcae44d0603a5c83e2ce SHA512 d948a87d2e6c4f21139cefe099cbae1c19b4fb757c5e59a559edbf3c6b03c9ce71ec9195544b49630d6c63a2c74d3852a9ee49c16789107100aba0ee7871116c
+EBUILD tiff-4.2.0.ebuild 2056 BLAKE2B e6c3f2878ae89232c7b47eace14c36641a0609cfe4766e171c87c0355a0f989ed66e9b8271b57f23fe152c29f892be849a6296bc364387d3536e823a6b26d46c SHA512 85ad2d18abecf9a69c8e757663736697a0ea8fe0c16e967058ae2c59930535b1a53a43af79baf90fce0098e77f40c7407261f19ce369704bb7e2811d72e02f6f
 MISC metadata.xml 559 BLAKE2B c7f72104f0c49114e27a3db9548edfc112b6bb04881c980d5f4175835abd46a7be088cd9e8c2eae8311bd1656064d975d50579547a96e814b1affef54a17befe SHA512 95ca6b5655637f4cfacb224a77532ea958634e208b3f7d39cf2be778033b99f77af7947bce9db1e633dbcbc721ea2fba60e5a18a4c0e32a9019fcb95f568cce8
diff --git a/media-libs/tiff/tiff-4.1.0.ebuild b/media-libs/tiff/tiff-4.1.0.ebuild
deleted file mode 100644
index 69bb47338e2a..000000000000
--- a/media-libs/tiff/tiff-4.1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="0"
-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="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( jpeg )" #483132
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-src_prepare() {
-	default
-
-	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
-	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--without-x
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable cxx)
-		$(use_enable jbig)
-		$(use_enable jpeg)
-		$(use_enable lzma)
-		$(use_enable static-libs static)
-		$(use_enable webp)
-		$(use_enable zlib)
-		$(use_enable zstd)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ tools//' \
-			-e 's/ contrib//' \
-			-e 's/ man//' \
-			-e 's/ html//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		emake -C tools
-	fi
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
-}
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
index c93faafcf23f..69bb47338e2a 100644
--- a/media-libs/tiff/tiff-4.2.0.ebuild
+++ b/media-libs/tiff/tiff-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-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"
+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="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/zita-resampler/Manifest b/media-libs/zita-resampler/Manifest
index 7b7826f541a5..05d58d8adbf7 100644
--- a/media-libs/zita-resampler/Manifest
+++ b/media-libs/zita-resampler/Manifest
@@ -3,5 +3,5 @@ AUX zita-resampler-1.8.0-makefile.patch 3222 BLAKE2B d13a3e6b2beeb6eb4b440f68431
 DIST zita-resampler-1.6.2.tar.bz2 125539 BLAKE2B d2e04fb5e0efbde3432ce973df59a11d2a184146d124b662712a5de2d9c243f6564899f190f7a7b68a9e01bcaab05c92b91ebcbf942473134a12a85e4e08c603 SHA512 d547419dd222c8a399d8f196efa1ec88a3f781275b696ae2fe1bb6e2fc329285affb8aace85972c304ad256becc4a155534dd5ef4ce3c57cbc9dcca0122b670c
 DIST zita-resampler-1.8.0.tar.bz2 131161 BLAKE2B 1ba5d255fff9c66e18e6177bc7e48a4710fdf54f58c07f162f8c8801f4f449b22dea9922645e7e33b70e07739c2b381176714e704f9840305f194f3c23d66de2 SHA512 adf1f465ac09104be5a02c1cf0f052a44b4c1a448312f3aca016a889e98cfcdebfded38f60300ad85d18ae03eadca7e8e95efb2875267bc36435ccfac881a8e7
 EBUILD zita-resampler-1.6.2.ebuild 899 BLAKE2B ab844529d67e9284f42fbd8a7e7a6ba536188ace3e778c370e30c39d46fd8de400869d6093cfbc6cb461008667a7cd9f253ab4e4634adaaa6d3326631f9e99f1 SHA512 deaf05a05be70b4d72f07495a64a880cab200d259315314736c192528efe6a502918cd074f7750dc48344b468907ea4727d10faad3d1f761f36149762f8cb091
-EBUILD zita-resampler-1.8.0.ebuild 1011 BLAKE2B 4fc04d354cd69f216003c0e2f46ae9ce3f9af98eaf5def7569ba8b02772e7813c2dd2e33b9517de72f1946d81f70e8daa8c47c838b3dc0049569cf46f221a0c7 SHA512 30f1a438ac17b3c891928053f39262d376d3510e5de4bacd30ff2b91bc040820d04a8351e6056ba4cd9554ed7422ceb91f1a40ace92ee679b3049f2688058af1
+EBUILD zita-resampler-1.8.0.ebuild 1008 BLAKE2B 7e7ece6fd29e22f16d3099cb2fc49ec5f72647aed596aeb62add7f9901ff5b04a120ce6a805b37129d7cdde8535c92e6d88e2fcab0f33ee8e96cac36571efb8a SHA512 a50cbe37238c4959e0286c271adb0c8322091ffdc9f4ea28270c6d38fcf1e7dfe02d44ed0089097900b679f3146a10c505f8c754a4918b3727d9c3a0ed495d8c
 MISC metadata.xml 692 BLAKE2B fad59853ee366f99db8e9c0dfa932c564eb0d8194808b809182ce64f286d39de2a363eb86f192d124adbbc92b1e7801a9fa5be0752fad1725f147d468484f589 SHA512 be926699e99357b49f5fe90a78c60b0fd701229fd603dca5988b40611ae5bb0c271a6a346469e0ebaff62bdc718c400954491ccc2557e5799a4fba08c67207cf
diff --git a/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild b/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
index b23f36961060..48b57888ad18 100644
--- a/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
+++ b/media-libs/zita-resampler/zita-resampler-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 sparc ~x86"
 IUSE="cpu_flags_x86_sse2 tools"
 
 RDEPEND="tools? ( media-libs/libsndfile )"