gentoo resync : 09.07.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
commit: 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree: 8c816148bcbd22757d892089c989ae614eae4f5a /media-libs
parent: 0f558761aa2dee1017b4751e4017205e015a9560 (diff)
88 files changed, 1908 insertions, 1089 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index b9105cff00cd..a2088a91812a 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 af4575c6c6e0..e2ed308ff268 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,8 +1,10 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 DIST alsa-lib-1.2.6.1.tar.bz2 1079670 BLAKE2B 4f3d1d078678773b4f6a569d0eea95d0cf89a846605c3a95e11b92f1fe0bd9fb164b8f710906f0de9675ade7ef2123375eb1221945bec511708d6fdd85c051b9 SHA512 70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45
 DIST alsa-lib-1.2.7.1.tar.bz2 1084711 BLAKE2B b7be12a51453a82d0eb2e57fb8f9391c8778e8c63b78b6e6f46437bca39e3efb13394ba0e060547781ccde75fcdc19da532d5aed24fe0d5cfb885c1604e4e8ce SHA512 2a0b4205e8bf602b56a6f5007ba219799e5443827393058e439adf5b391bb6c4815a48bb994b5d108b9f31a90db0eb43a96a0d7741216e2d710dc63d372de27e
+DIST alsa-lib-1.2.7.2.tar.bz2 1085117 BLAKE2B 9ae3d4358d802970249e1b904faa7c4d646dec1d8c93e0de9c4b70065e912b910303d77e8f9f68c97b883ec270cf0dd8b97146b4a85f3aede4f290683c462fce SHA512 79e5920384e570a1acd8ecd1eb8812879333c3cedb1d15780080afc40125b97df893c33f4163d9dd863871b628bc6026265f8ace2c8634fc1af5b52b62ac9cfe
 DIST alsa-lib-1.2.7.tar.bz2 1084924 BLAKE2B a3bfbbfcf31625be0749218b3c02b307da9077d4bd82e9f980b8e3d6f9275f3a3f3c8158bb28fb1c61724a35e794eb3f6cc8872202ff42fb847725058109087e SHA512 6bd48b07d659fddad792876326a93b2a549ce94bc191131670365599c31f81f737bfd8e94dec6fe296bc5d86df2e3e381bbb7a694d24fe7e8e501f1c994ed084
 EBUILD alsa-lib-1.2.6.1.ebuild 2313 BLAKE2B 02d78d02d665db5d31f937be8983f86ba45d28f1b8f9961edd7b97fc83c2186929836ca7c217b9989c651e9dee75e0e37d3daa462fe099ee9a8a6685bc1cc6a3 SHA512 af89550a294ef1932045604cf81c9f37a40f94acd731a55d654391d96eb5bd7c026716ba72303af64621cf0a98c2bdd92abd22881e4a776845e5e235778d4762
 EBUILD alsa-lib-1.2.7.1.ebuild 2574 BLAKE2B 8f30c5cac3083fb8afbf3b20052b9234c22572289b7283106bdc4917ea66ae3f0838b0fa588552d191195626fd83120328a7587b1ad328d61963a6bc62b07535 SHA512 6fec4746221fe2f71fdb5e05bf599aef8a6f7e560ec65ceeaff212a6b5bb9540632775c339e4aa97c8091f9dc452520cb3b88f400ae16b6cc89191e050e44520
+EBUILD alsa-lib-1.2.7.2.ebuild 2574 BLAKE2B 8f30c5cac3083fb8afbf3b20052b9234c22572289b7283106bdc4917ea66ae3f0838b0fa588552d191195626fd83120328a7587b1ad328d61963a6bc62b07535 SHA512 6fec4746221fe2f71fdb5e05bf599aef8a6f7e560ec65ceeaff212a6b5bb9540632775c339e4aa97c8091f9dc452520cb3b88f400ae16b6cc89191e050e44520
 EBUILD alsa-lib-1.2.7.ebuild 2307 BLAKE2B eb062334ed34d1d40a32fec1cbd63fde78c17b5e71752dd15f53a9e562457c685894f6676e60fa2c1f566bf6015dae9195f56d735b00d13015d8bdb6a16968de SHA512 e0adc0f5412c292871e46a216afcd28050f77aa32b13093709087d560b6ee80be3362775c4151ed06ce923ba39e0f4d21e017c8606cf6c408c3e3022cf455f05
 MISC metadata.xml 503 BLAKE2B 89b5c41a55784ff388766f60c106e719edd59a3bd47a1f2c240ad185ce750b1dc1a2efec704361b09c5e6e30d965514955f32fffa304200db7ff031a27d7fd85 SHA512 43f3a7e18f13ac58b4cbf31a92bd809c0618be1dd34a6a47d03e00ededd66343c3082bddac98cc286683ba32436b62aa2d61102de832f5fb21925ecfb2b54755
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild
new file mode 100644
index 000000000000..2fb3f286446d
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools multilib-minimal flag-o-matic python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc python +thread-safety"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="media-libs/alsa-topology-conf
+	media-libs/alsa-ucm-conf
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# bug #545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Broken upstream. Could in theory work with -flto-partitions=none
+	# but it's a hack to workaround the real problem and not strictly safe.
+	# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
+	filter-flags -flto=* -flto
+
+	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)
+	)
+
+	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/babl/Manifest b/media-libs/babl/Manifest
index b1056e2a42bc..25f313bc5420 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -3,6 +3,6 @@ DIST babl-0.1.90.tar.xz 309324 BLAKE2B 9fbbbe06539fd85007875e697529aa071d32a2d9e
 DIST babl-0.1.92.tar.xz 309784 BLAKE2B c3c716ba1b54082743ba6ea33da99fb458dc971ab78ae72170af9840eadbc7f2aeb0a26d3270ede2a6e0d7b55489fc8f700b1c69731a4612ba4106f9672762d0 SHA512 c2baf39f576bf7f57786c59f2de0818257f4d1d62cadf44fdd802c9a534ed94390dd1616e7e72fcc9de1fb85a24a10fbacdbbabbe376a45ae598be46817e3bc0
 EBUILD babl-0.1.88.ebuild 1761 BLAKE2B 5a2bdf88fb83178a3e64ac744d2c8c87d2ef1d7496c7cb35fab80de297be56b60445e282f0cce2188000517f1f63b6b118c8d9ea7f1cf4fa7e32a50c5118cb22 SHA512 96aac9e6aef6489543f7cc1d287efd7e2e98f8ee3139cc96c354c13f976693ae8e53db1716f4cc13db6e183f257c53e57c097293b93d0ddcb5074650bf9d0360
 EBUILD babl-0.1.90-r1.ebuild 1833 BLAKE2B ab7a5aaf9597c4b151387754df092f03039ecfcc2f81e17666a8a1af473e9ae40cbe3d526fd8c5a3ae756ddc1da420f3a8930a08def9cc7e3b447e7c768e1310 SHA512 1f907db70d1ce4693125169f8e5fd33215d85ed80c1ba0cd8db8f0610b6e10891f959b91b7f1364a3daccd2501a20df0a863e559164c9b92f5add8cf1feee4c5
-EBUILD babl-0.1.92.ebuild 1833 BLAKE2B ab7a5aaf9597c4b151387754df092f03039ecfcc2f81e17666a8a1af473e9ae40cbe3d526fd8c5a3ae756ddc1da420f3a8930a08def9cc7e3b447e7c768e1310 SHA512 1f907db70d1ce4693125169f8e5fd33215d85ed80c1ba0cd8db8f0610b6e10891f959b91b7f1364a3daccd2501a20df0a863e559164c9b92f5add8cf1feee4c5
+EBUILD babl-0.1.92.ebuild 1830 BLAKE2B e3d24fe097ce0f9b9568bc6b3eafa94fa05ca4c42c1e141bc2f7fa0cc0359f1749c53551d6baddd76052380ebad2e0de89359033e958faad49e4f456bb861826 SHA512 ef3db65f625c9d1a24cfada1ea274f68ed194967ac2ef157f1bcda084efc8c3cb665eb51529ba288135fefd25b39cfae5b9c0ea9774ad53357566fba9142c2af
 EBUILD babl-9999.ebuild 1760 BLAKE2B ab87ef3372006a2c9907edd13ad0e0f5bb896860188cc3e84a7e97e3c794dbe82c6245653e3d8cc1f48c086186dcefeb9cb9adc81e1c889a3c994b8f35cffeec SHA512 6967e4fd78adcc1799b601aae900d45df2c63717f5b920ee82909335c1842101712544429acbf36c5a4c2c1f54c0d2b1760037f8af3f7af53eaa3b860285314f
 MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
diff --git a/media-libs/babl/babl-0.1.92.ebuild b/media-libs/babl/babl-0.1.92.ebuild
index bd0399f8e4cf..d57f8880f2dc 100644
--- a/media-libs/babl/babl-0.1.92.ebuild
+++ b/media-libs/babl/babl-0.1.92.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index ab9be5c01362..6fe2c650ad2c 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,5 +1,5 @@
 AUX 3.0.27-video-sink-Remove-RGBx-BGRx-support.patch 2406 BLAKE2B 936bdb2306030eb615b555f3d82ef14808a6f840f1b0eb9de4016b5cb7fa733c27efaadbcbb48ea2b40a65a989877dd3f12b3481491f60a82dd406a88cd7e857 SHA512 00ead4f4785c33b846caf74de79d7b44ec41499d44f16775cf1881b4c5d3a10e6b2a17eb60deafba19cd41f9d760d1df6b0b61299d6cb620e2b909871c369660
 DIST clutter-gst-3.0.27.tar.xz 404972 BLAKE2B 6861e6a0e8770b1d0c1a1d3ca593b2f8b5ea381614d063c040ee92e4099d8b4e43d25fa6058f7d1c146fdf94766b20e7aa69fa6fc6725b46af4a3ed976aa05cc SHA512 27271d9b2241a35cf7f61c4e9e25126d578494843c947cbeac6b5ad1dc8726c7a2a056239617ec39b04a7671a45dcbe2a65c364b10ed470f7c857647f8c36cac
 EBUILD clutter-gst-3.0.27-r1.ebuild 1439 BLAKE2B 5d32b0b52a270b73a7070bdadb84711ca75ffb78b802cac23f012645fb394c6ee44df804f0391c34e585fb4186856a6b82e6095e47577b6fe6f4344f2150424a SHA512 0d66197c99965ff613531baac0c551093ea5e4f448d226bf890689ce60c873d840d260e15fc5603e1fb0197dd49fb764a763e453a551df029c23a3e2d49cd2f4
-EBUILD clutter-gst-3.0.27-r2.ebuild 1291 BLAKE2B 223e4478cef41f70494b2082f6794aa4db83c7d7a8835cb373b10d5da46ebca60f172826e3f220967a945071ed3f03398b849a11110d33a46da9d090febef27a SHA512 c1ffa673c6d97c4556f5a4ba870c16b65ebd952a30ecb752cd2ee1d8c2d4fcb7943e5809a9de5d08ca9665d3bd98da5f909aa1e6b9a18a8cbea202051bf5f441
+EBUILD clutter-gst-3.0.27-r2.ebuild 1289 BLAKE2B 90674244ea27a1fc3d47631929e9fd4f3f9c6893b16fd7b2dbf6eb5b5aa501573ebd85ab2d7ac3e797e366a67e76fb00e3164af66dbbddf3b1c37a5a2bc5ea8d SHA512 9309a2866e78fefc6e52b7bc39cfbeb618f8a38d0f7fe5faf49181e6a3567c8b99376821df5d579f5e1ba4439e760503ccf42256508715ac1fb8f21988eeb2a8
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild
index 3b28b0d10ce9..f65691ba453f 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="GStreamer integration library for Clutter"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="X debug +introspection udev"
 
 # >=cogl-1.18 provides cogl-2.0-experimental
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index d33dc1029300..050bf631baa2 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,4 +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
 EBUILD codec2-1.0.3.ebuild 1076 BLAKE2B fe3df169eb9d6ed3810294d98ac94a453f66cb7357d731d3ed7af8d2f5bfe3210f5c06199abba2e369c35c34c9985232de05cc6fb504ed54bc912bda187b420d SHA512 7a42bc69ce7f708e8112031895f6d541dadd68a8bddd33ebdfe996e26d9b2a3b9f4cc1756223dd5777e97e87d01f014519fda335e33aee3d3e85d56480034725
+EBUILD codec2-1.0.4.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.4.ebuild
new file mode 100644
index 000000000000..fdd5f6ec18cf
--- /dev/null
+++ b/media-libs/codec2/codec2-1.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Low bit rate speech codec"
+HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"
+SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples test"
+
+# Not yet passing, but infrastructure added to run
+# Needs Octave dependencies like "signal"?
+# https://github.com/drowe67/codec2/commit/9a129f1b3ad12ecbf3df7f4460f496ee11e49c08#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R155
+RESTRICT="test"
+
+#BDEPEND="test? ( sci-mathematics/octave )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DUNITTEST=$(usex test)
+		-DINSTALL_EXAMPLES=$(usex examples)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index f9f3f3e0708a..b8a3f8b66ace 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,7 @@
 DIST Image-ExifTool-12.30.tar.gz 4948601 BLAKE2B 359c06dc5d4f71e186d7a265488cb16e47e40438d8a0e2d4e74f75b6aac7efd1c5b3271a158cb8b822eace5f6b437d5d39458c31ae8e6e886e93f2e643f8c9a9 SHA512 2966854d8fd163fd5aaaca5608eeab2a3f0681fe9e22e006840acacd2ff2aaecd6076bcec23989facb7baf64aa96425ad7eeceb4045da44004421b8f10050935
 DIST Image-ExifTool-12.33.tar.gz 4958375 BLAKE2B 699529e71e87cf2a5b4d1a69049f48b7b00ce8e720918cb25c2f2b35453fd44c580444bca2ff14d6cef76de99568b2e22b98ea87f45e550d69b40dda464831fe SHA512 7d6bb1942597535cc982e77397b4dc2edee3f361338f82cf2b5f24fd7fa94c148312b125d1d4f37c8dd303eed45173a805eb79ba61a6e74205e21c52f7561d90
 DIST Image-ExifTool-12.42.tar.gz 5042086 BLAKE2B c518906dfc6c354a6bf834044322727ff0c6787f74c387fb24b2320072bb525fd8b0b55d74cc324ac6e2ad6e75de0f3c552db2f6a1e665ab4b1bed9117916c2b SHA512 f7d3dd98623f44473f67ccf740370fd7704b60274efe1272b5219599dba9fe312afe4107937c6d64c5ee11380914b6e97a5248a2abcf88820822f9947cae0f8f
-EBUILD exiftool-12.30.ebuild 732 BLAKE2B fc90bec7eb1678b20f065e79a58e371c2bbd2800d2bf1ec947cfff6c1760a05705388b0d7e1d17a4efeb30c8f20b0c8b4e044c2e4820c9621a4451e74e80ad16 SHA512 6c484d1c80baa16e46ac293f444f3d39a764226f7be901aeda85fcf7142c894d4fdc340ef4060d51e3baad5dac7a7a5a79ed244852bfba036ad6a925aaffc776
+EBUILD exiftool-12.30.ebuild 732 BLAKE2B cadd5fe386fbdd768d535c6fdc481ad1516e0e0d92847ab6b30e92b2091cce07f91a0d9e5e729c5762fa881e00ad6d9796958342d70e73e7cdb11705f76363db SHA512 c7c9d9df1f5a0659622b395373aa5956e744d74b5d39a150782d64b1dd0548e18d460243e249a778bb3b80216487459a97026fb1f55ca54a8b124fb2b8644961
 EBUILD exiftool-12.33.ebuild 721 BLAKE2B 4620592e48f233b221170fb14a9858673df955ee98a1611d377da2e490e075fa75bfd5564eeee5a728ddf9829aec41ed443b94f9877542b56653f0091e2e9c22 SHA512 1dce772649e115fe845cd399a2dc1b3d0ef4ac8efd63c1ec123b2fe5bfa01f67bd569d71aaf93da2f6e99492a94b11259abc08a11a60e3423ae2d5fac9ed5ea1
 EBUILD exiftool-12.42.ebuild 721 BLAKE2B 4c158caf6b79b0d4b3559589ff6a0effc7409386a8099cacb06f04a8cbe3e109085cb4084a5863cfb936c5b4b07aa221252dca0c5566c7b9300ee5a18761d765 SHA512 9279f184ae5c45d2f34da9f555c08df7d9f7eef18af75a09163e5319ddf20dcfa2102dc4fd09049f063c23deb5c61117b322d68d1d202a513025ac37874c2262
 MISC metadata.xml 10040 BLAKE2B 8bcecde1df2dd3e79c3bcfbd38dcd9d3db9564a7abd5a684e0204779bcb685946f2eeb83a62efaa03efc841f0414b82f1087a3da3c6bd5f43e85561e43d7fb3e SHA512 af79302b57833d1368eff738b2326dd9cd47de47baf42426bfb00f61c1c6f52fcdc41d74bf95d8f65b2b0b00578ce07c3471b8cf4923e2f47c2c0b9d58dea35f
diff --git a/media-libs/exiftool/exiftool-12.30.ebuild b/media-libs/exiftool/exiftool-12.30.ebuild
index debd1e4016eb..c321168d12db 100644
--- a/media-libs/exiftool/exiftool-12.30.ebuild
+++ b/media-libs/exiftool/exiftool-12.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,6 +7,7 @@ EAPI=7
 # Ideally don't bump to non-production at all, but certainly don't stable.
 
 DIST_NAME=Image-ExifTool
+DIST_TEST="do"
 inherit perl-module
 
 DESCRIPTION="Read and write meta information in image, audio and video files"
@@ -17,8 +18,6 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
-SRC_TEST="do"
-
 src_install() {
 	perl-module_src_install
 	use doc && dodoc -r html/
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index c173a74f9fe6..3603bb8218a5 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -11,7 +11,5 @@ AUX freeimage-3.18.0-tiff-4.4.0.patch 492 BLAKE2B 284ed6a083b982fbc758237ba96812
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
-EBUILD freeimage-3.18.0-r3.ebuild 3182 BLAKE2B e4279ecd9c3e8e00a998da85402efb3edd6845a20e1a2b25a61480d666d65a8702df19762615290e74fbdb8960d0d95f83e31a12865bb14c335fc7377139c7e4 SHA512 2113ca778f0116fc5ac12b74e9264e2fb04169af05d0b84e09ba3c3b42c9f51b30fab059fbc432d4c151a2761652cc0fd3296f661b9727f6a78d7a68b03923da
-EBUILD freeimage-3.18.0-r7.ebuild 3289 BLAKE2B 5c91326a25624833c7435c4ddbe31765316334603aa1d4877cd259bb3bd3d2a15d9df755c14eca3ceff2f128ea9779bab1f8842bfe39ca09bbf5bca8c7d9b53f SHA512 1511ca9d8ee82a882ccbad93e1d390873381b092874d2e44063caa0e5f46630b94d69c8ec3da4569a383060b83bb889ef75a41ac412ed3b06ef6f8f391ddc389
-EBUILD freeimage-3.18.0-r8.ebuild 3384 BLAKE2B aebf2eec88d7b6200068ed035dea874aa767dabaf2deb793deef622ef4a9c3f5fc269e6f6e7017b28eb23331d80c949c912d9723223c083bf8a9a88ced1fe204 SHA512 190a1527e85112048bea692ccc3b0fb647fabf78b64c5ba56735b6dd647afaba01b942bc63898f03096014ae788e777bb0a0860f6e25953b64607ccd50f7a1ef
+EBUILD freeimage-3.18.0-r8.ebuild 3383 BLAKE2B 8a7a1dcc374730e0fd7e3528731bb4e3c6fcbfe2cfaef7c9d645c54075b9fa2c2ac36786c4349216e2e1d2e8eace3ec0b3aca74a5aa4d8a5685cb51973b943c5 SHA512 82f6cc0082fd698777e633757a6dc8023f2ed8c036b2c589e56b10dd2f40f9f96dbd3345167f738ff993b9825e62a556c39afa673fdf1c3fb6f7ff3823bf4afb
 MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
deleted file mode 100644
index e0aea4f7eb1b..000000000000
--- a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix toolchain-funcs
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-MY_P=${MY_PN}${MY_PV}
-
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="https://freeimage.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf
-	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
-
-# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( media-libs/openexr:0= )
-	png? ( media-libs/libpng:0= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		media-libs/ilmbase:=
-		media-libs/tiff:0
-	)
-	webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}
-
-DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
-PATCHES=(
-	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
-	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
-	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
-	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
-	"${FILESDIR}"/${PN}-3.18.0-raw.patch
-	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
-	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
-	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
-)
-
-src_prepare() {
-	pushd Source >/dev/null || die
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
-	popd >/dev/null || die
-
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	sed -i \
-		-e "s:/./:/:g" \
-		-e "s: ./: :g" \
-		-e 's: Source: \\\n\tSource:g' \
-		-e 's: Wrapper: \\\n\tWrapper:g' \
-		-e 's: Examples: \\\n\tExamples:g' \
-		-e 's: TestAPI: \\\n\tTestAPI:g' \
-		-e 's: -ISource: \\\n\t-ISource:g' \
-		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-		-e 's:INCLS:\nINCLS:g' \
-		Makefile.srcs fipMakefile.srcs || die
-	sed -i \
-		-e "/LibJPEG/d" \
-		-e "/LibJXR/d" \
-		-e "/LibPNG/d" \
-		-e "/LibTIFF/d" \
-		-e "/Source\/ZLib/d" \
-		-e "/LibOpenJPEG/d" \
-		-e "/OpenEXR/d" \
-		-e "/LibRawLite/d" \
-		-e "/LibMNG/d" \
-		-e "/LibWebP/d" \
-		-e "/LibJXR/d" \
-		Makefile.srcs fipMakefile.srcs || die
-
-	default
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			USE_WEBP=$(usex webp) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
-	einstalldocs
-}
diff --git a/media-libs/freeimage/freeimage-3.18.0-r7.ebuild b/media-libs/freeimage/freeimage-3.18.0-r7.ebuild
deleted file mode 100644
index 7f916489e378..000000000000
--- a/media-libs/freeimage/freeimage-3.18.0-r7.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edos2unix toolchain-funcs
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-MY_P=${MY_PN}${MY_PV}
-
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="https://freeimage.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	mirror://sourceforge/${PN}/${MY_P}.pdf
-	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
-
-LICENSE="|| ( GPL-2 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
-
-# The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
-# uses code from it to handle 16bit<->float conversions.
-RDEPEND="
-	sys-libs/zlib
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:0= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		>=dev-libs/imath-3.1.4-r2:=
-		>=media-libs/openexr-3:0=
-		<media-libs/tiff-4.4.0
-	)
-	webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}
-
-DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
-
-PATCHES=(
-	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
-	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
-	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
-	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
-	"${FILESDIR}"/${PN}-3.18.0-raw.patch
-	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
-	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
-	"${FILESDIR}"/${PN}-3.18.0-openexr-3-imath.patch
-	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
-)
-
-src_prepare() {
-	pushd Source >/dev/null || die
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
-	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
-	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
-	popd >/dev/null || die
-
-	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
-	sed -i \
-		-e "s:/./:/:g" \
-		-e "s: ./: :g" \
-		-e 's: Source: \\\n\tSource:g' \
-		-e 's: Wrapper: \\\n\tWrapper:g' \
-		-e 's: Examples: \\\n\tExamples:g' \
-		-e 's: TestAPI: \\\n\tTestAPI:g' \
-		-e 's: -ISource: \\\n\t-ISource:g' \
-		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-		-e 's:INCLS:\nINCLS:g' \
-		Makefile.srcs fipMakefile.srcs || die
-	sed -i \
-		-e "/LibJPEG/d" \
-		-e "/LibJXR/d" \
-		-e "/LibPNG/d" \
-		-e "/LibTIFF/d" \
-		-e "/Source\/ZLib/d" \
-		-e "/LibOpenJPEG/d" \
-		-e "/OpenEXR/d" \
-		-e "/LibRawLite/d" \
-		-e "/LibMNG/d" \
-		-e "/LibWebP/d" \
-		-e "/LibJXR/d" \
-		Makefile.srcs fipMakefile.srcs || die
-
-	default
-}
-
-foreach_make() {
-	local m
-	for m in Makefile.{gnu,fip} ; do
-		emake -f ${m} \
-			USE_EXR=$(usex openexr) \
-			USE_JPEG=$(usex jpeg) \
-			USE_JPEG2K=$(usex jpeg2k) \
-			USE_MNG=$(usex mng) \
-			USE_PNG=$(usex png) \
-			USE_TIFF=$(usex tiff) \
-			USE_RAW=$(usex raw) \
-			USE_WEBP=$(usex webp) \
-			$(usex static-libs '' STATICLIB=) \
-			"$@"
-	done
-}
-
-src_compile() {
-	tc-export AR PKG_CONFIG
-	foreach_make \
-		CXX="$(tc-getCXX) -fPIC" \
-		CC="$(tc-getCC) -fPIC" \
-		${MY_PN}
-}
-
-src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
-	einstalldocs
-}
diff --git a/media-libs/freeimage/freeimage-3.18.0-r8.ebuild b/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
index a262dc8058d9..2616dbf53ee7 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 
 # The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 2bc9c29fa239..be165981ae64 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,6 +1,6 @@
 DIST gegl-0.4.34.tar.xz 5647516 BLAKE2B 7d9e0c395e6bf38e407ed55f43c090789e29692254990a341e7b9a391ae67423a9948821c1b8a4dd156fb42c16fe6b8572de2ee7b5be09b9f802b892e82df580 SHA512 13bbc19c4fb1feee609d2191b09fe1d2f020da1be788f9dcf7ed89dfef8465ce77dc34a9cb74279c88336aa0f3d3a7a44ca35335a3c2374516f590a40edbc08e
 DIST gegl-0.4.36.tar.xz 5680876 BLAKE2B e2051d21eadfd6ff5c4547d337e749ebb9526be0b45bf80116cfdd1bb98b0fd3b4cced83b4700ecb04c003f83074928ac0c7b4bc8929134c57950a1ac957d50b SHA512 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8
 EBUILD gegl-0.4.34.ebuild 4769 BLAKE2B b604793b8f69d8a4633f74364d8ebd841ea604ceca71abdf74f13ec7290662bb4e8486f2b1d729b0afbe6ee8d8d35fdf083069f5add4e0521f063fb1e6f51b3d SHA512 27fe527925ceb33137244ad4bdcc7ce62e46b72abb022706876bd45ab6ebe3b9b29283e27a84e076758539e5937be3430a25fe7dc86b89f014ce013a3e2a60d4
-EBUILD gegl-0.4.36-r1.ebuild 4592 BLAKE2B 0ed8be4945cae0fddb346428a2a40fc919161399cf2afd04fc15cf7119f657ee03dc0effea6b0403b99de754216260c842a657a6c38f8f4e3e84bc8091331f5f SHA512 39196850da1fe93f7404cb645ac186bed91ea99e25bf33e11c5b819f4bf0d1aa6c92c645b199332371a6f168ee95f06047e2795a364e7c3573968564f34f46b3
+EBUILD gegl-0.4.36-r1.ebuild 4589 BLAKE2B 76f5545fe85d8d77bf60b786b5c29ede05d77c9ce1f58819a1e7f1c264ad99d91c96e7db558d0e8b6b21f946b2fa85db1fadfc744a3d84789d494ab7f65c2c1d SHA512 2d3434ab4115625d17048456bc1e00371e52f70c47a07735c126a34a33bec27070c17e8621135abb53cef90ed946e6e69115c2ccfee706114fd54bbfa856129b
 EBUILD gegl-9999.ebuild 4378 BLAKE2B 84ff73cd6821e16038c52a87daaa404d7b4c09b701c0251bd2744bdd57a546f90f636efce4e6dd838c99131e251bd6c710fbb0190449bb51e412c3a357df7416 SHA512 5aa398283404313498eb5638f0a0c9c31b0f8db59acde5d5fb244558cb8148510463217c850196d972e9eb8a5148401ed03604580dbaf3e0248ccaeb743921dd
 MISC metadata.xml 581 BLAKE2B 180d0731a2d488b8772fc6aa8411871cb892a886ff93368a39a32b284702b7daeedfe32fdf19c0f11101304231ed1338cd8462d7788a08df1bc7ae1b8ac16a66 SHA512 bc5907cd42cbba848b57266cf1023a402296ed96f6ea53ede2501fb49923c23d636622ec569463df402dbb5db3c970353b92b110962945806222ec92257a12d9
diff --git a/media-libs/gegl/gegl-0.4.36-r1.ebuild b/media-libs/gegl/gegl-0.4.36-r1.ebuild
index 6a4a84a8223b..fe22d2a5c5da 100644
--- a/media-libs/gegl/gegl-0.4.36-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.36-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index d46421f89183..ba62b0d23b5f 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,10 @@
 DIST harfbuzz-4.2.1.tar.gz 29096419 BLAKE2B eb523c2e3c956559e2445bd12719b14c244cfdedd239041afec71a17912e489adb94c0b6fe148c60ae9e908cc3e740752de2a33a255c123ef937debe6008d78b SHA512 de14b673f6bd03d561c45f94e9bda44ee41897a643ab8837493260a83b1eb1f1ca0fe105c1bee241f2ecd6ab869dbccf3ffba8e2c4ee9a3a1fca4e1c6c7ca4f3
 DIST harfbuzz-4.3.0.tar.gz 29200217 BLAKE2B dfe5e3b47e3d89a5ad7c6eaf6d274027a0eb05d1994b922d3124c97270f34353384c0161d8815fb2e379e82c8bdf046843902ba53db38daa4348e99d99255900 SHA512 bccf7cfb06ac18a9a9bf465c30dbfb51d73762a6667b3a069a85f9f597e6d27858e9e39a36cce12e23ec5b002b9e572638bf00c76bdea66545ae67a2bb7915f4
 DIST harfbuzz-4.4.0.tar.gz 29226048 BLAKE2B 6534002bc750f12b960289aaff7129b15b2d53a043e67f6273f65fc311cb1767b9649eeb885b90358b595a12ac2f20e83dbe9252518852c8d0e2b213ff004004 SHA512 dd0a9768fa6c60c100d8b053ebc2ce06d236c9b06af0b99ca30ac6567298e94744d22d94ea1c8d8a0af8dcefaeda9328804964b80b8d278dab8978f933ef66d1
+DIST harfbuzz-4.4.1.tar.gz 29231251 BLAKE2B 3947084ea2eedd76d64acfc5286ecd14d772ce0507163bc2c54a86579556a8799959ff4d47ea2919ee8472f8fe50d0266d325e3d0a7024f2ae8dcdf48d14f37e SHA512 bbc415d7b74408b1e8d34bfbc19a3cab002471fdd56d71b469c3129f0eae5532d5c7aaae7bb5cc3942fea6008d2ed9e96a7b20b10f4f5e46db63cecfa5c0248e
 EBUILD harfbuzz-4.2.1.ebuild 2568 BLAKE2B cd0fd13772b43e47a8c90a5912ed5839c09599766e865e5fd7633a0694b9f379ad4c19c7c4b28af4aebaa839e5eefe45138254b075954427a9b105fa0247a52c SHA512 6d4ab2b384c575df4da788cb4042ce3ea88010d1513d1a84a340881e26efeefec5eb46179758eb06b377bedeba5ad999f69ef9a5e33c0779c4d25394b9d1aaf7
-EBUILD harfbuzz-4.3.0.ebuild 2575 BLAKE2B f7d6be6ce8c117f7f5b4d8f58f9e26c3726c3f5a6603f966895b442d12c7eade67de31f46eb5ed80bd49b9f8de6321420e9253da366e38f76c64bb24c60055c9 SHA512 10b26a5e659e579463ebd4c50fee28c90d47eec099c795c95288d29747393bf6553653f9f07fa5db3582b927cd1108ad8b629d77b3e4166f970fb53795bafba9
+EBUILD harfbuzz-4.3.0.ebuild 2573 BLAKE2B 38e1412570ddd7f0f27bcf56ce5e421585d69597518ce499b8a4742296fbf19684d6ee0070090a615927d56bbffdfe591d6ce9c2ccd424edb9f6abe7eea3be44 SHA512 b5740b418c4000e7d23709ed2fb14885345b4e78d731455338b8403493390626d228c0501f50b08ff63d7aa2db0894206dbb0b03152875ba99a860740ba99fc3
 EBUILD harfbuzz-4.4.0.ebuild 2576 BLAKE2B 09004b39b15d8579369e445f9ed43969fe07bae360d3ff8f64c9652427bb1f5ca4aceb444b126b1b5b3fc84317b3edba9d88fec4009392685ad153006bd08838 SHA512 cae3657529a8ae6448d54a705b2ea7665b02256b078bdff2ee4d38f6a3eb1a8ec981c076c2d39bb944978ed6a68778ae7ef22d4273ca85395b1110f8aa03c21e
+EBUILD harfbuzz-4.4.1.ebuild 2576 BLAKE2B 09004b39b15d8579369e445f9ed43969fe07bae360d3ff8f64c9652427bb1f5ca4aceb444b126b1b5b3fc84317b3edba9d88fec4009392685ad153006bd08838 SHA512 cae3657529a8ae6448d54a705b2ea7665b02256b078bdff2ee4d38f6a3eb1a8ec981c076c2d39bb944978ed6a68778ae7ef22d4273ca85395b1110f8aa03c21e
 EBUILD harfbuzz-9999.ebuild 2569 BLAKE2B b0d0ee97ba2e80f55c7ebd237fd10ba16c3be21fb4cdfae92a8332f130e67ab1cf6d8a5bebd40fd14e1f114802f82be2d66a509c4dc693eba9df5863d14ae625 SHA512 072199bab29c5d69097a34a3a67e31a7f092ef4aa5ff14b9f8d543348b7853beb90df791f9f7c9425158f586b506b8b1a9ad19d7cd3d435114568c78ad6f3d5d
 MISC metadata.xml 706 BLAKE2B 8f8639d60a36707cea3dce7e25634fbc6204c6a685dd73d2a470678ae5cca042749378e84a9472a888532310fa001dc0db42cdb60b02f9534e422da67d34e05b SHA512 c573f3ccb80e692a061944ec0d8d54342f9a4ae3f082e784e729e13ecb4b20f0d4ab59d6446ec51a8755842653315922469475d9c2e508db5b3712609fa70411
diff --git a/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild b/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
index 09fd173408b3..312db83be556 100644
--- a/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild b/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
new file mode 100644
index 000000000000..c0e115b06945
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-4.4.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/4.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	sed -i \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
+		|| die # bug 726120
+
+	# bug 618772
+	append-cxxflags -std=c++14
+
+	# bug 790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	# bug 762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for introspection, bug #535852
+	local emesonargs=(
+		-Dcoretext="disabled"
+		-Dchafa="disabled"
+
+		$(meson_feature glib)
+		$(meson_feature graphite graphite2)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+
+		$(meson_native_use_feature cairo)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature introspection)
+
+		$(meson_use experimental experimental_api)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 3e8d7395c88a..2f6d9aec7c7b 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,7 +1,4 @@
 AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e554fa65342c4c364ba51f13717c3c96806417cc7ae814a34a59137da3a93c442cc436bfe7f4330f0a537ba7ed9579a45a4b8c986b443fdfab3fcb42f2 SHA512 06318e4c019fd02c49f7e3c2cf0ecbf0701ee625607763709b010984fa96f2681e19955ad0538397ac9ee3c1a514840f84423b0fe98bafad5e399c43e619175b
-DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 DIST ilmbase-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
-EBUILD ilmbase-2.5.7-r2.ebuild 1089 BLAKE2B a23dfaf5e1af5e869882ff36a3f3c594d92243fc4cc3d029a9e3b666814d2464237cb5708647d9702880695249d5879687d4cb22987ed40a65517f0072a0ac39 SHA512 34b375053d274b9c8cbb994471c9b1393ed7f00be8ff60e2cc76ef9cff338f71d549d768223d25b16424614af46cf406c0372a338c508225350ccc2d1ba5e8a7
-EBUILD ilmbase-2.5.7-r3.ebuild 1142 BLAKE2B cffd679f9c0b88a7173445bdcf0242b2e7f694162b74faf5c335b18832a32178a5fa9419ccb58bd38d889229181283e0fbcf5a49ff5e2b0d111d68a2ed655cd5 SHA512 69cd3492ac065772db9829027afa1c6d559d534bf7b7859532367e14a776f6cbc0c3308f0a73d90a4abd0a804ab22cebd4005e16bbc9c044dd633cf580efcd3f
 EBUILD ilmbase-2.5.8.ebuild 1128 BLAKE2B 6f808706804ba9b0cc2f9c07bf35be288708c5d10760a728981d01c1a33befcb108d1eab45060c1fec2361d7aa53f7bed07a063e871da803621ef378b950cd6d SHA512 8c20aee265f5b13427089d8b34e36acda58051c64c34c79e0bb3fee7111ca4af45fd8ee6ad7ed73415c78d089f8b8f287ddca66fcd09e2eefc57ef0bfedbee37
 MISC metadata.xml 692 BLAKE2B 7127a8f7a09d330611b53333d304a65edc9e97ed0d64ee8c0be87ce14c072f2f58507a84800f0ad1191ff2307b97401611aae00f3406bb197ef08294e2cd4639 SHA512 ab1157b16c56c47ae496b12da23f08670bfcae120a00b6c37f5d93cf82fc6981c7f054dd945a67cff17c8c282a4a3e45dc8924cd2ccce78ba6e232f24fa16c99
diff --git a/media-libs/ilmbase/ilmbase-2.5.7-r2.ebuild b/media-libs/ilmbase/ilmbase-2.5.7-r2.ebuild
deleted file mode 100644
index f059ec0f2bc5..000000000000
--- a/media-libs/ilmbase/ilmbase-2.5.7-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/openexr-${PV}/IlmBase"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="large-stack static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README.md )
-
-src_prepare() {
-	if use abi_x86_32 && use test; then
-		eapply "${FILESDIR}"/${PN}-2.5.4-0001-disable-failing-test-on-x86_32.patch
-	fi
-
-	multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DILMBASE_INSTALL_PKG_CONFIG=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/ilmbase/ilmbase-2.5.7-r3.ebuild b/media-libs/ilmbase/ilmbase-2.5.7-r3.ebuild
deleted file mode 100644
index 4e17a1bf8dab..000000000000
--- a/media-libs/ilmbase/ilmbase-2.5.7-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/openexr-${PV}/IlmBase"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="large-stack static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!media-libs/openexr:3"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README.md )
-
-src_prepare() {
-	if use abi_x86_32 && use test; then
-		eapply "${FILESDIR}"/${PN}-2.5.4-0001-disable-failing-test-on-x86_32.patch
-	fi
-
-	multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DILMBASE_INSTALL_PKG_CONFIG=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 9a572b28fc17..ca424a38ad9e 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,4 +1,6 @@
 DIST libaom-3.3.0.tar.gz 4768475 BLAKE2B 22060694019bcd925cb38c365063b8f2be60aed4cc6f9b0aa95cf8b4c4c5b40f5c603359d8c0728c5650fe9f7eea7573b8fd4a93975481c67409b201b4c48428 SHA512 9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
+DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478
 EBUILD libaom-3.3.0.ebuild 3231 BLAKE2B 3ad7ddf62b2aad9be9401ac792241cc162be618d8f1c4a35e015479f5736a6970ae48b99ab2e950a890f5bddb6f44ee50edf421e46f8c072ccd82a0bf6d5dbb3 SHA512 aba993a08e60d01e6d904ba4103a761d6dcaf9290f6af726c4c0dc98eeb0644a1cd2167ade6357b0382f5629b7065d595b5bd634705fec89bf7330f364132f0e
+EBUILD libaom-3.4.0.ebuild 3237 BLAKE2B 14178eaa332094518b8f1ca02403656dd0e03b9a8c7b10f2943806be72d1192cdaa44013b7a08f3d33530680ad0c59137d1a681a377698231965cba583726809 SHA512 9ab366eb3d8a045ad65e3c32c59da5cda4eb4a68591bba78af92321f9c50a2599123625a1c25b8ceab24ba6ac816f102519650ef50875bb5acf01b04167416cc
 EBUILD libaom-9999.ebuild 2439 BLAKE2B 4001e4bed132d41f7b11d2bd1550ad818b924289f36d78aff574633a6da5032a69502b6fa4e01eb4b157892b97b1852b7adb05c309657224c42610228bfd993e SHA512 820c5aa842cd37d2c2740891aece3fb218ee987c3d72b87ef2483b4f2e26af96638a8b19813509ebadaee8d8b299bc84c43593f77f80559ecb5b25336c4ba5d8
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.4.0.ebuild b/media-libs/libaom/libaom-3.4.0.ebuild
new file mode 100644
index 000000000000..07423e062dca
--- /dev/null
+++ b/media-libs/libaom/libaom-3.4.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="doc +examples test"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+# Tests need more wiring up
+RESTRICT="!test? ( test ) test"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="${PYTHON_DEPS}
+	abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# the PATENTS file is required to be distributed with this package, bug #682214
+DOCS=( PATENTS )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CCACHE=OFF
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		# Needs libjxl, currently unpackaged.
+		-DCONFIG_TUNE_BUTTERAUGLI=0
+
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+	)
+
+	# For 32-bit multilib builds, force some intrinsics on to work around
+	# bug #816027. libaom seems to do runtime detection for some targets
+	# at least, so this isn't an issue.
+	if ! multilib_is_native_abi && use amd64 ; then
+		mycmakeargs+=(
+			-DENABLE_SSE3=ON
+			-DENABLE_SSSE3=ON
+		)
+	fi
+
+	# On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456
+	# Just force generic, given it's a niche situation.
+	# TODO: could try forcing armv7 or similar?
+	if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then
+		ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)"
+		mycmakeargs+=(
+			-DAOM_TARGET_CPU=generic
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	"${BUILD_DIR}"/test_libaom || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libdmtx/Manifest b/media-libs/libdmtx/Manifest
index bdc7661489e3..97351633782d 100644
--- a/media-libs/libdmtx/Manifest
+++ b/media-libs/libdmtx/Manifest
@@ -1,3 +1,5 @@
 DIST libdmtx-0.7.5.tar.gz 790944 BLAKE2B af94a998e6ab0b06c17d64d6c720e874540830282fd1219260aa1e5fb44159b59f63fcfd1fbd750333ae50b080c341ec02b81216c2e975a8ef85628b23d4fb55 SHA512 c4bccc9eff4a93b6bb417ed23ed46e82cc98b650a94be40479d192af8537ee02a16700fbbd8f2271035ff8b804c40ab6461825d94bd80a3081d3a4b3988ea22a
+DIST libdmtx-0.7.7.tar.gz 791517 BLAKE2B 5ff0ba22dd753b644cc7d84a2ee9c98f48047d05b322993458d4a35e704ac9d330d3112db8f3461fd9945c1d09422059d47417b46b8000d3e65f31430efc8e45 SHA512 802a697669afeb74da0cc3736fe7301fcc1653c1e3bebc343a8baf76e52226cc5509231519343267a92e22ebdfcc5b2825380339991340f054f0a6685d2ffcdc
 EBUILD libdmtx-0.7.5.ebuild 636 BLAKE2B 5c016cee6ae44354c10138d2555eac4be1f1283515c2ec21fa753ecb6a7fc802b9dcac133c5a10b785af1055a22786902ad7fe8b40673a0201d085dae41a4cfc SHA512 6347f88703bf4bd669bfef3ff14d30f60d371f9498eb5df0e3d8040dae07cb9f0c18b08834146e84c0e74ab4fd7f8581a49b41b7d6b009594eaa5195c804e7ad
+EBUILD libdmtx-0.7.7.ebuild 592 BLAKE2B 0d139e67fd4204b5bed2f31490e519e4b4874954e78aba9892123dd90e468a6fd93641e08f3e0923c320f2499a966f4ede2bb0a3a5b665a92f5885172890c3e7 SHA512 0955518d5d97c0cc99fbed5f5011a0c5d3bcac3d0d8588abb5e9a68667398e313f79734864ddea544c1ca633260c81f48b9fa56997c7227e5091a3d507d0e039
 MISC metadata.xml 379 BLAKE2B 7a0385fd25a2a4063b4daeee8e67299eaef34bc20c23e639bec3db9f2db760bd4fbec23778c1673e9355a2c053f7a4ddf5170735147efd3038ed6da21fc05ff5 SHA512 384fd330b22976134122440b2fd617f34a8d9508abe72c261e2821fee2db8d2ef65d967875b70dc9fac1bbd72e832166ac808348894c6b4fa60c41ac3badd1e1
diff --git a/media-libs/libdmtx/libdmtx-0.7.7.ebuild b/media-libs/libdmtx/libdmtx-0.7.7.ebuild
new file mode 100644
index 000000000000..1f83c814eec8
--- /dev/null
+++ b/media-libs/libdmtx/libdmtx-0.7.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Barcode data matrix reading and writing library"
+HOMEPAGE="http://libdmtx.sourceforge.net/"
+SRC_URI="https://github.com/dmtx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+src_prepare() {
+	#bug 663346
+	sed -i -e "s/-ansi//" test/*/Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/media-libs/libdvd-audio/Manifest b/media-libs/libdvd-audio/Manifest
index bdb0110bc3f2..f92ded458558 100644
--- a/media-libs/libdvd-audio/Manifest
+++ b/media-libs/libdvd-audio/Manifest
@@ -1,4 +1,4 @@
 AUX libdvd-audio-1.0.0-makefile.patch 2001 BLAKE2B 34a0dadb1b8647f75f2df25e08804546729c18441b0b7730e209acb968830e9cbe84da6747f1962e43240c8dee962c4cc045cf98c82d2ffb2fda25cb6b07bd08 SHA512 3bc65331a28970c877ebcce1b008603d9491838bebd61fd87b9c50af8f0bf3093fa9045e0d8ad9dcbaed02f5dc50fa2c5082c179ba73633bd9c01f7de4e0c9c5
 DIST libdvd-audio-1.0.0.tar.gz 224989 BLAKE2B 972d53499a5736d9a006d1c4bfab5f51ce0a6404b5b7dd05a17e76642cd9231c4db25202b9108cfaeff1739f651c7b43ad5450941a625284c61c80646a8278a5 SHA512 b0a19670b07d9bbc3622ecd0d50b2ead56f1d7b2c9c3082a02f7cee75532fd333e1ebd5fafeeb431d2427c2dfcebdb9ffb03fb3b6b4d6ce6f307e0333e5beb64
-EBUILD libdvd-audio-1.0.0.ebuild 760 BLAKE2B 328662b858f5f5eed0621d0db16811e6169abe6f8a68a925e1e12ced9eb90331f69e3e986de8c2d20014666e553ada9ef9d08513c687fc08133d1fd8828adbd9 SHA512 a4867dfbdf26db32e00f26b806b32850f11166c4cf56dab25c96aa2e90560a3306d43eca7150a34378e2db4be7df54b8abeb7f1ca09c420b19382c77980c3755
+EBUILD libdvd-audio-1.0.0.ebuild 759 BLAKE2B 3c89a19d7fe8c811e49a911cfcf8f3673abe3232acf95e4c8998434350aaafbcbee16863ce2ebd63a42c7a864c0f127113b272bbdc363db12c85c8625b2098b8 SHA512 e45fad78b58ed835d4e17f326b2117713873a88273d3fcc0ebf573c6740cb6c66eb2674f2e266576d4f166288820ada7c623a6bf7e7ba6299602370e828de9cf
 MISC metadata.xml 336 BLAKE2B b70e98d50da55d8916f6a8cbce3894a00d4c987d64fccf4d4d3c14146c8fbe8a049e385bcbee8d96b4facc2a9f3456a0785ef7e207dd08aee997e59445bed747 SHA512 e29bebad5df1bf692fe81601e9684bb7a9c5b2869724309edcb155590d4495d8fd0981521aa391b247793134899e3039b17f1bd4bc795813f9b70c3ee6c947a7
diff --git a/media-libs/libdvd-audio/libdvd-audio-1.0.0.ebuild b/media-libs/libdvd-audio/libdvd-audio-1.0.0.ebuild
index 040a6ebb4991..e8040edd4a51 100644
--- a/media-libs/libdvd-audio/libdvd-audio-1.0.0.ebuild
+++ b/media-libs/libdvd-audio/libdvd-audio-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index f7816aa5c1ef..3744ea1d9d8e 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,3 +1,5 @@
 DIST libgphoto2-2.5.29.tar.xz 5875684 BLAKE2B a0bc48b95ecff3c7f157b7baee18bc3ad86d376c9adc6f7eedd2f8cea40434cc97598cad49ebc1e4683492f9eb3e5b3494de3112bb740d2ccd8e2c55cf4ff1ed SHA512 f8e3dbea58fa6f19a100ee319d5561387a54e8701a19d034bc7d6fe474dc6e4f21fccc4b6c11346df4fdc811666d49ea0b9a2b5b67aab00acd5a1e94d9259c94
+DIST libgphoto2-2.5.30.tar.xz 5890196 BLAKE2B 4da7a650bec695a9d8356d1014081786eb6d31641c4f36f75ba7171b2b395a5e8bf6f59d452adad6d9faa30eea77abeb52e62e645d963bcec2709b3eb5094a4a SHA512 969e5765dc5de9e5fb8156eda679aca069f568e744cc48b643846175eb3cff78bc6ec3a848150a4c636d948018de022f2988da7b94029f103589384f9144b7ed
 EBUILD libgphoto2-2.5.29.ebuild 6191 BLAKE2B a45d63e34a80e3b42b50d51e933d8abca7ae05c1f9feae88f526c39d6a7f17a09a5719bdb8b44d7a1bc7895b0e97b6ccff13d41266cadc5b912e9ed67e17076f SHA512 dc4035b4638815fc56206421493e54ce9ac999e0ce904f72dac53b129fb00316bc7d233626bd9431f8ba72eb35db57f76ed29222ed136b818d9b102675f94198
+EBUILD libgphoto2-2.5.30.ebuild 6262 BLAKE2B 5e9d312143af8a775851afd982ed957c0fd1788bb12e777d4c2afcdbf6c22ca712b2adc62ee67e64265381ce495f37ef57b382f10ac02c3cda8ddc37db7f99a6 SHA512 4a2fe88d8a13ff405d17d79fdf3192ce57cbf00a906a378ff43482313a9e606d504b7e121429e7f8f65d266961145c3d4c2fedaf92699b59043117d493629ee3
 MISC metadata.xml 401 BLAKE2B 114b82879f1ab00f4b6b0784a675fc50ba303fee05355f5d6edf32e3f5d3e3015f43e8f300fb9ff45b9dc9100a30431d0458ea8fe1c868090ad739e83587053e SHA512 87a96a6120a0a29c1b05aa43c1548cea9d7fcf0ff3c5815c3369dac7545c8ca05f5a7795f870566bd264cb2873fdf6a79a7dea92d318fca8078d8ec6d8c6a2e3
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.30.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.30.ebuild
new file mode 100644
index 000000000000..f7868771f609
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.5.30.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# 1. Track upstream bug --disable-docs does not work.
+#    https://sourceforge.net/p/gphoto/bugs/643/
+
+EAPI=8
+inherit autotools multilib-minimal udev
+
+DESCRIPTION="Library that implements support for numerous digital cameras"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.xz"
+
+LICENSE="GPL-2"
+
+# FIXME: should we also bump for libgphoto2_port.so soname version?
+SLOT="0/6" # libgphoto2.so soname version
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples exif gd jpeg nls serial"
+
+# By default, drivers for all supported cameras will be compiled.
+# If you want to only compile for specific camera(s), set CAMERAS
+# environment to a space-separated list (no commas) of drivers that
+# you want to build.
+IUSE_CAMERAS="
+	adc65 agfa_cl20 aox ax203
+	barbie
+	canon casio_qv clicksmart310
+	digigr8 digita dimagev dimera3500 directory
+	enigma13
+	fuji
+	gsmart300
+	hp215
+	iclick
+	jamcam jd11 jl2005a jl2005c
+	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
+	largan lg_gsm
+	mars mustek
+	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
+	ricoh ricoh_g3
+	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
+	toshiba_pdrm11 topfield tp6801
+"
+
+for camera in ${IUSE_CAMERAS}; do
+	IUSE="${IUSE} +cameras_${camera}"
+done
+
+# libgphoto2 actually links to libltdl
+RDEPEND="
+	acct-group/plugdev
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	net-misc/curl[${MULTILIB_USEDEP}]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
+	cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+	cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+	exif? ( >=media-libs/libexif-0.6.21-r1[${MULTILIB_USEDEP}] )
+	gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.1
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gphoto2-port-config
+	/usr/bin/gphoto2-config
+)
+
+pkg_pretend() {
+	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
+		einfo "No camera drivers will be built since you did not specify any."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle examples ourselves
+	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+		|| die "examples sed failed"
+
+	sed -e 's/sleep 2//' -i configure || die
+
+	eautoreconf # For configure.ac patching
+}
+
+multilib_src_configure() {
+	local myconf
+	use doc || myconf=( ac_cv_path_DOXYGEN=no )
+
+	# Upstream doesn't default to --enable-option-checking due having another
+	# configure in libgphoto2_port/ that also needs to be checked on every bump
+	#
+	# Serial port uses either lockdev or ttylock, but we don't have ttylock
+	# --with-doc-dir needed to prevent duplicate docs installation, bug #586842
+	ECONF_SOURCE=${S} \
+	econf \
+		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-docs \
+		--disable-gp2ddb \
+		$(use_enable nls) \
+		$(use_with exif libexif auto) \
+		$(use_with gd) \
+		$(use_with jpeg) \
+		$(use_enable serial) \
+		$(use_enable serial lockdev) \
+		--with-libusb=no \
+		--with-libusb-1.0=auto \
+		--disable-ttylock \
+		--with-camlibs=${cameras} \
+		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
+		--with-rpmbuild=$(type -P true) \
+		udevscriptdir="$(get_udevdir)" \
+		"${myconf[@]}"
+}
+
+src_configure() {
+	local cameras
+	local cam
+	local cam_warn=no
+	for cam in ${IUSE_CAMERAS} ; do
+		if use "cameras_${cam}"; then
+			cameras="${cameras},${cam}"
+		else
+			cam_warn=yes
+		fi
+	done
+
+	if [ "${cam_warn}" = "yes" ]; then
+		[ -z "${cameras}" ] || cameras="${cameras:1}"
+		einfo "Enabled camera drivers: ${cameras:-none}"
+		einfo "Upstream will not support you if you do not compile all camera drivers first"
+	else
+		cameras="all"
+		einfo "Enabled camera drivers: all"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen doc/Doxyfile || die "Documentation generation failed"
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+
+	einstalldocs
+	dodoc TESTERS MAINTAINERS
+
+	if use examples; then
+		docinto examples
+		dodoc examples/README examples/*.c examples/*.h
+	fi
+
+	# FIXME: fixup autoconf bug #????
+	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
+		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
+	fi
+	# end fixup
+
+	local udev_rules cam_list
+	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
+	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
+
+	if [ -x "${ED}"/${cam_list} ]; then
+		# Let print-camera-list find libgphoto2.so
+		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
+		# Let libgphoto2 find its camera-modules
+		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
+
+		einfo "Generating UDEV-rules ..."
+		mkdir -p "${ED}"/${udev_rules%/*}
+		echo -e "# do not edit this file, it will be overwritten on update\n#" \
+			> "${ED}"/${udev_rules}
+		"${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \
+			|| die "failed to create udev-rules"
+	else
+		eerror "Unable to find print-camera-list"
+		eerror "and therefore unable to generate hotplug usermap."
+		eerror "You will have to manually generate it by running:"
+		eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}"
+	fi
+
+}
+
+pkg_postinst() {
+	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then
+		elog "Don't forget to add yourself to the plugdev group "
+		elog "if you want to be able to access your camera."
+	fi
+
+	local old_udev_rules="${EROOT}"/etc/udev/rules.d/99-libgphoto2.rules
+	if [[ -f ${old_udev_rules} ]]; then
+		rm -f "${old_udev_rules}"
+	fi
+
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index 1254bb63db89..c80d4d4176b4 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,4 +1,7 @@
+AUX liblscp-0.9.6-conditional.patch 350 BLAKE2B 5354ef415e5905d3dd03879372f6a434e1b0fb50ab6e5db750a0c61a6bb89ecce714d020b1e79fd09ef13fda947ad9c161d7302302ea34f4189803b33c86298c SHA512 c2db8ae9044138353ead1d4b992cb8bbb83038a96c1a20d953762f0c30ccd493d2503648c2f6588a97aa3e72edbb959e30e8629e7d3e1d7a74c7c2f5617863f5
 DIST liblscp-0.9.4.tar.gz 697219 BLAKE2B f1824c75237e478888ffcd95c15b72e4746cbc8997924f70cced966baddb68877526cbbcd56ff419fa1eb5f1ca6a1537ce5db368ba41cac39e51813921720e9b SHA512 6aa9b15d538925edf3327ca05023bac8285611902703fec20572416dde5cd7300ed429a7db464d92b9f6c1d524b89066888f8cbd0d56283ff3c78074605f396a
+DIST liblscp-0.9.6.tar.gz 100811 BLAKE2B a86a5e9e6d52dfd2449274e1c800e40887094dcea3e39d257670dded8b3805f2cdf575b41f640b0df95cd008656d3e7c8ca93d5bc5360c8727b80d6d2695ed83 SHA512 51c3b0b3dfe3947ac5d7cfec18fec597a4282aacc489cdda5a30d5853c3a43778e207ddf2f211c28ba04386fd6f30a09eed62dc2a33177e5aeccd7f77b4ef520
 EBUILD liblscp-0.9.4.ebuild 637 BLAKE2B 8f259597f3b0360dba84efbae838531fdf0524f7a962717ba691f4cc324a2a24d07163afd1efa0641db6fcc3a8bbb754bbef6c83580d703c52e1dd91139a39ae SHA512 659b7dfa673a2b07220b56e58ab84f9fa008a9727dae2bacdf5644e5453c49708cbc3491851f88d86977a90d7df74c9ad4b8f52158c7c1ae3e8e8b93bce7d374
-EBUILD liblscp-9999.ebuild 666 BLAKE2B 6d46b9205a46720401495db41bd03e090e29b1b4f23bac9b41d4d6d86f187a3d3d69d0eac2849a623a30f2b4ce8f43a2ddd85b7e1d8f951cd88f0bfd884eeb78 SHA512 676ddb8b98247c647b70f8283dddaebd318a2a0a2944a3da931492c01aec648042b9ae1d58854a285fa0b23199d8d831b09efbda6ca51d7f61cc82b62c0432d4
+EBUILD liblscp-0.9.6.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
+EBUILD liblscp-9999.ebuild 750 BLAKE2B 4ec1fd94a04806df5a2c8ec18f12a21cb53159a933be39253bbf2ad3d2e505e8cc71d8bfcb8bfeb751da7fc60c18437d63c74c05e4a723f94106f1d4717bb4c7 SHA512 fdcb708593aec437922f534f90a1bee1040d68c5659d56645052f933f7dec512767d70b359f535db3d7fec4dd6677dda306e0c205be565b25a48d470290e687f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/liblscp/files/liblscp-0.9.6-conditional.patch b/media-libs/liblscp/files/liblscp-0.9.6-conditional.patch
new file mode 100644
index 000000000000..a7f1cdf5c45f
--- /dev/null
+++ b/media-libs/liblscp/files/liblscp-0.9.6-conditional.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cf38831..a13f094 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,8 +129,10 @@ endif ()
+ #
+ 
+ add_subdirectory (src)
+-add_subdirectory (doc)
+-add_subdirectory (examples)
++
++if (BUILD_DOC)
++  add_subdirectory (doc)
++endif ()
+ 
+ configure_file (liblscp.spec.in liblscp.spec IMMEDIATE @ONLY)
+ 
diff --git a/media-libs/liblscp/liblscp-0.9.6.ebuild b/media-libs/liblscp/liblscp-0.9.6.ebuild
new file mode 100644
index 000000000000..5d0c3733b0ff
--- /dev/null
+++ b/media-libs/liblscp/liblscp-0.9.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ library for the Linux Sampler control protocol"
+HOMEPAGE="https://www.linuxsampler.org"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://svn.linuxsampler.org/svn/liblscp/trunk"
+else
+	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
+		https://download.linuxsampler.org/packages/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.6-conditional.patch"
+)
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOC=$(usex doc)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/liblscp/liblscp-9999.ebuild b/media-libs/liblscp/liblscp-9999.ebuild
index f456569bf546..5d0c3733b0ff 100644
--- a/media-libs/liblscp/liblscp-9999.ebuild
+++ b/media-libs/liblscp/liblscp-9999.ebuild
@@ -1,36 +1,37 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools subversion
+inherit cmake
 
 DESCRIPTION="C++ library for the Linux Sampler control protocol"
 HOMEPAGE="https://www.linuxsampler.org"
-ESVN_REPO_URI="https://svn.linuxsampler.org/svn/liblscp/trunk"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	ESVN_REPO_URI="https://svn.linuxsampler.org/svn/liblscp/trunk"
+else
+	SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
+		https://download.linuxsampler.org/packages/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
-DOCS=( AUTHORS ChangeLog TODO NEWS README )
-
-src_prepare() {
-	default
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.6-conditional.patch"
+)
 
-	emake -f Makefile.git
-	eautoreconf
-}
+DOCS=( ChangeLog README )
 
 src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
+	local mycmakeargs=(
+		-DBUILD_DOC=$(usex doc)
+	)
+	cmake_src_configure
 }
diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index 6b496d30f990..f4a5df0c6cc9 100644
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -3,5 +3,5 @@ AUX 1.9.5-meson-add-vapi-option.patch 1600 BLAKE2B 1d6cdfb25740c310c6bd4c1ce7be9
 DIST libmediaart-1.9.5.tar.xz 5549620 BLAKE2B 6656baeb52aa0f4c355354dab3eb5499af957a2d9c5530e46874127a71a55b744b0370ec25b5e187ea9b615acb195f5b817196d59e668c34f2e3c8c4f8060598 SHA512 b1d54f4b480cb5cf63a2231b082635268ac1ab708ba829a3e5ccfdfb530e9d463c5ac505cd1dc44643f23f787c4df2ef287a7e68d56e93a05b97be450c7799b6
 DIST libmediaart-1.9.6.tar.xz 5551220 BLAKE2B 15f17592075461d6199c9a4e0de1a99493b88147410c25e360e71dcb3e9f2d5e733977cf66c8bf900c654e4e9930d551d30832f2d64dcb8b2b5306b6ce085f80 SHA512 93af1a06aa7b12d8fc7573201f51abc41838bd9405bc8cf56d4fcfb5cfa9f7427d8d8ddc2ee36501e938bc8e123d91f590cff2cdb4689e1e6ed2358f7264e887
 EBUILD libmediaart-1.9.5.ebuild 1191 BLAKE2B c0beef107a6aa39c624624e093066a6fb496ab7db6bef6632c03e0b40c90813274f81532da6cf50c2827ae4ece20683311def74b8d1771f2832f1841945061ba SHA512 0aef5fe66ac859553fef2f660dc8f1b9c6b4cffe572a74416349e1fd359b3c268b3686219b8d35f7c8e5387de132fdb12e2538d195903f82fa796819d0bf93e3
-EBUILD libmediaart-1.9.6.ebuild 1132 BLAKE2B a6bceb1ab8797857dfbaf3d7689e1854e8ede2be7859b0006363faec4335fcc6d8755613076a723bf2c1f8ad3b8b2c4dd51d01faf32b3a6bf219f7e35beb75e9 SHA512 798b8aa69efe3bd2136158197a151b99741418860b1637b31898f2537dd3d3e950bc5b54a70282c9d46b70aafecca1d0071b9aa26edfa33ffcf2aaf97614a599
+EBUILD libmediaart-1.9.6.ebuild 1130 BLAKE2B 0488c73f27170c2206f20381145c7f5e113df3e7467b7f0d5279e8eea901ee8e6307f1f40de9e77b75baf6785d58d5c9ff7a4103c176c20967af54973f371fe8 SHA512 c13922d30dfd548101590df634e33a718470d68d30f3cbb63727d005d0455ae5abfe1950ebc8599f0e679467d10155e1cc81e4296bb07cb519051381a7fbeaa3
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/media-libs/libmediaart/libmediaart-1.9.6.ebuild b/media-libs/libmediaart/libmediaart-1.9.6.ebuild
index cdaf217b05fa..fc0f7522e832 100644
--- a/media-libs/libmediaart/libmediaart-1.9.6.ebuild
+++ b/media-libs/libmediaart/libmediaart-1.9.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libmediaart"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk gtk-doc +introspection qt5 test vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 5d239db14661..2d5a4268ad03 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,5 +1,8 @@
+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
-EBUILD libmtp-1.1.19-r1.ebuild 1660 BLAKE2B 49555601ed00630500316f6bdda97adfafb27997531ccd32b22496d97278ee2be8846012f90eba422faf9de2b55b79e68c96713065dbca42fb1353c3fdb3a9f8 SHA512 69b39b58ae37408338f8928b7d8f7ebabc5ead0557963f38e193563fcddf09588b1a15486f9e44816d569068217cad928d09d7d9a11c45eb007ca34a2ae769e1
+DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
+EBUILD libmtp-1.1.19-r2.ebuild 1710 BLAKE2B 94dc2b986f7d2e8c33a40c5b82846508758dfacde64ab2411e3e58d3aac27b1495442fb1813c4c86d900bf012ea67c08c65f0dc8ea9642cf957b3dd9b79b2733 SHA512 230e50ebb1c614f78c04010a424d3bbef1dbc382685e144337312bf38f5a2de6a5b56c0ed8d2aa763cb1479b0a1cb2556252b6d970c9189072acdae750c84786
 EBUILD libmtp-1.1.19.ebuild 1671 BLAKE2B 10bfcb9527fb3590bf8ad6daad17804abe282dfdd8662024029663fddf3101664b7083d282a5e8ee4eb42bb6f3a2e2ca3d018f8a6d7257447500f1d123754d4d SHA512 13aa3c4a74af67858b0a57f5f754dbc1654a9d83e63a29aecf72e1f887106722ae126fd8a9adc434659e966d9dfb5f9d182c0640e921edf17230a2c464b77976
-EBUILD libmtp-9999.ebuild 1642 BLAKE2B 7ecd6d41037949e3d3efd042a50c1407a20f5860afcee37e0f91b2b96cc880155a6d20e64a7b77f929628ab73e03410b656b12920bbc358f87dbc71d94fe2fa7 SHA512 3cb4d3ce86e544e3bb9248c076be25f027a80e0011839b9fdb9446b7c1ab25663e83ed44e5b7054ad7b5c49726faabcdacda409cb7eeea477ba3372142d1be68
+EBUILD libmtp-1.1.20.ebuild 1719 BLAKE2B bf05733a42e02fc5109548e6af9bdbeb9f23d7a35df3031176e525aef7b831ef3792575496f6f1cca1f7bea5293f8f4fd14fd6563d5576f5f96a75bd18ff3c31 SHA512 a596419c6b4e7946cccbfa511c6f2817609ebb7c4d17ec11b6843205fd1abcf2fc618bbbfb5672f01ef0a67d8399deb98b67fa47012c52ddf908210b4a93247e
+EBUILD libmtp-9999.ebuild 1661 BLAKE2B a69293877e373fefde0c6fb420dbb66c1fb805624e22a547eee2f541f43fb4ba1756fa1e062829e01683aea13d3bd97efccb320f349b3c94e51de01ba665f298 SHA512 b942f7eb68588be410d8b949060255199e0d2601e11a7e92060d0a00bc92c9e09411caa978a6d939ffecdd6f7412600bedff0e1e7cf29540d8d4cd1e9c5a028e
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/files/libmtp-1.1.19-fix-docdir.patch b/media-libs/libmtp/files/libmtp-1.1.19-fix-docdir.patch
new file mode 100644
index 000000000000..25450079d203
--- /dev/null
+++ b/media-libs/libmtp/files/libmtp-1.1.19-fix-docdir.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index fede3e0..d801a47 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -256,7 +256,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Doxyfile.in examples.h mainpage.h
+-@HAVE_DOXYGEN_TRUE@pkgdocdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++@HAVE_DOXYGEN_TRUE@pkgdocdir = $(docdir)
+ @HAVE_DOXYGEN_TRUE@htmldocdir = $(pkgdocdir)/html
+ all: all-am
+ 
diff --git a/media-libs/libmtp/libmtp-1.1.19-r1.ebuild b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
index bf1575d7a256..fd347a6888d2 100644
--- a/media-libs/libmtp/libmtp-1.1.19-r1.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.19-r2.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
 
 DOCS=( AUTHORS README TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-docdir.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/media-libs/libmtp/libmtp-1.1.20.ebuild b/media-libs/libmtp/libmtp-1.1.20.ebuild
new file mode 100644
index 000000000000..5e6a85f46c71
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.20.ebuild
@@ -0,0 +1,85 @@
+# 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}/${PN}-1.1.19-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
+}
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild
index d0c62a952673..ab7478bda189 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -22,6 +22,7 @@ IUSE="+crypt doc examples static-libs"
 
 RDEPEND="
 	acct-group/plugdev
+	virtual/libiconv
 	virtual/libusb:1
 	crypt? ( dev-libs/libgcrypt:0= )"
 DEPEND="${RDEPEND}"
@@ -57,6 +58,7 @@ src_configure() {
 		--with-udev-group=plugdev
 		--with-udev-mode=0660
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/media-libs/libnjb/Manifest b/media-libs/libnjb/Manifest
index 519035de1b70..b675ac33c2ae 100644
--- a/media-libs/libnjb/Manifest
+++ b/media-libs/libnjb/Manifest
@@ -1,6 +1,7 @@
 AUX libnjb-2.2.7-exclude-samples.patch 288 BLAKE2B 8d9646562a8b7a07460577a563ae576bc1793ba7fb330a5a141a076ecc443872759dfbd51c0425fa52fd1460d3a5347fd4f0b46c4a5bef9165bb6dbedacacb73 SHA512 218ad125a74545340bb3c1295e7bde74701ae656ebf0955d96d23f554dc1119d20e8ebe530d658883c799d0552144f094e1c825f2dc6daae529ea8d37114d7f6
+AUX libnjb-2.2.7-fix-docdir.patch 462 BLAKE2B afc0ea3f8d8a776ed37f93fb2430f931cd154f1f88ed1a28fe8c5ebbd9b5501bf63de0999ed01fe79c72133f5e76c4e0cf7d4876e40fdf7f93ef1a5bac964c8c SHA512 f85f5ab0a628850cc2db04ef4beae79448bcd144002dca5552999c9487cb65ece8ca4bbcea9135b892cb813e8bfa28dd94c09e7d08ba562807f329217bef58d5
 AUX libnjb.rules 1773 BLAKE2B 3fdc3a8ceaec9b065e5ea174738642311b57f4cf41f2759375160ef0cdd6044434427f82dae8dc4cad167bfd4578b51bb019a3e4924883f8a6f9efc06a7fe6be SHA512 21d9aa5b0d0c170c3f8071a81981590714f6bbf203d5b6f973aea6a2365f69cde5008969748a2136b9791db327fc476d33fe8937cc7c7d26168ac1803738419a
 DIST libnjb-2.2.7.tar.gz 497862 BLAKE2B e6b7ba77d99f2f4e777ebdca6793d6a348073d9696b9b38b51bc7e29ddacff9a5d19116ca538416ef068496a8827700ed4f740e8ce0c0c1402751c97eb45ed58 SHA512 d217beb772024ec122739327dae9f1e991ace4c3dfe79a4960d1d7421c3d663f924304331025a1790ea7b697ac84d8926f3ab507c6d919e781e90ca82ef6fd06
-EBUILD libnjb-2.2.7-r1.ebuild 905 BLAKE2B 35222a81e34ae0cc7adf6c9b8c93b2361d75d2e83293f601eac729d8f14af5ac19585aef58190feea71d94aaae0be243430c5c05b3ef9aa4d18ae6a501895bd5 SHA512 9d11fc3b1c3dc8689098ba9fc76ecfc95a320faa7ec901facff054085c2a14850ecf7e6d6378558850c0c449ee40fe1ce95b6f9eb01cb6efe9537e1e60604b7d
+EBUILD libnjb-2.2.7-r2.ebuild 943 BLAKE2B f8e71417fe6652e74a0c35c9600e7c8dbad2cee72bcdb682c27aaf6dfedf7e26d0ba2a7d6575ea82237df4bf69cf17a6f3e89600678d9f2c0cdf3b678e4752b7 SHA512 cdcb47e9d15f08e193c3c432ee58bdf200a9544ae3c7636d9d321d3c23bc534c4f58b824ef2348d8990ef8ea9a8ebe32ea537a830481ef1372836746725d976f
 EBUILD libnjb-2.2.7.ebuild 901 BLAKE2B 6a80b5cbd83f412b2d266ced3351089b015b2b5236ced0ed8fffc159ffa55fe3c01490058f86d771fc8e486f24ceb23a246bf743ba733d2147be8cd5de3b7711 SHA512 8c9d7564228c4910c37caabb1803cff80603f7ca932f8bd0781a55a60e7eb25c47bd6e0195d18ad8445c1e79881042122bacdc00347188ec855bfce01e6392fc
 MISC metadata.xml 330 BLAKE2B 39ec86a9bd0ff38039476fcd261ba7c73f76e5fc753eef58396595adca1c3222ee7f0d84b2d13834448334b89641ad4b0d3d18d73052272e3d733138e3bfc019 SHA512 d01d952928c34e77ebc9b00e3248fce151c2d0bdef18a9e60512fbdeb76d473a57fd26ae3891bad2fe747e7d016a4cd84ce3029db6ad2918fe14f63dc7555dbb
diff --git a/media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch b/media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch
new file mode 100644
index 000000000000..efa6825e7473
--- /dev/null
+++ b/media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index 5a9b1bb..3e25fb5 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -169,7 +169,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Doxyfile.in examples.h mainpage.h
+-@HAVE_DOXYGEN_TRUE@pkgdocdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++@HAVE_DOXYGEN_TRUE@pkgdocdir = $(docdir)
+ @HAVE_DOXYGEN_TRUE@htmldocdir = $(pkgdocdir)/html
+ all: all-am
+ 
diff --git a/media-libs/libnjb/libnjb-2.2.7-r1.ebuild b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
index 2f593d538544..5673ca924821 100644
--- a/media-libs/libnjb/libnjb-2.2.7-r1.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
@@ -18,7 +18,10 @@ RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}"/${P}-exclude-samples.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-exclude-samples.patch
+	"${FILESDIR}"/${P}-fix-docdir.patch
+)
 
 src_prepare() {
 	default
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 9f6bde112312..e704748153ab 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -3,5 +3,5 @@ DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66f
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
 EBUILD libpulse-16.0-r1.ebuild 5735 BLAKE2B 9cde48b54a8fbf46523c849b06cb7bd7b4d6802fec17c88a863ac69ae4bc7c918f1d58c976c229d2cec80cbf2c19e9b9f447cfb43f9e6b816c7007bc3c16a762 SHA512 45df9f35e826b99b7d0a430e227693e21fbc09d212751999d94fd8fffd55cd56583d1b339dd08f6e089166ac798999e1acd3d54481ce386593324df1f3ef4410
 EBUILD libpulse-16.0.ebuild 5666 BLAKE2B 54aebcba30972a1bdfebde9be49f695a19122d3b95bd1285435a0f787800ca03086692ae94dccf855b36ecf7deeec8e24f1fcf7fc12040fd11d2e25507674c50 SHA512 8cb2bf0bb4e0cf81bc820c6da95a0743b79aa3379b6955e093ba07aa22e5d27e40634d0b1228dc931b7fb0268a5bdf438c6b2d860e1f1525ee3568e2d78c4137
-EBUILD libpulse-16.1.ebuild 5682 BLAKE2B 41c02d5df51af3b1748d57644a7a9506a058ca2c81e1e6006f0317cc79ead05c0c16560b0772c5267baf2e3193b6db3b79bb6b7f0d453957c8a35f72b5548206 SHA512 ab10738fd70e36ce73dd38121416160ab0a545b611514e96cbb6d6de735e542b80668cfb0b01d6cbca5118c72d4b4bcdb8d1a493604a13459bea482dfce64feb
+EBUILD libpulse-16.1.ebuild 5811 BLAKE2B dc6286d95021b46feaaa99675359ec1cf26ee636bc030c3e661021867f206d588d029ec78c6c5a86b136e0904945e3b3fd82f07ab7aea433a40057cac4db3800 SHA512 c42eb07401f808e5ba8690800cd4a08e59abe2d65e0ed718e71ee8e6e5c56d99da19988e8514e8f93015c40e2e27ccc2c34a8279eba6f2bcf49db92bdb19e069
 MISC metadata.xml 925 BLAKE2B 00eb044359e5cbbaa5fdd085a76be9582c1142dc7334ebcfca531975961bbe35bd4d7a3b1f06e760126b0422614103480c1199128a908567dbe477af017f5ae7 SHA512 9c244a9725fa5acf9d1c3e869cd794d0d70dbe29126af877ea5918adf12c9ebfe87576c074db8126d168368ca93bb0e5577912780eb467377ef58d4cf44895bb
diff --git a/media-libs/libpulse/libpulse-16.1.ebuild b/media-libs/libpulse/libpulse-16.1.ebuild
index a3bd8e6f7528..fe632b3d640b 100644
--- a/media-libs/libpulse/libpulse-16.1.ebuild
+++ b/media-libs/libpulse/libpulse-16.1.ebuild
@@ -67,6 +67,13 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
+PDEPEND="
+	|| (
+		media-video/pipewire[sound-server(+)]
+		media-sound/pulseaudio-daemon
+		media-sound/pulseaudio[daemon(+)]
+	)
+"
 
 DOCS=( NEWS README )
 
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index f80ab3a60497..b344a0cc4333 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,5 +1,3 @@
-DIST lilv-0.24.12.tar.bz2 427404 BLAKE2B 47efe553c6fc249ed0cde47a47a01e0b3496ea4dfac88849b75d9720cb3a158fa1c95959ffc1a09e606f8ba3831e79382ba08ad100ee17cf19c7f1ffa186d6e2 SHA512 ea22db4e995792b62d60d793169c792549b8fb0255c2cf7a85780dd149811921e2fae5eaea0fb83465f01b14dfa66361af3be40bf7cb3733e98655b943f4faee
 DIST lilv-0.24.14.tar.bz2 428004 BLAKE2B bc84fe5a4bf34f88ea7f9c09cb3168186f7f0fd2f3f23b08f55100502d959fd74fe7e1c6d9307772b1983fbeedde100f75d6751e9bf92a9663aaaa115ca0770c SHA512 f266e91f3cbc325c25dd7d08bde5033091cb3072c2dcb1490e9474f562b798dbc71c45ca7d971ed4dfd6bb16f5f6725ae242a58c4486684b71350e73f1469f47
-EBUILD lilv-0.24.12.ebuild 1776 BLAKE2B 8d2c5fc1be653e0dee02107d54d144b40e9f9808e13d134f99659a02897a7ca92eecda145d72ae72758f619f89ef9517a80b624666f41e11ef2da17d5bcd2dc5 SHA512 96b6d6ade16f2df560d8b2b15dcbcd54129a1e8d7c59223fec92c205726197576d9c9185f05f62c71d4f72c44ee8d08e2c6f9d08afdc983ddc44eeab8e86d033
 EBUILD lilv-0.24.14.ebuild 1776 BLAKE2B 1cd04755b543809c7ec44ec4e3295784398d86213a9dc99fd26fdabea8ee0e72ba11eb1d56105a11360151d0cd83203ae86e590590b29d192701c71ef5c2dfb8 SHA512 a836bdb1fe475aab2664c3fb46889b1b24846396abb08a3e396928afa3579ca6daf6126f1e6a85f75209c65525fa195cfea8182f83f6161b430187d7959126cc
 MISC metadata.xml 627 BLAKE2B daf8d11256943c40b936380dea55442e864896de881882c7a74a041fefb6774d4c632ea54979937a572f88f1e5301f6fc5ff1a9eb56f22c0a606f7c268f07b84 SHA512 b3de9e939e32df99104be4941b3f59a6d03bbb00b31960f6f186a02872db4151f2ac3d8aa5e9ecadf103008a6537026798758c5cbf191fdecd4ee20a68c1767a
diff --git a/media-libs/lilv/lilv-0.24.12.ebuild b/media-libs/lilv/lilv-0.24.12.ebuild
deleted file mode 100644
index 987842065f05..000000000000
--- a/media-libs/lilv/lilv-0.24.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
-
-DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
-HOMEPAGE="http://drobilla.net/software/lilv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="doc +dyn-manifest static-libs test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		dev-python/sphinx_lv2_theme
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/serd[${MULTILIB_USEDEP}]
-	dev-libs/sord[${MULTILIB_USEDEP}]
-	media-libs/libsndfile
-	media-libs/lv2[${MULTILIB_USEDEP}]
-	media-libs/sratom[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--no-bash-completion \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "") \
-		$(usex dyn-manifest --dyn-manifest "")
-}
-
-multilib_src_compile() {
-	./waf build || die
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	sed -i "/lv2jack/d" utils/lilv.bash_completion
-	newbashcomp utils/lilv.bash_completion lv2info
-
-	dodir /etc/env.d
-	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
-
-	python_optimize
-}
diff --git a/media-libs/lvtk/Manifest b/media-libs/lvtk/Manifest
index d6b14c8ab15b..2dee23baacf9 100644
--- a/media-libs/lvtk/Manifest
+++ b/media-libs/lvtk/Manifest
@@ -2,6 +2,5 @@ AUX lvtk-1.2.0-boost-system-underlinking.patch 535 BLAKE2B 371119bce2f368e0ee5cb
 AUX lvtk-1.2.0-py3.patch 358 BLAKE2B 8ee7f4ba685e6327f261358bf637ae05598e8a06b417139d1513200436677bde04259b27d7f4317760196b4d22bf728bb26776fd4f76a6d7db2c965e97a37ad8 SHA512 982ebd8884d0633a5f7e4bedc970a76f390523ba5a2ef58c382dbf521d17fa05cc9b00825f35f04a515cf6ebccb612b16eb79142b04fbf6da9a0f05802cadf8f
 DIST lvtk-1.2.0.tar.gz 201146 BLAKE2B d6aa47f5d89e861393b95d60fe53a232f8047c77f8593dc7dcfc700c3933d2bc37e3e499d1d63a84854e0bcfc2232c170cc92b69fd8b01be30f0f581b216a4a9 SHA512 f193ec28103cb2f6353ff0f96f8790041baf1ae99472c5d04017c23b42d0179b1f5e1de6722e17080410311d0e7e1de4ca0ae9ab76fb3bf8a02d9dc1451d8db7
 DIST waf-2.0.20 104725 BLAKE2B c9467b5205f596cd1b5d4b6ccb97806e9fa1f4d4eb9109d378a0978179ab49a029926cb86876ca2088878378f88eb292d899840b4a072e62fc6542b93bc2d894 SHA512 72de1c5a78eb353da4b4a6ea4fbf52d232ed6dd08e972872744e3727b952f813f44e47f0b47106bd6f05ce7fa137c4685ac313fb0b0d70e5fc85dc34918e66f0
-EBUILD lvtk-1.2.0-r1.ebuild 1660 BLAKE2B 8009dc65dbd71fbd092100eac92af10c648b06b78b90f03c37ed15f46a1ff72a83b2b2fcdc50f6d7db7fb8d48a777276cb64122bc32281420b6b696f86a8dee8 SHA512 e7a4019a23f413858d04a2b272265a0720a3b46e9c015c834691944127a33c5ddfceea9b8296c8dcc468031ae1cd9bc8f8bfc6a566eadc640d792245787d8c16
 EBUILD lvtk-1.2.0-r2.ebuild 1651 BLAKE2B e862769c1d1677bb65c32dfe61410549df912ecdd5a8cdad6399f6f472a67e25e349e7df51e88c21dcb02f1aa184a56109577024895121f67346fba86404d755 SHA512 493c0e0f0cf6b65a043679bfa8f74d7e2dbf0c21446bd8fd542ea454ae7da93a92b0f42d5148e13978191d53cd33842c7a2c3a6f12d3b14a9fa686f674315120
 MISC metadata.xml 503 BLAKE2B da817c2f2da95de274e47910a76e728a5405cb324249f890b0d1d6af73632e0b6049fa2efd2bb545a03fe63052845fafde35d73039159144af1c60cb1798e004 SHA512 d1ec2a73e1862efc13e4cb781dcdfa3db467fe9765b827eac207590337d044d5b5a8576cc72001c3f84ceba6313a247598e37c35974a3f43e56b30d2f6653c59
diff --git a/media-libs/lvtk/lvtk-1.2.0-r1.ebuild b/media-libs/lvtk/lvtk-1.2.0-r1.ebuild
deleted file mode 100644
index cc249035b06c..000000000000
--- a/media-libs/lvtk/lvtk-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,66 +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 python-single-r1 waf-utils
-
-WAF_VER=2.0.20
-
-DESCRIPTION="A set of C++ wrappers around the LV2 C API"
-HOMEPAGE="https://lvtk.org/"
-SRC_URI="https://github.com/lvtk/lvtk/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://waf.io/waf-${WAF_VER}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc examples +gtk2 +tools"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="media-libs/lv2
-	>=dev-libs/boost-1.40.0
-	${PYTHON_DEPS}
-	gtk2? ( dev-cpp/gtkmm:2.4 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		media-gfx/graphviz )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-boost-system-underlinking.patch"
-	"${FILESDIR}/${P}-py3.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz || die
-
-	# we need newer version of waf to work with py3
-	cp "${DISTDIR}/waf-${WAF_VER}" "${S}/waf" || die
-}
-
-src_configure() {
-	local mywafconfargs=(
-		"--docdir=${EPREFIX}/usr/share/doc/${PF}"
-		"--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2"
-	)
-	use debug    && mywafconfargs+=( "--debug" )
-	use doc      && mywafconfargs+=( "--docs" )
-	use examples || mywafconfargs+=( "--disable-examples" )
-	use tools    || mywafconfargs+=( "--disable-tools" )
-	use gtk2     || mywafconfargs+=( "--disable-ui" )
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# It does not respect docdir properly, reported upstream
-	if use doc; then
-		mv "${ED}/usr/share/doc/${PF}/lvtk-1/html" "${ED}/usr/share/doc/${PF}/html" || die
-		rmdir "${ED}/usr/share/doc/${PF}/lvtk-1" || die
-	fi
-}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d5fc7779914a..748075aa30fb 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,8 @@
 DIST mesa-22.0.5.tar.xz 15777136 BLAKE2B 9622193bebea643a973e4ffa94b86aef1b2a9de0bc8d4c2d79ee07de3555353ae65d22237ae461f739dfe302647232847b9e044e7d4f3846c2c51e0c3be68839 SHA512 c73a4c3bfb41fef68e2ec1ccfd3df0a5af019c1e862af27d9bca27487dd4352dafeccd0dc0c3f15fadc54048573b9634261e4e969ae958c4f9fa88114131e910
 DIST mesa-22.1.2.tar.xz 15992280 BLAKE2B bb2929e6c7dd0384b8e58b2a0ab6f91eabec9b29b77349868ea737c2c8b8c0e33febb9836c6259601caa3ba4c6ab67f2c4df4d2677cdfab359bbce53d8df316f SHA512 2bcce3dcb6f151de7717153a0745c1c754dec7e63dae6923a2123d2149562f13ef8faaa0f15e54c434e80b0562932a8cf8be007d181777c82ccf7a1b1bb621cc
+DIST mesa-22.1.3.tar.xz 16016520 BLAKE2B 3f9838022914b4ecc8882bc648bdd99a81aab2c6ebd4d9a3ce74655d6ec718d09abc6424bdb4b84a5430dcc51113d67bfd3368af4a3f390d3c574733b8ade4b0 SHA512 e7348839eb37de89c90d21277a7cbb42ee673ad6c656177853f6d35db99556dbac29867712222342d902b4fa67df5687c9d543bad99c81bcd0ecfb7f08f37480
 EBUILD mesa-22.0.5.ebuild 12064 BLAKE2B 51531f4eda83c55fc660e0e0af4ecd56dd27f3a63e4e9edd682c2b59dba3fc9b5d807ba83e58ba72027238c39a8230746aaa8e274181998233b76e0059d6a7b4 SHA512 e07146df6d58f19f336dd9f791d1216394c9ceec2a8d91c78c9948af5071e13bea02c856b8c1f6237595530b471b01640a1abfccbfc658edd7675e2578efca12
 EBUILD mesa-22.1.2.ebuild 12083 BLAKE2B 0098256a7a32c52540258dcc1d531a701ad531891d2f6f4ca2f4cf0c1cdc364c4a8fb6487a6b8f0b6efe46d6fd06ff951e194ae4d64ab0b51d58140d95d1ac93 SHA512 b1f9f47fc0cf720a7be0193c7c11e0ec63dd3408aa284690ced9b58761c94520961b2bcb2b00ec0cf7e2b0d66b0d41b77b886069fd605ab08cfc0cee8ed6c3a9
+EBUILD mesa-22.1.3.ebuild 12083 BLAKE2B 0098256a7a32c52540258dcc1d531a701ad531891d2f6f4ca2f4cf0c1cdc364c4a8fb6487a6b8f0b6efe46d6fd06ff951e194ae4d64ab0b51d58140d95d1ac93 SHA512 b1f9f47fc0cf720a7be0193c7c11e0ec63dd3408aa284690ced9b58761c94520961b2bcb2b00ec0cf7e2b0d66b0d41b77b886069fd605ab08cfc0cee8ed6c3a9
 EBUILD mesa-9999.ebuild 12192 BLAKE2B f7ab540bfcced9776a26c8ed0e313106f766c923c514e7db78f26ade09594480ea5528093736f95b0d5c03137cdde9963b11947f7a7973205c168e7e68ac6500 SHA512 8fcf0c89f6e9dc99e9de9f09f45338c5f14fdc6f516fbe20727fcd77030b5efd99d60c9ad4465410cf4da27f068c6805637c010309df89221ec409093406bb39
 MISC metadata.xml 1638 BLAKE2B 693f9dccb9933167cf5910541eff88b872bed49915574ffdf1776e430ef1e42f2a5a4aef5767a65927250a5e884c444fdf1340665a1f88105c1337ae8677dd59 SHA512 e304809d792e03ff480bd00f83358a6e33ad688cf45dd41fd5526a080bce6316148d838fc8d880f776501fb56524798a7e8a0a3b28105402ae3151ce7dda1909
diff --git a/media-libs/mesa/mesa-22.1.3.ebuild b/media-libs/mesa/mesa-22.1.3.ebuild
new file mode 100644
index 000000000000..b0927a3c4385
--- /dev/null
+++ b/media-libs/mesa/mesa-22.1.3.ebuild
@@ -0,0 +1,461 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+				>=virtual/opencl-3[${MULTILIB_USEDEP}]
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	vaapi? (
+		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="14"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:14[${MULTILIB_USEDEP}]
+		sys-devel/llvm:13[${MULTILIB_USEDEP}]
+		sys-devel/llvm:12[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.24 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_intel ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	if use video_cards_r600 ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature xvmc gallium-xvmc))
+	else
+		emesonargs+=(-Dgallium-xvmc=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 && \
+		! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	# opencl stuff
+	emesonargs+=(
+		-Dgallium-opencl="$(usex opencl icd disabled)"
+	)
+
+	if use vulkan; then
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=enabled
+		-Dgbm=enabled
+		-Dglvnd=true
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index 4a4bddd7afb0..264c1700fb04 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -2,7 +2,9 @@ DIST oidn-1.3.0-glibc.patch.bz2 6359 BLAKE2B 743cd87f92bc89182de716254f89136e690
 DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a SHA512 19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
 DIST oidn-1.4.1.tar.gz 50448597 BLAKE2B f5a1dcafa058eb1fa46f1b397599075f45ca0145e51692014a47405e9d1ac2f681a1a23ead50d6bdfcf1750f7504a992218b65d984a6daf2780e829598172f3c SHA512 6551bb038692a1c00a0a408f1682d8609a8c74470a2c4f439af80c1332d4237e723a655a9b7ef95f93c6cbe52fdb3a46a84539f5cdc90073d716afd7b48c3615
 DIST oidn-1.4.2.tar.gz 54221996 BLAKE2B bb6593e2e15877f65d9224fc93dac72aff6d567a00d727b050a88a1add4dc1441e695dc38056dd796e004e20916054b43ed7d0e90f22a16597f6617cf6a119e7 SHA512 8b464cedc91ef7a88cfc97c3fde80275b12058cdd26b352718d90f8f20b3462c4ac65b2b1ad5548a520590fbd015fcc8ab9f964633bc8b89d72901fe8a13e352
+DIST oidn-1.4.3.tar.gz 54222682 BLAKE2B f9b585c318258fd78e221a453b64e83965a3e5035a912baa49e4d5b48466441bf1d3c15291de2cd4d36e9da187ff7a643bb9d4af5282cdbb8b6bc99fb3cda0d0 SHA512 6fbdf347763c0734140195a523cf0878b1dbd91d4943c9ce4928f6991549f8b3d5ab4d57b90e20a8d04a87d00e3a1554ce73a3a3c1e64fcb016a3c1f8aa07982
 EBUILD oidn-1.3.0-r1.ebuild 925 BLAKE2B f38e5ba0887cdb823e36b7cff5a092a93c12c38bcb8aa5acd44686a7c6b102115f0c4794b4826ceff06fbf05bf3ce4d9ae58273b9cd4e896f380a63b33af93d4 SHA512 8eefc86b47ea486447cbcdb7012b51966594e59a0c00690610d3a9c21263f3b41275c0137877b840dac4187b8fe2ccef0c343bef1b9a1559865e78fc1f6d0df7
 EBUILD oidn-1.4.1-r1.ebuild 804 BLAKE2B 74e3f828c6d08b74b584cf54bddf1687b271d852ab64e746841eb83cd38c20fff165e2c977d024f4a453061c3b3bb8994b86fd1101cbca1faa1b6b2c85000ad1 SHA512 3845870de35356b4b0e6210ed0f114b483f8cf64300927399ab9516f4a636d2513fe8a5f3e9b0040df0a3342e8887733cf554f008dc6ab352b5aa1dfb68e855a
 EBUILD oidn-1.4.2.ebuild 709 BLAKE2B cad25864d215b415e28c08ae04d03135b107f031654ab35fe0bbab00c394d5b3075d9aff4aa14f76324888a42203cc29e70599f96c16a8f5830ceae8808e64e0 SHA512 b4f43f3d9f8583a720076de280ec1cb4485cd0678941e83fee13a9f1eaeb54d6b94e44efa88ea549984a52f11b56d813ff06472ef7a1d81164cdae270d848740
+EBUILD oidn-1.4.3.ebuild 710 BLAKE2B 49ae7d7917d7fb5bcd72b3c50475bf5646f28318444d07bb1e624c3ea67d33e1cbceedd33268cd9cff2882e0db8db23b38b6ee57ba805610027bd283f313b38e SHA512 733ba7ea093be8331c1cb0b7616543937083e10a5511649f61dd6cc5ea607c4690cd99ebac5570ad004f2c66d1be2230c953924602845726131f61fb0cfd4340
 MISC metadata.xml 754 BLAKE2B b1be901e2f498cb917222e495a89f5515c2837a83e086e5a7c8db5f571ce50401d3ca82546e61ab3507de3d3068eee4ee8c85b3430565eb3db7c3cfc3194f827 SHA512 1806e677d62ae2b3cc2857eb05d106abf840a1e1fc21d1a875716441ffe3db1a13c5d96ca9316b2285c43fda4e2d62829ceb4b32ad13ecea2a521a1b1ed84096
diff --git a/media-libs/oidn/oidn-1.4.3.ebuild b/media-libs/oidn/oidn-1.4.3.ebuild
new file mode 100644
index 000000000000..ac7878513748
--- /dev/null
+++ b/media-libs/oidn/oidn-1.4.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Intel(R) Open Image Denoise library"
+HOMEPAGE="https://www.openimagedenoise.org/"
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-cpp/tbb:=
+	dev-lang/ispc"
+DEPEND="${RDEPEND}"
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 6af0f1937fe6..89bec6b1a114 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -12,6 +12,6 @@ DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 4a020824688e379f1d127fb834b000
 DIST opencv-4.6.0.tar.gz 90208971 BLAKE2B f01a907eb4a54fc0795293f1a28bbf3af5a3d237293293f6ef5275646207d48b3d634b2d91e7011407176405b60c7e4383076e520ceb56f92b09c36e97333148 SHA512 93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46
 DIST opencv-4.6.0_contrib.tar.gz 59667769 BLAKE2B 26b454436d943d7955194fd21ad29efc417d5c873fa19a6a200beb319cd75c6ec5766734c478fcd55745a7c200ffdaa92e7b1821f13810bb9d181d263f8fc6da SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-4.5.5-r1.ebuild 21330 BLAKE2B 223524a4979eee203b8ea48fe62f9b56187cf654bc8c190a089775009864d86db252ac82dc38da558b8b74c84172d0c5af81aac0b24fb0c9751f21336ce5a228 SHA512 c96c30fe7f820780c5367da744d5970824a60327622f08e54124933ad985fdff2fb9539bb2357aae57de1171941d6049be15898b07e4c65d7b6c800c25f92bbc
-EBUILD opencv-4.6.0-r1.ebuild 21139 BLAKE2B 8a567468a42cb65d337a6fc253212ab1d00fbe29641a9f5449f3de23f11ba6c5a5d07baec5eb34700b53289388953a6d37a0fb7757187ea98a62d9152f37411c SHA512 b29860244647e29867a1688b8882419286cee302e6ddac157d9f72b4bd27619b261fa354c9cd6192bcdc3867a21e875dc6e6f1d1d7fb1555b8f8e5cfa66c5737
+EBUILD opencv-4.5.5-r2.ebuild 21346 BLAKE2B 5c06a61e789705db0514f638101bd90c02048844876fd24f852b8eb67ccffffc2cb58793211b4f4debbe792dd11f4103c0c005219ae0223b3c8ff0596fa85cc2 SHA512 bf23a8b8a2bea4215efe475d8ad3acf973d16a343cb90c20f1e1c6ce34c644a7b98eb0f8acd077baf5591ad73afeba85f49c2da1a1f8eebc968f43ce364044f7
+EBUILD opencv-4.6.0-r2.ebuild 21143 BLAKE2B e3902897ca5eb8f2857e8cb31732d05c17f8b5bab963d4f771ff2a6c554b320cdd1a5d3f4ce2ef82497510b4f9005a663ad3fac7508fe27508a943b14b54b42b SHA512 83822a0ea21787514005f004ef1254a8720c8fb385c26ad7a5cd612feb895fa7f1befb68a8f3ef6bccb0df00a9c8083dc5796851126a65ffd273784d18c6cf2e
 MISC metadata.xml 3110 BLAKE2B 56215511d99a98894fdb70f5db8423b307b4a487acbc88a836a78cf48e249015856e33b85ce741a4cde9d55fbf8d653d1197a9a4abb692284ab03457e14453ff SHA512 93df09d61b5be54d8d14ec15a3274326db1bd7de9cc56c876d788d5e5d94b62de311b30cb46a9d864f3c8b0974c5a9e59418519de7a9d28666ffee33572bab23
diff --git a/media-libs/opencv/opencv-4.5.5-r1.ebuild b/media-libs/opencv/opencv-4.5.5-r2.ebuild
index c91d39563697..3685fb5fc3c5 100644
--- a/media-libs/opencv/opencv-4.5.5-r1.ebuild
+++ b/media-libs/opencv/opencv-4.5.5-r2.ebuild
@@ -99,8 +99,8 @@ RDEPEND="
 	contribovis? ( dev-games/ogre:0/1.12 )
 	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
 	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gflags? ( dev-cpp/gflags:=[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog:=[${MULTILIB_USEDEP}] )
 	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
 	gstreamer? (
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
@@ -115,7 +115,7 @@ RDEPEND="
 		sys-libs/libraw1394[${MULTILIB_USEDEP}]
 	)
 	java? ( >=virtual/jre-1.8:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
 	lapack? (
 		virtual/cblas
diff --git a/media-libs/opencv/opencv-4.6.0-r1.ebuild b/media-libs/opencv/opencv-4.6.0-r2.ebuild
index 56eae7b76fa1..49f04357d294 100644
--- a/media-libs/opencv/opencv-4.6.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
@@ -97,8 +97,8 @@ RDEPEND="
 	contribovis? ( dev-games/ogre:0/1.12 )
 	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
 	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gflags? ( dev-cpp/gflags:=[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog:=[${MULTILIB_USEDEP}] )
 	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
 	gstreamer? (
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 026864244c8a..2d3278231515 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,13 +1,10 @@
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
-AUX openexr-2.5.7-0001-disable-testRgba-on-sparc.patch 937 BLAKE2B e2e432649100457a3273b50aa6725625ac50f48bf95bb04b85a2587a44d4c9e87662a36b68c3b7ac0c741068223e439fb51c1b69d5ae8f852794b0a7ee238d4a SHA512 8c640d67f2db6ed2789b8e25dd25e6ba8db6b3ed0ddb2138027ca579b3fe5db43b60d5bffc4de3f31ba60521c6479cf89f1ff7a8b2bbba97dd22c13279b92f81
 AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e
 AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278bfbec06b88d1a2b1a0caccb651a53aa4d54945524e3c79fb03d9031540ed0f423be4503fff0881b2185cc33b614a2508135cec3113f9384 SHA512 e07602d78d15ab0f1076d7b5d3f3d16912e9d0ad792703af1b1d3d8fcf472eef2e410efc2abed2da70e39a97f4dd9194a47c6de50484da799d49cf44e62c9167
-DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
 DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
-EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866fc55ee5de8211721745fbf048d2431aba65d1627ed9748862e751c04f58c51b50355fa34f3d22f163fbdde2a14 SHA512 4a91fa4d593dfc94aba295d5572ed9f7c73e9ccdba52b4f38053a0431bd4a89e1b195aa50aed4f5297464838815d62dbe388b24f72ff29ff40bcb0396c8c6e09
-EBUILD openexr-2.5.8.ebuild 2142 BLAKE2B a37123b989ac0ea73137b2d8eebc852de686c00f4f398bf03d8b82e879b586473675e922128003c12a396503269107e12376f39c44177b6def0785e3bcfbdbc1 SHA512 79b3a52cb707d8ec2f4130b165f8db7dafb057320845adfb0c15d9465792671ea7f037e6f6fe328350677487ed1fc37e5a260e1923a30c026e5b8c873b78c67f
+EBUILD openexr-2.5.8.ebuild 2056 BLAKE2B e73f4da39cbadcae890ae51090dbed09704d866cdf9cb87a57aee45a427d917bc2bf839ecccdeb3414e3bd7e71fa0c84657138ba28ca474b8dffa513b10e9190 SHA512 da621c9f9497afbcb5ec57e4e0c2f9bef63db1645143c77a3692f147aea0ab36bad7dbfbf2fc74a44f34cb321cda6e40418e910dc0eaba8b65146ee81383ec81
 EBUILD openexr-3.1.4-r1.ebuild 1910 BLAKE2B 2eb8cad3ae2a3951a534b5d3173f0788ba8a3792eb0bf4462321fe073580b3b71c04b99669e1a2ab6d599c9e0ed2062ceeb9185d0b48fb8c307c670123272bcd SHA512 b65c849f91b3226cc751052511f517e10607ad2c64eb7f17f80ad4e0cb8b2e9b28767741057095ef661787c327815cae16b1d15dc49c330522203d3b38b41c21
 EBUILD openexr-3.1.5.ebuild 1803 BLAKE2B eb42d6fa4b88568e6133aecc6b41e6f0024e989f0520e1015142720f93e839d54cd5a4f7fc1eb9353451cce8fdc9bf0aaef7470c96fc69b28cc71a0d2fa21132 SHA512 2c7c8df67620d87eeb6c44aa257fdde1de9419a209ef07323a0249c432b80373e37239978dc7144a9e2a818565898a37df77b3ee5bf7d07c97e527551f9b5786
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch b/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch
deleted file mode 100644
index 368c9173d133..000000000000
--- a/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 21 Jun 2021 12:03:02 +0200
-Subject: [PATCH] disable testRgba on sparc
-
-Fails on sparc, bug #656680 and issue
-https://github.com/openexr/openexr/issues/222
-
-Bug: https://bugs.gentoo.org/656680
-Bug: https://github.com/AcademySoftwareFoundation/openexr/issues/222
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- IlmImfTest/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp
-index 3245fc4..3ba3e60 100644
---- a/IlmImfTest/main.cpp
-+++ b/IlmImfTest/main.cpp
-@@ -206,7 +206,7 @@ main (int argc, char *argv[])
-     TEST (testXdr, "core");
-     TEST (testHuf, "core");
-     TEST (testWav, "core");
--    TEST (testRgba, "basic");
-+//    TEST (testRgba, "basic");
-     TEST (testLargeDataWindowOffsets, "basic");
-     TEST (testSharedFrameBuffer, "basic");
-     TEST (testRgbaThreading, "basic");
--- 
-2.32.0
-
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild
deleted file mode 100644
index 990a17843d0d..000000000000
--- a/media-libs/openexr/openexr-2.5.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/OpenEXR"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( PATENTS README.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
-
-	# disable failing tests on various arches
-	if use test; then
-		if use abi_x86_32; then
-			eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
-		fi
-
-		# Technically this doesn't disable anything, it just gives this test time to complete.
-		# Could probably be applied unconditionally but will leave this to the maintainers.
-		if use riscv; then
-			eapply "${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch"
-		fi
-
-		if use sparc; then
-			eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch"
-		fi
-	fi
-
-	multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DINSTALL_OPENEXR_DOCS=$(usex doc)
-		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
-		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON
-		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		DOCS+=( doc/*.pdf )
-	fi
-	einstalldocs
-
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild
index 9040c83eabdb..e5e93f2625bb 100644
--- a/media-libs/openexr/openexr-2.5.8.ebuild
+++ b/media-libs/openexr/openexr-2.5.8.ebuild
@@ -40,11 +40,7 @@ src_prepare() {
 		# Technically this doesn't disable anything, it just gives this test time to complete.
 		# Could probably be applied unconditionally but will leave this to the maintainers.
 		if use riscv; then
-			eapply "${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch"
-		fi
-
-		if use sparc; then
-			eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch"
+			eapply "${FILESDIR}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch"
 		fi
 	fi
 
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 12d277ca398d..1a3cce49567a 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -2,10 +2,12 @@ DIST openimageio-2.3.12.0.tar.gz 32452689 BLAKE2B f5fd428c597b573586a4749b56225a
 DIST openimageio-2.3.13.0.tar.gz 32456755 BLAKE2B 897a7db0eabb9a7cc29ab8fea368c32fc70b63b5ecebbcfa8d1fffe55c2435d9638f8a1f69069c45fad3723a2b7dc40e83971f48892afc631a7593a7629fb92a SHA512 fbefa341a11fd502ec9313ca48a0fe433c5822699e4934f6a14089f670314cbe1c9c0b9a491b1d1927bda0223e38a62192c6ddeec6c4c5e6215a8b3fb6900dd8
 DIST openimageio-2.3.15.0.tar.gz 32626322 BLAKE2B 1367e40dbed3d43b53db1b7117c563782396b255e366ea9586438a5c81cb8ae96ff42a0e445c7932bc92dc327adae921b383c2e6d787dc6e67cf71946d6174c1 SHA512 8ed0303fd9314e01cbf6d45627eb6e88e3fd356387a7657a4b31bbe455a4a493f88a2b511c1d5cf86a9c00346dbc03f9b32d2a6df9da033e7e78e86142ce888c
 DIST openimageio-2.3.16.0.tar.gz 32632560 BLAKE2B bde9d46b74135f03215cc3741c0378580dc34381da041b3d06ff50154627edd69b93e1a714bc99c7800fe952300f752cb9d8ca62b042ec91569dbbc9bc10950f SHA512 2249dfc7f9c4ede563d5ed05ed76557e0b81c35054832b4de2a7820c8619886afa3f260cd26b5f4291f74c9d9c16b9a2ac3772e23b5b70bc87c2c7a0d0c10726
+DIST openimageio-2.3.17.0.tar.gz 32640557 BLAKE2B 6e3df687e51615687b2e1f445b9a241fa703fec14f0f93e80c50ce6c2e035489be751656e62dd685bac59f983942615fe8a33eeae7e83fd93b037e58d86a248b SHA512 25cb1a671e7cd5154e363eef178ab091fd7d55868746a4394340567a794f6c6f0295e58721a5b4ee8bf66b4cc0e6a01c3e82f9cc9de9953ae349d45738a04700
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
 EBUILD openimageio-2.3.12.0-r3.ebuild 4640 BLAKE2B 7eeca5be1bd3c8e1fc81bf0fd1116aa5448df61d8cacab682a68472171e430c3cc9e1e30640972a927f76770954b5d2491abcde1a1b552bce4695d177971386f SHA512 0bf5d25e8a636a7c1a670d4481d46258f1ed3b6bb33ad64f5203bb0d0f32abf75ab35870f54311b5c4285ef87c383ce88747806269d7659646ff97fa6ea5bd0e
 EBUILD openimageio-2.3.13.0.ebuild 4654 BLAKE2B e9fad8d19fcabccb3cb318696fa65a9f4018559f323c31636bca4a82624a29ec08d709a3fd6e9f9b70329651f193649e66fc3bbf8f7c9450d784802aaea4c78f SHA512 76a527fa0e3c7b2978541129eb39b9c04f3a63e8b6cca448c34d277c29bb1146e309e1f30c6f70c0c8ca4ce477a33266beab8f9f6aeef7d6276daa7b7f255172
 EBUILD openimageio-2.3.15.0.ebuild 4652 BLAKE2B cbf5df67b5fc6461693c77758d5a2ded83a30973266f2bc5aa950f1c889a03510a6466ed4b9e67be01a8c46f52a7bd0867644613434bdaceaff8d8e76ff00080 SHA512 9ed6872bd72942c69981c30bce64019f7da0bcbad2aa7472426b93373837d0172d7f73cbcdf0fa0adcb38171eee470913f426a79c3740a3e06eb4bc62866428d
 EBUILD openimageio-2.3.16.0.ebuild 4654 BLAKE2B cebafc4a779e0e2d1ee40acfb3ada29440398f517183642fe720f1b4df169a6adcbb54aab92ea21658cc269cfb8f67647a6e37854abf2781d411e10c7bbe61d1 SHA512 0b7b997693bd9a2369cd9f2caec0f8ca4bfe76fd9a1f51f70ce059aa16a08ec0296c05bf175d5a27ca5e71f5748652cd2a98db0fbaab6a085fe8158f60e0b3d7
+EBUILD openimageio-2.3.17.0.ebuild 4654 BLAKE2B cebafc4a779e0e2d1ee40acfb3ada29440398f517183642fe720f1b4df169a6adcbb54aab92ea21658cc269cfb8f67647a6e37854abf2781d411e10c7bbe61d1 SHA512 0b7b997693bd9a2369cd9f2caec0f8ca4bfe76fd9a1f51f70ce059aa16a08ec0296c05bf175d5a27ca5e71f5748652cd2a98db0fbaab6a085fe8158f60e0b3d7
 MISC metadata.xml 724 BLAKE2B 057b0c63428b1860a3b11442b9687b136a749935e3d0bb2e27eca00245d1d9e6f3e40aa796b723664b9b320d8c958a345812199ed04f8d1a476364a80c76e355 SHA512 5243cd4cac10b569e1488226b61c98012af13f50e32c023176e6a2ba29f7804e164b4774957b35f212bad62f496bb466b242d6bc1be44ca3ea0909371b9d5415
diff --git a/media-libs/openimageio/openimageio-2.3.17.0.ebuild b/media-libs/openimageio/openimageio-2.3.17.0.ebuild
new file mode 100644
index 000000000000..347165ba2e87
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.17.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+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/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
+# for changing to openexr 3 which broke ABI.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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 gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test ) 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/libheif-1.7.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	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
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+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
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-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[*]}")
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
+	fi
+
+	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 bd23e430828d..237a1e6007ad 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -12,5 +12,5 @@ EBUILD openjpeg-2.4.0-r1.ebuild 4478 BLAKE2B 46a5f1d2ea203610cb86b081c34477f1e8f
 EBUILD openjpeg-2.4.0-r2.ebuild 4540 BLAKE2B 4687d9a0481facc18df6ca69fd4f6065186cae265b0dfd187faf312a4a6258dc5ba18c2cebd9bbf16c99b3942476983fa5a47ae3ed5a4242854b75e6fd178a31 SHA512 92c25bce2326243646e2c9d7cf95053dd64f4ca2727e4a4c38fe03c58b08840ce95e0ea52d21d850528e4b8732f63cf07c4003b46a4b93cd2f6eae5aebe98779
 EBUILD openjpeg-2.4.0-r3.ebuild 4686 BLAKE2B 35c49e770b00c471d116348e9cc35b1859e7cf4c3326d89e9b050196d1cd74853625454039bd36ea9ef4ff413416c81b8926db28213857b4691e24a918366025 SHA512 1bdea8bca4bae97679388966da4eec19f5e27d6be3fedfd4b55d0c882028d7165613873e454a6445f50ddd34527845214113fecbccf0dcb2374764583ab1da6b
 EBUILD openjpeg-2.4.0.ebuild 4467 BLAKE2B c1940c9c26d9e010fee76fe1c5c894a0fbffa5be2bc8eba8bb6d1d74b28e37f3a1e1eaad6a9bab60e58ce82942019a7fe796b2672c518c7c519b5cd05d2778fb SHA512 40d63968fb5f16b086ed154ef407a02f1cac452e82ce4fbd853f05ec76ef336db75be867dd1767c2845019eab72e3a6142d0de526b870b1b9f6d8b847441def2
-EBUILD openjpeg-2.5.0-r2.ebuild 4449 BLAKE2B a6b518cbde3bbc19a247ffed8de6d2c018ace2b65f3817191086229a7b7352fca5daf906920a7c69123b26e214a24dff1da85b311becc08d464fd23382de042b SHA512 77310ab19ab926041b0a3d1f5083d9ac99ab6f0b67c574fde3c73f2deb1615ee64a76b2817b78c9e4add1ed1ef1baf349b2cce730029af58ad87d1bb97e14418
+EBUILD openjpeg-2.5.0-r2.ebuild 4444 BLAKE2B 8d5ae99be1f331b754b627e9a8b8c1c27a7a0ea91a36b373193ecdeea86710b4cc3576f5db52a4b6a5c57e270c03620f1af6369ea4d681874fcdc4c14564e5f0 SHA512 4ed208c2557421778bb1218638444b84d80361f0053931941492f6f757f0fb16a07f429a97cefe19733c648b5cb22c4e32dab3a4ec217b92004177c414e0ceb5
 MISC metadata.xml 551 BLAKE2B 39647e4fca09d2f613785e350aed813dedb0fb109d718a2ab9b08f7d30d55eaeab4abcf3c58b1434ad239548c966aefac7ebcc3a13d50220ad4a2e59054a75d6 SHA512 a2d0283f5b3d97b6d942d865fa3433f007127dbc63e9479bdf06b8e33c8885dfe6c642cb1b1a8595164fa7fe9961ed44a8c8e70086d7b4dea2f75c1816bbf793
diff --git a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
index 70cd86a4a35c..b7f5f6918adf 100644
--- a/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.5.0-r2.ebuild
@@ -20,7 +20,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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -120,7 +120,7 @@ multilib_src_test() {
 	local FAILEDTEST=
 	local HAS_UNKNOWN_TEST_FAILURES=0
 
-	awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" | while read FAILEDTEST; do
+	while read FAILEDTEST; do
 		# is this failure known?
 		if grep -xq "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" ; then
 			elog "Test '${FAILEDTEST}' is known to fail, ignoring ..."
@@ -128,7 +128,7 @@ multilib_src_test() {
 			eerror "New/unknown test failure found: '${FAILEDTEST}'"
 			HAS_UNKNOWN_TEST_FAILURES=1
 		fi
-	done
+	done < <(awk -F: '{ print $2 }' "${FAILEDTEST_LOG}")
 
 	[[ ${HAS_UNKNOWN_TEST_FAILURES} -eq 0 ]] || die "Test suite failed. New/unknown test failure(s) found!"
 
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 6d258574a2cb..a81987c5c540 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -2,6 +2,6 @@ AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89b
 AUX osl-1.11.17.0-llvm14.patch 1187 BLAKE2B 2925b8c83753bfaf3a45cbe3737bdb6490f9ced0131abf8c903075fa5b8949222e10aebf7ef905956efcfd3787c21e6bf5ac43491405b0f56b90dac0ae86a232 SHA512 2862f2b52b68cb5ff057f968cb48b30d54b84f00af251b08eb210a91aa8df940b03657cf61010ea52d99563fa8de8595fd0bde633c7b6d0912fc10276cd2fd16
 DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
 DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
-EBUILD osl-1.11.17.0-r4.ebuild 2761 BLAKE2B a8cb219690f439bb93af1d8f88e7fc6c66762d07c0ab01022df7c68150c6bbcd4ce7beeedcc6ea158946c6f20e4afd45378cd2a62aa25a9be754f604b23f894a SHA512 9b34d2a55c0151ff812966e91e300f52c41be8cc22922640eb240d8c4a3fddde4221660134bcfd3f4177f1b3d5acf0a232b7f9b7d432beaba32fc9d839219246
+EBUILD osl-1.11.17.0-r4.ebuild 2916 BLAKE2B aa9d9c6a5990f1b1f98dd3f29c929aa3133298e7ce621eb00742049d5737a1bedf22a83332fddfefcdfa2782c412bcb9b6b4abd375bf3fbbd16fb91aa8238011 SHA512 65e0dd27eff41bf877dd9df9c69b300bbef55abbf1145c5e01a30819bb4ed4af717bb704c13f588773621ae3442d258db45014b2fb0ee4108dd52390af28a9de
 EBUILD osl-1.12.4.1-r2.ebuild 2288 BLAKE2B 4eb4472614a960a29ed871f0e6850590594886134a1b56243daa3752e1c0cebb972a20dff41367af764d22bf820747c9b383acc4c2c6979a19b64426f9b2217f SHA512 473a2b7176bb301738667ab997e1f1410904708dfc116f5ef189315fdca10d40e85ab3715d398fb5c2d0f32637bb560e1b8f60a22990d2cc7520f17aa10fc51c
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/osl-1.11.17.0-r4.ebuild b/media-libs/osl/osl-1.11.17.0-r4.ebuild
index 0a1926fb5a2d..49498f248837 100644
--- a/media-libs/osl/osl-1.11.17.0-r4.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r4.ebuild
@@ -31,7 +31,10 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
 IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
 
+# libfmt dep can actually be removed once it builds w/ 9.0.0, it uses
+# headers via openimageio, but it's code in osl which breaks
 RDEPEND="
+	<dev-libs/libfmt-9.0.0
 	dev-libs/boost:=
 	dev-libs/pugixml
 	>=media-libs/openexr-3:0=
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 3d89850b46dd..b8e806c73a82 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,6 +1,4 @@
-AUX portmidi-217-r4-python.patch 1540 BLAKE2B a5fe8c48e8d312cead822fc8893f8a610bf5cf280dd2445da04ab42ed13a5a121174afa2e8874dcf3f7a7b89cd60894a819404438c6d5cb2b99a8e2ae6f3aba8 SHA512 d7ded737346f9756450ff3eaf35daf33da941a109d7db07598ea57593ef3272213b889a9ab33bed71bead4583cb080439813bf7fc4a6d1a6cbb84ed4cd25b51f
 AUX portmidi-234-cmake.patch 13979 BLAKE2B cc6b4193e9008899c89545e2e416c75779d08a6ef100e7a37c21a7c745ac3416c31b044664ba439368c8bb0f3a7fde119343a86d31efe3482c4a88718affdd6d SHA512 b07cd643699084f8e02ffc53d3721a53dd17b421d8ff5b2889a14ab99ff709c14f68b30adc2e7db818cbe7884f93cab8290ff9466ac8616d0db58b3e7aab1f75
 DIST portmedia-code-r234.zip 1342298 BLAKE2B 3c3686b79ca0c8cbfaa6c44ae8c4f294630e1c5940576709ff1ca5854bfcfba1af7b067471656f2b39ae28cecea9b6c4403f72d5a2552355760c795eff123243 SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794
-EBUILD portmidi-234-r1.ebuild 3281 BLAKE2B f2748f19d9f6d76ad64cdf2335abc38b0a32d76424941674f082bb1ba5cd520dd2e91549510193eb781637fec16a828a704ac685e43764202f52dc46f8f904cc SHA512 f80d2541dfd10c13ed31d6e4893f25f743c7e4d704f091e57999d15b0f81027ca2cbe1b59552eb84febf229df0eed9acd6455dd19d665c570276c6204542fd78
-EBUILD portmidi-234.ebuild 3290 BLAKE2B 8b8300bf7287b13b020c501fcd3f268a9717e6aed30f27a75e9be26483f6f26ea54dd1fc76040bb2a83e64edad596050b1c277c288daf958d1a1ff8d8bdd1302 SHA512 85d6f546c7d1cf6f7f1fd8e8a95c03753b7a6cdaa41c1ff2913bba5c83905236451c5bd9108d1741897cca44e0d0e98241d71f611d0e49169fcfc98c1fc34cb1
+EBUILD portmidi-234-r2.ebuild 2670 BLAKE2B 33a5c55e68d85d7f4b751896f4a118faf2620fc6fc0b2bea7c92a369e56cf2b2177307f1970ccfa5187a11c460bed0b54118064f45f6ce433e437ffa8c0b1277 SHA512 7611953009b9c4d26cd97108d208d1e548fc496048b05a2cb4c96c33c041b2668c3ae4e7314215517a05b45ac59ca015bda10c5a0acd1ed03bee2399c97c7ea6
 MISC metadata.xml 437 BLAKE2B 8560766f0e6d8f0484374ed827f14ffddc01cd7ee4df2b75ccf62f6b0f4b804eac1dad8f06931328aac3910b0382c0125ea1bd71aa786bcb674531d88ed85de1 SHA512 a932e03068f3971eb8e40c1f18646652f0fe04a898cb10e9b7156cfe2b712285cf83c247a19cb887aaa2e575bc95ffad58d5fcfbb44d9e8d39f3d7b2d0cadd76
diff --git a/media-libs/portmidi/files/portmidi-217-r4-python.patch b/media-libs/portmidi/files/portmidi-217-r4-python.patch
deleted file mode 100644
index 23ef6c3add1e..000000000000
--- a/media-libs/portmidi/files/portmidi-217-r4-python.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur portmidi-a/pm_python/setup.py portmidi-b/pm_python/setup.py
---- portmidi-a/pm_python/setup.py	2010-09-26 15:32:44.000000000 -0400
-+++ portmidi-b/pm_python/setup.py	2020-03-19 12:34:34.398365103 -0400
-@@ -15,12 +15,10 @@
- 
- 
- DESCRIPTION = open('README_PYTHON.txt').read()
--CHANGES = open('CHANGES.txt').read()
--TODO = open('TODO.txt').read()
- 
- EXTRAS = {}
- 
--long_description = DESCRIPTION + CHANGES + TODO
-+long_description = DESCRIPTION
- #import sys
- #if "checkdocs" in sys.argv:
- #    print long_description
-@@ -142,7 +140,7 @@
- 
- 
- if sys.platform == 'win32':
--    print "Found Win32 platform"
-+    print("Found Win32 platform")
-     EXTENSION = dict(
-         ext_modules=[ 
-             Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
-@@ -154,7 +152,7 @@
-         ]
-     )
- elif sys.platform == 'darwin':
--    print "Found darwin (OS X) platform"
-+    print("Found darwin (OS X) platform")
-     library_dirs = ["/usr/local/lib"]
-     include_dirs = ["/usr/local/include"]
-     EXTENSION = dict(
-@@ -169,11 +167,11 @@
-         ]
-     )
- else:
--    print "Assuming Linux platform"
-+    print("Assuming Linux platform")
-     EXTENSION = dict(
-         ext_modules=[ 
-             Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
--                      library_dirs=["./linux"],
-+                      include_dirs=["../pm_common", "../porttime"],
-                       libraries = ["portmidi", "asound", "pthread"]
-                       )
-         ]
diff --git a/media-libs/portmidi/portmidi-234-r1.ebuild b/media-libs/portmidi/portmidi-234-r2.ebuild
index 04c8e493ea61..c3f4ed1cd791 100644
--- a/media-libs/portmidi/portmidi-234-r1.ebuild
+++ b/media-libs/portmidi/portmidi-234-r2.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_OPTIONAL=1
 # ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop xdg distutils-r1 java-pkg-opt-2 flag-o-matic
+# Python bindings dropped b/c of bug #855077
+inherit cmake desktop xdg java-pkg-opt-2
 
 MY_P="portmedia-code-r${PV}"
 
@@ -18,9 +17,7 @@ SRC_URI="mirror://sourceforge/project/portmedia/${MY_P}.zip"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="debug doc java python static-libs test-programs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="debug doc java static-libs test-programs"
 
 BDEPEND="
 	app-arch/unzip
@@ -30,11 +27,9 @@ BDEPEND="
 		dev-texlive/texlive-latexextra
 		virtual/latex-base
 	)
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )
 "
 CDEPEND="
 	media-libs/alsa-lib
-	python? ( ${PYTHON_DEPS} )
 "
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.8:* )
@@ -51,9 +46,6 @@ PATCHES=(
 	# fix parallel make failures, fix java support, and allow optional
 	# components like test programs and static libs to be skipped
 	"${FILESDIR}"/${P}-cmake.patch
-
-	# add include directories and remove references to missing files
-	"${FILESDIR}"/${PN}-217-r4-python.patch
 )
 
 pkg_setup() {
@@ -97,14 +89,6 @@ src_configure() {
 src_compile() {
 	cmake_src_compile
 
-	if use python ; then
-		sed -i -e "/library_dirs=.*linux/s#./linux#${CMAKE_BUILD_DIR}#" pm_python/setup.py || die
-		pushd pm_python > /dev/null
-		append-ldflags -L"${BUILD_DIR}"
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-
 	if use doc ; then
 		doxygen || die "doxygen failed"
 		pushd latex > /dev/null
@@ -120,12 +104,6 @@ src_install() {
 
 	use doc && dodoc latex/refman.pdf
 
-	if use python ; then
-		pushd pm_python > /dev/null
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
 	if use java ; then
 		newdoc pm_java/README.txt README_JAVA.txt
 		newicon pm_java/pmdefaults/pmdefaults-icon.png pmdefaults.png
diff --git a/media-libs/portmidi/portmidi-234.ebuild b/media-libs/portmidi/portmidi-234.ebuild
deleted file mode 100644
index 5d72e4ab709c..000000000000
--- a/media-libs/portmidi/portmidi-234.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop xdg distutils-r1 java-pkg-opt-2 flag-o-matic
-
-MY_P="portmedia-code-r${PV}"
-
-DESCRIPTION="Library for real time MIDI input and output"
-HOMEPAGE="http://portmedia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/portmedia/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="debug doc java python static-libs test-programs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	app-arch/unzip
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
-"
-CDEPEND="
-	media-libs/alsa-lib
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-DEPEND="
-	${CDEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-
-S="${WORKDIR}/${MY_P}/${PN}/trunk"
-MAKEOPTS+=" -j1"
-
-PATCHES=(
-	# fix parallel make failures, fix java support, and allow optional
-	# components like test programs and static libs to be skipped
-	"${FILESDIR}"/${P}-cmake.patch
-
-	# add include directories and remove references to missing files
-	"${FILESDIR}"/${PN}-217-r4-python.patch
-)
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install wrapper for pmdefaults
-	if use java ; then
-		cat > pm_java/pmdefaults/pmdefaults <<-EOF
-			#!/bin/sh
-			java -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/" \\
-				-jar "${EPREFIX}/usr/share/${PN}/lib/pmdefaults.jar"
-		EOF
-		[[ $? -ne 0 ]] && die "cat pmdefaults failed"
-	fi
-}
-
-src_configure() {
-	if use debug ; then
-		CMAKE_BUILD_TYPE=Debug
-	else
-		CMAKE_BUILD_TYPE=Release
-	fi
-
-	local mycmakeargs=(
-		-DPORTMIDI_ENABLE_JAVA=$(usex java)
-		-DPORTMIDI_ENABLE_STATIC=$(usex static-libs)
-		-DPORTMIDI_ENABLE_TEST=$(usex test-programs)
-	)
-
-	if use java ; then
-		mycmakeargs+=(-DJAR_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/lib")
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python ; then
-		sed -i -e "/library_dirs=.*linux/s#./linux#${CMAKE_BUILD_DIR}#" pm_python/setup.py || die
-		pushd pm_python > /dev/null
-		append-ldflags -L"${BUILD_DIR}"
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-
-	if use doc ; then
-		doxygen || die "doxygen failed"
-		pushd latex > /dev/null
-		VARTEXFONTS="${T}"/fonts emake
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt
-
-	use doc && dodoc latex/refman.pdf
-
-	if use python ; then
-		pushd pm_python > /dev/null
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	if use java ; then
-		newdoc pm_java/README.txt README_JAVA.txt
-		newicon pm_java/pmdefaults/pmdefaults-icon.png pmdefaults.png
-		make_desktop_entry pmdefaults Pmdefaults pmdefaults "AudioVideo;Audio;Midi;"
-	fi
-
-	if use test-programs ; then
-		exeinto /usr/$(get_libdir)/${PN}
-		local app
-		for app in latency midiclock midithread midithru mm qtest sysex test ; do
-			doexe "${BUILD_DIR}"/${app}
-		done
-	fi
-}
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index fdbfcd408505..3f5ca8b1f4f3 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,4 +1,7 @@
 AUX rubberband-2.0.1-build.patch 6021 BLAKE2B f9e745c1eda3dc8d4f603df144a41143f3f7ee3691a09f97f069f469378d9541a057aefd1e23c7c00dbc276e13eb510dce63579f2334d2384433ce60b41231f6 SHA512 4e20aa9722f2995ad2959cfabd3eca24b6d72eb1d1e59bf2f4b283e4cbc60025ae0ee754bacfac3042214f96900f4bac100c3c1918da1a256ea7f42f0befe912
+AUX rubberband-3.0.0-build.patch 6150 BLAKE2B 2548de747697e04988e55483f08afd1c8e748080ff81f2db997cdd34ac64ad7031fa6ce5852bfeac0c5f96a04ba906f10d61ce395383ba509da7ed46823fcfc1 SHA512 b1be06cd1ec660db0f023268796850833e0813480acb9c0ba15a62ffca5174b2c5e4897eedc94606033bc51b865da607a549c1bca1bc56a3cd9268cae0566488
 DIST rubberband-2.0.2.tar.bz2 178974 BLAKE2B 602d7eb76791d431a65bd5ef0d53ea0c2672e67aaa566594b3b2bb026cdf1b8879380818c3626a2c6d51cd6366bd47a52c69c110da566aa234fb7b37b19f027b SHA512 87dc5d59995bf949c35b885bb2eced067d84775bab76692da1202ae7554cb1b8404ca7371c264363e6d55c8978762ed32b446535746061f09e90cfc599adc0a0
+DIST rubberband-3.0.0.tar.bz2 213089 BLAKE2B 74afdf1f7c3360b711b365d73e12fe84afa5abc8ddb6a10a3d31392a621e9fca67e8b4c0292238b0e5726c56242438e1b2ef1d7d6ea6979a360cc7ecab45de75 SHA512 d8ce300a2cca7e35c548f9cd9f2f77f9b730b0e9427214d4a825b32ea9c90769e229f91db5846b90ff11a1513e8f68447fb598aa2684f67f10b4b9414b9ad748
 EBUILD rubberband-2.0.2.ebuild 1580 BLAKE2B 63d0645884bbbf9b033c42c257477c57b794f95a6dad529e707db3c4319b6ff9be4b62a42f17f2fd8528ffcf3998653bae2b3eaa72a2448d1fcbbda30b3b2438 SHA512 708a74df246ca65f6ea0f384ada9870b88c4db42d92d03758daf232d7f2bb6d35de6c50b3291ac4a5bbfb1aac82ecce38d33c0785d6a5df5e107479cd39093a6
+EBUILD rubberband-3.0.0.ebuild 1579 BLAKE2B 44fe0a735c5bc45bbc037b2d924154092badb0612d627f4ef13591b864dd619f88a4bc816724075968832b2dfc42675a9529c90d2836163b15f3667a6171fa23 SHA512 b409d6db0bec4f6df57accd20c75f9cb74aea9db576db3b40bd7103cf6ddb0c1d32976cec82e10cf30ce2311aa564140302fc7a236183bdb02ad436a19ae53eb
 MISC metadata.xml 491 BLAKE2B bda0db771d95de138274eb35f4c135f3bd9fb3a1b75ce60a8c57ad71e0c0a894924bb52060c8ca87e689f2a0f581213639de2ca5615a134dfecfa4f008698b2a SHA512 c549bcf465808927153a79f145b222379270d2813e150606382dcb1c15980a37a89d7f0178d3fee2fd3eb7216dd6ad989efe0a24e398f67af95872f6c92d570a
diff --git a/media-libs/rubberband/files/rubberband-3.0.0-build.patch b/media-libs/rubberband/files/rubberband-3.0.0-build.patch
new file mode 100644
index 000000000000..3892f5231716
--- /dev/null
+++ b/media-libs/rubberband/files/rubberband-3.0.0-build.patch
@@ -0,0 +1,165 @@
+diff --git a/meson.build b/meson.build
+index 42f7f7f..b2a342a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -113,19 +113,27 @@ endforeach
+ 
+ fftw3_dep = dependency('fftw3', version: '>= 3.0.0', required: false)
+ samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false)
+-sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
+-vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
++if get_option('programs')
++  sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
++endif
++if get_option('vamp')
++  vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
++endif
+ boost_unit_test_dep = dependency('boost', modules: ['unit_test_framework'], version: '>= 1.73', required: false)
+ thread_dep = dependency('threads')
+-have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
++if get_option('ladspa')
++  have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
++endif
+ have_lv2 = cpp.has_header('lv2.h', args: extra_include_args)
+ have_sincos = cpp.has_function('sincos',
+                                prefix: '#define _GNU_SOURCE\n#include <math.h>',
+                                args: '-lm')
+-have_jni = cpp.has_header('jni.h', args: extra_include_args)
++if get_option('jni')
++  have_jni = cpp.has_header('jni.h', args: extra_include_args)
+ 
+-javac = find_program('javac', required: false)
+-jar = find_program('jar', required: false)
++  javac = find_program('javac', required: false)
++  jar = find_program('jar', required: false)
++endif
+ 
+ 
+ # Check FFT and resampler options and set up dependencies and paths
+@@ -296,37 +304,41 @@ if ipp_needed
+   endif
+ endif # ipp_needed
+ 
+-if not vamp_dep.found()
+-  vamp_dep = cpp.find_library('VampPluginSDK',
+-                              dirs: get_option('extra_lib_dirs'),
+-                              has_headers: ['vamp-sdk.h'],
+-                              header_args: extra_include_args,
+-                              required: false)
++if get_option('vamp')
+   if not vamp_dep.found()
+-    vamp_dep = cpp.find_library('vamp-sdk',
++    vamp_dep = cpp.find_library('VampPluginSDK',
+                                 dirs: get_option('extra_lib_dirs'),
+                                 has_headers: ['vamp-sdk.h'],
+                                 header_args: extra_include_args,
+                                 required: false)
++    if not vamp_dep.found()
++      vamp_dep = cpp.find_library('vamp-sdk',
++                                  dirs: get_option('extra_lib_dirs'),
++                                  has_headers: ['vamp-sdk.h'],
++                                  header_args: extra_include_args,
++                                  required: false)
++    endif
+   endif
++  have_vamp = true
+ endif
+-have_vamp = vamp_dep.found()
+-
+-if not sndfile_dep.found()
+-  sndfile_dep = cpp.find_library('sndfile',
+-                                 dirs: get_option('extra_lib_dirs'),
+-                                 has_headers: ['sndfile.h'],
+-                                 header_args: extra_include_args,
+-                                 required: false)
++
++if get_option('programs')
+   if not sndfile_dep.found()
+-    sndfile_dep = cpp.find_library('sndfile-1',
++    sndfile_dep = cpp.find_library('sndfile',
+                                    dirs: get_option('extra_lib_dirs'),
+                                    has_headers: ['sndfile.h'],
+                                    header_args: extra_include_args,
+                                    required: false)
++    if not sndfile_dep.found()
++      sndfile_dep = cpp.find_library('sndfile-1',
++                                     dirs: get_option('extra_lib_dirs'),
++                                     has_headers: ['sndfile.h'],
++                                     header_args: extra_include_args,
++                                     required: false)
++    endif
+   endif
++  have_sndfile = true
+ endif
+-have_sndfile = sndfile_dep.found()
+ 
+ have_boost_unit_test = boost_unit_test_dep.found()
+ 
+@@ -535,7 +547,7 @@ if get_option('default_library') != 'shared' and rubberband_additional_static_li
+   )
+ endif
+ 
+-if have_jni and javac.found() and jar.found()
++if get_option('jni')
+   target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] }
+   message('Will build Java Native Interface')
+   rubberband_jni = shared_library(
+@@ -570,7 +582,7 @@ if have_jni and javac.found() and jar.found()
+   )
+ else
+   target_summary += { 'JNI library': false }
+-  if not have_jni
++  if not get_option('jni')
+     message('Not building Java Native Interface: jni.h header not found')
+   else 
+     message('Not building Java Native Interface: Java compiler not found')
+@@ -584,7 +596,7 @@ install_headers(
+   subdir: 'rubberband'
+ )
+ 
+-if have_ladspa
++if get_option('ladspa')
+   target_summary += { 'LADSPA plugin': [ true, 'Name: ' + rubberband_ladspa_name ] }
+   message('Will build LADSPA plugin')
+   rubberband_ladspa = shared_library(
+@@ -651,7 +663,7 @@ else
+   message('Not building LV2 plugin: lv2.h header not found')
+ endif
+ 
+-if have_vamp
++if get_option('vamp')
+   target_summary += { 'Vamp plugin': [ true, 'Name: ' + rubberband_vamp_name ] }
+   message('Will build Vamp plugin')
+   rubberband_vamp = shared_library(
+@@ -683,7 +695,7 @@ else
+   message('Not building Vamp plugin: Vamp dependency not found')
+ endif
+ 
+-if have_sndfile
++if get_option('programs')
+   message('Will build command-line utilities')
+   target_summary += { 'Command-line utility (R2)': [ true, 'Name: ' + rubberband_program_name ] }
+   rubberband_program = executable(
+diff --git a/meson_options.txt b/meson_options.txt
+index c820c20..81710de 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -26,3 +26,18 @@ option('extra_lib_dirs',
+        value: [],
+        description: 'Additional local library directories to search for dependencies.')
+ 
++option('jni',
++       type: 'boolean',
++       value: 'false')
++
++option('ladspa',
++       type: 'boolean',
++       value: 'false')
++
++option('programs',
++       type: 'boolean',
++       value: 'false')
++
++option('vamp',
++       type: 'boolean',
++       value: 'false')
diff --git a/media-libs/rubberband/rubberband-3.0.0.ebuild b/media-libs/rubberband/rubberband-3.0.0.ebuild
new file mode 100644
index 000000000000..d19aa930e757
--- /dev/null
+++ b/media-libs/rubberband/rubberband-3.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib flag-o-matic
+
+DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
+HOMEPAGE="https://www.breakfastquay.com/rubberband/"
+SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="ladspa jni static-libs +programs vamp"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	media-libs/libsamplerate[${MULTILIB_USEDEP}]
+	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
+	jni? ( >=virtual/jdk-1.8:* )
+	ladspa? ( media-libs/ladspa-sdk )
+	programs? ( media-libs/libsndfile )
+	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+multilib_src_configure() {
+	if use ppc ; then
+		# bug #827203
+		# meson doesn't respect/use LIBS but mangles LDFLAGS with libs
+		# correctly. Use this until we get a Meson test for libatomic.
+		append-ldflags -latomic
+	fi
+
+	local emesonargs=(
+		--buildtype=release
+		-Dfft=fftw
+		-Dresampler=libsamplerate
+		-Ddefault_library=$(use static-libs && echo "both" || echo "shared")
+		$(meson_use ladspa)
+		$(meson_use jni)
+		$(meson_use programs)
+		$(meson_use vamp)
+	)
+	use jni && emesonargs+=(
+		-Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux"
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	! use jni && find "${ED}" -name "*.a" -delete
+}
diff --git a/media-libs/sdl_audiolib/Manifest b/media-libs/sdl_audiolib/Manifest
index 500086980b87..522a07cc4ab6 100644
--- a/media-libs/sdl_audiolib/Manifest
+++ b/media-libs/sdl_audiolib/Manifest
@@ -1,4 +1,4 @@
-DIST sdl_audiolib-0_pre20220410.tar.xz 223932 BLAKE2B 09f35684b64b2b96fd0230612cc8458a8c7b0b94860c9d616c90141cd6d8088048e783170180191ed9998b2601676892686dc7d8373c8507d71db59b919c178b SHA512 01ef7f4d8987e1e27b4413d21eefbb8a83ab720f64ed76fd6314244d0d53bed5a061f4a22d4967e21cc9f6086532d33fea233f3e72e8a7abc5a80108f74710c1
-EBUILD sdl_audiolib-0_pre20220410.ebuild 1595 BLAKE2B baf2f56c4dd09145cf8d4a2f9d024c1677d6fdcd6f8d7d6bbd26e743c481fa2417d934973daf96bb74d66227518125450a912eb09b51a713c442421c74952c13 SHA512 4762073f00aaf4d08bca24d10280d045fb2b52babb05df5d23379820eb9bc1e5d0af6df6055acd29088f679c3ff222bed6a043a73b23890df5918129c2decb93
-EBUILD sdl_audiolib-9999.ebuild 1595 BLAKE2B baf2f56c4dd09145cf8d4a2f9d024c1677d6fdcd6f8d7d6bbd26e743c481fa2417d934973daf96bb74d66227518125450a912eb09b51a713c442421c74952c13 SHA512 4762073f00aaf4d08bca24d10280d045fb2b52babb05df5d23379820eb9bc1e5d0af6df6055acd29088f679c3ff222bed6a043a73b23890df5918129c2decb93
-MISC metadata.xml 627 BLAKE2B 9f7dce2b6e9ef5f8b8665b4ea890bcc6933bc9fb444387fe9f8b93e44bd5ec6310384ad236b3f27a6f56c4bfd2ba89cf0d037479d628f3b7c61216ee77d381c7 SHA512 743b16b1683dc5aa48030ac7d4ed0effec157f19b222f2b8ba10bc88fa7418804a258c2c3c27792419f5255fc58abd90c16e9eafebfae22b15251bc1de9f26ef
+DIST sdl_audiolib-0_p20220622.tar.gz 1138752 BLAKE2B 01e565506b29e922f3eb5ff2705a0614e53c6afd43526d781eb83d86f54dab6692689de51d618e07779fe8c97ee2cfbe3de744f29c1798e3f10205141dcb28ea SHA512 ec6267665fb1a98fcfb91a40ebbd86f7bb14e9fed36509a903ba5408d0f4b8672b19421943de6a4b3d2d0b187f9531dae4b7c9f766ee07f9c1aefa08ab6a51e3
+EBUILD sdl_audiolib-0_p20220622.ebuild 2068 BLAKE2B 5a575eec91c86e2cddc675ec52012a7a7c5a94d9e9c2e9b63a2b6b616a3992a60899726288e031810402b2ed7f2f29069542a7793de5fef2c1955ebafc4b0212 SHA512 ca1fa86ed95a01a336f7d9319739f38e182f335d39841777145ed42629adc033cbbc1e34c116083cbcfb5d8fe6ee25672b44d0e07461318f2b1ea53753341a34
+EBUILD sdl_audiolib-9999.ebuild 2028 BLAKE2B 456872876217570077b442a244c311f3f58db78e159228a058a656bce28d7182800a46fb0c8b0ccd6883ada1f3772c661767feb637a50a5c5e26156a1ab9cb8f SHA512 0b92b69cb613b388144dae7468d0dc58ae5dba11d7eb3c9cc9d73cc4ac5346bdc132b3827119d6733b3140f5edccc6968d977dbb67127de82ae53159f50cb576
+MISC metadata.xml 826 BLAKE2B 6bf43ce9d28875ebb58e21eedafd36f61944646dd863f0810b25ae1e44d2e0234f002af4473ca265b09a7a77f5e65862e1c5fe90f48e81a450e9167a57351fa3 SHA512 b3353de39f31147e500a9d0138f3531404f342dd01d8d8634365289dfb206a0628d4ce4504726387eb9f91ea8a39fae70182545d52a59a853390a81283187908
diff --git a/media-libs/sdl_audiolib/metadata.xml b/media-libs/sdl_audiolib/metadata.xml
index 20558bf8a00e..93b2751b25dc 100644
--- a/media-libs/sdl_audiolib/metadata.xml
+++ b/media-libs/sdl_audiolib/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>games@gentoo.org</email>
+    <name>Gentoo Games Project</name>
+  </maintainer>
   <use>
-    <flag name="fluidsynth">use <pkg>media-sound/fluidsynth</pkg> for MIDI</flag>
+    <flag name="fluidsynth">Enable support for MIDI via <pkg>media-sound/fluidsynth</pkg></flag>
     <flag name="mpg123">Enable support for mp3 decoding via <pkg>media-sound/mpg123</pkg></flag>
     <flag name="openmpt">OpenMPT decoder via <pkg>media-libs/libopenmpt</pkg></flag>
     <flag name="soxr">Enable SoX Resampler support via <pkg>media-libs/soxr</pkg></flag>
+    <flag name="wildmidi">Enable support for MIDI via <pkg>media-sound/wildmidi</pkg></flag>
   </use>
   <upstream>
     <remote-id type="github">realnc/SDL_audiolib</remote-id>
diff --git a/media-libs/sdl_audiolib/sdl_audiolib-0_p20220622.ebuild b/media-libs/sdl_audiolib/sdl_audiolib-0_p20220622.ebuild
new file mode 100644
index 000000000000..2a3199706b09
--- /dev/null
+++ b/media-libs/sdl_audiolib/sdl_audiolib-0_p20220622.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/realnc/SDL_audiolib.git"
+else
+	SDLAUDIO_COMMIT="b66a66fedf8f65cacc5ce2ff8ed8d10649c6de31"
+	SRC_URI="https://github.com/realnc/SDL_audiolib/archive/${SDLAUDIO_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN/sdl/SDL}-${SDLAUDIO_COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Audio decoding, resampling and mixing library for SDL"
+HOMEPAGE="https://github.com/realnc/SDL_audiolib/"
+
+LICENSE="LGPL-3+ BSD-2 || ( MIT Unlicense )"
+SLOT="0"
+IUSE="doc flac fluidsynth libsamplerate modplug mpg123 musepack openmpt opus sndfile soxr vorbis wildmidi"
+
+RDEPEND="
+	dev-libs/libfmt:=
+	media-libs/libsdl2[sound]
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth:= )
+	libsamplerate? ( media-libs/libsamplerate )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	openmpt? ( media-libs/libopenmpt )
+	opus? ( media-libs/opusfile )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	vorbis? ( media-libs/libvorbis )
+	wildmidi? ( media-sound/wildmidi )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_DEC_ADLMIDI=OFF
+		-DUSE_DEC_BASSMIDI=OFF
+		-DUSE_DEC_FLAC=$(usex flac)
+		-DUSE_DEC_FLUIDSYNTH=$(usex fluidsynth)
+		-DUSE_DEC_LIBOPUSFILE=$(usex opus)
+		-DUSE_DEC_LIBVORBIS=$(usex vorbis)
+		-DUSE_DEC_MODPLUG=$(usex modplug)
+		-DUSE_DEC_MPG123=$(usex mpg123)
+		-DUSE_DEC_MUSEPACK=$(usex musepack)
+		-DUSE_DEC_OPENMPT=$(usex openmpt)
+		-DUSE_DEC_SNDFILE=$(usex sndfile)
+		-DUSE_DEC_WILDMIDI=$(usex wildmidi)
+		-DUSE_DEC_XMP=OFF
+		-DUSE_RESAMP_SOXR=$(usex soxr)
+		-DUSE_RESAMP_SRC=$(usex libsamplerate)
+		-DWITH_SYSTEM_FMTLIB=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use !doc || doxygen "${BUILD_DIR}"/Doxyfile || die
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r "${BUILD_DIR}"/doc/html
+}
diff --git a/media-libs/sdl_audiolib/sdl_audiolib-0_pre20220410.ebuild b/media-libs/sdl_audiolib/sdl_audiolib-0_pre20220410.ebuild
deleted file mode 100644
index d993c84aa88b..000000000000
--- a/media-libs/sdl_audiolib/sdl_audiolib-0_pre20220410.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="audio decoding, resampling and mixing library"
-HOMEPAGE="https://github.com/realnc/SDL_audiolib"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/realnc/SDL_audiolib.git"
-else
-	# No official releases from upstream yet
-	SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="fluidsynth libsamplerate modplug mpg123 musepack openmpt opus sndfile soxr vorbis"
-
-RDEPEND="
-	media-libs/libsdl2
-	fluidsynth? ( media-sound/fluidsynth )
-	libsamplerate? ( media-libs/libsamplerate )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	openmpt? ( media-libs/libopenmpt )
-	opus? ( media-libs/opusfile )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_DEC_ADLMIDI=OFF
-		-DUSE_DEC_BASSMIDI=OFF
-		-DUSE_DEC_FLUIDSYNTH="$(usex fluidsynth)"
-		-DUSE_DEC_MODPLUG="$(usex modplug)"
-		-DUSE_DEC_MPG123="$(usex mpg123)"
-		-DUSE_DEC_MUSEPACK="$(usex musepack)"
-		-DUSE_DEC_OPENMPT="$(usex openmpt)"
-		-DUSE_DEC_LIBOPUSFILE="$(usex opus)"
-		-DUSE_DEC_SNDFILE="$(usex sndfile)"
-		-DUSE_DEC_LIBVORBIS="$(usex vorbis)"
-		-DUSE_DEC_WILDMIDI=OFF
-		-DUSE_DEC_XMP=OFF
-		-DUSE_RESAMP_SOXR="$(usex soxr)"
-		-DUSE_RESAMP_SRC="$(usex libsamplerate)"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild b/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild
index d993c84aa88b..961a40fde5e4 100644
--- a/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild
+++ b/media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild
@@ -5,24 +5,28 @@ EAPI=8
 
 inherit cmake
 
-DESCRIPTION="audio decoding, resampling and mixing library"
-HOMEPAGE="https://github.com/realnc/SDL_audiolib"
-if [[ "${PV}" == *9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/realnc/SDL_audiolib.git"
 else
-	# No official releases from upstream yet
-	SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	SDLAUDIO_COMMIT=""
+	SRC_URI="https://github.com/realnc/SDL_audiolib/archive/${SDLAUDIO_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN/sdl/SDL}-${SDLAUDIO_COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
-LICENSE="LGPL-3"
-SLOT="0"
 
-IUSE="fluidsynth libsamplerate modplug mpg123 musepack openmpt opus sndfile soxr vorbis"
+DESCRIPTION="Audio decoding, resampling and mixing library for SDL"
+HOMEPAGE="https://github.com/realnc/SDL_audiolib/"
+
+LICENSE="LGPL-3+ BSD-2 || ( MIT Unlicense )"
+SLOT="0"
+IUSE="doc flac fluidsynth libsamplerate modplug mpg123 musepack openmpt opus sndfile soxr vorbis wildmidi"
 
 RDEPEND="
-	media-libs/libsdl2
-	fluidsynth? ( media-sound/fluidsynth )
+	dev-libs/libfmt:=
+	media-libs/libsdl2[sound]
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	libsamplerate? ( media-libs/libsamplerate )
 	modplug? ( media-libs/libmodplug )
 	mpg123? ( media-sound/mpg123 )
@@ -32,28 +36,41 @@ RDEPEND="
 	sndfile? ( media-libs/libsndfile )
 	soxr? ( media-libs/soxr )
 	vorbis? ( media-libs/libvorbis )
-"
+	wildmidi? ( media-sound/wildmidi )"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_DEC_ADLMIDI=OFF
 		-DUSE_DEC_BASSMIDI=OFF
-		-DUSE_DEC_FLUIDSYNTH="$(usex fluidsynth)"
-		-DUSE_DEC_MODPLUG="$(usex modplug)"
-		-DUSE_DEC_MPG123="$(usex mpg123)"
-		-DUSE_DEC_MUSEPACK="$(usex musepack)"
-		-DUSE_DEC_OPENMPT="$(usex openmpt)"
-		-DUSE_DEC_LIBOPUSFILE="$(usex opus)"
-		-DUSE_DEC_SNDFILE="$(usex sndfile)"
-		-DUSE_DEC_LIBVORBIS="$(usex vorbis)"
-		-DUSE_DEC_WILDMIDI=OFF
+		-DUSE_DEC_FLAC=$(usex flac)
+		-DUSE_DEC_FLUIDSYNTH=$(usex fluidsynth)
+		-DUSE_DEC_LIBOPUSFILE=$(usex opus)
+		-DUSE_DEC_LIBVORBIS=$(usex vorbis)
+		-DUSE_DEC_MODPLUG=$(usex modplug)
+		-DUSE_DEC_MPG123=$(usex mpg123)
+		-DUSE_DEC_MUSEPACK=$(usex musepack)
+		-DUSE_DEC_OPENMPT=$(usex openmpt)
+		-DUSE_DEC_SNDFILE=$(usex sndfile)
+		-DUSE_DEC_WILDMIDI=$(usex wildmidi)
 		-DUSE_DEC_XMP=OFF
-		-DUSE_RESAMP_SOXR="$(usex soxr)"
-		-DUSE_RESAMP_SRC="$(usex libsamplerate)"
+		-DUSE_RESAMP_SOXR=$(usex soxr)
+		-DUSE_RESAMP_SRC=$(usex libsamplerate)
+		-DWITH_SYSTEM_FMTLIB=ON
 	)
+
 	cmake_src_configure
 }
+
+src_compile() {
+	cmake_src_compile
+
+	use !doc || doxygen "${BUILD_DIR}"/Doxyfile || die
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r "${BUILD_DIR}"/doc/html
+}
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index ea5a9ec5d5bd..2848fdda7b5e 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,5 +1,3 @@
 DIST sratom-0.6.10.tar.bz2 327047 BLAKE2B 6205a0269216099556556cd251649eba58fdf1a2c8a80611367f3b9564fe410ed7ff1c565ab7b628743fa99ca893eb7a86fed631872eff86e19de9ba534fae49 SHA512 cc5d2848d61de45a37d1f844b2c741016decf065bcac975214dd01108171ba332f0a51526f2f1078d5f501055af0a48716704515cbe7a9f73526fd878621ca4b
-DIST sratom-0.6.8.tar.bz2 327027 BLAKE2B 8e11e03e6a66e9c96f90a0f31f4a65c660ed44304600caa2daad09b955a4829b266f7495b8ed85c62c34adfbc3e7f97790096bd721b51e1038986ac2e3926e60 SHA512 49ec4b230a72005ab7a7a3de0bfa630a27a16f9f811ca8e7f6da7fcf6b34526577217075d428a993f95b813dd2a82a9b6892eeb2e36b66b122ada778fbb3fb95
 EBUILD sratom-0.6.10.ebuild 1278 BLAKE2B e1b8bd5bc3dd4c6ba7d922b3f7a021023c048c7efeba7f246e7eb12fd9a2ebb1c1996e8f3b713fc6748b8a10c08eca3966217ebb61c5559129125f9ebb58567b SHA512 79cd92b9ee933fdcea36374c4d8b7754176f084b9e6906e8603d3f929b7bf2467da5e4f22cb1c519c83b383e4b3492c8894f6c4730c61d9be71bc74d539875e8
-EBUILD sratom-0.6.8.ebuild 1278 BLAKE2B 726d583fd9ba66da7f176208d40487d6b6cf0f5a7653ba5ac869ff4ddca46714de5f00b730fb4aa2897952b1d6312019405c697f6e0e9be1c61c9588a069a337 SHA512 683097cf2c70ec21edc30cba38c5535d5476510cc0d6c1f3b40783043e7427a885321681cf40f60aa91eeecf7f2e91767929c15ffc659ad42d0f22ee6aa19e9a
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-libs/sratom/sratom-0.6.8.ebuild b/media-libs/sratom/sratom-0.6.8.ebuild
deleted file mode 100644
index 98534de316d6..000000000000
--- a/media-libs/sratom/sratom-0.6.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax"
-HOMEPAGE="http://drobilla.net/software/sratom/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		dev-python/sphinx_lv2_theme
-)
-"
-RDEPEND="
-	dev-libs/serd
-	dev-libs/sord
-	media-libs/lv2
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
-DOCS=( "NEWS" "README.md" )
-
-src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	default
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	default
-}
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index c87408eb3726..02e1e10efe86 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,5 +1,3 @@
-DIST suil-0.10.10.tar.bz2 339906 BLAKE2B 03d1ac744fa3fa487bbf44d6e006f6cfcc73dc4aa6eb79d1ac5d024dc9493e3e426ff6054705d1de514286b2d43f5a1448bfcf7e573fa95d61c41790ca06c405 SHA512 e442022096150b2f71d65bbd625e2e262cb3e3865c57f5a30f0472dac8ef90ad2fbbf67235823055019017e3751b46330f6e98b8e1745e5845eb02c4d2a4fc21
 DIST suil-0.10.12.tar.bz2 339666 BLAKE2B f70bbc18f5fa1a9263fe5c0a9241e966e124a855273bc6fe863375aef8505193e49b67d3b9d7ff6d4e4cf50cb6c2cb2b2d53dccab06005f82725e024cc8347d5 SHA512 f2b9ca36cc35d6b51c6e4ae144d61b1ba5e3b51113cca48d0535f6346ff918bdc7e299f0036ea1431c0ef59b1a02f1f4086a95db552d0a06bffb54567ab4a278
-EBUILD suil-0.10.10.ebuild 1080 BLAKE2B e31e13f77f38d9c2413f235fe4c68f87b441b3f804bfdef82f76fdc353aebaba2ca3fc4272607cbcf138ee757544f001a1ce24bae6e0c7e992ef65eaad975dc8 SHA512 ed46ba9df992f369a75512887743e862eabcb4f5f2edb44ba3a38420a26ee883c2f16b68f21d2274ccfda684fd3649e7032ada6b516f679da4575d9746fe45d3
 EBUILD suil-0.10.12.ebuild 1067 BLAKE2B f4d2fe9dc9af625225b401572446c6a53292e7f80a1d863a5daaf1718fdf758a3c5e6445f2aa4914bae865d6b56f1489b19ef086a4a4df56e5e89db407ede7d3 SHA512 e720c79edcc253b081577347ec7d82fbe03182403e608bfe9b8d5badf1ee08ab4992e3f9a00e4a1d43e9aed04710f6d0dc8698a5a7795f2f0efadb9c7a2df585
 MISC metadata.xml 492 BLAKE2B 08b9c4faabd0b31d5397307c0a025e49b25124edf27fb2972e3d77f93b221985dc8a94eb7626e0b6f845877cdf4c714ead49c25dee3e7346efb92c7fa98ba0c1 SHA512 2505c885384508559d1ee43cd2c5f382d444299de05abb7395cad7510cb9dd40c55b3c33a0f4348b278ac4c7c52d3f083d7996a44d8f5bda4611f038822c5500
diff --git a/media-libs/suil/suil-0.10.10.ebuild b/media-libs/suil/suil-0.10.10.ebuild
deleted file mode 100644
index df12118bcf1e..000000000000
--- a/media-libs/suil/suil-0.10.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
-HOMEPAGE="http://drobilla.net/software/suil/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
-IUSE="doc gtk qt5"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		dev-python/sphinx_lv2_theme
-	)
-"
-CDEPEND="
-	media-libs/lv2
-	gtk? ( x11-libs/gtk+:2 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-src_prepare() {
-	default
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--no-qt4 \
-		$(usex gtk '' --no-gtk) \
-		$(usex qt5 '' --no-qt5) \
-		$(usex doc --docs '')
-}
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 6752072d5910..2ad8774996ef 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -3,5 +3,5 @@ DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175
 DIST tiff-4.4.0.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9
 DIST tiff-4.4.0.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c
 EBUILD tiff-4.3.0.ebuild 2056 BLAKE2B 424dba5d1ffb1699a268dabb5498fe6a46a21b70123bc1cba04b5e9bcb637151b4ff49262f9a53adf95766293a4a2c7d9bfaeb192c92e083ae5cefa21931a436 SHA512 09d81e358ed7af8dd65c73dfb8c857e5d48d7cdaf764a5a5fbcfe400133915d074a2c6c15bb0a617d0fdd271f10de20402a807a4e265dfc96dbe65af8b016bb3
-EBUILD tiff-4.4.0.ebuild 2752 BLAKE2B c8e62fcb96c5c3821dff3c1a69bbe606c83203aee0b4a6fb08020383f72a58bc8948c83cb6e03bc595083365305abfd64f781ab6c9803688acea07b9fc7cf350 SHA512 12c6d7175612862a5ac3fbf8bfd97bd562b951ace3913b2b6ce556160711c1c7b08dbbc23412578ca48fb307520a6dcbd4b7ae825d50e6593196bdc1e69f43d1
+EBUILD tiff-4.4.0.ebuild 2749 BLAKE2B 2972cee88d4e4f9ae3a612338e4c3c8f01fde2f6ac1f9185dabe23ac9ff9e1932abd306a226167a50864c5bf17daf82ef39513c68c0cad5e998ba48ce5d029cb SHA512 c345cfaad0670f8dbe1ffb413fdd40943628c75c526bf2626331aebd95e346f422f7c3d7db1734c35340ebbb5b1868ef025e8861ad6481e55c80feb69f909c8c
 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469
diff --git a/media-libs/tiff/tiff-4.4.0.ebuild b/media-libs/tiff/tiff-4.4.0.ebuild
index 3d6799c26260..63867747709b 100644
--- a/media-libs/tiff/tiff-4.4.0.ebuild
+++ b/media-libs/tiff/tiff-4.4.0.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 938405b3ca53..4d1a95dacd2a 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -3,9 +3,11 @@ DIST zimg-2.9.2.tar.gz 266049 BLAKE2B 214a6afec061dc7cc7c751f2a57e56951e44b78fea
 DIST zimg-3.0.1.tar.gz 326304 BLAKE2B 353e623520df49122badd2d58400936fd25bf74fe386ade6b7a5c1b86db696dd50ff72ff40e1edbd38ee9a8a10dd429f207061fdb2ea326018396dfb92707053 SHA512 ae117399772d2c35ffa61b8cf5d156edf4ed65e9ffeb2e9e0688c88244fdd1a89c098bd842e3795b33fb0951da97f844fb6ffe27045e3234720f70f842356936
 DIST zimg-3.0.2.tar.gz 326554 BLAKE2B 2ebea0060519a6912caf685ec551ed60f64f3e379629c607ad21d256daa549a2e85e2c8dbc0886846e9636508576680ed60353d569aef407879ba5fa7dd3001d SHA512 6aed45c19a07862d389dfc2903a7ed9c0c6b6faa23e1d5de5483f15f1c3fb44a31c954004b8b9f34def0d387a43590d9403d9e24a99a271bcadc373c6ce30d42
 DIST zimg-3.0.3.tar.gz 326585 BLAKE2B 30ef9063d05869a718ba450e2733dede74abb3f60ca827bba683cc1c21f7c4521c830089e800a2f704bb7a133514b00fbd245362765d07811dcb4d2970b28d09 SHA512 859c625599b412ecdd72c73d7618f6c7f9760337f7c8aec69fb97e30e1e65e4da51f6cbc5a2c8ad58cb7fbccdccb5322b95f24166c0204da6a3a8cd862cfb2ab
+DIST zimg-3.0.4.tar.gz 326578 BLAKE2B 0fa63ccb0037cb6de93cdf9a5cc2d7b7d822652361c08845f9776b85856f03f29ef9fdbe9db55c074922ef13cf76ce4170786fd480da934556997658b7c32a30 SHA512 94beddb109f0b301f0fecf09ea2761d3707aaa1f0cc1caf682bb3d1d7dcd89164de8388e922758e274914df9c7c7c1a0a0c5192e78f88655ed4c6da0ee51995c
 EBUILD zimg-2.9.2.ebuild 888 BLAKE2B 434361e85ebb7e8c03baddc5e8d1a9b165f239fa7d613ee779ae72114bc95b9e53344c8b2e75c1865eb90ee8710ad8c01cffdbc28afef92032dfc4b4d6721bf5 SHA512 51fcd2adae236f6083ac1ec669b78c8c4e190081d16d6afa2616e47980c20e41423662c4845b4f174f730c669bd30428f4088cb1fbe5fdd74506c07e6989847c
 EBUILD zimg-3.0.1.ebuild 777 BLAKE2B 3ff6bb65c43a747b0fdd6638f4dbd847d805d3d1ced7f877205d88809b501d59c27c6427de3116e3bca4b80e82020d3b348479c768d4986eca56c4997a3207c8 SHA512 214b3ee47ab0cdf5dab93a94708e6fc49258e92338da2445b3889d65ef83709413d1af5cce9474df8874c7ab95f2654eb594bda3d546c9cc09cd753c0e698547
 EBUILD zimg-3.0.2.ebuild 790 BLAKE2B 82bb65dae94ebcb7297fcf7cd7d008a422948f1a8d5fb823e2ebd8e0f208822d6047a93df42a7060af67dacdbcaa685cf19ef105e6248577a7cf0b6993e1c397 SHA512 f99abe15acd9d55ab345b73a6e2e6ba2b1ece7b3fbb2b293d0a249c371d3f6d8a4b85b18563a6ff07de155289507d613b01bed6b16d3fdbed7936f1d7e9d39d0
 EBUILD zimg-3.0.3.ebuild 790 BLAKE2B 134fe89f4b4ce53353b67388e2dca74f18dce7cd28c3061c3ed8c0310d7e54b07157fb9e3f4e547b4541192b1b6054239c524117a6856cc81e2c083c8349e640 SHA512 ee669bffff67304cd5c2d112af1162f9d7d689f413c3c160de3c18a8623d71e77c738733e9bf34503a57ab575ca00f5c561753e95d541bd12c3b56c18e73eac3
+EBUILD zimg-3.0.4.ebuild 790 BLAKE2B 134fe89f4b4ce53353b67388e2dca74f18dce7cd28c3061c3ed8c0310d7e54b07157fb9e3f4e547b4541192b1b6054239c524117a6856cc81e2c083c8349e640 SHA512 ee669bffff67304cd5c2d112af1162f9d7d689f413c3c160de3c18a8623d71e77c738733e9bf34503a57ab575ca00f5c561753e95d541bd12c3b56c18e73eac3
 EBUILD zimg-9999.ebuild 790 BLAKE2B 134fe89f4b4ce53353b67388e2dca74f18dce7cd28c3061c3ed8c0310d7e54b07157fb9e3f4e547b4541192b1b6054239c524117a6856cc81e2c083c8349e640 SHA512 ee669bffff67304cd5c2d112af1162f9d7d689f413c3c160de3c18a8623d71e77c738733e9bf34503a57ab575ca00f5c561753e95d541bd12c3b56c18e73eac3
 MISC metadata.xml 312 BLAKE2B 278c7bce7361e1cb96725595df0c35f0e227db2e6732d3cf1b53c960ad4a319a831a0e7cbf51702b24785f0f8d7bc73d3443a17e88595509a62a476caec5c5f4 SHA512 c070a6ea9f0a64532f6aa33b12ad04b293e8a6e014245936a71d5ab6facdec8ffd2665a49cdf3562a3dbc60406b6a24261aa9e65f7b7b63ef0d005927967cac2
diff --git a/media-libs/zimg/zimg-3.0.4.ebuild b/media-libs/zimg/zimg-3.0.4.ebuild
new file mode 100644
index 000000000000..2c7c54c43cfe
--- /dev/null
+++ b/media-libs/zimg/zimg-3.0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+inherit autotools multilib-minimal
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="debug static-libs"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
commit	2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree	8c816148bcbd22757d892089c989ae614eae4f5a /media-libs
parent	0f558761aa2dee1017b4751e4017205e015a9560 (diff)