14 files changed, 152 insertions, 217 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 420dafb17960..1567003698e1 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index fc1ba1030dfa..5695bbb86044 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,6 +1,6 @@
 AUX codec2-1.0.3-fix-build-with-Os.patch 937 BLAKE2B c0f0ca07e4dffdf6adf93507c296a729c5fad2572e7672c080e51944dd0faa48701486b741f8be760ee35aa6a5beb5f83bb98b598cfa1e895cb01d1320eea92f SHA512 dbb5ceb346a4ef5f9d7eedab6d5c58f4f83124c194cbca9413dde202eeda41d68cf583efa8229538c548f9a6a966fe03798dc6dac4ef8d23a1aeb58c49554471
 DIST codec2-1.0.3.tar.gz 15000670 BLAKE2B 784f3f522ff6de0f5d6622ca379e5b61081c999b1310e0f45891758c818005d12418907bc9627c1a177cb961f54d20e330e646426b4eb885a548af70014ab521 SHA512 1b59a0520d55b0f92b72a51dde0f58a0cd845056195734d23bf59bf44e7b5c7431bdc3cebe7c60aef7dadf3ec02f9edd62f041b4b283c05a4b50a0380f3ed67c
-DIST codec2-1.0.4.tar.gz 14787297 BLAKE2B 21d7ec1d88cd27846e853c4c812efaf354bbd229a42635b4de8cb248880e37ef083660131083d011cb98d4ad37ef5597fea93ccc2499e760ac671345e892c760 SHA512 af279528876f7fdbca853ce4840683e07ca2124a5fd2aada4f4484501eac64f06fb1e8ba0bb1d588f9460968a029ea7c3d71c969e7ac2b7024916efd2dacc207
+DIST codec2-1.0.5.tar.gz 14786826 BLAKE2B f5be917c1a76f47f386b7fe2a58872e4c660bcfe477e11dfa6880ff71f29dca79c35612f0b0537ec54e7f8db9e24c56088c90c021e67e99b373b1de75f434ff4 SHA512 692feea8ff99430a7ed8efa5bf48a633dc9689b1f39009cf1f907315e600da26ea3787a994b51d7ca9d4cbc8b8c9b26f89031af899f114fa130f0703266a6b17
 EBUILD codec2-1.0.3.ebuild 1057 BLAKE2B 982b803ea6a712253bcca033895d7f52adadb36e62a51c23dc988ef7b68b360c1986fc12913c230686ac2287416d2a311e760ca87d0f1e3e54188ea1bab9737d SHA512 372bb860cc681e0192e927ccf86a703f8d26a0b284229e6ae6d4624528fd03cab50894611ecf962be9ccb6c5d3aed331b7927a9a8572b6393f57891c2e04f6ba
-EBUILD codec2-1.0.4.ebuild 948 BLAKE2B 1708b5852251c3d73ac3bf0d6815ce11ad99fe640c07c8f1af26dbe79366d1ba0d717c7ac891350f1419dd75500fc56938b6b8526f7f48297937c08044d3d42f SHA512 deefb8b227dd9ba7bef20501f1fd408652cef203f75461bcd1f6b9f71f2792874f9c003c3de7b1ccf211220de2f1f5d3449bcc36d80667abd082571fa34809d9
+EBUILD codec2-1.0.5.ebuild 948 BLAKE2B 1708b5852251c3d73ac3bf0d6815ce11ad99fe640c07c8f1af26dbe79366d1ba0d717c7ac891350f1419dd75500fc56938b6b8526f7f48297937c08044d3d42f SHA512 deefb8b227dd9ba7bef20501f1fd408652cef203f75461bcd1f6b9f71f2792874f9c003c3de7b1ccf211220de2f1f5d3449bcc36d80667abd082571fa34809d9
 MISC metadata.xml 326 BLAKE2B a7fc8408d6f6b58ad9d7019e858c703fd65ba38072dfefa381a5d00b500fe5d0ba024c2a3ed2d37e8e11da71f53bbfbeb80ead070935b9e83929d75d3a7852af SHA512 73c8e213262ac05ced95080d9e97a1e2abfdb2ad9e436ededda82de01feea321c3d499c8c2e8b3725a81b434e9efc4b12b321d738ab966d104e3344f4e29206b
diff --git a/media-libs/codec2/codec2-1.0.4.ebuild b/media-libs/codec2/codec2-1.0.5.ebuild
index fdd5f6ec18cf..fdd5f6ec18cf 100644
--- a/media-libs/codec2/codec2-1.0.4.ebuild
+++ b/media-libs/codec2/codec2-1.0.5.ebuild
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index e5ed264f7adf..b20540c59120 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -2,6 +2,6 @@ AUX build-avoid-meson-s-symbols_have_underscore_prefix.patch 1300 BLAKE2B edb499
 DIST dav1d-0.9.2.tar.bz2 833722 BLAKE2B b05edd1ca627906e57923be08f1ecd73469f9a8e2ed585edf81f1fe1ffc173f1e4ba52eb766b82d9ea1349a6c1cf2a5a48cc9a5bcf2debeb9d640d9842e266f4 SHA512 adfb822734a3fc8b73e9cf5f757bfd78fb144b00d95f1e942254c5caf1d801b05438d39571486ef37a94d2226166937fc56160a862e8d6d45c4f6d790531dc3f
 DIST dav1d-1.0.0.tar.bz2 960470 BLAKE2B 79355eeceea37df81e30be49dfea3dee9747fbbb82c0a08be3bbda525881112a8eb847afe3c3ccd0447fd6ee67ae540c5120ea00d4f891ac422850c611850c97 SHA512 86c6481e787fb6b8c28521e1efb1876d1be99f5fa5332cddab1111059b44775e05203cfc5c80a1b404ee00f35a1f5e1099e21b1f0851d77fb0101567e8b1a892
 EBUILD dav1d-0.9.2.ebuild 1392 BLAKE2B bfc3a4e00ab29a8492a714e27ae9577ef5fa0963dbf041eea653a007d4fee4121cfa9c74279084ec1e83292d25ca3ade0cb4bf17ae1bbf49aee781a2af1dd26e SHA512 50521384c4d9d2a54f011e64a0ec9605bcbae244da3408c71c77cfc21633816e1573f4035e8d38565ef624fd136519475ef95c69e7abc7fd6ea1e377e921173d
-EBUILD dav1d-1.0.0.ebuild 1312 BLAKE2B 48d312f49f7b5f787b065e5bf9e80bc766e271a3c224543c91d8d6b3ac75e239485dfa11af27b1694287ecb955c77a39e1a4b54072f893f3fcf0200a89b012fb SHA512 aceeeb7038b635ec1041fde0e5802a520f410cf70cb0d261a07da42ba295638afd733375666e14570ac41b6173e8312cf32e7b6372147e606e79601e3e3791cc
+EBUILD dav1d-1.0.0.ebuild 1309 BLAKE2B de42f5a7895e34cf5acf6916f1cae3d7cb4837395a250b5bdd695e523dd49e8c1844bec32cc89323360117c35ccbf0f8529a531181f45f991366d17d70a1e8c2 SHA512 4d68269aec8f7b3f5cdca296d2faa1ab13ca3c482cb3aaaaf1e9a74d5cae6491582077bf4a1b886600d917189dad7f4e7f0b8d4111094c8fa4a84db41be46ff2
 EBUILD dav1d-9999.ebuild 1315 BLAKE2B b858d3015020b0034224c895c41a10a0e80de71369ebee128dd9d6245ee4d86ce11fe6b5fd5653730bb29481faa02736c46d60682fc0e93f8d1c71596618c00d SHA512 8400187367f9fbf901eaba0bca8f7dc260c1d5328e8de06bcdef88c6ce3517b374958df45b35a42ef5729b798205d1b2bbe34c33097ca61a1317c6947d9b08e2
 MISC metadata.xml 626 BLAKE2B 517fdb1d54d2714913d8d7644c5cc9d72ad04aa51160ba3b31b9915246c1aba3f18c3870428ce66a5b13afb50e6e65e95f12a65af931baf9b73defa8dba16c82 SHA512 7fca750f4f56a87b44ef4a14c466818411ff8a4aa1a376abb11b41648a661ef77c58611d649daebf97fafc1f5bc712d9486327b8f7ea6d94e1981a1d14bf2fd3
diff --git a/media-libs/dav1d/dav1d-1.0.0.ebuild b/media-libs/dav1d/dav1d-1.0.0.ebuild
index 67512717bdc6..5ae243c3ad65 100644
--- a/media-libs/dav1d/dav1d-1.0.0.ebuild
+++ b/media-libs/dav1d/dav1d-1.0.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit meson-multilib
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 60d81165757e..158b4d93463f 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,5 +1,3 @@
-DIST libffado-2.4.5.tgz 1229890 BLAKE2B 18c260b782c9a97e3f2c8689a218f7a4925158c3e3cb14987182bf04043438d1325a9ababfe29860f6769a5eeabb49a843a8d15072b24b914334c447b5c7238d SHA512 a2c1d0515e14015b7803c4d52d67605afec27ae2569888dec085375ed4a488f4885b5033369e52305e668a35289d3bd749a9babb5778df339fa93553c23af30f
 DIST libffado-2.4.6.tgz 1230455 BLAKE2B 1e86e7f9179e94c00a74514dbd7c0c299de6d1870f22c4d9ba14cb6b105b41c9dda62d19d0d660e84eee7e0f02c0bf7c44fbe58e24634ccf9cc9e41f1d38b5c2 SHA512 dac651233ea94c19834e810c64230bcbd5516de9e694ced1b6497ad927d734c527b3a556281676393674d33da768cb2431e7da1a0fdfc6ceb268e897029aa584
-EBUILD libffado-2.4.5.ebuild 2814 BLAKE2B ff17cb0a6f5b3e38f8c8d218166f50135af2d3f99ff91371273f1e82a1ea039548009f366b95a96a2fda26d575a86d07b7c884ff0d2792b04f830e67a458e1a7 SHA512 fe1530f2fc2f93e771107c08d1844e17cc9fff59f68678459ac72778f48f610318d7092c232012761084f24ef622dda729d4dde823f79c0a2c8b94f9fbaa085d
 EBUILD libffado-2.4.6.ebuild 2814 BLAKE2B ff17cb0a6f5b3e38f8c8d218166f50135af2d3f99ff91371273f1e82a1ea039548009f366b95a96a2fda26d575a86d07b7c884ff0d2792b04f830e67a458e1a7 SHA512 fe1530f2fc2f93e771107c08d1844e17cc9fff59f68678459ac72778f48f610318d7092c232012761084f24ef622dda729d4dde823f79c0a2c8b94f9fbaa085d
 MISC metadata.xml 344 BLAKE2B a7d2c27caa7e9fa72716534c406145b94bd8a13eadf57d06ea8e3148339857311bd7e8f0434edbf8a70a5e7bfec1726425e1d16734841b056caeee7754471666 SHA512 30d31f76c73ff218fa34e5f9d442e2366082bf4697038c804c093cac0e22720341691b732bf653466f8e5fc7e734c11b08a02cef7dd2a4bd93635968e2c29447
diff --git a/media-libs/libffado/libffado-2.4.5.ebuild b/media-libs/libffado/libffado-2.4.5.ebuild
deleted file mode 100644
index 4bb810c42e42..000000000000
--- a/media-libs/libffado/libffado-2.4.5.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
-
-DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
-HOMEPAGE="http://www.ffado.org"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit subversion
-	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
-else
-	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="debug qt5 test-programs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="${PYTHON_DEPS}
-	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
-	dev-libs/dbus-c++
-	dev-libs/libconfig:=[cxx,${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/libiec61883[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	sys-libs/libavc1394[${MULTILIB_USEDEP}]
-	sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	qt5? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
-		')
-		x11-misc/xdg-utils
-	)"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-
-myescons() {
-	local myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		UDEVDIR="$(get_udevdir)/rules.d"
-		CUSTOM_ENV=true
-		DETECT_USERSPACE_ENV=false
-		DEBUG=$(usex debug)
-		PYPKGDIR="$(python_get_sitedir)"
-		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
-		# -fomit-frame-pointer is added also which can cripple debugging.
-		# we set flags from portage instead
-		ENABLE_OPTIMIZATIONS=false
-		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9.
-		ENABLE_SETBUFFERSIZE_API_VER=force
-	)
-	if multilib_is_native_abi; then
-		myesconsargs+=(
-			BUILD_MIXER=$(usex qt5 true false)
-			BUILD_TESTS=$(usex test-programs)
-		)
-	else
-		myesconsargs+=(
-			BUILD_MIXER=false
-			BUILD_TESTS=false
-		)
-	fi
-	escons "${myesconsargs[@]}" "${@}"
-}
-
-src_prepare() {
-	default
-
-	# Bug #808853
-	cp "${BROOT}"/usr/share/gnuconfig/config.guess admin/ || die "Failed to update config.guess"
-
-	# Always use Qt5
-	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
-
-	# Bugs #658052, #659226
-	sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC CXX
-	myescons
-}
-
-multilib_src_install() {
-	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	python_fix_shebang "${D}"
-	python_optimize "${D}"
-
-	if use qt5; then
-		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
-		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 376763b9212f..0ca301322bbb 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,8 @@
 AUX libheif-1.12.0-dav1d-1.0.0.patch 1569 BLAKE2B 1cd1629a3d519ef574a5b98ce5cfc5b8f074847b5d4fc6544fdeab3476c35b764739c98fda9a8d0a4f4921fd25412b08e124118f07694fe540b04f306716f6c2 SHA512 62a1afe3f42d1a61b3c314aaae9804dbd436f141075fa4daac415db07a1542c1033dd42cef6906b29ea0f072726888f5ef5f9b7c13c6ec8dca57b6e2bfdfd119
+AUX libheif-1.12.0-fix-bashism.patch 1325 BLAKE2B 5a43b5f2611e256a48603ce9f5d59ae9e08fec30c58af829a82d62ba04e09eb263d0f439b3aecd39d8a053ccfdb4b4f5dbdc5ec8792cd5ffb767e0c2c64e4e66 SHA512 47250ccf9ad920f2067477728f79d46cf9ee70d581b72fecacd33b927c77cb3af2744a6995c7f6b21aad64a9477bcdf702a3cea30bebf99980d93c8c3a560718
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
 EBUILD libheif-1.12.0-r1.ebuild 1798 BLAKE2B 737d57dde4f9a3a0566c0a91b1d6ec0c167dc6bb59c16b3acb9ffa28135eac395328b41418381ac2e22999852d1182580845d2227b9fa8e2c0e13bd4eff42e63 SHA512 112f937a560ef0e3dd666c7e4c7e0e973738fd31942cfd52e3c5f27b1e4aa4c3305e4a0d9ee66d6a24f3a02d47a895f511684688fdbed88ad709ff1be783309a
-EBUILD libheif-1.12.0-r2.ebuild 1871 BLAKE2B c4061747e049526201cfd77e1996cf9e52d7f8395d658d4f03bf56d31181db72401949c666e099214f7f716168bed3edf41427453056fb18de05233d3c06c09a SHA512 4844745aa4eaeecfa2ed679a0e1a4b3745712982d7a5c5adbad7521e9b8d66469c598b1ac54d604e6913cc5fd6006e40549c54ffda4d162938a9b19b8b214dc4
-EBUILD libheif-9999.ebuild 1822 BLAKE2B 087d9bef42be7bf7bc4668fb8944f43465fbba753fcfa433bf50a1d978849b0f662789af00af9c9a131d33e216ea6f774910dab7c6d100c5fb60dff60303261a SHA512 6d5071608b4781114839f994ef7b55e34621f3c42ef9b7d7d5faa422923d0a41c5a58f42c94cca760d337dca891e4a3cd929df392c6c5d4cde902acbf22e8574
+EBUILD libheif-1.12.0-r2.ebuild 1895 BLAKE2B 22e34da2f3c0512e86b02c7b6e0e2fdf118d899b06f584d4b74a3dcdf15dcfe1c5dcaf17661633dc8807270c581c6400fbdf671b0c33400778e0a4cd48e7ce04 SHA512 41d8674f6f5ef8e93dbd50b01cae52bdd18e0b741a7396ff952c75d3cd8c4ab63013d96baaae269da39f3e1b0ea3af77a63d96809a37c594a6a692df65211033
+EBUILD libheif-1.12.0-r3.ebuild 2098 BLAKE2B 91e8397a6cc92d9c572995c1ba754c96fc78abf31aebdd3ab7176756a5233cc76f9306a4282a4eed12c00d9d6d54c9d973fb599367bee27ebbbd4f0215f8c6bc SHA512 f25e1194186b95ceb70ca437566eca639da45f5ac5d6f3fda29fbb539085d51896a2655470e14a37dbd90372317b0678921cf90673b3c4b6a0c5d2105b24aa8c
+EBUILD libheif-9999.ebuild 2060 BLAKE2B a8609b3bd278265e09c3152e96c712bb800d14f0a3d97a629252ee45b877ae26cf4805f69b845c8bff1d57b822855792f13284be5ee44ead16b63d356e256e85 SHA512 83a48b52f508b0411bd3fac84e23f829fc8e50399f16b5f72e8bb01abdfd077f648276cbd8e12b42dc6241dfaab91333897f3856e0e691d9e33dd27b21a931de
 MISC metadata.xml 805 BLAKE2B 99457c3561cc5ad915c5503f96e52b6261981157de467073ac7a8ece68af3798b9db516b40b7db9e0bd92388b083898926d877fb3bbc8fd1701b280bfd4baa09 SHA512 e5461f86bd18b9878a0e4857fc25ad7554e4095b8b71b2a8de2334b49b7d6c62ccbc2d6bc31e016e65ba3c8bd3a872b5f00b2c2bf39e1d04306124bfedb8486f
diff --git a/media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch b/media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch
new file mode 100644
index 000000000000..3d4d12495051
--- /dev/null
+++ b/media-libs/libheif/files/libheif-1.12.0-fix-bashism.patch
@@ -0,0 +1,37 @@
+https://github.com/strukturag/libheif/pull/660
+
+From a50ef159794ff66fc0a03d5269b1c36a000673ea Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 16 Aug 2022 02:23:13 +0100
+Subject: [PATCH] configure.ac: fix bashism
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes errors/warnings like:
+```
+checking for pthread_create in -lpthread... yes
+checking for simple visibility declarations... yes
+/var/tmp/portage/media-libs/libheif-1.12.0-r2/work/libheif-1.12.0/configure: 18821: test: x: unexpected operator
+checking pkg-config is at least version 0.9.0... yes
+checking for aom... yes
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,7 +85,7 @@ AS_IF([test "x$enable_tests" = "xyes"], [
+     HAVE_VISIBILITY=0
+     CFLAG_VISIBILITY=
+ ])
+-AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_TESTS" == "x1"])
++AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_TESTS" = "x1"])
+ 
+ AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" != "x0"])
+ if eval "test x$enable_visibility = x" ; then enable_visibility=yes ; fi
+
diff --git a/media-libs/libheif/libheif-1.12.0-r2.ebuild b/media-libs/libheif/libheif-1.12.0-r2.ebuild
index e2759984de2b..0b5dfbc4051e 100644
--- a/media-libs/libheif/libheif-1.12.0-r2.ebuild
+++ b/media-libs/libheif/libheif-1.12.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -61,6 +61,7 @@ multilib_src_configure() {
 		$(use_enable gdk-pixbuf)
 		$(use_enable rav1e)
 		$(use_enable threads multithreading)
+		$(use_enable test tests)
 		$(use_enable x265)
 	)
 	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
diff --git a/media-libs/libheif/libheif-1.12.0-r3.ebuild b/media-libs/libheif/libheif-1.12.0-r3.ebuild
new file mode 100644
index 000000000000..f6505de170a5
--- /dev/null
+++ b/media-libs/libheif/libheif-1.12.0-r3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.12"
+IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
+REQUIRED_USE="test? ( go )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3
+		dev-lang/go
+	)
+"
+DEPEND="
+	media-libs/dav1d:=[${MULTILIB_USEDEP}]
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]
+	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
+	go? ( dev-lang/go )
+	rav1e? ( media-video/rav1e:= )
+	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dav1d-1.0.0.patch
+	"${FILESDIR}"/${PN}-1.12.0-fix-bashism.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' configure.ac || die
+
+	if use test ; then
+		rm tests/catch.hpp || die
+		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
+	fi
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export GO111MODULE=auto
+	local econf_args=(
+		--enable-libde265
+		--disable-static
+		$(multilib_is_native_abi && use go || echo --disable-go)
+		$(use_enable aom)
+		$(use_enable gdk-pixbuf)
+		$(use_enable rav1e)
+		$(use_enable threads multithreading)
+		$(use_enable test tests)
+		$(use_enable x265)
+	)
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_test() {
+	default
+	emake -C go test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index b2726cb668a0..457096c4b4e2 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -22,7 +22,12 @@ IUSE="+aom gdk-pixbuf go rav1e test +threads x265"
 REQUIRED_USE="test? ( go )"
 RESTRICT="!test? ( test )"
 
-BDEPEND="test? ( dev-lang/go )"
+BDEPEND="
+	test? (
+		<dev-cpp/catch-3
+		dev-lang/go
+	)
+"
 DEPEND="
 	media-libs/dav1d:=[${MULTILIB_USEDEP}]
 	media-libs/libde265:=[${MULTILIB_USEDEP}]
@@ -36,11 +41,20 @@ DEPEND="
 	x265? ( media-libs/x265:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.0-fix-bashism.patch
+)
+
 src_prepare() {
 	default
 
 	sed -i -e 's:-Werror::' configure.ac || die
 
+	if use test ; then
+		rm tests/catch.hpp || die
+		ln -s "${ESYSROOT}"/usr/include/catch2/catch.hpp tests/catch.hpp || die
+	fi
+
 	eautoreconf
 
 	# prevent "stat heif-test.go: no such file or directory"
@@ -57,6 +71,7 @@ multilib_src_configure() {
 		$(use_enable gdk-pixbuf)
 		$(use_enable rav1e)
 		$(use_enable threads multithreading)
+		$(use_enable test tests)
 		$(use_enable x265)
 	)
 	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index a77688d9e098..c37d88e24f5a 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,7 +1,5 @@
 AUX libmtp-1.1.19-fix-docdir.patch 462 BLAKE2B 5c23a2b98a138fb6bc51d49c07d556cff17357ce604cc7e11bf652e180d560cfc1befb2957629a5bb9e46876721fa62d186dd7e0a4dc0e95b74f41a3d5620f9c SHA512 50e15c26fe110d551c350ec11e9fc2309f8dfb26039e824e7d59aa1e5b5250e012397ed30278578524eb579132b0206fae8d5c40f387dd71b93ac7fc261ac2e7
-DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
 DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
-EBUILD libmtp-1.1.19-r2.ebuild 1705 BLAKE2B b8a2231e68ecc3afd4bd66894b9940f099ad151bdcf9c5bd777d62c239badaf18089607fa7db935ad12fe97f797c44f72ffac41a8b8536e7afdef2aa69ac5d75 SHA512 692dbba0b3a8b629dee534f1dd3ac36b2f813a5b4d5c6e8c1b8116844078e794b6a57d15492d634d2bc89d5b16fa424b72caae933f4ba48a7bba193c81155507
 EBUILD libmtp-1.1.20.ebuild 1912 BLAKE2B 1dce036ece405a07e6fd65c29ec3fdf9765ef1cd2dc5f3092bac783f93442843b18e5d82f1afab2e558674ae98aa3a1e57e3b4a05b717d954b320bcf08ea7e49 SHA512 efe58c0954c1f6e6b73f453c63d4dfd49485e35ecdc2a93fd36cd014342cda1f90c541f79adf0c13080f06d96c5a9cbb5a75114cae46cf951b949fc9d9927ce3
 EBUILD libmtp-9999.ebuild 1859 BLAKE2B d6c4d0516b3028951494178b3823090a56e03b1777871134a3b6152709ebf6c00e0e6caee12d38a00453245402ce5499ee7b568880195f6cf45256bd76255e3c SHA512 f102aba2ae7d1b10997dd3dc2676f1463b5dd14890fe74796c4490524acd6d706a2cb3709f876c2ffb3e035a9599a027ca2b76519c61663185bef663f00a6f0f
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.19-r2.ebuild b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
deleted file mode 100644
index 37ef02006caf..000000000000
--- a/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit udev
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/"
-
-LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
-SLOT="0/9" # Based on SONAME of libmtp shared library
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="
-	acct-group/plugdev
-	virtual/libiconv
-	virtual/libusb:1
-	crypt? ( dev-libs/libgcrypt:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS README TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docdir.patch"
-)
-
-src_prepare() {
-	default
-
-	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
-	rm ChangeLog || die
-
-	if [[ ${PV} == 9999* ]]; then
-		if [[ -e /usr/share/gettext/config.rpath ]]; then
-			cp /usr/share/gettext/config.rpath . || die
-		else
-			touch config.rpath || die # This is from upstream autogen.sh
-		fi
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable crypt mtpz)
-		$(use_enable doc doxygen)
-		$(use_enable static-libs static)
-		--with-udev="$(get_udevdir)"
-		--with-udev-group=plugdev
-		--with-udev-mode=0660
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}