gentoo xmass resync : 25.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-25 20:34:27 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-25 20:34:27 +0000
commit: 0f15659d48c193027158492acb726297501202c5 (patch)
tree: 5502ba879a78b759da28441d418dbbfe08bd8f03 /media-libs
parent: 93a93e9a3b53c1a73142a305ea1f8136846942ee (diff)
39 files changed, 373 insertions, 483 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 01baa32cb5b2..1572322395d7 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index db95babe0fe4..64ba06cd9814 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,4 +1,6 @@
 DIST chromaprint-1.5.0.tar.gz 615217 BLAKE2B 14bf219c23360028ac232e67b7eb36e3226bb6e19838ef239266a9d826e1bd50d798f69f961bcb78f36baf48630a93f53243f8f9ab6187c403382bab23042630 SHA512 25ab3f7834581a8204ac09614fef6036c801f5f8b7b72a864701ca0de8082b2458a2bd7c075d53451581d770898576411cdcfb23ce609bc82f9d9b395cc1a129
+DIST chromaprint-1.5.1.tar.gz 1581159 BLAKE2B 9f7f030e97d3114cf679df298d313ea826c0fb05e7e7d8a10090d0a27ed0811b380b81b29fce973e0493826c478964367396311fd0484619cb2fc4c2d8e0d4c0 SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
 DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
 EBUILD chromaprint-1.5.0.ebuild 1335 BLAKE2B 72e5ae920e50b84fc4397c43e3ed7d59fae119a431d3a49cd9ed768fa145193a5d1c160cda28c56861ddeeaf69d964c77ffa52adc32e2628d1fb54eb7fdb132f SHA512 50bc22f297910367e12efdd7a93a67e86e0dc06542ac219e2a400d4506e30601558b18c9987fa40ca913918f9e9d3c6f98a0bc521a20723d317d03ae660acb3f
+EBUILD chromaprint-1.5.1.ebuild 1307 BLAKE2B 8b946463fa94006e32282e27b8cb4c990d12f389a2e2dd463fe01fb7e9e6fd1bb8cebd2520d94bfcdef57e14b080ee1b9115c3fc83e75de53612374ef9d5e838 SHA512 df8b455d751a30725ea7d04f2d04dd8b5191cb28795b16c29799496b06bdaf23d667d57c1e95d685dc25c00fad83d4986a5784b775fb3278ef574a47171eb3b8
 MISC metadata.xml 503 BLAKE2B badb1250c59d72306e528508fe7016028a5aec5f349ad050437ba4c818ed0fc9d63efcdab5774b5ad94956067fe4243f6f4aff5423e25a2ac9685e147590d976 SHA512 b10104402e9b04d904a9ef4e6876bb52764ccf4a0b38b1f5ef7b5b9534737e64b285bfafdb3e9f7582fc21d0204f52014cd7eea6e22c8097ac46f15c111971c3
diff --git a/media-libs/chromaprint/chromaprint-1.5.1.ebuild b/media-libs/chromaprint/chromaprint-1.5.1.ebuild
new file mode 100644
index 000000000000..8c85b0d8d008
--- /dev/null
+++ b/media-libs/chromaprint/chromaprint-1.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+GTEST_VERSION="1.10.0"
+GTEST_DIR_VERSION="1.10.x"
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
+HOMEPAGE="https://acoustid.org/chromaprint"
+SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/v$(ver_cut 1-2 ${GTEST_VERSION}).x.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test tools"
+RESTRICT="!test? ( test )"
+
+# note: use ffmpeg instead of fftw because it's recommended and required for tools
+RDEPEND="media-video/ffmpeg:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+DOCS=( NEWS.txt README.md )
+
+multilib_src_configure() {
+	export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_DIR_VERSION}/googletest/"
+	local mycmakeargs=(
+		-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DFFT_LIB=avfft
+		-DAUDIO_PROCESSOR_LIB="swresample"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cd tests && (./all_tests || die "Tests failed")
+}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index acf77444b8ee..24caa1500637 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -6,9 +6,11 @@ DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab24
 DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
 DIST gegl-0.4.30.tar.xz 5398052 BLAKE2B c57b34ed64d3b9305d3e639b872c283bd4c9c798d13f7bde49b991044139bb4e433a3adb0a9e991b78b2905985496ca3bf4ed116333ceaaccc043b8a66426131 SHA512 73db2d18260ba061fbbc2adb3256ea9d5b822b57f5654cc3aefb59e7afeeb2e4f0fd7e95ac14603c0a549935df04d5744001089efb378511c914c68664dbd378
 DIST gegl-0.4.32.tar.xz 5633796 BLAKE2B a4ba5d19291a61c6903dcc368e6cc3e1934e8d89b555e81afd22709504fbb8a7ed104890af5f1e7bfbdd5664caef8f5e015341c7882f2171ecb518afe32a65ef SHA512 68da02b8df0a1d234063958896f3678ead62772e611bddb39a6f21ec58cc744599d0a691224c057f2da4d04f2ccfb155a545deea92e77c728dbaeeb90e68cad6
+DIST gegl-0.4.34.tar.xz 5647516 BLAKE2B 7d9e0c395e6bf38e407ed55f43c090789e29692254990a341e7b9a391ae67423a9948821c1b8a4dd156fb42c16fe6b8572de2ee7b5be09b9f802b892e82df580 SHA512 13bbc19c4fb1feee609d2191b09fe1d2f020da1be788f9dcf7ed89dfef8465ce77dc34a9cb74279c88336aa0f3d3a7a44ca35335a3c2374516f590a40edbc08e
 EBUILD gegl-0.4.26-r1.ebuild 5022 BLAKE2B d76955b962ac995d1648152318607f4ebc4f74680e95e357eaf2ff0391800212c9cf0ba2bb7445ce89031ff0d0fc1c5c14046903de32bb4e49a6adc3267fb49e SHA512 14bf294c9c1b073d7c3dce07b61b0b02d298ed3fe9d53825c91c4ed6b10d28fdfebc73dcb63fff9dbd272d0278b688a64236ca0ddce5ca15722af2b17d009912
 EBUILD gegl-0.4.28.ebuild 5034 BLAKE2B aa7b52183ed7cf1047dc19be3343fd06efda464eb03aecd93959bbecde260a4d7aaf172bb91194d672fa8ae2512ef698e0b77492a8bc6307eda9c4f093271f73 SHA512 bb2ab17cfbab58b420bad3b957a2b84563d7294631a7b188fef6a5dc530b742da96b6dee5d0fc8103ee419e9ef2b587ee1011e02cb96bac372df7f68404fab8d
 EBUILD gegl-0.4.30.ebuild 4830 BLAKE2B fa94364b30d66a79315ea3590fadf06467c8b24ae4ed83b7d4e27435b4e0b54f48a7252e009165d1aacbd0db72673c9ed3d32cd593c0ab652e74aec635f2aeae SHA512 65935c4762ab9e6aae27e23fc0ea4498db7d4ce7cc3479c694b9fd665a1dbe90aed34c467fa7dfc72955ee522a955dbfa9944f8d665e4e06bd7c9039a6d9de69
 EBUILD gegl-0.4.32.ebuild 4768 BLAKE2B 28e5d8e1a0f489a75a4189f9aba3a3ddf2c0b64969d3e82b0a73bc8a0e5291bf8a8101d80782b8d12b9786df3857e98dfdd05b0d3555b9e0e7792dc71e847413 SHA512 378d9dd8e728a4b9abf1c86beb2576d938ea8a28beb718c96580bcb7d6cb08d73a11b5a946610de8219b41f0218e7fb2d738a5f34d0c5b4325e05a12f67ee256
-EBUILD gegl-9999.ebuild 4502 BLAKE2B 9d432a8647e2d5b2e2f77025a602b92ceecca6080b1945e6a5e3971619ff00e918f277a10ca5accc9c0feb5aa7786d33d76fddc530aa9b4f56b740f5d5a0f7e1 SHA512 a9c920fdf717898e9722d11b59a1c78d7c0a7686494b904df2de29216a921a049e2687bc61457fd1cc9f347079990fc7200a6afd6f0bb1bda96e591ea74d7794
+EBUILD gegl-0.4.34.ebuild 4773 BLAKE2B 4fe2ea80db7178069c0ef6203956b32a5eae7ff43b617140defa2ffbd52792bfb27816e4eb72a48d3b906874f49638e24c789a66fae6b00cfaefb4bd65b7030e SHA512 58022c7ac32788806ed85ed75c221490eecb2e7fe7692a180f0074091762eeace4a5415f03bbcf22c94688e7f04d3bc5c4d81063d6158981211f60d723f8ad19
+EBUILD gegl-9999.ebuild 4503 BLAKE2B 929b36e0e05ab11cc0d542141a0b756a00f27fd2c36e63e1a17896d9e2f85e6bdadb5e85c9e14f3bd71d902e89501daa44ab7f8e22e9b498e00bf0d133639862 SHA512 8153e84bead2d81cd63c3ba1376bc03c0a6afc271b52dc5496053a6061cfdb470fc6f39793b19c392bbe156a368d5830a648fa41629564fa432f6e089a454d40
 MISC metadata.xml 581 BLAKE2B 180d0731a2d488b8772fc6aa8411871cb892a886ff93368a39a32b284702b7daeedfe32fdf19c0f11101304231ed1338cd8462d7788a08df1bc7ae1b8ac16a66 SHA512 bc5907cd42cbba848b57266cf1023a402296ed96f6ea53ede2501fb49923c23d636622ec569463df402dbb5db3c970353b92b110962945806222ec92257a12d9
diff --git a/media-libs/gegl/gegl-0.4.34.ebuild b/media-libs/gegl/gegl-0.4.34.ebuild
new file mode 100644
index 000000000000..2f812f3aec2c
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.34.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson optfeature python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	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"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="https://gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.68.2:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.88[introspection?,lcms?,vala?]
+	media-libs/libnsgif
+	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
+	virtual/jpeg:0=
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/pango-1.38.0
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
+
+python_check_deps() {
+	use test || return 0
+	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	# patch executables suffix
+	sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die
+	sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die
+	sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die
+	# skip UNEXPECTED PASSED 'matting-levin' test
+	sed -i -e "s/composition_tests += 'matting-levin'//" \
+		-e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/meson.build || die
+
+	# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
+	pushd "${S}/opencl/" || die
+	for file in *.cl; do
+		if [[ -f ${file} ]]; then
+			"${EPYTHON}" cltostring.py "${file}" || die
+		fi
+	done
+	popd || die
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Djasper=disabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		-Dsdl2=disabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature pdf poppler)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 241f4ce6cfa1..074d6327b123 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 VALA_USE_DEPEND=vapigen
 
 inherit meson optfeature python-any-r1 vala
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 19233b41456e..8ddd3bf59ca6 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -3,17 +3,13 @@ AUX libaom-1.0.0-update-vsx-ppc.patch 6367 BLAKE2B 4afed9f37d8fa8a9267b21700dbeb
 AUX libaom-1.0.0-version.patch 403 BLAKE2B 8ab115aecb2251750f964bafea7e74ea8e4ede648bffa42724e0b71a47bd1ffe841c36059a8e634cc581488a645dc4cc42d8884516067ec79a3f71adae1e8b06 SHA512 ca715566cb821de9b32cdc77b1a1f2b11627e7ced3c134f75fa9a1d1dc59494c4097bb6d9efa0adfa5c841f73666fe10cd86f2ca9db01e07ab97e1966d8dd159
 AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
-DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
 DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e729fb86380f2849b9bc80deee0251bf0a1149b548ebcb6642fa6edac13658f3e9c55d5f50c905fb733f8312431 SHA512 8e72e6d1c2fbae7fd8afaea6e7d086f2b533006934ffa8e126d4e769d3fc1aa92703ce7cae4c6dfa5dd8050b2afdbe2eba54fbf4f49c1d11ae41cc9913379607
 DIST libaom-2.0.1.tar.xz 2391756 BLAKE2B 46d5938c49e720ec773d55e461f38d86a4307358fe8d3d9cc0e16e63dd52e54d41163bd14a583c059c9881a6980b1a8c54323b499dbef8301e9fa90094cd0e02 SHA512 2e7e2a9f456d51641ded44cb3ff639982e996276157d34e6a38895a68b7a8f36e209bcbad3dea7a04bd5b45b8cfe8a3bf202ab630f93388ea6dfb516f13ed82f
-DIST libaom-3.0.0.tar.xz 3272588 BLAKE2B ffe3dae3d275818e1fa8819d016ed7a1f01d374ea058a1daa0cfde2a43f3d065a0be08bcd55db7cb823e0a1802a0cf0ae8cdcae63d7fadad9fa1b53e3f654e13 SHA512 6845d7139b1f5d49a0dea98b08de66904909ed0280d90ac56e740f26f17fe1ec3f49c454aded311db5505d7a4133eedc05a09eb6a0c45a43a4895223f5dc35a2
-DIST libaom-3.1.1.tar.gz 4604400 BLAKE2B b5e5030639fd7e33a4d0479cf0b5a174f2e0d0f67f6338bec6df7de333fd9bafa3821c7eb721959c1733a678209981f4893e4f228ed339e93f7b0b6fd136d967 SHA512 de91a47c23200ae83c34899c487db7f3b71872890f0506ffa7e2d9a1153ec389fc121b4df5ab1b30b28020599af34bb5d301eac3cdf2a34ce48dd26e07d7fc5b
 DIST libaom-3.1.2.tar.gz 4605501 BLAKE2B 7aac22da4103408f04a5c2e5d11a96d5a12651fd52e980b547427ebe3e235ba7c16700a131f4bb1b6b4e8a7f82f3175e526281eb593cf604ad491bd7fed0184e SHA512 466c2923115dcf0b0e29fafc8922a057814a84d0e61780ab9b6816bea31d0b741695326183884da5a04afffa5c925ff8ec8f6073e0a1e48ed4914066da975c3b
-EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5
+DIST libaom-3.2.0.tar.gz 4717955 BLAKE2B b247c9092bf3b8080b33671f182b10eea060a2eafd94eeb1b92177d2c7b5c32de2342f9cf1c7e500b28fdac2b00ea8d43b1e56c9d1c8c0efe1bbc4e40285a52a SHA512 649bebde85c1a42b0c1c3d2d3b7110b999e3ee1c8e76595259e4e75a8b0f3918e23ff7c7e2c313da4d579882f55bf29765bb882570280adc81f3bc1e82f1ee19
 EBUILD libaom-2.0.0.ebuild 2309 BLAKE2B 58f2c55f85387c62abe184863c934979033c63f0b966664a11e13bddf4abf22ead334a94a645bb1cc28ae05ae58f9398cb462e9384f7b087e1ec1983257d1870 SHA512 6fa8b6e03dd556b84abebb271047c58b3936eb7e9479360d87f6f2f4b3bb7815911e43a10de03c4acc431a60897457a39de65ce4e2087ec238bf3afdfd8c285e
-EBUILD libaom-2.0.1.ebuild 2319 BLAKE2B 072057d02485e70a557be99c7e0eb0d52b8382a3cd11afd9c6ac375b830965cb1291488e7a599e4226d4fc553287b618b50ae1cfea27c2e935ce259c2870431a SHA512 4b284f8049d487a178b280c9bb18bfd757f4e8a9f0b673c4cda337085c0fb7192632b46540081967fd03dd9c982cd488155751bb008cc114d4d38f5e98cc8c35
-EBUILD libaom-3.0.0.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
-EBUILD libaom-3.1.1.ebuild 2328 BLAKE2B be9c7b100dcad9afb4413eab3396bb83abf7ee958fe9f08c1716bf20159f24556e50322c3031f120b66d2419a0d707c3d2e5e7ab021a45084c4acf42882ec5fb SHA512 09fbf070bef621b010c7c33a04a2d1776d28866504080c192439f6a93c0bd8731518519913f0bea65dc42650803bb36e61eda8faae3d8bfc613a6c43804ec136
+EBUILD libaom-2.0.1.ebuild 2313 BLAKE2B fcf505f08903965e6f8520854a36047c3acf1ccdb2ce0fa5fcc59141ff912f73861d112ec2fd4784a7f217439d3096c3e15ce7bfd78366a450a228d91c986e9b SHA512 c2924bc953a80d712bcaeae850fef3bff45862b23fbaa42679d0951a9c0742c47916a0350fee2c3e4f76f788b755245641838d12f70142375d0a34eac3205cba
 EBUILD libaom-3.1.2.ebuild 2328 BLAKE2B be9c7b100dcad9afb4413eab3396bb83abf7ee958fe9f08c1716bf20159f24556e50322c3031f120b66d2419a0d707c3d2e5e7ab021a45084c4acf42882ec5fb SHA512 09fbf070bef621b010c7c33a04a2d1776d28866504080c192439f6a93c0bd8731518519913f0bea65dc42650803bb36e61eda8faae3d8bfc613a6c43804ec136
-EBUILD libaom-9999.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
+EBUILD libaom-3.2.0.ebuild 2488 BLAKE2B 5d00f0501961637e9a862647bce17e52080c0989ef555fd1478e86fd490168e3088453b3c39db3462ca03524dd7b721633e7ed86d90948b45a51548845802102 SHA512 5f6a4979ad9d25bfc661059153fe47e27a99a5017ead8c38051f4948065168af15326934f4b72cbaeddbfac7a382c34585c2dc55c8217bd3184fc88be309b4cb
+EBUILD libaom-9999.ebuild 2488 BLAKE2B 5d00f0501961637e9a862647bce17e52080c0989ef555fd1478e86fd490168e3088453b3c39db3462ca03524dd7b721633e7ed86d90948b45a51548845802102 SHA512 5f6a4979ad9d25bfc661059153fe47e27a99a5017ead8c38051f4948065168af15326934f4b72cbaeddbfac7a382c34585c2dc55c8217bd3184fc88be309b4cb
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-1.0.0-r2.ebuild b/media-libs/libaom/libaom-1.0.0-r2.ebuild
deleted file mode 100644
index 3565b7b17727..000000000000
--- a/media-libs/libaom/libaom-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
-else
-	if [[ ${PV} == *pre* ]]; then
-		SRC_URI="mirror://gentoo/${P}.tar.xz"
-		S="${WORKDIR}/${PN}"
-	else
-		# SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="mirror://gentoo/${P}.tar.gz"
-		S="${WORKDIR}"
-	fi
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org"
-
-LICENSE="BSD-2"
-SLOT="0/0"
-IUSE="doc examples"
-IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2"
-IUSE="${IUSE} cpu_flags_arm_neon"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-BDEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	"${FILESDIR}/libdirpc2.patch"
-	"${FILESDIR}/pthread_lib2.patch"
-	"${FILESDIR}/${P}-version.patch"
-	"${FILESDIR}/${P}-armv7l.patch"
-	"${FILESDIR}/${P}-update-vsx-ppc.patch"
-)
-
-# the PATENTS file is required to be distributed with this package bug #682214
-DOCS=( PATENTS )
-
-src_prepare() {
-	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
-		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
-		-DENABLE_NASM=OFF
-		-DENABLE_TOOLS=ON
-		-DENABLE_WERROR=OFF
-
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon 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_AVX=$(usex cpu_flags_x86_avx ON OFF)
-		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
-	)
-	cmake_src_configure
-	rm aom.pc # ensure it is rebuilt with proper libdir
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use doc ; then
-		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	fi
-	cmake_src_install
-}
diff --git a/media-libs/libaom/libaom-2.0.1.ebuild b/media-libs/libaom/libaom-2.0.1.ebuild
index 8a9361596daa..b489132bc822 100644
--- a/media-libs/libaom/libaom-2.0.1.ebuild
+++ b/media-libs/libaom/libaom-2.0.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
 	S="${WORKDIR}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libaom/libaom-3.0.0.ebuild b/media-libs/libaom/libaom-3.0.0.ebuild
deleted file mode 100644
index 358a43197c20..000000000000
--- a/media-libs/libaom/libaom-3.0.0.ebuild
+++ /dev/null
@@ -1,77 +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
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/libaom/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org"
-
-LICENSE="BSD-2"
-SLOT="0/3"
-IUSE="doc examples"
-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"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-BDEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( 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_DOCS=$(multilib_native_usex doc ON OFF)
-		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
-		-DENABLE_NASM=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_TOOLS=ON
-		-DENABLE_WERROR=OFF
-
-		# 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)
-	)
-	cmake_src_configure
-}
-
-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/libaom/libaom-3.1.1.ebuild b/media-libs/libaom/libaom-3.2.0.ebuild
index 32590cb16b0a..d2f98922596a 100644
--- a/media-libs/libaom/libaom-3.1.1.ebuild
+++ b/media-libs/libaom/libaom-3.2.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_ECLASS=cmake
-inherit cmake-multilib
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -20,7 +21,7 @@ HOMEPAGE="https://aomedia.org"
 
 LICENSE="BSD-2"
 SLOT="0/3"
-IUSE="doc examples"
+IUSE="doc +examples"
 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"
@@ -30,7 +31,8 @@ REQUIRED_USE="
 	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 "
 
-BDEPEND="abi_x86_32? ( dev-lang/yasm )
+BDEPEND="${PYTHON_DEPS}
+	abi_x86_32? ( dev-lang/yasm )
 	abi_x86_64? ( dev-lang/yasm )
 	abi_x86_x32? ( dev-lang/yasm )
 	x86-fbsd? ( dev-lang/yasm )
@@ -43,6 +45,7 @@ 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
@@ -50,6 +53,9 @@ multilib_src_configure() {
 		-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
@@ -63,6 +69,7 @@ multilib_src_configure() {
 		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
 		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
 	)
+
 	cmake_src_configure
 }
 
@@ -70,6 +77,7 @@ multilib_src_install() {
 	if multilib_is_native_abi && use doc ; then
 		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
 	fi
+
 	cmake_src_install
 }
 
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 358a43197c20..d2f98922596a 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_ECLASS=cmake
-inherit cmake-multilib
+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://dev.gentoo.org/~whissi/dist/libaom/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
+	S="${WORKDIR}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
@@ -19,7 +21,7 @@ HOMEPAGE="https://aomedia.org"
 
 LICENSE="BSD-2"
 SLOT="0/3"
-IUSE="doc examples"
+IUSE="doc +examples"
 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"
@@ -29,7 +31,8 @@ REQUIRED_USE="
 	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 "
 
-BDEPEND="abi_x86_32? ( dev-lang/yasm )
+BDEPEND="${PYTHON_DEPS}
+	abi_x86_32? ( dev-lang/yasm )
 	abi_x86_64? ( dev-lang/yasm )
 	abi_x86_x32? ( dev-lang/yasm )
 	x86-fbsd? ( dev-lang/yasm )
@@ -42,6 +45,7 @@ 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
@@ -49,6 +53,9 @@ multilib_src_configure() {
 		-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
@@ -62,6 +69,7 @@ multilib_src_configure() {
 		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
 		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
 	)
+
 	cmake_src_configure
 }
 
@@ -69,6 +77,7 @@ multilib_src_install() {
 	if multilib_is_native_abi && use doc ; then
 		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
 	fi
+
 	cmake_src_install
 }
 
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index c620e2c19da5..e5df18c97b52 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,6 @@
 DIST libglvnd-1.3.4.tar.bz2 715616 BLAKE2B 77866bcd80b80dc27accbe960d63f45b5052ad110590890ed4707db0c2d7efd6882755f7258fc007b3b11bed9cee02477103ed65003185f9d7d2f6e82bef7df8 SHA512 3132bf2a547d5b7ffe12c6f1574b62c666cce8708d0311dccdbdb82063e5b6efd6f889ff1829d550af903305cd7c5bd2f7c5e0253234b25e0ea98234769e7ccf
+DIST libglvnd-1.4.0.tar.bz2 563441 BLAKE2B 079b37571da7f1eb3cf8f87ea727aeec04a27158f015889552787ff269cc779f33c10a426a7113d4e45b13008b6540c2a2eec2ac69cb1cb5c551ac82e11475e5 SHA512 a887044b6b3b8bb2dae74f28a9b92ffa0ab7b65adc74d788e28c292b99ed618f93deb1ddc041b9a9460cf46eba5f63a4ba1c20f120dea868659a022428689287
 EBUILD libglvnd-1.3.4.ebuild 1421 BLAKE2B b22257530cbf32ff9e61f9abeb5990a376e839caf28491d6ab5b99c149ce51a812cb9b6a7d8e43cf5f56bbf6dc21a969635270843556e407aa85b18a0977feca SHA512 35aec220b9ce9596cc668cefc40d6977282396f3c381bf6a633278186782cb336a9bccd4a335e4898c27b8c05bc5c175d033f1374259431fd900185e442ec321
-EBUILD libglvnd-9999.ebuild 1429 BLAKE2B fda7073e06cf25ec60594bca3adeed8b32d46479e0dc1bd6e39a86313a665ede380c204762ebd4e190ac68c5d32aeb223abf2755ee7aa1f53275d4a20e5d9e86 SHA512 bd63c9223b5f7051405b703d452153c917901d8b5db9f73229f5ee64a7e1daf4cacf114cda3c9741dd14284a3c51861a5e85cc5e8617d120dd4e398293f2ad7b
+EBUILD libglvnd-1.4.0.ebuild 1426 BLAKE2B 3ea571c65e40145ea193dcd978cee912e367b82ff84f27861e82ca1cb5ef073f2c6326975bea77ac344751173f1a48f8f2d8460041e0e4370de5929a728ca1c5 SHA512 c8af8a78d63eb8f65c96b5a4e031a5667eb5272ced4ab3837f17a3d5d9253bef2810cb499bd24f94c084a284fafceaeaa34ec17314a2b27831c7f4af1553a5e4
+EBUILD libglvnd-9999.ebuild 1426 BLAKE2B 3ea571c65e40145ea193dcd978cee912e367b82ff84f27861e82ca1cb5ef073f2c6326975bea77ac344751173f1a48f8f2d8460041e0e4370de5929a728ca1c5 SHA512 c8af8a78d63eb8f65c96b5a4e031a5667eb5272ced4ab3837f17a3d5d9253bef2810cb499bd24f94c084a284fafceaeaa34ec17314a2b27831c7f4af1553a5e4
 MISC metadata.xml 315 BLAKE2B 138fe0ad285ae16426c77740c19a0740a9b882a421fd6a0dc39489ce5bfcd21254e3de2fcd315386e4cf10f6caff39ccfa4c3df0491ed4165d5a6a768e5f454c SHA512 958019318d542e273a11b6ab57d4dad10b375f85bda613279ddb2b5cc834c1a023b1f1b3d14e9450d5b48ee579506a8a904ecc540276138c1d5350a27d34e14a
diff --git a/media-libs/libglvnd/libglvnd-1.4.0.ebuild b/media-libs/libglvnd/libglvnd-1.4.0.ebuild
new file mode 100644
index 000000000000..f6b7cee43834
--- /dev/null
+++ b/media-libs/libglvnd/libglvnd-1.4.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python3_{7..10} )
+VIRTUALX_REQUIRED=manual
+
+inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
+
+DESCRIPTION="The GL Vendor-Neutral Dispatch library"
+HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S=${WORKDIR}/${PN}-v${PV}
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+RDEPEND="
+	!media-libs/mesa[-libglvnd(+)]
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+		$(meson_feature X glx)
+	)
+	use elibc_musl && emesonargs+=( -Dtls=false )
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use X; then
+		virtx meson_src_test
+	else
+		meson_src_test
+	fi
+}
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index f3579afc1b9c..f6b7cee43834 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -51,7 +51,7 @@ multilib_src_configure() {
 		$(meson_feature X x11)
 		$(meson_feature X glx)
 	)
-	use elibc_musl && emesonargs+=( -Dtls=disabled )
+	use elibc_musl && emesonargs+=( -Dtls=false )
 
 	meson_src_configure
 }
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 1cda7a6a8cdc..4dfef2d3a480 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,5 +1,3 @@
-DIST libmpdclient-2.19.tar.xz 69144 BLAKE2B c045c4847d43f166a3e1549654784bd994fa4156e3ecebf7c02a412b34ca150940f3c43cdc385839cd7c281bd4ed4fd1935b757d8505133d146ea955ec2d0832 SHA512 5d67b95d4b615bc750641f6d5a0240122e8f59c66108838a96bd4bc5cdda8b15288ad03d0e35d92d6e562e67c600f68aad643ca541092121074952a1bc5b3590
 DIST libmpdclient-2.20.tar.xz 71552 BLAKE2B d80c343d7655ccddb253275694d40665d286bf9c59729d0c836c927ab479b1ab4819f36a69c62a29c3ad220fcbfa712da5418cf8c3cc9f9e24af4e3c39ce1e11 SHA512 3271c8eae017402976dbfabc51c7cb8d39912c8a3fd6cd075adc978d490f2eb850d86ccec9f7bccbda48c9d6ca1cda89918ac7c76b21f7f63ca1a276b67e94b6
-EBUILD libmpdclient-2.19.ebuild 1023 BLAKE2B 441e2a801eba069a9eaa33fbf6b1a0a679db0a71cd4b7571b738bb81c8e8b9142558842017f6d8f159ae63b4f7df8da33ba42a66ee802a8ee6096d0bd5496a55 SHA512 c588eb4d9d994d3ed75787d11d264a65df287562f2c226b19e1a03ccd8edad22ecf8ce0f98b2bb94eb6116e8039bf40c2add2d1c8f0b86151bd47bcac557dd0e
-EBUILD libmpdclient-2.20.ebuild 1028 BLAKE2B 83356d8ac5c4daab8bf40576dc6cf251189c8b3d00a52af49200ac341a6ac32266d4d03fb9b7777c5fcf92beea6997813c76896453dc8ca121208ec1b52ada25 SHA512 b254ee705b8e98ca556360d09f89f67b4da3d1e767c09258b96ab48802a692ca507ea803fb65e34dd27393c8a7659593f29e4f6de00f56368a9ac9bdb9815914
+EBUILD libmpdclient-2.20.ebuild 1023 BLAKE2B 885902239be571d2193c3635cee0fcc930bca9813513a07633d74fca28a5ecc23507689326be50ebd988c2789d3c54af221399a8dd3b4b11c0f91613cfeae112 SHA512 ad9421de6f5269aa4440e69b889bafdb91d1b6bf2f4e7bde661a62473393c21a4431824f29d151dcdfb9998ec4e066de56f099bda7bbd805b3719632b8c65ba6
 MISC metadata.xml 349 BLAKE2B d4d0ea2f19d76de587387907f676073a9c162d1bfb19543a3b5ab9f8beebc68c790cd64027a897da33d1a73925c11b5ed63f9d8f1ae53394a61922311aba7e79 SHA512 7e1aace7ae0668b1855ec46371320e98fce2a7f4719847e7fb1675ae9ecb54bd6006d699f3fd6bbccd4e2789512493fac310e104b84f77efcbb080cdf9de7129
diff --git a/media-libs/libmpdclient/libmpdclient-2.19.ebuild b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
deleted file mode 100644
index 331c4c43c9db..000000000000
--- a/media-libs/libmpdclient/libmpdclient-2.19.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Library for interfacing Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 ~riscv ~sparc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-DEPEND="test? ( dev-libs/check )"
-
-src_prepare() {
-	default
-
-	sed -e "s:@top_srcdir@:.:" -i doc/doxygen.conf.in || die
-
-	# meson doesn't support setting docdir
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "/^install_data(/s/'COPYING', //" \
-		-i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=$(usex doc true false)
-		-Dtest=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use examples && dodoc src/example.c
-}
diff --git a/media-libs/libmpdclient/libmpdclient-2.20.ebuild b/media-libs/libmpdclient/libmpdclient-2.20.ebuild
index dbea91ce11a1..f76f8a091c05 100644
--- a/media-libs/libmpdclient/libmpdclient-2.20.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 9f4f47ffc9e2..02c94ca634b0 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,3 +1,3 @@
 DIST libmypaint-1.6.1.tar.xz 519464 BLAKE2B 6302914ab7e0876012e5235573c5cb3a76cbca9b5f0707321b0fc0a8406f712b9164ccb02ecc8a63b13d1e640a04cba8063c568bcbe40fc8543fc4a2c1576e5b SHA512 e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608
-EBUILD libmypaint-1.6.1-r1.ebuild 1522 BLAKE2B 98fee78e1c979e24280f0b178ed2e4638d05f1f15796ba7b7f351fce55c57395081d3af081e26f5201f13db43c6cdba5819f6f057dc68ccc8ff4276cfdd30413 SHA512 eb4310ccc5d05e87efcf269e305c1a5ab7f5771b0805bc342f737a01d2b9cbc1fc3a271ee4344764dbf1ae801d87f880180e4eb77897594b8b4b43f7229ba2bb
+EBUILD libmypaint-1.6.1-r1.ebuild 1548 BLAKE2B 5c00abdbf38f44a2c4bd125cc269c36ac960d1ae5ebbd73bdcfac7851f650e20fa480b90f04db7b672ec8bdad87bd175bd6ec6d65fe2eb8200d9ae2584960ef8 SHA512 c39610288a23ab229957c864fc6743ca7a87e9d7fd8c07149ddd095e63c890f6d50ca9310cc3b5f871fb3c63cc7abdb1886b66f92f3498ef1b375454c185b329
 MISC metadata.xml 408 BLAKE2B c33e77a854b4b4b17fc8cd6a2d693557e33993d813f7a12d50e21b9bc165757848788efe4ba6d479c331d3f35813483238a2a2fa9a40d4c6ba98abb912e2d9dd SHA512 7b766deb6889ecc403e7a379e0aab4967811ca7bfcf45034b3e77ebd9788031d728f2d0017752bf8fa111c6abc4e80c28192298a3e8065db0372282c2efedca8
diff --git a/media-libs/libmypaint/libmypaint-1.6.1-r1.ebuild b/media-libs/libmypaint/libmypaint-1.6.1-r1.ebuild
index df9fc52982d4..f2d8a4157819 100644
--- a/media-libs/libmypaint/libmypaint-1.6.1-r1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1 toolchain-funcs
 
@@ -47,6 +47,8 @@ pkg_pretend() {
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index c9daaa0afe89..b8afe442e005 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
 DIST libopenmpt-0.5.14+release.autotools.tar.gz 1446898 BLAKE2B ab6ff8db2e19d859fecca882aea3e569b58d96d5055ec0dd42494a7eb38fefa9c8b88f4700d354de71346c71c6d9a96327db1c2b7b48e227928dcba0ce7347d6 SHA512 8897549c18afb57c5bf54f4dd8a1d80983829bca958052d76cda1315ef4a37f4201575817b7cedfe17a44ee79051a52aa35b26a51b554091e92c9d2dcf5924a3
-EBUILD libopenmpt-0.5.14.ebuild 1545 BLAKE2B 8f69ca10382827f3f5837e6a9a1bf18df9735caef8a4fc7669a9ffcbe8e1a3e641a1faaee1a22fead8459a9fdb10196e321f40d0e66f5a6553fc6c8087d67c82 SHA512 d2aa60d52afecf9d9703dc9faf0797c3baeec206f7ebb5c4b5e4238cc64c4cd3b4de56bf6be89b2618a104552f1063ea10e7daa52c71a3e8c91a17975106ba0e
+EBUILD libopenmpt-0.5.14.ebuild 1544 BLAKE2B ce1beb9e386a70e598f295b4caedab63a9bfb273e4d31a7b78047d68b176dc6b46bf673ca97a395bb30067629785ef9f9117502c3bb0f6a50c25d7045203f51c SHA512 9b834a31821d7fae8e409241b4acf5c298a539c815191cef68219ed6ce6a4edb1cf85f50254c6ea61d17898fbbb0f58ed5c40f4ca35c7cc5965aadadcaa4a5d9
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-libs/libopenmpt/libopenmpt-0.5.14.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.14.ebuild
index 355417353980..e07e69b35262 100644
--- a/media-libs/libopenmpt/libopenmpt-0.5.14.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
 SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 IUSE="examples mp3 ogg static-libs test vorbis zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index 309a6d2f7c27..8db2e073a6d2 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,4 +1,6 @@
 DIST libpano13-2.9.20.tar.gz 3564544 BLAKE2B aabf9d8a3dac5b01e4a5bdb6d5ad6b56ea3e672f143b002c06b7108fae19cd6a00e8b524a4c18cbe16c65f41242fc12e7b19dd71c00bf6b553db65472fe8798d SHA512 18da5cb3760f06df8007622a64c4121c3acdadf8b02faa2125f319acde30532378cec5d97ccd5a65d6d2c1960c1b4946c80ffa850da2dc790051f5c0b76f8a86
+DIST libpano13-2.9.21_rc3.tar.gz 2801535 BLAKE2B e4b2ea3894b4b53e6bbaaea39370254ad3bd1a981a1857376ff96e801cf167115ceacbe3ef4c790c3dcd380e3b0ec4a6d2b3d116e212f22cc4a56eb373f3447f SHA512 d344b81b56ba6e7dd38c0826e7e085ad5e20f5d2b09b27369ffae1e30d8f5bc03ab00d656d472069429b843d2e1eeceb173eeac39ee31a3622ca851387daef04
 EBUILD libpano13-2.9.20-r1.ebuild 865 BLAKE2B 80da7ee945400ca2aec7bce606e64bb43628d38a921aa973a6049931f8f91b4920fe55fa41718f7ea790dfd05b5ac74263065b36dd5e12f2861eba98b1c9c5dd SHA512 d86662a87b63ef9c627cb7ac0134bf09c93fe4a726c59f0e7b6394c3611444b5e5d09b064b801442395d28d90f7a5b8f43051fc7e17e61e816efbda113425568
 EBUILD libpano13-2.9.20.ebuild 863 BLAKE2B bfedeb2bdacaaf0869fc81b94639696d8e3a55780ece792315d106bf4b273f24ef37e3616277d36d78397f19fdedb79ddc826cb7d0eb6454dd046ee7f82c5d29 SHA512 70a3d1b93416a41481a5de719aee25a322caaf5093eb781b257c5e23d115e642531297110d785d90e552d98d0ff435b6c457e650234e801b43a5392fefc706ee
-MISC metadata.xml 325 BLAKE2B 71566f5af7a046704cb65029e19317a2115db3499d35435a1bb95981d28bc747c5d3c315ae5b5dee2702a69659908599f76491ffb43701e8ad0a3f0e7787e927 SHA512 d048905b91a3c4332ee5fd6063b36ca02b386799e829ad54b9c47df42a381f03ba46152eb16daf73aebb23da1e1439e1c720488436bb7635abd1232561852e24
+EBUILD libpano13-2.9.21_rc3.ebuild 755 BLAKE2B 9259283c6b91413e2b71bc6d41f121aa38f29f6ddc64cb4d1a2a0f8888ef68deebf51d93270f92a6ceb6a3d0c8629f322f55f641145695c06dd1f25edacf3d98 SHA512 ac4b9a817d5755d60f582b0966b534331175bc177909260f936739a3b51e955cbdece3a2315a540bfddf65f98ed930332bde555ef7bd2b4f9c64b52b276c4789
+MISC metadata.xml 462 BLAKE2B 2043b0e6c260305e607a04d5d8e541c82408344a00e920c891eb1981aa05b75998f845800bb0a4fd16f3e1c83bcd2f4118e673845e47142a3ec58fa5df86ac3b SHA512 6f05c609c8a8f5a41b18009a1fa5258071328b99b33a670e0e2c56e1aaea398112759c42902b2e822684dc0f5b2979cda7efc59adf97dfe53c27d14707e1a6f0
diff --git a/media-libs/libpano13/libpano13-2.9.21_rc3.ebuild b/media-libs/libpano13/libpano13-2.9.21_rc3.ebuild
new file mode 100644
index 000000000000..5d5496338675
--- /dev/null
+++ b/media-libs/libpano13/libpano13-2.9.21_rc3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake
+
+DESCRIPTION="Helmut Dersch's panorama toolbox library"
+HOMEPAGE="http://panotools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="java suitesparse"
+
+DEPEND="media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	java? ( >=virtual/jdk-1.8:* )
+	suitesparse? ( sci-libs/suitesparse )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSUPPORT_JAVA_PROGRAMS=$(usex java)
+		-DUSE_SPARSE_LEVMAR=$(usex suitesparse)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/libpano13/metadata.xml b/media-libs/libpano13/metadata.xml
index 41d76d208afb..abb57c7dc0b1 100644
--- a/media-libs/libpano13/metadata.xml
+++ b/media-libs/libpano13/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="sourceforge">panotools</remote-id>
 	</upstream>
+	<use>
+		<flag name="suitesparse">Use Sparse Levenberg Marquardt algorithm instead of dense Levenberg Marquardt algorithm</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 37f2d1e3e08e..c8484cf4c08c 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,7 +1,7 @@
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
 DIST libwebp-1.2.0.tar.gz 4092120 BLAKE2B 213b2385f646dd0fbaa7c9103b0d33a9cb5e7285d9df91107db722f514428ab8cc896704d71a3913ca1aedffeb706fcda4c7a59a3960ebc21c74ca9422632605 SHA512 c46b41899a543cc80914c89646dd607dbb5d025a9727dd83ef70994b9310eedc697666bd812141a90aa16632a9a354a031d9360a9ee1112295c7e154e69f0b74
 DIST libwebp-1.2.1.tar.gz 4100806 BLAKE2B 6bbc6dd1a3ec094a6ad0045fd483bcce055c5f3dd15022595de090c4719e5b7bfec60818a8c88886ab2546325a515526d750c9fd31017278ac6d747218570f5e SHA512 5208ac9532c89ea9fec01122cb307afacdbf5c501ed1c6056e9ffc98e2a3386e637224e0301da88ae3a32aa0c210364e1e4eac79487e465ef9e54eb9b1af80aa
-EBUILD libwebp-1.1.0.ebuild 1838 BLAKE2B 104227fcf8dc4c6abae133dde661f269ca77bacd915fc502c38b0123a9df48006ebdd96b607cdcc187a7e1da6eb4d4903e57988878a844269e3dcaf13cf4071e SHA512 cf3218f03cd046b6a8d8e5236a13f418b346feab3a4b1004ba3925da6e55f7b82cfc009606afd418082f4ebb7eb81b60b523a2dec903a18b1ef8d4f26aad29f8
-EBUILD libwebp-1.2.0.ebuild 1852 BLAKE2B 0d52ceb076a72cbd0399213cb507fd705ab34ea0fa021b90384cfd6e718920827a80b1c98c8866a01e404cc92a1f1942c5bc888615d5450d7ba3d7a904398ba7 SHA512 d894ec1c5427d9a396b46bae6675739dd3aaecc32297d0843282b87a61d9dff89fff7ce674172f95a7704d5bd6735041c8d80bde88404aa1d6fd539985ba6211
-EBUILD libwebp-1.2.1.ebuild 1852 BLAKE2B 0d52ceb076a72cbd0399213cb507fd705ab34ea0fa021b90384cfd6e718920827a80b1c98c8866a01e404cc92a1f1942c5bc888615d5450d7ba3d7a904398ba7 SHA512 d894ec1c5427d9a396b46bae6675739dd3aaecc32297d0843282b87a61d9dff89fff7ce674172f95a7704d5bd6735041c8d80bde88404aa1d6fd539985ba6211
-MISC metadata.xml 432 BLAKE2B e1d2cb38a6bfc88fa08fdb597f334d735eb85252978698de1a19157c3ebd2cd7e362c5d4a19b7ff4c383030e5829007b6e3439cb06b5c2a3adff81479c864bd3 SHA512 923d26fcb2dc0be5cf51ad21fe5aa3de712d2a491f14d8b5e0c263e555757f35b3ddb10a49ce4de33eaae5ff2774994e5751edabeac6bac2c0e50a7fa78b68cd
+EBUILD libwebp-1.1.0.ebuild 1854 BLAKE2B 8b7c661b253198816a6987d2e0d5b42572211f0bd7ab9317501871e73faf3c74d4e29c61a4b1ecf1182de1ce37e67d2d51a6b87ee98c098d665863d8797a2578 SHA512 630a2f2af3d7572a8c7b526521dc444ee90efdc65f12152606fffd7446d6d8b0ea244d5be57c5f990cf82087a684d485c2d336f28a74505e9be944277e4b9dfe
+EBUILD libwebp-1.2.0.ebuild 1868 BLAKE2B 0887de53bb12d90b72f844c2716d7e3613ef3e96aac44a68ccaab1c6c5d581ab7767003e79bf5cc6ecc9cf3ec74ec5afc9d93f2792b00abb2ce56958e877dea1 SHA512 e97316bc68a5b593c4c8c098ad5790d7929adca010d776151d94492ccf2be6db1ae5726988af93d4e7d2f843bd8461cb1261f4179e939eb5670cd7f5f077557e
+EBUILD libwebp-1.2.1.ebuild 1868 BLAKE2B 0887de53bb12d90b72f844c2716d7e3613ef3e96aac44a68ccaab1c6c5d581ab7767003e79bf5cc6ecc9cf3ec74ec5afc9d93f2792b00abb2ce56958e877dea1 SHA512 e97316bc68a5b593c4c8c098ad5790d7929adca010d776151d94492ccf2be6db1ae5726988af93d4e7d2f843bd8461cb1261f4179e939eb5670cd7f5f077557e
+MISC metadata.xml 442 BLAKE2B 3700315ba8872e208756f663236158c42f967eab7bec9b440b238b14f76357fe7721e571b7c11d79fff0f8df90f9ad35504cef3f6dc2803b8e5394ac0e3ea437 SHA512 5fceda7410ea654e3d9297f3adcad43b99c298b436ec5d77a9396259b61a0c9dd2945b98f7fa7d0b7d38622e14bf82bcfbbbdc18f011f0b949ae61a9a8794800
diff --git a/media-libs/libwebp/libwebp-1.1.0.ebuild b/media-libs/libwebp/libwebp-1.1.0.ebuild
index f338c5100529..60aa78742a2f 100644
--- a/media-libs/libwebp/libwebp-1.1.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.1.0.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools libtool multilib-minimal
+inherit autotools multilib-minimal
 
 MY_P="${P/_/-}"
 
 DESCRIPTION="A lossy image compression format"
 HOMEPAGE="https://developers.google.com/speed/webp/download"
-SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
+SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
diff --git a/media-libs/libwebp/libwebp-1.2.0.ebuild b/media-libs/libwebp/libwebp-1.2.0.ebuild
index ac28d36ff548..9caaf52eff64 100644
--- a/media-libs/libwebp/libwebp-1.2.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.2.0.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools libtool multilib-minimal
+inherit autotools multilib-minimal
 
 MY_P="${P/_/-}"
 
 DESCRIPTION="A lossy image compression format"
 HOMEPAGE="https://developers.google.com/speed/webp/download"
-SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
+SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
diff --git a/media-libs/libwebp/libwebp-1.2.1.ebuild b/media-libs/libwebp/libwebp-1.2.1.ebuild
index ac28d36ff548..9caaf52eff64 100644
--- a/media-libs/libwebp/libwebp-1.2.1.ebuild
+++ b/media-libs/libwebp/libwebp-1.2.1.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools libtool multilib-minimal
+inherit autotools multilib-minimal
 
 MY_P="${P/_/-}"
 
 DESCRIPTION="A lossy image compression format"
 HOMEPAGE="https://developers.google.com/speed/webp/download"
-SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
+SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
diff --git a/media-libs/libwebp/metadata.xml b/media-libs/libwebp/metadata.xml
index 4bd6e7f89be0..6180c20ec6c4 100644
--- a/media-libs/libwebp/metadata.xml
+++ b/media-libs/libwebp/metadata.xml
@@ -9,6 +9,6 @@
 		<flag name="swap-16bit-csp">Enable byte swapping for 16 bit colorspace</flag>
 	</use>
 	<upstream>
-		<remote-id type="google-code">webp</remote-id>
+		<remote-id type="github">webmproject/libwebp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index bd2a235badb4..1be80def3a76 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,6 +1,4 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
-DIST shaderc-2021.2.tar.gz 221444 BLAKE2B 77ba2a6cd5a08d19ef1e3e81b186a4ce5478aeccdafa940192347026dc550666eaf0acbf9c0e3ab5c62eaacf3c56c7bfc888480a13490403d30b0edaa173f19a SHA512 44779d3ec8c3451c51ad1a51a5644565dd7feacb0695fe3adc5c46fd2b5b5ca1220ed92f2178e0c56352a73db7c89653eac829b5cdc6ae8394902e1805b73ed3
 DIST shaderc-2021.3.tar.gz 221509 BLAKE2B 5061073e4489bdf2245a7cd18968a5a874cd33c16b8944b5c781b78e648f20bc8cf49b52e61ee3fe5b2aa029fa8195687079865403bb662839917b142421c49c SHA512 759eca72564bea59c06d31f70a85571a391360d5d428db85a30f934d080bb25e254ecb5650f71a96742cf417f09d819f36d301e92294a5d0d294581ca554248a
-EBUILD shaderc-2021.2.ebuild 2143 BLAKE2B a261b5b0633e101afdd6e19aed5249b487a4fe96f07219315123fe648fcc938bb577e4ed8110a92e19ac04ad643f411b689aa041720b4564569954fa0b86d495 SHA512 d4505504b470dea73ef871d9691fe268987e52420371b37a0ca57d04bd07ddfad218814113b5a0b0a47ced0bc54c84c9cd8faf14bf61644646561db3222ab935
-EBUILD shaderc-2021.3.ebuild 2108 BLAKE2B b9bf03bf7618b61b75417734ec10ebb5bb0204416ae2a3f32918a07752d45fe1edbd4a2e6b0660ac2cbdf3280ff0c5bac697c5973fd59bde006fe1025a197068 SHA512 d28e8f07ebfcd27e0414b419286b07b751351600e2f3315a48d4cc72c9ef2aeae5e82c64d60400a1d27860f84bb9b0a208f44d750ab8536a1a2c555842145546
+EBUILD shaderc-2021.3.ebuild 2101 BLAKE2B 42f3908ff4b993f0d42ebee384c8dcc5ca37b1519fcb4e46be80aeea3ff4bc3d6ae6b7c03900c50a78fd7b25d5b24bf3a8b7dedeb1ab6bd6764feb1aab56e95f SHA512 a64488699535d988181ff860af17010990d4db9abf467f00d3c579b9a64c7b8dd60eb256908f63fe9c5bfcbaf3701330729cd854b125b3160c5ab2a1c20a1fa0
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2021.2.ebuild b/media-libs/shaderc/shaderc-2021.2.ebuild
deleted file mode 100644
index 94f52642f34b..000000000000
--- a/media-libs/shaderc/shaderc-2021.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-EGIT_COMMIT="d0d8d7e7ea5074cb107499a73a22ce14bec3fb10"
-SRC_URI="https://github.com/google/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-util/glslang-11.6.0[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-20210825[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/spirv-headers-20210817
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-2020.4-fix-build.patch
-)
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-		-DSHADERC_ENABLE_WERROR_COMPILE="false"
-	)
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake_src_compile glslc_doc_README
-	fi
-	cmake_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake_src_install
-}
diff --git a/media-libs/shaderc/shaderc-2021.3.ebuild b/media-libs/shaderc/shaderc-2021.3.ebuild
index 5fde20a88adf..542b6fc9b649 100644
--- a/media-libs/shaderc/shaderc-2021.3.ebuild
+++ b/media-libs/shaderc/shaderc-2021.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 CMAKE_ECLASS=cmake
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 05d4db7be30d..5503c28e8e06 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-layers-1.2.189.tar.gz 2869378 BLAKE2B 54a610c95487873c470ea304f8bbf0160a9def6a06118baced0a1b14a847cc116f3a2377cf0a287b866dffe9ff9657133ba1fa7109e0c23380412ca4f389c6f1 SHA512 7fd688365cbe69d763bb233d7be2498bb5aa286ba26c4ca9d4bdeddc28cf3f69992a89d6276d3f943d198146dcc01eca36b1d8de5747ae0893244bdb15665855
 DIST vulkan-layers-1.2.198.tar.gz 3555293 BLAKE2B 1a419b1b4b50241f6f4225a8666b8f6f4fc00e30dba045deeca709f4b9ff777f8a66691ef094b72cbf059c9dafee9f1ad2986108e48c8ef3974ac805c103644e SHA512 c5ac3e458987f3aa8ca21a79aa7819fbc1ca6013b6e445a82407ac0664884b90b8f79a2593368f6264a509674aa1f9584614c7c464c88d74284601f0c7636ef0
-EBUILD vulkan-layers-1.2.189-r1.ebuild 1605 BLAKE2B caedc28c9debc00a11712c115acb39aa18603021463c79492e00bce8d09baa6edf8d5423076952baf96400be5484b4f5ba1d64c2746b36bd668936c08d59391a SHA512 5a20b176f821946dcb2be5e54b4d1fe9026d94d42b381c31571c33c96f050882f7ce7ec6f319b1d55ab63cb9c5be730d722478821daf62cc2fefdaa43e4e12a5
-EBUILD vulkan-layers-1.2.198-r1.ebuild 1608 BLAKE2B f8e3b7d67a081f661ea9365b45cffd69db20e58906ea4814fbbbc694c7312194653b1df37673c9dceaf43890b8f11c9404974f71d1aaa0e1f8f6781bed4136f2 SHA512 c689d1f918c29a748bac7008aa9b111a6fbf6768e0ab463c7740567d8db6a8d223ec453a0a20b8b599b2f652bbbd1d2b943009bf1b4d85c21cace732f034dc71
+EBUILD vulkan-layers-1.2.198-r1.ebuild 1602 BLAKE2B 8eacbcfd0c71f721bfcefd5487570635c2113067104c3ef97cfe448a2ba4bec2a8c17fc162603060dce5ee83c1cc08f08cb59435c0cb97ac3c6e1d00d0bc187d SHA512 313a2f169ce77b408715cf6f6122d6856d5cff491f5160e8d594337ed21e94e3f314b635de00beecbb228a68020591a633b93c707e879a4abc3e600c923b70aa
 EBUILD vulkan-layers-9999.ebuild 1611 BLAKE2B 50fd48eb09f923675ba0eab56f6d47eecab42c1ea0cea439a9b741f402c5c0f79fdf39ef22e9ea2718439f34ffcbdf5e9b562cae10e0ec92d5d4ba34ca834b60 SHA512 47f1a60644c9ee16254d07db612f05d2a9a9367a7baba136499e26b1752fabe9dc5a2aff2a6aa413ab4eb478cbec1956037d9480e9082b877fbbd8677461e036
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild
deleted file mode 100644
index 8031ea7cdc59..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND=">=dev-util/spirv-tools-20210825:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-cpp/robin-hood-hashing
-	>=dev-util/glslang-11.6.0:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
index 8620262391de..e7998585382d 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index adcb1bee5a69..eb752125e445 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-loader-1.2.189.tar.gz 1508029 BLAKE2B d889c398d886e2bd6082bdd4f728078986b15610da478634475c2b17f860bf127fa5b81d409f1298d4d3705a1b9274bb982447a425a930ac5ac3fe44de6aaa08 SHA512 358bda8081bf86b0cc119c15ed791d63e4fc7273d95e550dac11dfadf3d3f9b709936207a9b0fc3b53595b9f46c41d47f573613c5d57e789b58405a5a5cd5b14
 DIST vulkan-loader-1.2.198.tar.gz 1440922 BLAKE2B 5048a85155f94cd13f36fae48414ae3a0ea5f120a22f8b199fd43a2813b7168a9c5310ac6298ec2dee6488012d17d06043cf37dee38de265924e408f36498ed7 SHA512 92fc0cfa872e286abe4aa26a68a2bb90683b68425abbe001a62ac511c76850ad08102634e64ac06a88cf8ab225e60ddaf5bc80aa2c4bf68c25c0c47e5782f4fc
-EBUILD vulkan-loader-1.2.189-r1.ebuild 1749 BLAKE2B 01a80f1c37d590fde2f2b08d91e0abadac06f5bd511b35a6b0a6ed447046973e0479c1296b70e937b1bdc8733b1d629c00a5b96d02ec34385947fc0488c984a8 SHA512 8622292a36a4b506822522efb64043ba676affa83d511a6e611b768f00548d663734e4d8f71f212701feb65cd210cc039ffb042a266c885e4d6d260d996c3cc0
-EBUILD vulkan-loader-1.2.198.ebuild 1766 BLAKE2B 49c51cbe49671126cb244fc0b91d7c44b431817462ba7a4ac7d36110308fa002fe83f3b26058c88407b812ab2404f8b392fcd88dcf6119686ae5835312c6a147 SHA512 133dec0c07c43dad42e5719171c54939b6850249321a994c67891f6797e0adc6f78ad434bb31b8004789a971c1fe2cea844983663915eaa4dc23a63d4c64b888
+EBUILD vulkan-loader-1.2.198.ebuild 1760 BLAKE2B 0744e4e484ed2b0c1161e5941f5f0c4ac2f9fa6edfa6ac692ce0935c92cb1d71c5183035fde85abc22b57c3088b74410487a93f0a82ac5441ca0b53f6f47c6b1 SHA512 905a76ff689729fc9f40778d0a007c5729ec2ae54e4d146b14c5f69e00a8df6ffeeaceb307fdde441eff9702b4cfeeccb0f6e8c9ed049f15423ec2164d184fdb
 EBUILD vulkan-loader-9999.ebuild 1766 BLAKE2B 49c51cbe49671126cb244fc0b91d7c44b431817462ba7a4ac7d36110308fa002fe83f3b26058c88407b812ab2404f8b392fcd88dcf6119686ae5835312c6a147 SHA512 133dec0c07c43dad42e5719171c54939b6850249321a994c67891f6797e0adc6f78ad434bb31b8004789a971c1fe2cea844983663915eaa4dc23a63d4c64b888
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild
deleted file mode 100644
index 788fdacbefeb..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-inherit flag-o-matic cmake-multilib toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild
index 18dc41ace6c3..edcb493caa84 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
author	V3n3RiX <venerix@koprulu.sector>	2021-12-25 20:34:27 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-25 20:34:27 +0000
commit	0f15659d48c193027158492acb726297501202c5 (patch)
tree	5502ba879a78b759da28441d418dbbfe08bd8f03 /media-libs
parent	93a93e9a3b53c1a73142a305ea1f8136846942ee (diff)