From fc2f1018fc323ef2c6572734a9b130427cba76a6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 3 Nov 2021 06:47:15 +0000
Subject: gentoo resync : 03.11.2021

---
 x11-libs/Manifest.gz                               | Bin 20497 -> 20482 bytes
 x11-libs/cairo/Manifest                            |   4 +-
 x11-libs/cairo/cairo-1.16.0-r4.ebuild              | 135 ---------------------
 x11-libs/cairo/cairo-1.16.0-r5.ebuild              | 135 +++++++++++++++++++++
 x11-libs/cairo/cairo-9999.ebuild                   |   2 +-
 x11-libs/libva-compat/Manifest                     |   2 +-
 x11-libs/libva-compat/libva-compat-1.8.3-r1.ebuild |  72 +++++++++++
 x11-libs/libva-compat/libva-compat-1.8.3.ebuild    |  72 -----------
 x11-libs/libva-intel-driver/Manifest               |   4 +-
 .../libva-intel-driver-2.4.1-r1.ebuild             |  54 +++++++++
 .../libva-intel-driver-2.4.1.ebuild                |  54 ---------
 .../libva-intel-driver-9999.ebuild                 |   2 +-
 x11-libs/libva-intel-media-driver/Manifest         |   2 +
 .../libva-intel-media-driver-21.4.0.ebuild         |  64 ++++++++++
 x11-libs/libxcvt/Manifest                          |   6 +-
 x11-libs/libxcvt/libxcvt-0.1.0.ebuild              |   2 +-
 x11-libs/libxcvt/libxcvt-0.1.1.ebuild              |   2 +-
 x11-libs/libxcvt/libxcvt-9999.ebuild               |   2 +-
 x11-libs/pango/Manifest                            |   4 +-
 x11-libs/pango/pango-1.48.10-r1.ebuild             |  84 +++++++++++++
 x11-libs/pango/pango-1.48.10.ebuild                |  75 ------------
 x11-libs/pango/pango-1.48.7-r1.ebuild              |  75 ------------
 x11-libs/pango/pango-1.48.7-r2.ebuild              |  84 +++++++++++++
 23 files changed, 510 insertions(+), 426 deletions(-)
 delete mode 100644 x11-libs/cairo/cairo-1.16.0-r4.ebuild
 create mode 100644 x11-libs/cairo/cairo-1.16.0-r5.ebuild
 create mode 100644 x11-libs/libva-compat/libva-compat-1.8.3-r1.ebuild
 delete mode 100644 x11-libs/libva-compat/libva-compat-1.8.3.ebuild
 create mode 100644 x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r1.ebuild
 delete mode 100644 x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
 create mode 100644 x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0.ebuild
 create mode 100644 x11-libs/pango/pango-1.48.10-r1.ebuild
 delete mode 100644 x11-libs/pango/pango-1.48.10.ebuild
 delete mode 100644 x11-libs/pango/pango-1.48.7-r1.ebuild
 create mode 100644 x11-libs/pango/pango-1.48.7-r2.ebuild

(limited to 'x11-libs')

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e41187e0bebf..c78067bab0d0 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index df974e49b1e6..63389daac053 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -5,6 +5,6 @@ AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b
 AUX cairo-1.16.0-strings.patch 690 BLAKE2B 2509bdb3d6592c9606c92730f1e052c0ce5dbbd557daaeb5955b998b8d89184063f15c583ea745fc16c07185cfe06e5f8ef9c18f749d35341918d626ceadd2b3 SHA512 90c9595698b30cceecc17ca186e7936d7884c382a23b8d536bdb10b912e6f1640037fc55326833a4977f332e02fc88d967ded751e50543c68dd80763b5fc43fe
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r4.ebuild 3928 BLAKE2B d04b7d787e2da853859b31c0c375649d1020e6cb48dfe3a8a8a31835e07805b4ef62cbd2b3d3bcff322231f13483390e8d2fa55e4080f4f7b65fd4601bbdf208 SHA512 92bb5abb2dcf5b632b026ab38e442120d7cf1cc39f263ac576028afc9e5d20eae7e69a37668da85874b1b09b6a44d11db070b91d10f35aa55e0ca487c173f4e3
-EBUILD cairo-9999.ebuild 3768 BLAKE2B 9dfc837b6dc7865285a918a56dd334b9898a4ed08b7c2fcc482813622e763e183705c954c88bd368b7277f6ec183da9ef9da97591417df8322a1115ce5428797 SHA512 0be0f7370eb817eaf4cdd8b4946cd0d4e44dc61eae299a1e760892a0efcf7d65b752fb94520b0f48f8934a2ec89f525495ec9648fe5b567e966269bea5cb0b56
+EBUILD cairo-1.16.0-r5.ebuild 3931 BLAKE2B 60f42f9bedc541457ccc3332fe15f0ad0c5a89ce4858bea355d1fdaace8b6d0f466e836a40177a9934d858869dc10d1e6b57d04190eb9c183bb041767323a525 SHA512 1fd72bb071bf3950ca9edf2450125441116d899730a5a3e2d095c52143a06c21421792fef0c9b56a944a18d01997e9adf45397594cc0f9fbd9a37a8b7314f284
+EBUILD cairo-9999.ebuild 3771 BLAKE2B f7392420ac41def74875552c009aa71de27b6f69cc68521a5e09bab31955e04a39bcc6bbaebe7cae5c1bff6e1f13c6e7c1be72aecfbf59238c3555d3b1a71cb5 SHA512 536957b24909a96054f2893cb1be4e13458959fa3532a79541286fdcc9da38f70e0b1c01667448f1fa34c2a2979e6f8eb3dfb76c54110d4d3270d4b19044831c
 MISC metadata.xml 710 BLAKE2B 11585ec0ac0ad56eb192f84388ab9fb7ce751ae29555fb366cd8966ec38fceace4978a2b6cad310073484eae51539dcbbe68323205b2b8e97217bc1b87f62b48 SHA512 1021784a9a6db6290fa57e2e5ed356131860820a114a601c8e77fab77eb7b075b81f1288e5df97cad8fe2d86b7aeb67a712f8fd9c5ed775d607d50d6a589dc01
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
deleted file mode 100644
index d5b20a6b4204..000000000000
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
-	SRC_URI=""
-else
-	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/libtool-2"
-RDEPEND="
-	>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
-	gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
-#	doc? (
-#		>=dev-util/gtk-doc-1.6
-#		~app-text/docbook-xml-dtd-4.2
-#	)"
-
-REQUIRED_USE="
-	gles2-only? ( !opengl )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
-	"${FILESDIR}"/${PN}-respect-fontconfig.patch
-	"${FILESDIR}"/${P}-pdf-add-missing-flush.patch
-	"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
-	"${FILESDIR}"/${P}-strings.patch
-)
-
-src_prepare() {
-	default
-
-	if has_version ">=sys-libs/binutils-libs-2.34"; then
-		eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
-	fi
-
-	# tests and perf tools require X, bug #483574
-	if ! use X; then
-		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
-	fi
-
-	# Slightly messed build system YAY
-	if [[ ${PV} == *9999* ]]; then
-		touch boilerplate/Makefile.am.features
-		touch src/Makefile.am.features
-		touch ChangeLog
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myopts
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_with X x) \
-		$(use_enable X tee) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable X xcb) \
-		$(use_enable X xcb-shm) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable gles2-only glesv2) \
-		$(use_enable glib gobject) \
-		$(use_enable opengl gl) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable utils trace) \
-		$(use_enable valgrind) \
-		--enable-ft \
-		--enable-interpreter \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--enable-script \
-		--disable-drm \
-		--disable-directfb \
-		--disable-gallium \
-		--disable-qt \
-		--disable-vg \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
-}
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
new file mode 100644
index 000000000000..03d9d52ed6af
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
+	SRC_URI=""
+else
+	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+BDEPEND="
+	virtual/pkgconfig
+	>=sys-devel/libtool-2"
+RDEPEND="
+	>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+	gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
+
+REQUIRED_USE="
+	gles2-only? ( !opengl )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+	"${FILESDIR}"/${P}-pdf-add-missing-flush.patch
+	"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+	"${FILESDIR}"/${P}-strings.patch
+)
+
+src_prepare() {
+	default
+
+	if has_version ">=sys-libs/binutils-libs-2.34"; then
+		eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
+	fi
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myopts
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_with X x) \
+		$(use_enable X tee) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable X xcb) \
+		$(use_enable X xcb-shm) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable gles2-only glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable opengl gl) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable utils trace) \
+		$(use_enable valgrind) \
+		--enable-ft \
+		--enable-interpreter \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--enable-script \
+		--disable-drm \
+		--disable-directfb \
+		--disable-gallium \
+		--disable-qt \
+		--disable-vg \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	einstalldocs
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 804c6cdb0003..526be1dcbbf9 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	>=x11-libs/pixman-0.36.0[${MULTILIB_USEDEP}]
 	gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
 	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libva-compat/Manifest b/x11-libs/libva-compat/Manifest
index fec2c3b1a8ac..bebbc9ae90e1 100644
--- a/x11-libs/libva-compat/Manifest
+++ b/x11-libs/libva-compat/Manifest
@@ -1,3 +1,3 @@
 DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea
-EBUILD libva-compat-1.8.3.ebuild 1992 BLAKE2B f33bb33643a71009baa8922d97982421f0bb1bbdbb29f22af5f44bb16312252e94437e2cfe1ab50526a5b87c9c8f08c7a2981aa5ccc5d7a2a72268a9c1d4a179 SHA512 f8becb98e04bfc0ad5f7cc787786019b6bf347991f591e46b1b35f7d61b17ef3cab287e9f54509d6cf245bc2a2d46e549468ba0e2489db44d715cb102dbdbfa3
+EBUILD libva-compat-1.8.3-r1.ebuild 1995 BLAKE2B 4c1ee367563e496bec8d4f1731690438adc1bd575e2799e3e672fa1ba40003adb829f263b31bbc9b41e4a4f071d1aed3dce475bebbe4f679da843aca4d952d4f SHA512 18ce41526f57cc1077f364ef1f04361adce4f218febd4e50c7345aacb4099414778dc88b9caa989fd6b1b51b0f5ace7caa8cc7f5706bd60b7ca8463aafd1d026
 MISC metadata.xml 440 BLAKE2B e8071d75c17e53b38897201da353284933b04c5337f01404b2c80c6edf571d47b2e2b92f85451097aba5db421f5dca1a254d24425e096067c270b8aa0e732ae3 SHA512 eafd1feaee7adcd7903c26d9efd0cdadb118c2af683d3158a68a7f931eba83367d8702253b6ebfbea45001009f225a6b15f0cca8d8a2b303f757fb0d7d499541
diff --git a/x11-libs/libva-compat/libva-compat-1.8.3-r1.ebuild b/x11-libs/libva-compat/libva-compat-1.8.3-r1.ebuild
new file mode 100644
index 000000000000..1ad904ecd9ea
--- /dev/null
+++ b/x11-libs/libva-compat/libva-compat-1.8.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+MY_PN="${PN%-compat}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="+drm egl opengl vdpau wayland X"
+
+VIDEO_CARDS="nvidia intel i965 nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	egl? ( >=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+	!x11-libs/libva:0/0"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	"
+
+REQUIRED_USE="|| ( drm wayland X )
+		opengl? ( X )"
+
+S="${WORKDIR}/${MY_P}"
+DOCS=( NEWS )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake -C va DESTDIR="${D}" install-libLTLIBRARIES
+	rm -vf "${ED}"/usr/$(get_libdir)/*.{la,so} || die
+}
diff --git a/x11-libs/libva-compat/libva-compat-1.8.3.ebuild b/x11-libs/libva-compat/libva-compat-1.8.3.ebuild
deleted file mode 100644
index 31cdf24dbf51..000000000000
--- a/x11-libs/libva-compat/libva-compat-1.8.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-MY_PN="${PN%-compat}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="+drm egl opengl vdpau wayland X"
-
-VIDEO_CARDS="nvidia intel i965 nouveau"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-	!x11-libs/libva:0/0"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
-
-S="${WORKDIR}/${MY_P}"
-DOCS=( NEWS )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake -C va DESTDIR="${D}" install-libLTLIBRARIES
-	rm -vf "${ED}"/usr/$(get_libdir)/*.{la,so} || die
-}
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 6a41b679dd82..e1a6bcbcea42 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,4 +1,4 @@
 DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
-EBUILD libva-intel-driver-2.4.1.ebuild 1312 BLAKE2B 2631a8b68421c285c1718c381b58f88367893b72894033f75230e7627a36a027af5fc4ab10088e5f91eb2f5e837b52e90b8f2fe272f895b97d30e603b3181238 SHA512 d1e5af4a00a0adf6c1bb04473d6bcf72144697e14f5e59c7b82cb5da855083084a3144e4974633c4d8ce2630fbf110a496e296ef82c8f78b035bf550772c7993
-EBUILD libva-intel-driver-9999.ebuild 1314 BLAKE2B 10eaf18d44d1e5a583e665c7e423caaede7909748fc62dfc270affcb3b0e9db3ce7ee8e9c00cfca3d5aa936857e50a019ec7295a28489281e28a80915393ec66 SHA512 225cacaa64b8a4dbdf2d1c7ea29e45d90422fd15fdf938d8957de1e3ccf2d60951e52663f9f5bee9a08e267ff60ca7595816f74d2829f29f5693e389b310ae84
+EBUILD libva-intel-driver-2.4.1-r1.ebuild 1315 BLAKE2B b3143086acc0278e1d84e0ca35a34325ba667395f547437205c70a8182d560cda32a704fb0016674f0691a661e19ad7321e88ad9fb09dedb4db2610f9d0a0a0a SHA512 4dd1702c81a808eaafe6b519eeef298bf1e6c6872c3b87011f928f90abd642decfd53f43b8663f9f646fe147d1e4e6e871ef8fa496b92e42cdd1c996fd18f530
+EBUILD libva-intel-driver-9999.ebuild 1317 BLAKE2B 916b05fa1c1b8baf20fcbea3256f04771920362863af4fb13688b539a819125227e63ea574081089b8c42b09278a1815aeaf217ac914204e05930e19fde0e9b7 SHA512 9825c011b68f4610f6600bae36a4b6a099aa34cedd6de6a7be2345bd584e1e8c3f00adbcc670a1ac9ffd8731c25da151c7d842eff241fc2e2efa50a8654f7e35
 MISC metadata.xml 349 BLAKE2B ef740cfab9baa746a0bd75f99e4458e76899eadb7c65f546de16093b5fc7a6a16e84bfd289c5b5a3a82e96775904cdda76cb60ad5b9389672c63d1a8f9d97f03 SHA512 2d8f4932efe61409edd7b1cafc9a84e8a3620d87db60053a378cbe180f2c6206a51e0033943fa349de91954c1b76154651013dea99e51fdcaaff7e9f0e40616d
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..6952b1401a4e
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
+fi
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+RESTRICT="test" # No tests
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
deleted file mode 100644
index b7af94433ccf..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="intel-vaapi-driver"
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
-fi
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
-if [[ ${PV} != *9999* ]] ; then
-	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="wayland X"
-RESTRICT="test" # No tests
-
-RDEPEND="
-	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
-	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
-	wayland? (
-		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable wayland)
-		$(use_enable X x11)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 4e4df0e31706..4f49ea343696 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
 	wayland? (
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
 	)
 "
 DEPEND="${RDEPEND}"
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index f9cedc2ff2cc..53b4f893fca5 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -13,6 +13,7 @@ DIST intel-media-21.2.3.tar.gz 23025524 BLAKE2B 0652563f8e8494c9fa181822a7af348c
 DIST intel-media-21.3.2.tar.gz 23069924 BLAKE2B cb7035698bc19eb65f0cf338e7fb0e11a379a27c243566b6f884d63897da10e2ded39523fcc81131f41885508d1413e7960e38cf9cf2d129d7a6a3994fa9b384 SHA512 27a1849ed2f2367e5de63189faa6e14a1a23f6708c45392f661fab819f856bb4a3d0d31754213b084c4f05be3b155b0a80c2f4e330c79879597910f77e3f1597
 DIST intel-media-21.3.3.tar.gz 23092541 BLAKE2B 083cc368095bbc9cf333953855ad94d7a8d633337b967f4f93d94e3c8e23bbcdadad19c1b1032cafc671ae9a9df9be547498ebe84426ad9d91a9e82557095eb8 SHA512 a9da8a627420c5ea0de9413ce0aeb471f40a0886abd67380ead7ffba32de4abbc1741c47cfcfc73d42b14456090266f4dad8d363c8ad590cef521ef48e42f692
 DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
+DIST intel-media-21.4.0.tar.gz 23116624 BLAKE2B d913e379c4990bd0f5a5d07654baeb374d3b4f7adbe607338a96ac6555631560005d6124fb0124bafe5e94107b54acdfd0fbcfdabc820210b453ebb61c828c36 SHA512 e338e645677d90d4c2e91d5096a9002b87cec602ec354283b67e4ee31fcd6a2454918c4e179b86189126d30742ab2814bc8400072fb1d06638c3bc0bf66385e4
 EBUILD libva-intel-media-driver-20.1.1-r2.ebuild 1182 BLAKE2B e453b09ac58040ab6e0da45768caf70d8cdace4b4683f94f8133904513212652e5fa7effa8392be7e495e00f8d6227163c465d4404f8628f804eebd9c0c3e3b4 SHA512 52b2221c79305305deda5a952314f8de487399f99f5840e0ec9a2d67ebce819cba2d8e31ee9de4e17300e758925d68ab5f3205ecec62631d19b0a1c7f213203c
 EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b
 EBUILD libva-intel-media-driver-20.4.5.ebuild 1466 BLAKE2B 44ab893c79c0eace0f0e237c89a81636123733a51da2b71b4314f5707e98855a59696896cac73a783cfc0b646f9dd1b2e99bc555888d6b53ddd6a54d2e13dca7 SHA512 95749d2504f57449baddfe40b9f1595f45d5058e9afb3656b9ead1163a5dc8a899aef6e71c9bea3ffd5f452b181ca3eebbeae7943e563292be51be7bc24037e2
@@ -23,5 +24,6 @@ EBUILD libva-intel-media-driver-21.2.3.ebuild 1456 BLAKE2B 3ef7e7a112b602fcc8bab
 EBUILD libva-intel-media-driver-21.3.2_pre.ebuild 1484 BLAKE2B 30827123d8241e2cb52bd92d1455ab40accbe60ca374206e38919f4f0add83c4b297b0a7fe86a4f38f1b8d9f1c8775d0e7d6181f0e9604afabcd406cc5a71519 SHA512 ded439fb9d7b41cd8ab6905dcfec3bcb4eb6f0527509a8ac62be6ce5873dc93dd9045be5e6222feca005385bcb16ad08f6e79769caa894ce4f5037fee4ae0392
 EBUILD libva-intel-media-driver-21.3.3_pre.ebuild 1484 BLAKE2B 30827123d8241e2cb52bd92d1455ab40accbe60ca374206e38919f4f0add83c4b297b0a7fe86a4f38f1b8d9f1c8775d0e7d6181f0e9604afabcd406cc5a71519 SHA512 ded439fb9d7b41cd8ab6905dcfec3bcb4eb6f0527509a8ac62be6ce5873dc93dd9045be5e6222feca005385bcb16ad08f6e79769caa894ce4f5037fee4ae0392
 EBUILD libva-intel-media-driver-21.3.5.ebuild 1494 BLAKE2B 19e86871ffcfc7429630d27ddfea83c12aad6515fb835a164d3af932680b1cdc11a1afc2607e010a63cfc8318128535c103ec05a34525eb952251b0632b47402 SHA512 377bcfa3181f363ec2df809c237435531411d7aee6da415227e15df89fce118edc72fe56bc44606b4255b53c012a7246f654bd63cb479a164cdc91a3412b6097
+EBUILD libva-intel-media-driver-21.4.0.ebuild 1494 BLAKE2B 19e86871ffcfc7429630d27ddfea83c12aad6515fb835a164d3af932680b1cdc11a1afc2607e010a63cfc8318128535c103ec05a34525eb952251b0632b47402 SHA512 377bcfa3181f363ec2df809c237435531411d7aee6da415227e15df89fce118edc72fe56bc44606b4255b53c012a7246f654bd63cb479a164cdc91a3412b6097
 EBUILD libva-intel-media-driver-9999.ebuild 1494 BLAKE2B 19e86871ffcfc7429630d27ddfea83c12aad6515fb835a164d3af932680b1cdc11a1afc2607e010a63cfc8318128535c103ec05a34525eb952251b0632b47402 SHA512 377bcfa3181f363ec2df809c237435531411d7aee6da415227e15df89fce118edc72fe56bc44606b4255b53c012a7246f654bd63cb479a164cdc91a3412b6097
 MISC metadata.xml 617 BLAKE2B 70709460de09a33bcaac37b7a6b46ab82366fefd61b525a9d73fca0e3bbab3332635cfcc52d01468f5270168222b55360bb221890fd97f01af3e9c46ceb8ca14 SHA512 bab84b0d3113695f920d4710329e5a147a946b9fe56cf6ff7e583694b249c7f284b359d2edd1a8c12d3035232dc0eaa12f8f3450992d6dc0d287b4db0a94f497
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0.ebuild
new file mode 100644
index 000000000000..15ca5a26b62c
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD"
+SLOT="0"
+IUSE="+custom-cflags set-as-default test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-21.3.1
+	>=x11-libs/libva-2.13.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DUSE_X11=$(usex X)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use set-as-default ; then
+		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
+		doenvd "${T}/55libva-intel-media-driver"
+	fi
+}
diff --git a/x11-libs/libxcvt/Manifest b/x11-libs/libxcvt/Manifest
index 4018e9fb8dd9..bc98a71f069b 100644
--- a/x11-libs/libxcvt/Manifest
+++ b/x11-libs/libxcvt/Manifest
@@ -1,6 +1,6 @@
 DIST libxcvt-0.1.0.tar.xz 7912 BLAKE2B 31653a085fc8c60ff3eb1cb3749e382f2b98b1aa967bfe6f4e8ec94536b35ec73f0d8cbd76be782f46c81255c166a889141dfebb41448db5ad8e29797b340d3b SHA512 c2ca7abfc2954cf4427e0b3c3e302aad438525118dc9fa2047fce2bce6578863696387af8eb7adfad40af6313d9d9c87a9dcaf7e026e8049d48118063f6f0088
 DIST libxcvt-0.1.1.tar.xz 9600 BLAKE2B 47628fc10d9d75207b7d09cb5b789e58fae485c95a5e3e95345c289f0eeb20859dff6384049e22532ddcb3c04a84ceca6557c3490e5cd8c6956c6ac6c81d6636 SHA512 50e9cd0283858823d4cfde75f06e23ffc42983272cb1f75408052fb5b76a4bb6f9de7d42d8ff9ec0dae6e95eefebc6273e03c919a92f237585db55eaf1a57005
-EBUILD libxcvt-0.1.0.ebuild 433 BLAKE2B f02f870579d86ce724772048ed1082d88a452beb6a4bcd01556a5f1a8bfd8b8f7a551afdc0924a26894743bb2901e81eed8bc3e1af4a0496ec5307aa9f7a6455 SHA512 122891744c05cdbb9160f1d967214a1edc4e485bbf588da5c4bb2138fd4d82be8b568af178417ad1b4ed40688f84dbc3dbd6a53d9e67104a62ded5cfd95995c4
-EBUILD libxcvt-0.1.1.ebuild 436 BLAKE2B b13a64eaecaf9289bcd697cf0079cca9e94d0aa381b9b3d8972b9533f11a3ea0977bf1c275c0babd38b8287b967032dbd9dea30264f831969dcab1c12b849a2c SHA512 7fce6832fccf4106d8b0db634db441c985cc91b79be636a2ee28c2571f38e6b7ed090488c636edd2d34f4a528d408b08462e62e78546ffe5fa7a101e065a6345
-EBUILD libxcvt-9999.ebuild 436 BLAKE2B b13a64eaecaf9289bcd697cf0079cca9e94d0aa381b9b3d8972b9533f11a3ea0977bf1c275c0babd38b8287b967032dbd9dea30264f831969dcab1c12b849a2c SHA512 7fce6832fccf4106d8b0db634db441c985cc91b79be636a2ee28c2571f38e6b7ed090488c636edd2d34f4a528d408b08462e62e78546ffe5fa7a101e065a6345
+EBUILD libxcvt-0.1.0.ebuild 440 BLAKE2B de7206496a1ca519c7a1758d07ac0ee69559b7e5a2e5d82d2b4f6443b81d19bbd0899078f1184b50b98bdb7ec323606d3b4ae81280909528c247902f3168e183 SHA512 1922871bd1912bdb34470fee1a5e4626dca881488ca5adc2618631803af0a8fbdaf94afb44a2604eea5278a2c235d1e5bb38d744bb665d61d542872d5a86ddb0
+EBUILD libxcvt-0.1.1.ebuild 443 BLAKE2B 16629eedc9d8f77b5106fb1ce51097ade89d1b278827cc85c3fe973bca8e1510e768e8ee1d88e39535e3278fa0a57d992bbedea2e0965d193c6c1f27b37c417b SHA512 41f6ae4220c16c90978a7b1fdfd597989fee3e4fa30db1367a0777aa348acbfe0482eda68047d6a66e41b9971b838b8ecc2d376d1c50712a075c2ec50aed0fe6
+EBUILD libxcvt-9999.ebuild 443 BLAKE2B 16629eedc9d8f77b5106fb1ce51097ade89d1b278827cc85c3fe973bca8e1510e768e8ee1d88e39535e3278fa0a57d992bbedea2e0965d193c6c1f27b37c417b SHA512 41f6ae4220c16c90978a7b1fdfd597989fee3e4fa30db1367a0777aa348acbfe0482eda68047d6a66e41b9971b838b8ecc2d376d1c50712a075c2ec50aed0fe6
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-libs/libxcvt/libxcvt-0.1.0.ebuild b/x11-libs/libxcvt/libxcvt-0.1.0.ebuild
index 27041453c6a1..ae1345214fcf 100644
--- a/x11-libs/libxcvt/libxcvt-0.1.0.ebuild
+++ b/x11-libs/libxcvt/libxcvt-0.1.0.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="X.Org xcvt library and cvt program"
diff --git a/x11-libs/libxcvt/libxcvt-0.1.1.ebuild b/x11-libs/libxcvt/libxcvt-0.1.1.ebuild
index 0ad3f5af940d..4da7a73c761c 100644
--- a/x11-libs/libxcvt/libxcvt-0.1.1.ebuild
+++ b/x11-libs/libxcvt/libxcvt-0.1.1.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="X.Org xcvt library and cvt program"
diff --git a/x11-libs/libxcvt/libxcvt-9999.ebuild b/x11-libs/libxcvt/libxcvt-9999.ebuild
index 0ad3f5af940d..4da7a73c761c 100644
--- a/x11-libs/libxcvt/libxcvt-9999.ebuild
+++ b/x11-libs/libxcvt/libxcvt-9999.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="X.Org xcvt library and cvt program"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 339bc92881dd..2588bfe7f3b9 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -7,8 +7,8 @@ DIST pango-1.48.5.tar.xz 1819476 BLAKE2B 8529e8cbcf0f33be56cf09229abe45fb3525e12
 DIST pango-1.48.7.tar.xz 2050880 BLAKE2B 2ee048d9713aed0972ffdf3feb96c7c0683ffa1494ac2b798a4f6b1f5797d689b0e0c06bcc3f4a10130d23279ed295a3a59141c75bd3a0f2da7facf62d6c3baa SHA512 e5680d628f531bea7633945bd74dc51a93c4c881dec58fcf9f6271043e77b82a4805e311355cb4d9f8cdfcdf52785a5a6391517a264b62416c26e82dff4aca39
 DIST pango-1.48.9.tar.xz 2063756 BLAKE2B d1610aaac783b95a35ad3e083b4bab33f3d4beff533386817addcb5eb9022de242087ffe4e62c043870b4aac1fbc0fe3e1c5d18744909a5a05015a702dfea2e3 SHA512 e3bba743bb596b0a34cedc893f9af0216bcc9fec521c2da09cfdeec9ad80a05b5c53c3fce1a225ab27536e9335725cffb87c66867d0522fd4632df00b1d4c056
 EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
-EBUILD pango-1.48.10.ebuild 2057 BLAKE2B 5d9d9507bdb3695655a2d181cca7ec59c89e827bc03fae07a4f6ac1fc51f37aa1b74de08444871a7172f9034be2f9472b08180572bf6d370dc77d87bb6f915da SHA512 064cc58be5b6a6354fa3e85fc476f5a16fba419fa2b059dfe359962a26b20d53916dc76fc5f4a219b0e20e65ec5320b8efdcef1dce0d14b3de1d62cc29c65b89
+EBUILD pango-1.48.10-r1.ebuild 2286 BLAKE2B 55034f42e682e0997522c44188be4599178bb1f935006413f5f1b5ef08e0f62bed95691bc5894b059356a9a98f9759f817104152e8bd61619c72899664c3ccbb SHA512 bc14e5ada67b6969b4b1be800a04bdc4b0a1bbcb4bd90c1ec20f47202594d525b0b453a528e3843ef6b4b9c00fb388b356b2ad7203824f25498ae441690fcecb
 EBUILD pango-1.48.5-r1.ebuild 2140 BLAKE2B e53a8cab9f9de8c8e5828fbfe3784877ef4c416ee39a1780a49b0978c5f4a85ff21e2a53a3204c65a51458d25b143ce8361dc8323fa34167981066040cb982ab SHA512 ebadd72e5bfb7ed5fccc1da685d6b973c7931fcc076c6a466e49e8c41980e0a781f3ff42272b83b0b9db02224b9a30881fd2f0c484c9f0f163101f17e1b5b3c9
-EBUILD pango-1.48.7-r1.ebuild 2044 BLAKE2B f41c95cf047f668bd702cb1a22423b714093a6c19d5c43f9765d6db78adb7d94948a13bfbd7c4d055524afb17d23016d15c279d09e8e84c4a6114ccb4e5eec21 SHA512 c852bffff4a6801009fa576fd9ad3f3d675404135f8d836dbfadaa34b2508f70db820e1808621ab953cb727eb901da0c020066ee658eed80c286a23a7034dfed
+EBUILD pango-1.48.7-r2.ebuild 2273 BLAKE2B 01b85b64743d399ec1372c34f8fe356cf08132a94b42ad3a6675088d90533d326cdb804bfca96cf52c197fef228574ef77b4d428a4102ed9dd0346a29ca995aa SHA512 25316916803bcfbb1f90fb6921d8d0596e70d1ea4f9eac9d35f612d55f3c53131d2f11d80469ff8b0244ad8758b54d937baba46f49fa38a29013430e48935d26
 EBUILD pango-1.48.9.ebuild 2054 BLAKE2B 487470875c5a78508292841229e1600208c73dcf4bf10accbffeff3f7ff04e85c2cf3623d085af116e753efc172951b3b9c168996859c6253430a9ca1ab4c369 SHA512 1c87f5774542d295a7f5ef2d8fe3445654493ce426af739d0f823c03732021df5667195462f498daf670f908e23558f43cb7e81802fbaa7faf98a44dcdc290c9
 MISC metadata.xml 523 BLAKE2B 623788e7504fe89c7d8604eaa2a6b1ab5fb022965eaa3044dd2a94b6f68638453011257659c0f17b7ced9b6945acb3eb4767f9fd3ce9686b69b3b60b867dcdfb SHA512 a60feab6e4e50cb9b477f388d4534eed4616fac6aca4f6eae450fac42bfa9ca0d7382e36b98a159732f9c6926162cb2ea55d72a644bc77629ff09fd0097226eb
diff --git a/x11-libs/pango/pango-1.48.10-r1.ebuild b/x11-libs/pango/pango-1.48.10-r1.ebuild
new file mode 100644
index 000000000000..9eb3d082e26a
--- /dev/null
+++ b/x11-libs/pango/pango-1.48.10-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic gnome2-utils meson-multilib toolchain-funcs xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv sparc ~x86"
+
+IUSE="debug +introspection sysprof X"
+
+RDEPEND="
+	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	dev-util/glib-utils
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DPANGO_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS
+	fi
+
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		-Dgtk_doc=false # we ship pregenerated docs
+		$(meson_native_use_feature introspection)
+		-Dinstall-tests=false
+		-Dfontconfig=enabled
+		$(meson_feature sysprof)
+		-Dlibthai=disabled
+		-Dcairo=enabled
+		$(meson_feature X xft)
+		-Dfreetype=enabled
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/gtk-doc/html
+	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
+	doins -r "${S}"/docs/Pango*
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if has_version 'media-libs/freetype[-harfbuzz]' ; then
+		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
+		ewarn "lead to minor font rendering problems, see bug 712374."
+	fi
+}
diff --git a/x11-libs/pango/pango-1.48.10.ebuild b/x11-libs/pango/pango-1.48.10.ebuild
deleted file mode 100644
index 0c88d2262013..000000000000
--- a/x11-libs/pango/pango-1.48.10.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
-
-inherit flag-o-matic gnome2-utils meson-multilib toolchain-funcs xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv sparc ~x86"
-
-IUSE="debug +introspection sysprof X"
-
-RDEPEND="
-	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DPANGO_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS
-	fi
-
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		-Dgtk_doc=false # we ship pregenerated docs
-		$(meson_native_use_feature introspection)
-		-Dinstall-tests=false
-		-Dfontconfig=enabled
-		$(meson_feature sysprof)
-		-Dlibthai=disabled
-		-Dcairo=enabled
-		$(meson_feature X xft)
-		-Dfreetype=enabled
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/gtk-doc/html
-	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
-	doins -r "${S}"/docs/Pango*
-}
diff --git a/x11-libs/pango/pango-1.48.7-r1.ebuild b/x11-libs/pango/pango-1.48.7-r1.ebuild
deleted file mode 100644
index aef9e1d9db15..000000000000
--- a/x11-libs/pango/pango-1.48.7-r1.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
-
-inherit flag-o-matic gnome2-utils meson-multilib toolchain-funcs xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-IUSE="debug +introspection sysprof X"
-
-RDEPEND="
-	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DPANGO_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS
-	fi
-
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		-Dgtk_doc=false # we ship pregenerated docs
-		$(meson_native_use_feature introspection)
-		-Dinstall-tests=false
-		-Dfontconfig=enabled
-		$(meson_feature sysprof)
-		-Dlibthai=disabled
-		-Dcairo=enabled
-		$(meson_feature X xft)
-		-Dfreetype=enabled
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/gtk-doc/html
-	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
-	doins -r "${S}"/docs/Pango*
-}
diff --git a/x11-libs/pango/pango-1.48.7-r2.ebuild b/x11-libs/pango/pango-1.48.7-r2.ebuild
new file mode 100644
index 000000000000..cc225cce0cdc
--- /dev/null
+++ b/x11-libs/pango/pango-1.48.7-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic gnome2-utils meson-multilib toolchain-funcs xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+
+IUSE="debug +introspection sysprof X"
+
+RDEPEND="
+	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	dev-util/glib-utils
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DPANGO_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS
+	fi
+
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		-Dgtk_doc=false # we ship pregenerated docs
+		$(meson_native_use_feature introspection)
+		-Dinstall-tests=false
+		-Dfontconfig=enabled
+		$(meson_feature sysprof)
+		-Dlibthai=disabled
+		-Dcairo=enabled
+		$(meson_feature X xft)
+		-Dfreetype=enabled
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/gtk-doc/html
+	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
+	doins -r "${S}"/docs/Pango*
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if has_version 'media-libs/freetype[-harfbuzz]' ; then
+		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
+		ewarn "lead to minor font rendering problems, see bug 712374."
+	fi
+}
-- 
cgit v1.2.3