gentoo resync : 17.06.2021

21 files changed, 29 insertions, 415 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 02659d1e7025..cd4a14ecc55d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 2f4fefedd09f..0b509387e512 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,13 +1,9 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
-AUX alsa-lib-1.2.2-change-order-of-pcm-devices.patch 2198 BLAKE2B 21db0baeb6bb130c2ed537eaf6509f54fa4970a54ddc90b82217e47e63e1161e76bed54161f5cb19f79d999ccb1079571938bb7591ac378ca13cb94527d6b629 SHA512 3be6b6a50dc570df19e77132b519aba4b5a04fc25056eaaa882c8a32f632389efd358bfe7aec833651acd63e964b1f411f86fcfbb9abf30072ba14f561af3bc5
-AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d018bf476ec327c5734e96adf9f5dfdf97212cb220837f42c93879ef7641d3775c8238fc5fe27a5fc85959d4fca7e0fcd62b69009d895bdd1c SHA512 6f71ab0b4424b684dbd6ba0b2a3ce0de05ec3124ec1c3223ccb35afaff02dfed834af2d42d8d1cb8bb7f2e96051277bbf18ba5687e94f15d753cf1b86cdd33f8
 AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d46a2671a1af65a3e2bf666c383b0b85387a337c268eb8e1217d17b6dd8e5eabd66e2cb3e8dafcbe0959cfe4574a SHA512 b809b547822acb486baa33038771aef4a66930a3bfe495dde815d1f551e15f1543484efffe30bb6faf2f21e309c8b6956b4479ac1edf19933af32ff5517867e3
-DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
-DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
+DIST alsa-lib-1.2.5.1.tar.bz2 1069073 BLAKE2B 5464cc7f263bdf7b10aa7e1f542ad6dbc55bf300156fd1bded00375c41a518d4b14f96e28eb1c60a6ce7cc6e27da4b2e8598cd867f15417f260fc23513f93e11 SHA512 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
 DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
-EBUILD alsa-lib-1.2.2-r1.ebuild 2180 BLAKE2B aa741e7e53d443b27d520ccf0a525384085844c64d5289ed22067b65ec0ee4cc9a4a75d68891fc6c830513b95de0ad6cac8280aa6cf7a5d37c9c6acc6aa27c82 SHA512 37fcd87e520494e1f0797cd5b023d9eac4dd78ed894588f85d223bb2a4b49da824381254cfd79905bb686a2751d22299d199df4eca5989b09ca8ac08786f4c8b
-EBUILD alsa-lib-1.2.3.2-r1.ebuild 2117 BLAKE2B 9e6c389cd0915a78ab9b6b6ddb6ae82a1bef79f5f316c3bc26481ab38ee1eb88f32f059cec764e0e127eba7978322c516aece84bf784250e958df7d93fe98dc0 SHA512 12f9735f278467a883b189c74d03cf8c78940dc18d21175a5938565db3acc7b2a17a7aca927055728dbd965510387fdbcf4b2158a1f8f1af6542d54258fec8cf
 EBUILD alsa-lib-1.2.4.ebuild 2184 BLAKE2B ec54b9d6096709fffee836715f2eda6539091ee7dca58a9b131fff6301c54e5069204569082f1ef8d99f5c832eed7e216233e7add1bf8050cb029431940f3018 SHA512 9267b26b819bc407c21986c60086d0503b108395c1ef238302956ea7a55fdd41ec72963e4fb30617f79a9981e3232be51517913fe0158bf91027b551d6cdcc4c
+EBUILD alsa-lib-1.2.5.1.ebuild 2505 BLAKE2B efc2a4c86f03f45019d8dc127f9ce84765718cf12d6948865600db6f5a17bbb07eaaaee4f8e1f814754b8278984c2bff12274124d1817a892e6844435dc86078 SHA512 6c7d07cdbfc6313c21afe7e95e6c34256bf5d9e6bb1a41074d8a24394f57b8def194d396a720105a401bddc60926675d4ef37026d6211926cee32c06ace7d2f1
 EBUILD alsa-lib-1.2.5_p20210604.ebuild 2977 BLAKE2B e0434a80ecf3694f1d5d483f55e6983db087e804027f2896cd98ca1f11f429f4cf29c6caa80ac1f937f6c26e86e23a13acc2dac48b4103935d077adb19c8288c SHA512 349716f1956ad1a37de3283347d83808232fe7bdd2dcdf13a6105c5d5901a4d54ef298684d4efada4b7c90cb7ca707b8e3c7c6466add7fc59716ae17390752a7
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
deleted file mode 100644
index 1a2b04a4cebf..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
-	"${FILESDIR}/${P}-change-order-of-pcm-devices.patch" #718106
-	"${FILESDIR}/${P}-namehint-add-omit_noargs.patch" #718106
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	if use elibc_uclibc ; then
-		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
-	fi
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-		# enable Python only on final ABI
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_enable thread-safety)
-		$(use_with debug)
-		$(usex elibc_uclibc --without-versioned '')
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::" || die
-	fi
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
-	default
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
index af903f22501a..7b6a92ccd5fc 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
@@ -1,18 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+if [[ ${PV} == *_p* ]] ; then
+	# Please set correct commit ID for a snapshot release!!!
+	COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
+else
+	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
+	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+fi
 
 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -25,7 +33,7 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
 )
 
 pkg_setup() {
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch
deleted file mode 100644
index b21e184f8770..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 27c7927842a691ef13724cd16fb26264680c6aa2 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Sat, 29 Feb 2020 10:30:37 +0100
-Subject: [PATCH] conf: change the order of PCM devices in alsa.conf
-
-Appearently, some applications use the first device for probe or so.
-
-Fixes: https://github.com/alsa-project/alsa-lib/issues/27
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/conf/alsa.conf | 46 +++++++++++++++++++++++-----------------------
- 1 file changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
-index 0998058..a091b81 100644
---- a/src/conf/alsa.conf
-+++ b/src/conf/alsa.conf
-@@ -119,29 +119,6 @@ defaults.timer.subdevice 0
- #  PCM interface
- #
- 
--# redirect to load-on-demand extended pcm definitions
--pcm.cards cards.pcm
--
--pcm.default cards.pcm.default
--pcm.sysdefault cards.pcm.default
--pcm.front cards.pcm.front
--pcm.rear cards.pcm.rear
--pcm.center_lfe cards.pcm.center_lfe
--pcm.side cards.pcm.side
--pcm.surround21 cards.pcm.surround21
--pcm.surround40 cards.pcm.surround40
--pcm.surround41 cards.pcm.surround41
--pcm.surround50 cards.pcm.surround50
--pcm.surround51 cards.pcm.surround51
--pcm.surround71 cards.pcm.surround71
--pcm.iec958 cards.pcm.iec958
--pcm.spdif iec958
--pcm.hdmi cards.pcm.hdmi
--pcm.dmix cards.pcm.dmix
--pcm.dsnoop cards.pcm.dsnoop
--pcm.modem cards.pcm.modem
--pcm.phoneline cards.pcm.phoneline
--
- pcm.hw {
- 	@args [ CARD DEV SUBDEV ]
- 	@args.CARD {
-@@ -323,6 +300,29 @@ pcm.null {
- 	}
- }
- 
-+# redirect to load-on-demand extended pcm definitions
-+pcm.cards cards.pcm
-+
-+pcm.default cards.pcm.default
-+pcm.sysdefault cards.pcm.default
-+pcm.front cards.pcm.front
-+pcm.rear cards.pcm.rear
-+pcm.center_lfe cards.pcm.center_lfe
-+pcm.side cards.pcm.side
-+pcm.surround21 cards.pcm.surround21
-+pcm.surround40 cards.pcm.surround40
-+pcm.surround41 cards.pcm.surround41
-+pcm.surround50 cards.pcm.surround50
-+pcm.surround51 cards.pcm.surround51
-+pcm.surround71 cards.pcm.surround71
-+pcm.iec958 cards.pcm.iec958
-+pcm.spdif iec958
-+pcm.hdmi cards.pcm.hdmi
-+pcm.dmix cards.pcm.dmix
-+pcm.dsnoop cards.pcm.dsnoop
-+pcm.modem cards.pcm.modem
-+pcm.phoneline cards.pcm.phoneline
-+
- #
- #  Control interface
- #
--- 
-1.8.3.1
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch
deleted file mode 100644
index 34ffa01f1055..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 09e78da4cade7b8fecb8f36717b85c456f2e5487 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Sun, 1 Mar 2020 19:57:06 +0100
-Subject: [PATCH] conf: namehint - add omit_noargs to the hint section
-
-Do not list simple surround devices in the namehint function by default.
-
-Fixes: https://github.com/alsa-project/alsa-lib/issues/27
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/conf/pcm/surround21.conf | 1 +
- src/conf/pcm/surround40.conf | 1 +
- src/conf/pcm/surround41.conf | 1 +
- src/conf/pcm/surround50.conf | 1 +
- src/conf/pcm/surround51.conf | 1 +
- src/conf/pcm/surround71.conf | 1 +
- src/control/namehint.c       | 6 +++++-
- 7 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/pcm/surround21.conf b/src/conf/pcm/surround21.conf
-index 1cf1b7a..ad19507 100644
---- a/src/conf/pcm/surround21.conf
-+++ b/src/conf/pcm/surround21.conf
-@@ -57,5 +57,6 @@ pcm.!surround21 {
- 	hint {
- 		description "2.1 Surround output to Front and Subwoofer speakers"
- 		device_output $DEV
-+		omit_noargs true
- 	}
- }
-diff --git a/src/conf/pcm/surround40.conf b/src/conf/pcm/surround40.conf
-index 9788ad4..7c61502 100644
---- a/src/conf/pcm/surround40.conf
-+++ b/src/conf/pcm/surround40.conf
-@@ -55,5 +55,6 @@ pcm.!surround40 {
- 	hint {
- 		description "4.0 Surround output to Front and Rear speakers"
- 		device_output $DEV
-+		omit_noargs true
- 	}
- }
-diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf
-index 7b4ef3b..cb6c044 100644
---- a/src/conf/pcm/surround41.conf
-+++ b/src/conf/pcm/surround41.conf
-@@ -61,5 +61,6 @@ pcm.!surround41 {
- 	hint {
- 		description "4.1 Surround output to Front, Rear and Subwoofer speakers"
- 		device_output $DEV
-+		omit_noargs true
- 	}
- }
-diff --git a/src/conf/pcm/surround50.conf b/src/conf/pcm/surround50.conf
-index 7d9a9e7..70d5406 100644
---- a/src/conf/pcm/surround50.conf
-+++ b/src/conf/pcm/surround50.conf
-@@ -61,5 +61,6 @@ pcm.!surround50 {
- 	hint {
- 		description "5.0 Surround output to Front, Center and Rear speakers"
- 		device_output $DEV
-+		omit_noargs true
- 	}
- }
-diff --git a/src/conf/pcm/surround51.conf b/src/conf/pcm/surround51.conf
-index e67f007..d0236e4 100644
---- a/src/conf/pcm/surround51.conf
-+++ b/src/conf/pcm/surround51.conf
-@@ -57,5 +57,6 @@ pcm.!surround51 {
- 	hint {
- 		description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers"
- 		device_output $DEV
-+		omit_noargs true
- 	}
- }
-diff --git a/src/conf/pcm/surround71.conf b/src/conf/pcm/surround71.conf
-index a26c3f3..66792dd 100644
---- a/src/conf/pcm/surround71.conf
-+++ b/src/conf/pcm/surround71.conf
-@@ -59,5 +59,6 @@ pcm.!surround71 {
- 	hint {
- 		description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers"
- 		device_output $DEV
-+		omit_noargs true
- 	}
- }
-diff --git a/src/control/namehint.c b/src/control/namehint.c
-index 60c48ae..169bd42 100644
---- a/src/control/namehint.c
-+++ b/src/control/namehint.c
-@@ -287,10 +287,14 @@ static int try_config(snd_config_t *config,
- 			err = -EINVAL;
- 			goto __cleanup;
- 		}
-+		if (list->card < 0 &&
-+		    snd_config_search(cfg, "omit_noargs", &n) >= 0 &&
-+		    snd_config_get_bool(n) > 0)
-+			goto __skip_add;
- 		if (level == 1 &&
- 		    snd_config_search(cfg, "show", &n) >= 0 &&
- 		    snd_config_get_bool(n) <= 0)
--		    	goto __skip_add;
-+			goto __skip_add;
- 		if (buf1 == NULL &&
- 		    snd_config_search(cfg, "description", &n) >= 0 &&
- 		    snd_config_get_string(n, &str) >= 0) {
--- 
-1.8.3.1
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index 7a1788bf60cf..8e7a3a17d801 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,9 +1,7 @@
-DIST alsa-topology-conf-1.2.2.tar.bz2 6346 BLAKE2B 6aea93139e85de3d28ce19319429340eac61bb340c29448dfa14d4fe1d80dc1e5e0c066b33ccab3d9c620efe6b95b095cf1ea52583d7543ca472f1375dc5ad57 SHA512 145ee0e16f7f84d5f97759b1efaa3df9fe35c8b33c7ae863ae1b915f361acd902ad05f59090e1d98b2a4f2ecc14933681592893564fcc45cdbc974899f789b94
-DIST alsa-topology-conf-1.2.3.tar.bz2 11787 BLAKE2B 8dbeafd6a6800e826e76c0305caa01f6d7af4d32eadb49feb6fcab23041e3b3bc4c2bb9286e41b2e1a123ee363d621c46a8c96459ce4af03f8a45f834b83c6c7 SHA512 e57439212fd76d1d0c1677654ae7cecef0f89c01a6c57f5f00a02ecd2f6d9f22dc31ed4f301cf82464d98ac32c01f2015a91a5b51d08268ddfeb4265e9b951b9
 DIST alsa-topology-conf-1.2.4.tar.bz2 11631 BLAKE2B 57df107b255e598e2fb79b56dc34d84130a023050db42e7925082ce5efb7048658ed6a8cd1854d2d9e23e8a833dbe90d7aa11ca7c1874f39caf392b292147ab7 SHA512 e5b367a23f42ed2c2a83f3dd9df264b4e054f5ba7c4be98520418598f0b06a11627498a8a6ef943522b209951645f83bbbbfb32db7c9c8260aa5db08358970cb
+DIST alsa-topology-conf-1.2.5.1.tar.bz2 11697 BLAKE2B 1f8bb172510d86bd0530f2ba437dd1132401c0bd436085c07c61e5ef296a6da6a1c24fb8d585572186fc0073172c82d40948c5c39fd293a01762d49c9c393662 SHA512 b34176b213e1afcb61fee19b569d6422a7692b62cf08b0ef651f2fbb1eefe49f25ca6386d0bfcec7152d4b5ed3daa84edb900181d40169e777751ae033125374
 DIST alsa-topology-conf-1.2.5.tar.bz2 11657 BLAKE2B 0870aa5db05d7b82e5312ac5bd3c2d887f0cafc25a317cbc416ce0ac6982ce296620833c4459ccb357b4b014d300329fc3d0028d3ec2024495cc21f9cc122e1f SHA512 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51
-EBUILD alsa-topology-conf-1.2.2.ebuild 504 BLAKE2B 7ae0989b47cc763201860307402eaceb1b68bb5a63cc7bef1a9aabe085dd4e23751728007e69806e497d291252ba4298594a957ab9d9b8367686f4db62775a6c SHA512 f94b3fa1e52ce9e38521fb946b89c724323ca0012ba7857cd851972811830b667d022255b3dfecc90783ce14b6a9c2e794fa52dc55b1f52b754847680b57c02b
-EBUILD alsa-topology-conf-1.2.3.ebuild 504 BLAKE2B 7ae0989b47cc763201860307402eaceb1b68bb5a63cc7bef1a9aabe085dd4e23751728007e69806e497d291252ba4298594a957ab9d9b8367686f4db62775a6c SHA512 f94b3fa1e52ce9e38521fb946b89c724323ca0012ba7857cd851972811830b667d022255b3dfecc90783ce14b6a9c2e794fa52dc55b1f52b754847680b57c02b
 EBUILD alsa-topology-conf-1.2.4.ebuild 511 BLAKE2B 3f2b857f3e199c575363bdfe68c2041f56a7b0a9fe1a49ba03206d30470f3a44f1da9175a90877c2ff7098726a274e9549136c9e675857933494b72d41b607c9 SHA512 b3c0b066e83ff53c70183a74b65a4646784591c9d5c10ec72c2205be647b372acad38b0edfdf975de82c95b65e13072b6e8a1abcdd8bb92297fd84c3c9286bac
+EBUILD alsa-topology-conf-1.2.5.1.ebuild 518 BLAKE2B f9e65fcddf4e222a88c2462241b04f41ceceb6545229a3ccc56d622e418de5004612e6c78b23c1dc5bcf18d5108ea788032a4e8a0781a7c8626c559368aec545 SHA512 7d90e1feda4ea1ac1cc8a385e492855a8e785363fc72ecdb5fadf8d5c274591d3a64ad4d9bb429c559ed68fda9069a86cc009693e09517d00030b83d161b739e
 EBUILD alsa-topology-conf-1.2.5.ebuild 569 BLAKE2B 031df6bdb91155682e5fcf7b7ccc0dc5280850b5db1d6e37a9abb9dd68c570b176a3479e11a782ced1c0d38758d720c11c18d42545b83b30c50b3318f43653f0 SHA512 e187ed4d6ce42d5be288cfd94d19915245063096ffc1ea36814f2403460292f1ece6ee2bec2e937dfc39a4eff8b30b34f0dad542cd5aa4739cfcf05454a52400
 MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
deleted file mode 100644
index 1a1d090cf8c7..000000000000
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r topology
-}
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild
index 1a1d090cf8c7..85f9fc044624 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.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
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 00c491063318..2602e85f3d06 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,10 +1,8 @@
 AUX alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch 646 BLAKE2B 271b720dbcfe5d32794b38125c0d947b62623a8f24b9cbe8a215281cd0586c65de805be2c5192f855f46744fda9b21a5fd463df7d540bf42f9c3035aedcda374 SHA512 aea5277bd5aa68680e31ffb09cd8853e13b9417bf8070480d450873f2864eb4037eabc8c23fafaa7fc482b5b2605ad1b9e45ff13b2b15ad8cb504b2d940d8bfa
-DIST alsa-ucm-conf-1.2.2.tar.bz2 14608 BLAKE2B ce850415a115f673267f6ab32f176c2ab73aad8bd7cf2be244bfbb7342756c6de2212044cb92b3524dc4189955c8144b134af144b6a15aabf33c06cbcfe1fdf6 SHA512 25e3f341c110772c7cffc8c7745b320f2ddd12fe6460380c088939b5dc67b99ae4ad92e69375179574e0e1c40d14ff49961e86494e223fde009e51590f00ca8f
-DIST alsa-ucm-conf-1.2.3.tar.bz2 17482 BLAKE2B d280ebb530c58df706d9b01c169472af8a88ec87735a8c5639981a2fddee31add0d78a2e47b43abf5bd13ef051dbb25749c701174aa0ea1b7255f771856e3e12 SHA512 1bdb024170f1dc18170c1d3699798c14d9cc7bbaccfe6eaef1fac0ec8c28074d08ed722bf47996682d4a0737138112b7eb4d45e224f00b027b3331da728e47cd
 DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
+DIST alsa-ucm-conf-1.2.5.1.tar.bz2 24124 BLAKE2B 317bcb8e866a68fe467047c67bd15fc88dc1e745e9bbe05f7b091ea1febdac6bd0fd512c2ce410970eb2593c0f8500c28c8405098de2bc56e1438e5b33b00d4a SHA512 774d6da1a0ee6fb1fcd764c1d4b3eb5812a35508cf27db71f6c82784f125eca207992da9081d25783fecb31e548d8b34124d4b3b3d506e33215b76ea48f71012
 DIST alsa-ucm-conf-1.2.5.tar.bz2 23992 BLAKE2B 8ecd5adee6c9f429ab2791dfd57b0f9b1d58272b04d2c6cd3ad9aba36b53b380cfe626cae1e5c40f703eb7f891fb53b0bf70a78f9e5d2d8ae6b2dfb30fd6f659 SHA512 f16e8f04018c65de5e24f2a3eb0b3edff26cbce78cc1820c42c46907c903913c571797b59e803ae36b8ec3136487d0a5aacd034e2a8df3e15ed998b7a70152b7
-EBUILD alsa-ucm-conf-1.2.2.ebuild 498 BLAKE2B 69b771656e59b7d0931db204557d74b863416df222db6417470dc5918407013ef691f99809556d1b31a61b8996500518c23438bacc9b8f5eee60d29069552870 SHA512 23513e4e794dff21c134690c325333dd9f839fc44c5b6795b988786b435dd7ea72bd193ef7d169218b59274265cfaa58bb916fe3a1aa6b38e720a73dc7fd2f48
-EBUILD alsa-ucm-conf-1.2.3.ebuild 498 BLAKE2B 69b771656e59b7d0931db204557d74b863416df222db6417470dc5918407013ef691f99809556d1b31a61b8996500518c23438bacc9b8f5eee60d29069552870 SHA512 23513e4e794dff21c134690c325333dd9f839fc44c5b6795b988786b435dd7ea72bd193ef7d169218b59274265cfaa58bb916fe3a1aa6b38e720a73dc7fd2f48
 EBUILD alsa-ucm-conf-1.2.4.ebuild 505 BLAKE2B 8877c4840182eb78b2359c503599aed365024c0954cc3d2dca5c0e21802010acb3f0c05f694404b3d4a281e76d2d15a4fa7d7906d9147e4fb7e6484e53bfde9e SHA512 f8ce73bcf18ac0237386fb9fc097ccba571d377a10ba588013660ce38389ce6355314d540ec2c4ef2b5b7032e1911619d79d481902aaf82a7436db77d565b3c9
 EBUILD alsa-ucm-conf-1.2.5-r1.ebuild 673 BLAKE2B 1e2b6c7a59bb27e2a0c97a4fea11250a2d51c5c3ad927fb6ac9a1b7229ef892fb8aa1d023cd215387a7446db873ba88d1be37794a40f1692066683298784f164 SHA512 ee6e0d1ee59f3f83bcfe4c7b815c408753bef852a0370d42f01b1c0f5bf44c02cac46a4c53d30256df08e79db14d52e94dd92446ee61196384b8eb4bd7c775dc
+EBUILD alsa-ucm-conf-1.2.5.1.ebuild 512 BLAKE2B 963c281c3a8fb363cb579404b838616052e1ba221353d540ea62ce5bc0365f5de4f408d7c6b75a5cc9d56cff28fe63b4e7d0765815c4928bf320bc70fc20dbae SHA512 e991d220034b9b59486782f5da8e311bcf09ef4e66774ced814cdd0911ec3205067e968af63b02ca3abd44e01afae72461d74fde98a68adfaa359fb797317d8d
 MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
deleted file mode 100644
index a89cadbba436..000000000000
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r ucm{,2}
-}
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.1.ebuild
index a89cadbba436..8e350b19b6fc 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.1.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
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 41ffd4ca923a..473471ed22d9 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -2,5 +2,5 @@ AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e5
 DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 DIST ilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 EBUILD ilmbase-2.5.5.ebuild 1069 BLAKE2B ac5419454146e4df6f7d22c3ef83765261e0638951f76e8f9928010be9a6c1e6b142ff4761afefc2a665d50d5f981aa55839410a627b4b1bcf4c6a5ca4612d9c SHA512 1a5ca247caa34c8d0551be377e3bef91d4ec8fa5c02aeea0102ea8d867f396211f6d23b4598a9064042f9a42f26f6c01f9dc9e130de3b3ab283ad425faa43001
-EBUILD ilmbase-2.5.6.ebuild 1083 BLAKE2B 8fa4ae20ed86dcd0cabef3a7d61e2a8b63b47a2c7951da60ed585f03fc97ad16f0eb560ae728cce9002e5b606b94aa63279dcda8ba27d9c23751fe068338fc1c SHA512 66542d6d72105d250a394bee7cfd6b847c2b9e7a3b3f517e107320a693178f339fb7c25b82c98e547f006f03f9e7da9673e448aedd606368a9e83e0ee365e500
+EBUILD ilmbase-2.5.6.ebuild 1082 BLAKE2B 53e4c6df7933cb12a162a83049233ecc46130a74b78d2d517d11fa0609abcb4ff25ad6cd32a758646a6791769b81552862625225825e72422f8e8e15437e788b SHA512 6c83dac92cc3ea34d9806269e8ebbbb13a78a096676e42f55520b95a8257b7dbe3e61cc6cc11a7d2a89938a54a5663b4e38f0d8c04cbd8ea48c24beba16c0584
 MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6
diff --git a/media-libs/ilmbase/ilmbase-2.5.6.ebuild b/media-libs/ilmbase/ilmbase-2.5.6.ebuild
index 24718e290866..c6b716115975 100644
--- a/media-libs/ilmbase/ilmbase-2.5.6.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/openexr-${PV}/IlmBase"
 
 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/liblscp/Manifest b/media-libs/liblscp/Manifest
index add64f63eba6..522c4cc7f72d 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,6 +1,4 @@
-DIST liblscp-0.9.2.tar.gz 689968 BLAKE2B 1b78389a764a58e47b24676a4b4cd6ada7647ef1bc16e9d63a7fe6ad6b62870521ec39eef866b862e07fad55baacb3f0814293858dcdaa6bcd6d8a94d600e780 SHA512 e0d6f2ae3679cf41b1bc8f04910614424d3bbc046e51272a9d526429d098b0e674dccd5951482fd85832d9788a74eeefce99d1d81291e3829c077c98bcb87602
 DIST liblscp-0.9.3.tar.gz 696509 BLAKE2B a3cddd07f55522291be12f2952eafd0b9761ac8c3d38c05010d9ca6593ef9db62d9bdd7a1e8f31d74fd9cbd29cbe3ade71f3b51ffa330780a0b7feb18ff71d32 SHA512 e776b0d48a9728e69b1a198d44ab88862366ecece293d71f6552ab395fd33bfdc395dbea6f56000c2ef9897ba00e0e287b0bc042fd6b6bdc1b4864b72b20753e
-EBUILD liblscp-0.9.2.ebuild 637 BLAKE2B 8f259597f3b0360dba84efbae838531fdf0524f7a962717ba691f4cc324a2a24d07163afd1efa0641db6fcc3a8bbb754bbef6c83580d703c52e1dd91139a39ae SHA512 659b7dfa673a2b07220b56e58ab84f9fa008a9727dae2bacdf5644e5453c49708cbc3491851f88d86977a90d7df74c9ad4b8f52158c7c1ae3e8e8b93bce7d374
-EBUILD liblscp-0.9.3.ebuild 639 BLAKE2B 4a1023307f6d44477fbe9da47ed6c0ba12125441a9fad00144556b5e32b1f9c5ac8d72408d001154348a9344f931fcdc7c47e1a8befb571a5b7a1adfe5c08709 SHA512 8f2815a7ac5a81ba951fe1a4748e229233deac43a33b5f839c1c2e78cab2722310f5e5d0a5213f6b4e9d458dbf17370c9be4f3c066df6591abbbe95c72ddfacb
+EBUILD liblscp-0.9.3.ebuild 637 BLAKE2B 8f259597f3b0360dba84efbae838531fdf0524f7a962717ba691f4cc324a2a24d07163afd1efa0641db6fcc3a8bbb754bbef6c83580d703c52e1dd91139a39ae SHA512 659b7dfa673a2b07220b56e58ab84f9fa008a9727dae2bacdf5644e5453c49708cbc3491851f88d86977a90d7df74c9ad4b8f52158c7c1ae3e8e8b93bce7d374
 EBUILD liblscp-9999.ebuild 666 BLAKE2B 6d46b9205a46720401495db41bd03e090e29b1b4f23bac9b41d4d6d86f187a3d3d69d0eac2849a623a30f2b4ce8f43a2ddd85b7e1d8f951cd88f0bfd884eeb78 SHA512 676ddb8b98247c647b70f8283dddaebd318a2a0a2944a3da931492c01aec648042b9ae1d58854a285fa0b23199d8d831b09efbda6ca51d7f61cc82b62c0432d4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liblscp/liblscp-0.9.2.ebuild b/media-libs/liblscp/liblscp-0.9.2.ebuild
deleted file mode 100644
index 515fa9bdea37..000000000000
--- a/media-libs/liblscp/liblscp-0.9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ library for the Linux Sampler control protocol"
-HOMEPAGE="https://www.linuxsampler.org"
-SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
-https://download.linuxsampler.org/packages/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog TODO NEWS README )
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/liblscp/liblscp-0.9.3.ebuild b/media-libs/liblscp/liblscp-0.9.3.ebuild
index 8d147da49de0..515fa9bdea37 100644
--- a/media-libs/liblscp/liblscp-0.9.3.ebuild
+++ b/media-libs/liblscp/liblscp-0.9.3.ebuild
@@ -10,7 +10,7 @@ https://download.linuxsampler.org/packages/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 3d8585a6cb72..16c3ebeef559 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -3,6 +3,6 @@ DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff623
 DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST openexr-3.0.1.tar.gz 25059445 BLAKE2B 76bce1ff830b5e32362bfaf91d39945add171c5c1f453968b2fa8ba41e0996064d3a104eb7759cea87477e96e8a52d548743c7d83f5c6131dd38aecdd47bd6dd SHA512 e450c55d150e4c0a8a9147f78fe1c73ea9134976444f8c77c832d0671d4c3796f96fee74d23f26cdb9383e658a33d6d57c989e9207d1edfc8556ad688ff25a5b
 EBUILD openexr-2.5.5.ebuild 1691 BLAKE2B ddaa5c3bca30159e1c1349a8d3ec8b79e670c0739f98abe62dac2286b8207352361f15461ec06577a9c90ab566bc0081372d2fd6f305e6a91fe7083eece97b9a SHA512 840e4a1652df0f5968b015dfcb14ea35f6587338f8b22e3e4b78dc4358dd33108cf7edf01c1406163f8e9a11e3b7c4e7582855d1784c8c4adb1f7d85f8c28015
-EBUILD openexr-2.5.6.ebuild 1693 BLAKE2B a422c9edba74894aea74071a44c1bfd4208d28042bee923c6096260f7ea699d4b35a15f5409507b2c7b970b76fb427fb799c8c411db6b180650e5dd3148cde5b SHA512 a24a022533124096014a2126ee24d54aadd8d68cf66fd5f5c89624acd660ef943e2e684dac350fc6b9f59f3b768f2eec17a7a6cb8752b43fdf6318c53c1dcbc4
+EBUILD openexr-2.5.6.ebuild 1692 BLAKE2B 644e3bfa7eb4159c36f7708b5e2dd46fe6c7df9a8f577a37b280e493b3e69eb54b0fc1251aac294e0679d57881b0a386caac1a38b927f21fd9dd69a6e67c1731 SHA512 eb6240b6c7ba5a9ebf6ba59743a76c508d9638ddccc26a12b75ffd3f22ae5c3eceaec724d074941b60bcc014d3c7aa52b0670654b3848506a654fb7042010524
 EBUILD openexr-3.0.1.ebuild 1913 BLAKE2B cc37bc00d13d64d5eb0787c165f051572b92ecb23798e6e753e5a723143ad4e93081b04877bbe2232b4480564b751b6be4b584d535bea5e303c703482fbe1684 SHA512 147d8abb4af8ba2f56ffc17632436e42621da0289fe0b0585299da55c16e7055d454e13db0da8011f25ccac878034e741d1f5b227013388a67d28b6ffa18c5a3
 MISC metadata.xml 796 BLAKE2B dacf5230d89550bae31517f5babc9cf7ea99ef94ab223e4acf1abb39d1042d146e71352f4b55a6bebff88689f32efc3d098f5d7ac04a207211f784a9b5e2ed30 SHA512 3deb6a5e83a03fabbbfce2845529a7c2f1aacdc6038ffb4a35ed16bd3f93521ea490ff0fc1576291b5e1d84d19dc4d4123aecf228e270e6b55b01c09ea2a6b56
diff --git a/media-libs/openexr/openexr-2.5.6.ebuild b/media-libs/openexr/openexr-2.5.6.ebuild
index 45229f8154f5..8d513079a9e5 100644
--- a/media-libs/openexr/openexr-2.5.6.ebuild
+++ b/media-libs/openexr/openexr-2.5.6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/OpenEXR"
 
 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/rlottie/Manifest b/media-libs/rlottie/Manifest
index 46fbaf0f0a16..7461bf867451 100644
--- a/media-libs/rlottie/Manifest
+++ b/media-libs/rlottie/Manifest
@@ -1,5 +1,3 @@
-DIST rlottie-0.2-1.tar.gz 3516947 BLAKE2B d5f6b643c910e0b831be223be4fcff3d42cde8239b01d413f2805eeccf2665abfbd209ee6877358c2434d3bc82ea7c5b3849f4dca1d0796436e47ffa6bcfed64 SHA512 1f645ae998ddbe83e4911addf28ec24ae3ff33f6439a9fb6c1e56986b46ac17dba155773ab02a59712e781febb31709a99075a3fbcda6136a0cb43dbd7c753de
 DIST rlottie-0.2_p20210405.tar.gz 4048368 BLAKE2B 46875135de630b8cae164bf9714abbfad389853aabf7e642c612b54ce50a3a0c105b57a314f0731aa69b4fd023e3638c122f0335a7ae886253a7bea0a5b3d51e SHA512 a0382bd9561cc47daafc0742db24c55efa25ec1c8e0d865ea49cf11d8f082b9f860dd673f4d0fbf95e02da708da164bc9a87c66b76cd58becf983c968e7aeb81
-EBUILD rlottie-0.2.ebuild 879 BLAKE2B b4a7951db369fff6b8a6cb4925903d2d59e7adaaf1a5ad4ce90299f2671f22a59ae0b918113d9f2038358fab2341d5a40c9db37a143e0b6e96e661ed4348ebb9 SHA512 4d2850e75042f6d0ed8438425025a8280703295062f8482e24cc44202953e37c48a0b278645d7c124d47e3580a170975b7d23d36393fdc510a683c020ef9f4ac
 EBUILD rlottie-0.2_p20210405.ebuild 965 BLAKE2B 10681cdd2f72094792f771c82d4388061af8afb4427eefe937ad409803cf3742a40ad7821ba0a42cef00bb3fde5bfdad714d44510749e424efc75a41013abb9e SHA512 30307056a1104f493b765cc63e466269b3d0bafbdd4151f04b665c862ddb3a229dd79ac2eac1eaa3853466e97d974b0d1938632eb5a041576b529bff5c3fd692
 MISC metadata.xml 901 BLAKE2B 0f2b146bafcbff57e44a91a21176114d15c9d81a076cc42f3d57e3849d1b3af3d46eb45bc74cf6e524679677b5394f440dc762c87ddc3652d0b754ebd62907b5 SHA512 f7e80a3946b2462a3718f508be57cdbbc3c85c632778b58393f467cfa5c4e80b96f3f264251d9fbb9ce4cf26e4907e534ee758c77661504f05f73577c4c06fab
diff --git a/media-libs/rlottie/rlottie-0.2.ebuild b/media-libs/rlottie/rlottie-0.2.ebuild
deleted file mode 100644
index faec02176727..000000000000
--- a/media-libs/rlottie/rlottie-0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A platform independent standalone library that plays Lottie Animations"
-HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie"
-SRC_URI="https://github.com/Samsung/rlottie/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
-
-LICENSE="BSD FTL JSON MIT"
-SLOT="0/0.2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug examples test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local emesonargs=(
-		-D cache=true
-		-D module=true
-		-D thread=true
-
-		-D cmake=false
-		-D example=false
-
-		$(meson_use debug dumptree)
-		$(meson_use debug log)
-		$(meson_use test)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR."
-	eninja test
-}