gentoo resync : 06.04.2022

36 files changed, 920 insertions, 386 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 5618f8245e5a..644fc2f489cf 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 5b4c631f88fb..09c7be06c98f 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -8,7 +8,11 @@ AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
 DIST gtk+-3.24.31.tar.xz 22449112 BLAKE2B 2a09b199ad88ab8006e8d768ff6d2c5ddbdd22f84aa7d661e8e25f87a7436135edf0116202574a092536d3293800d83d9dcf1affff27e9baedeb27d31291e6a5 SHA512 e7f8e5003a919e297bd3e616acccbc5cc9bf9c9d41377c108c24db51817fcccec919abc12d05c0ed585d49526d52f0395a1c0f3ed9d9ef816bb0c4b2aa615f9b
 DIST gtk+-3.24.32.tar.xz 22443900 BLAKE2B 0a07f4159d8c09dc46b22a98398020bf164a0a29ff4bc41aea158d697d95362b74558c9605eaafab366500cfeade9b8794baa980dd3023f71336ae8c49e1e4d7 SHA512 326640621b8aca59e9e46282c19b7a88f15469436e39bde7b845028014f245f23fef482db3589a7dbded20fcc82ec3adac66b837472f2b8c3016d285d38582c4
+DIST gtk+-3.24.33-add-legacy-icons.patch 157847 BLAKE2B 298a872d876421bb0d34f897b5d65984be768f623f294f0dd98e722df16ca2177c417e9508aa14fb81c75e3ff24981e018739d398748b62ae5450804f3286cee SHA512 a11b1e30a67214fbd65182efa0a7c1315a6fe75426d211a48678e5b4c13799b389b487e07b07b7a7044b7d3e277f7342a9842819e53176674ec71668481b9976
+DIST gtk+-3.24.33.tar.xz 22449472 BLAKE2B 7fb75393ecd0a932ed5ef6ea3c694e61dec237403e87addca3bbfdcc1dd8dcd4646d11fab3f0a8b7717bfb8c0c64926132a5aa8b1009e8c20f656c6eaa593c1b SHA512 35c844af67d442a9d55197028c6b660668c701ad8f83a64791669fca2930ada15194452b59b2ee11f8068098986218744fe9fc4742897af5a6b3eba23c98395e
 EBUILD gtk+-2.24.33.ebuild 9805 BLAKE2B e24f2718c012a86e34aec536e34afe919ad526721fc5cc2e9e5df3f92e3820c416a871110ea8f819838f44564d30dc4ff43cd0e4884ec9e8754a6e9ead006de5 SHA512 9cfbfdd0a24c78471d9917478685402706c9db097bf4c898db851afa61cc5335e6cf57c2c06e53a827d55ad5c1e1dbdf2d03b6003a517447dbf7e52249b49a8c
 EBUILD gtk+-3.24.31.ebuild 7203 BLAKE2B 7ad891b9fa23e198e2f76273cb60bcfd5a8d9acb24fcfe9b1d28ac7d87cf2e4f608d64c73b1efbea57cd7d99d094990f8b112e17a4202a4123df6438c85efd4c SHA512 54c803ca8a4fae72e45726dbaa570bbc050ec4d081f424953a883fc6e4a8414139851c05c86cb21f0035c979f440e8106997569104a98c1c9139b96c4f56ff8e
 EBUILD gtk+-3.24.32.ebuild 7211 BLAKE2B 79d8cf2baeaa79731fb74c2de6d17662cf952ddd0975b4e64ea45e28dd789a29c47cd3bf713228600ccce03a46a392ef3ef73bda600213a30a59cc94f0468f21 SHA512 d0cc7ebd356d006a41f085e98cfad987f9e95dba5983d575fa82914a1e3c8c2225f67258296b2c9b805f9fb4232882c9c002d4047c5d5d6eda9e8cb0d52600da
+EBUILD gtk+-3.24.33-r1.ebuild 7531 BLAKE2B 927539cc0a26b238c22008ffa14da8fb38303fc651139e7d4a436bbcf4926c34aec7ca45459cd2dd41a63299365d4882efa67b0203811c5b442b3526a0e894a6 SHA512 8cd880c427299e02bce720d210743aaf06de1683a3eddf85d3e9375be882ce4d99fd6f937868b4acdc36cca35ecbdf34ebe9f41ed7b508e6fadf3a9d648894dc
+EBUILD gtk+-3.24.33.ebuild 7211 BLAKE2B 79d8cf2baeaa79731fb74c2de6d17662cf952ddd0975b4e64ea45e28dd789a29c47cd3bf713228600ccce03a46a392ef3ef73bda600213a30a59cc94f0468f21 SHA512 d0cc7ebd356d006a41f085e98cfad987f9e95dba5983d575fa82914a1e3c8c2225f67258296b2c9b805f9fb4232882c9c002d4047c5d5d6eda9e8cb0d52600da
 MISC metadata.xml 875 BLAKE2B 40b9f97f4db18f276bb80587843146c5227b5b803306da704ad99f8c7c34fb22cddbfb9f1df3395e2288ed258970851cb9d100f40b846f95d414e2b47ab78f99 SHA512 02b9c2674783308f54bde4d983185d36b372f64f1ee5d9d2cd797fe1158e3653a1edb8ece51a0be143775e9b85d71d4375769e2682778a9286fff42cbf18836b
diff --git a/x11-libs/gtk+/gtk+-3.24.33-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.33-r1.ebuild
new file mode 100644
index 000000000000..87d3ef82b019
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.33-r1.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 multilib multilib-minimal virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+SRC_URI+=" https://gitlab.gnome.org/GNOME/gtk/-/commit/5a0ffbbb4568e39bdf26006e1bf18c1c1d0d597a.patch -> ${P}-add-legacy-icons.patch"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.2.0:=
+	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.17
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)
+	X? ( x11-base/xorg-proto )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	>=x11-themes/adwaita-icon-theme-3.14
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+# dev-vcs/git to apply the binary patch in SRC_URI, should be dropped on next release (3.24.34)
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	wayland? ( dev-util/wayland-scanner )
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	x11-libs/gdk-pixbuf:2
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		>=dev-util/gtk-doc-1.20
+	)
+	dev-vcs/git
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+PATCHES=(
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	"${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
+
+	# Fix broken autotools logic
+	"${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# bug #835966
+	git apply "${DISTDIR}/${P}-add-legacy-icons.patch" || die
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable aqua quartz-backend)
+		$(use_enable broadway broadway-backend)
+		$(use_enable colord)
+		$(use_enable cups cups auto)
+		$(multilib_native_use_enable gtk-doc)
+		$(multilib_native_use_enable introspection)
+		$(use_enable sysprof profiler)
+		$(use_enable wayland wayland-backend)
+		$(use_enable X x11-backend)
+		$(use_enable X xcomposite)
+		$(use_enable X xdamage)
+		$(use_enable X xfixes)
+		$(use_enable X xkb)
+		$(use_enable X xrandr)
+		$(use_enable xinerama)
+		# cloudprovider is not packaged in Gentoo yet
+		--disable-cloudproviders
+		--disable-papi
+		--enable-man
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
+		# need libdir here to avoid a double slash in a path that libtool doesn't
+		# grok so well during install (// between $EPREFIX and usr ...)
+		# TODO: Is this still the case?
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+	)
+
+	if use wayland; then
+		myconf+=(
+			# Include wayland immodule into gtk itself, to avoid problems like
+			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
+			# user overridden GTK_IM_MODULE envvar
+			--with-included-immodules=wayland
+		)
+	fi;
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} that would get installed by default
+	DOCS=( AUTHORS ChangeLog NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}${cache}" "${ED}${cache}" || die
+		else
+			touch "${ED}${cache}" || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.24.33.ebuild b/x11-libs/gtk+/gtk+-3.24.33.ebuild
new file mode 100644
index 000000000000..52be7e73169b
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.33.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 multilib multilib-minimal virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.2.0:=
+	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.17
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)
+	X? ( x11-base/xorg-proto )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	>=x11-themes/adwaita-icon-theme-3.14
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	wayland? ( dev-util/wayland-scanner )
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	x11-libs/gdk-pixbuf:2
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		>=dev-util/gtk-doc-1.20
+	)
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+PATCHES=(
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	"${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
+
+	# Fix broken autotools logic
+	"${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable aqua quartz-backend)
+		$(use_enable broadway broadway-backend)
+		$(use_enable colord)
+		$(use_enable cups cups auto)
+		$(multilib_native_use_enable gtk-doc)
+		$(multilib_native_use_enable introspection)
+		$(use_enable sysprof profiler)
+		$(use_enable wayland wayland-backend)
+		$(use_enable X x11-backend)
+		$(use_enable X xcomposite)
+		$(use_enable X xdamage)
+		$(use_enable X xfixes)
+		$(use_enable X xkb)
+		$(use_enable X xrandr)
+		$(use_enable xinerama)
+		# cloudprovider is not packaged in Gentoo yet
+		--disable-cloudproviders
+		--disable-papi
+		--enable-man
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
+		# need libdir here to avoid a double slash in a path that libtool doesn't
+		# grok so well during install (// between $EPREFIX and usr ...)
+		# TODO: Is this still the case?
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+	)
+
+	if use wayland; then
+		myconf+=(
+			# Include wayland immodule into gtk itself, to avoid problems like
+			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
+			# user overridden GTK_IM_MODULE envvar
+			--with-included-immodules=wayland
+		)
+	fi;
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} that would get installed by default
+	DOCS=( AUTHORS ChangeLog NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}${cache}" "${ED}${cache}" || die
+		else
+			touch "${ED}${cache}" || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 339767286b9a..ea92b2df8831 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,7 @@
 DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
+DIST libX11-1.7.4.tar.xz 1872992 BLAKE2B 6a25e5008ead53be5af7411f51711789eb410473f9aefc49fb4d0bf7227b89c5fd71f0f61fef9bc3f83e585e4815644f42884d5e5cf0bdcdd120abe6fe8a741b SHA512 8bfaaf9fc3081c47152d533d30cdc0b2521bfeb088ff813b041c08ffd518c80ba3725bb68cac7c21b521a4bace546f99424700fe21955b498015d14c2f7f9a57
+DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
 EBUILD libX11-1.7.3.ebuild 931 BLAKE2B d27af79560a6b919d117482959f3b33602025477821be40a1f1a63a53114608d726cdc561ca1c774341c9100949bd534a044dc3366d2a1fb422f15fd817b5c85 SHA512 d37cfe03fc06a48e09812118671f3fb9070ab388ba95025fdfd8bb35c68e0bcd775285aa22b5d07e62454639abe7c3ee773ea087b31a27313adcbbd005f6a5cd
+EBUILD libX11-1.7.4.ebuild 939 BLAKE2B c8c70725bb4cfd15cb2eeaba451fff53a239c07c0e159d1a905cdeef850222ff1aebd161bbed83ec68f105235b0c2bd96bce2112330e641ad9d55e82aaf871cb SHA512 a582dd6fed67cfd1af18035632e9d3c5e1505232c2287028cad6cdfb24b3892f3d61d715aa26debd41aa85adf8ed61afcd960e8fda71579da6b3df9587ed93d4
+EBUILD libX11-1.7.5.ebuild 939 BLAKE2B c8c70725bb4cfd15cb2eeaba451fff53a239c07c0e159d1a905cdeef850222ff1aebd161bbed83ec68f105235b0c2bd96bce2112330e641ad9d55e82aaf871cb SHA512 a582dd6fed67cfd1af18035632e9d3c5e1505232c2287028cad6cdfb24b3892f3d61d715aa26debd41aa85adf8ed61afcd960e8fda71579da6b3df9587ed93d4
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-libs/libX11/libX11-1.7.4.ebuild b/x11-libs/libX11/libX11-1.7.4.ebuild
new file mode 100644
index 000000000000..34171b8bc0c2
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.7.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX=xz
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	x11-misc/compose-tables"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+	xorg-3_src_configure
+}
+
+src_install() {
+	xorg-3_src_install
+	rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-libs/libX11/libX11-1.7.5.ebuild b/x11-libs/libX11/libX11-1.7.5.ebuild
new file mode 100644
index 000000000000..34171b8bc0c2
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.7.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX=xz
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	x11-misc/compose-tables"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+	xorg-3_src_configure
+}
+
+src_install() {
+	xorg-3_src_install
+	rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 80a78afc4fc4..ea05461be8a4 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,5 @@
 DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
+DIST libXcursor-1.2.1.tar.xz 280352 BLAKE2B 5c59a43d9cdaaab887ef7ffbe836534508e3542959dd5011c08e46db1d5e4de6e7ee47b1574eb1bd2aebc8baa8fe401e5195fa73bb2ab47b779dbd03af4bbf4a SHA512 ebb42a39855aab86d0c11fe6ad33d011cf56a6dc5c309bef643460319c03df239b7e09fe88777bb25c0e9ff8aceac6bf66e51cc04a2d5ee463b3bc3bbf1674e3
 EBUILD libXcursor-1.2.0.ebuild 887 BLAKE2B 3556729903c8d63bfba3d1e40ae86ba71812a740467bc0485847c2fd4611d00624ba2a138bb07bae79facb1d16ccbafe2f0ccaa5f6b099a0262aa30f7608f898 SHA512 8141cc2c6c1a704b1ca7b33828ceae7dc0e0e0c5b5663076c5b489acf6dcfcf0e52e409277ebffe01583a603b1e07bb2c348c3cffc3c2ae0daa49d9aedbc3656
+EBUILD libXcursor-1.2.1.ebuild 939 BLAKE2B 5268746df788ac051d580e0fb81782f718eb50d76112f87506993cab9715942d5a76fb8ef2da4a19baa112e68d3b64ff610a69ed7851c95c57b8150389ab7806 SHA512 9b1844050ae39b0c34cf8e53cd7b40db749b5747cd29acbbb9d19651d794c3991b1b0ddaf6f3bebfc0d69f2aba6e7f518e3ff47d8a0895225750f7f0f851f9f2
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXcursor/libXcursor-1.2.1.ebuild b/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
new file mode 100644
index 000000000000..850a4cccca0a
--- /dev/null
+++ b/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX=xz
+inherit xorg-3
+
+DESCRIPTION="X.Org Xcursor library"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-icondir="${EPREFIX}"/usr/share/cursors/xorg-x11
+	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
+)
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index 838c6449e450..589ffd6b3fc6 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,3 +1,5 @@
 DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955
+DIST libXvMC-1.0.13.tar.xz 274180 BLAKE2B 51e7a08b0a1c76c9ed3bf53dc9656d7cea836ce7f5c17175b0700f73f2a8c4c0a9a91a6c3bc3b3919c4fbfaecc8e305d344ebf4654662d297735bf53d9a55579 SHA512 c9d0f73884a586efb9ea4f77fc8555f60d940077d7dff8eaa765b86345c8b4e3d80b860f68191d2830c272b9e464c08450fbb51bb64819753a6f4228c71861ac
 EBUILD libXvMC-1.0.12-r1.ebuild 533 BLAKE2B 9046b13633b260e85afd2cb81745cbc5c2ecf437e4a914ff5e3e17ca8a523bedc9206dcb466d00fe370aa35f83165d7c5d4efedc0e5c73b4dc1e97fa558cdac0 SHA512 fb00943b7cb92d3b751750ed709d4f79fb1d31ca8996d8027405f769be49977f8d4d505da72966c93af17783c50623c36daea045e7c935b9488737dc15f730ee
+EBUILD libXvMC-1.0.13.ebuild 712 BLAKE2B f5f63c409cc1fd71e1265e4bc6134ba68b819f529550338850628a5f9fd2f96c38ab66b97add495ec9acfd210086e5813d0688696830e0c3a1c672329a596038 SHA512 6ee035271c35b70f98a09876bdcf6ad509d53c9a98c75c5b7984a52d8897df2dc2f787e3b0da0d67130245d6a20011de5842a4cbe271ab8efcae815e51486d1b
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXvMC/libXvMC-1.0.13.ebuild b/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
new file mode 100644
index 000000000000..26cfe3ebc0fa
--- /dev/null
+++ b/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3 meson-multilib
+
+DESCRIPTION="X.Org XvMC library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+# Override xorg-3's src_prepare
+src_prepare() {
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=shared
+	)
+	meson_src_configure
+}
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 9a42581af7aa..f18f2da4e989 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -2,6 +2,8 @@ AUX libva-intel-media-driver-20.2.0_x11_optional.patch 458 BLAKE2B 22670f925729a
 AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820733470396b42152b8d3863c45946307c3d6e62b16a90a199a29e1564fbb56c044f07c895b2e6d12ecd5ef235db054d87ee49fcf5c2ced2b9242fd11ebe9 SHA512 02edb8803be4dd4608e8ee970c5472c2c6e6c7dfd2ca5c33b2807900cba49f0ef6d65440c7ca7b978abc368b56bfb7a163c3671aead68512b879fbd446475319
 AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3303d8cf11e99fc08b01cb4a12b1500afba27920e52a47cdf2d3cacc0b2cbea72e417ca4c118793c1149659cf1e51b619c0a81ca5103505a25994d9a0fee00a SHA512 41cd3cefd7a6aa6482c4d06b912cf441879e6fd14cee93380b081021e344d6555791e80d0925f66f59178d1b2d5ee15ff1f2deb4835d72f7fb74673912fc6b9e
 DIST intel-media-22.1.0.tar.gz 26188730 BLAKE2B 7ade4b25d2fe50ed6c3498c37f0fb39ecf7241ba21485c423a4a8769628b78d8134471639aad12bcac79a7d107682e36cb5954227528601eb5253be5ce00acac SHA512 dd444608fd15fc7f05a0d2c9e6e2c8be3a588a1253ac014c045c207d5d59c9d172c89d248e94688078097a224f57025c11e86b9392271cd111bb9dce6d07617e
+DIST intel-media-22.3.1.tar.gz 27302226 BLAKE2B 24ac80adcd9a72f9e9b7db4b878715233835f2b69a25d1029538fb87da1fa49ed3c0606478a8b24e198f0c366003ff315e31972c7576e9ff2ecd8419e12ab150 SHA512 286f974a11546f8541429230330c5bd514c5eb372d3278461a132fb236f19908aa544a44010e52981bb942573ab6c2047c8c03471517182e2daf2da87b0eb74f
 EBUILD libva-intel-media-driver-22.1.0-r1.ebuild 1368 BLAKE2B 5f58f95f23416c6dfa77cd61e311c59448a5b1dadd3280115d17176bb392607320d3b4b00324cf80c7bfd953cf8365edeaed562edc7117ecf3a3f94c7577a00b SHA512 b24aa898bb3c48126c0e85f886cc564eee38f611d8ffb21ecc163b070814e526262892b7dc6d99fbec302345d2788b98c335734f82258d68a0357c0de9c8ca38
-EBUILD libva-intel-media-driver-9999.ebuild 1369 BLAKE2B 6629037820176d3beaf10be676db7d705d2b3b4329bd2682b3ff11e5ef47369585b3de1d246c4fec4589224068ac9146a1d6df86a4d2b9eff6dd74a995229bb1 SHA512 8abc05bd597ed110fd115f203d05f8847a7b25bc5f7764d6a6d46f5d27e4836b061a4c45dbb33fadf3d9d2a043369ffa1b9fa3a4314a8fca7328e44688ceb0de
+EBUILD libva-intel-media-driver-22.3.1.ebuild 1369 BLAKE2B e7a9336e295f00875c9eaef26a47113e5e94fd804459b3c17ec7ada98ae2ab70760d13ed9eff17295465e79c54a26ace0f5ba5d2bb3fca7a431bef7aa7b503dc SHA512 171e12e7d4613336a534bfcbac98aa53e68ad64a00edd21840c10f4db848803ed3d254c82a32c54fe99a02b401b7afb0782c2e35b7a453068208cbfe91ffc717
+EBUILD libva-intel-media-driver-9999.ebuild 1369 BLAKE2B e7a9336e295f00875c9eaef26a47113e5e94fd804459b3c17ec7ada98ae2ab70760d13ed9eff17295465e79c54a26ace0f5ba5d2bb3fca7a431bef7aa7b503dc SHA512 171e12e7d4613336a534bfcbac98aa53e68ad64a00edd21840c10f4db848803ed3d254c82a32c54fe99a02b401b7afb0782c2e35b7a453068208cbfe91ffc717
 MISC metadata.xml 506 BLAKE2B 22e3db4e87af8f032b2f02d18937c894524ede02e6a408cee8f8fddf492cfd2ebc8de6ebe8e2e1786ec81f119a09d3abb50dd2617c7651ff2082986d66421760 SHA512 5f7ebdec168766dc148294d92b1a6f6a355293a78ff8c879d1de94dca283ecfb9136bb0f124f41af15256f31832c2b034452a2b4d0ea0616a36b2576b7d8da58
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.3.1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.3.1.ebuild
new file mode 100644
index 000000000000..467f8eb13c6f
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 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 redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+	>=x11-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-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)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index b0004515b354..467f8eb13c6f 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ IUSE="+redistributable test X"
 RESTRICT="!test? ( test )"
 
 DEPEND=">=media-libs/gmmlib-22.0.0:=
-	>=x11-libs/libva-2.13.0[X?]
+	>=x11-libs/libva-2.14.0[X?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 53382792b484..c833fed5449d 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,5 +1,3 @@
-DIST libvdpau-1.4.tar.bz2 139504 BLAKE2B de2b9251060f10e3126b59f44595c3b9cc65c3f5bc719133809414ed51362fb1f90fa67d0351007a178455329493f929d0983a2a7e67c29022ff351ea1f5adfc SHA512 68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01
 DIST libvdpau-1.5.tar.gz 152838 BLAKE2B c3d76c1e46b718d71daff74232f2de9efb989c496cef7fa1016ec76d751530be39b5b6ad6354819579043f23744a647492d5d52b5ab93cae89dd82fb17d08289 SHA512 cebe0e0d9411b87238fa2adec40516881c61a67f33f80c22372f514e672e2dff839687291ab0b01d47af811c254fa65da579f360fcded3f65e382720548d3ea5
-EBUILD libvdpau-1.4.ebuild 1028 BLAKE2B f63cfa2124df8ba2aaf07ae483e14da0b42d7bcc6bf4761f299ee61207fa57eec2fa16fcbbc3a2b7190497fad44ee0c8357269255f38ad8f4fa8176f26d7ffac SHA512 a5f0e95051d22a30b5f013826fb42c856e9300a304ae5ee651902383a5a5db3a3fde002d79ffea6f2c71a02752c93f8e303f9e58175f5d1a6b44e43d8ebb27f2
-EBUILD libvdpau-1.5.ebuild 937 BLAKE2B 2f83e41eb8cec7193beb68d76d5e0dfb80ce5674006d860f9ccee34d0b9fbfd4d9a28f6252f5bb99df9f1fa6e8aecf00979b0786724052c5a8d095c6371288cd SHA512 8ff2c0f311962df290712688bff9a9d711cb2e2e31d228507080cdbcf396f6c1626512963cb0e590a00c7094203a4dfe3ec4c8f771c5db6461e1c80d6ae3024b
+EBUILD libvdpau-1.5.ebuild 934 BLAKE2B 55ef409c47b1c2999c119c175fae00238e4868d84001fb0332e22389080eb29b9d8cad7940422ceb82ae7e6001b4885cb25340f38812b189c8de70e0f54bf7b3 SHA512 f73eacec85942d7786bf8ccb0886047dddba19d6d649cdb4ea4321f28e17c4aa765e94d6120d4e0f06bf727e18855a420641149edfce4cb2ea8834bfcb27f642
 MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
diff --git a/x11-libs/libvdpau/libvdpau-1.4.ebuild b/x11-libs/libvdpau/libvdpau-1.4.ebuild
deleted file mode 100644
index ab328e5779fd..000000000000
--- a/x11-libs/libvdpau/libvdpau-1.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic meson-multilib virtualx
-
-DESCRIPTION="VDPAU wrapper and trace libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~riscv x86"
-IUSE="doc dri"
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dri? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-		virtual/latex-base
-	)
-"
-
-src_prepare() {
-	sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die
-	default
-}
-
-multilib_src_configure() {
-	append-cppflags -D_GNU_SOURCE
-	local emesonargs=(
-		$(meson_use dri dri2)
-		$(meson_native_use_bool doc documentation)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
diff --git a/x11-libs/libvdpau/libvdpau-1.5.ebuild b/x11-libs/libvdpau/libvdpau-1.5.ebuild
index 6e035344ce97..0ec6c6eb88e1 100644
--- a/x11-libs/libvdpau/libvdpau-1.5.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm64 ~riscv x86"
 IUSE="doc dri"
 
 RDEPEND="
diff --git a/x11-libs/libyui-gtk/Manifest b/x11-libs/libyui-gtk/Manifest
deleted file mode 100644
index 39a4343383ad..000000000000
--- a/x11-libs/libyui-gtk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libyui-gtk-2.44.9.tar.gz 292864 BLAKE2B 74ff741a1fd2ee6c87acdc1b44d5c6f22ef32d9b148c4122ef75f40cbd2fc959c692b323aa31917371a5143bbf2f6f6f65bd89476d45e26c330f3ba27d97a8c8 SHA512 cb1641f79e189bbafa41dc07ad7ec0c09bb6ab7696b576fa8709d0112b6870b12c97b757cd3d6a0b42bb67d6a21655f7749bd72b714af0a3b77ab8a16169f51d
-EBUILD libyui-gtk-2.44.9.ebuild 1097 BLAKE2B ad4b2abd9d78f0244aeaa2b428dce355f6f8013f7661a9f9baf807f3bd6a92762dd2d0cfc2546b344c9c2d58711c264a882d6ae5d5a19ae969841fe8f91ac979 SHA512 dec08fdc2aac2795d51a426f768f6c3c0f128faabbb42624bb2722d8fa4cf22da2d89298de540e0ce300a67baa6e0151bd064925d3746cc8a8d2c6f32d669f12
-MISC metadata.xml 462 BLAKE2B 7445566edf008e427a857892bd18c43f1fc4dfa0e60d7e4db914d8fabcd5323bed01124b355dc3d3d661cff3f034893addba9c2bc7f92c372ad2914ce84ddad0 SHA512 1b8f8f66a3faf251a735a2ba40e6c38edef365125a995b5ab9625e25450a56d7376d52dc438f18a4f901c56945ff0c0ad62b3f27f8c79b12fe509940a694ec63
diff --git a/x11-libs/libyui-gtk/libyui-gtk-2.44.9.ebuild b/x11-libs/libyui-gtk/libyui-gtk-2.44.9.ebuild
deleted file mode 100644
index 5cfe8cedc876..000000000000
--- a/x11-libs/libyui-gtk/libyui-gtk-2.44.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="UI abstraction library - GTK plugin"
-HOMEPAGE="https://github.com/libyui/libyui-gtk"
-SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="static-libs"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	x11-libs/libyui:${SLOT}
-"
-# Only Boost headers are needed
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_prepare() {
-	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
-
-	# TODO: set proper docs deps and USE flag for building them
-	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DRESPECT_FLAGS=ON
-		-DENABLE_STATIC=$(usex static-libs)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libyui-gtk/metadata.xml b/x11-libs/libyui-gtk/metadata.xml
deleted file mode 100644
index 86db53b6001e..000000000000
--- a/x11-libs/libyui-gtk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription lang="en">
-Gtk plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
-</longdescription>
-	<upstream>
-		<remote-id type="github">libyui/libyui-gtk</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/libyui-ncurses/Manifest b/x11-libs/libyui-ncurses/Manifest
deleted file mode 100644
index 479abdce7f97..000000000000
--- a/x11-libs/libyui-ncurses/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libyui-ncurses-2.46.4-tinfo.patch 933 BLAKE2B a737be5956d99e025caac2ab1b8bf83fdf2e028b124a878dc1d5fdd926a48e80dd3bc77a11b321dc471c8414f765b6cd08e548160be0c8c9eafa6d6fba14d99d SHA512 f64eda593d6c8e6fdf3c2210c092ab68aea778ed0bf346d7cb42fa89dd1ee53170dfc6f2230476f79f3966d32fde20e9b42a6ab79d17fc255ed23d51176e3a23
-AUX libyui-ncurses-2.48.3-ncurses.patch 826 BLAKE2B 151d9033a179a761f87824c4c50eb441bd5eaecc5a2210407031e6377aec8a6da79cb6001f67d3255178198cb24f4cb237bb170eb1d1a023c74d17ee7d653c75 SHA512 44c47b12362ecddf1953d50f259b2ef2c63984a2de3036d76b6aa2389155b6c4ba9825db32f8872b368d16b67dd1aff0b9210404b5dfd8116feed25c01035e4c
-DIST libyui-ncurses-2.48.3.tar.gz 189621 BLAKE2B 360b12f40c6e7dace84e5e10edb32d9b75ec33cb0c796ce31697b90b17df3ac13096d7a3d715d4bf4963c487e705ab4031dbe682f99237331dad951d19c32979 SHA512 18f7cec47aba1fd33443d4154b358c7dd769ed79a5544b11d907f6de461c96fcf1f980ee602781bd3cf3242d692d02721fcf975728a0c00955b34844104419d0
-EBUILD libyui-ncurses-2.48.3.ebuild 1196 BLAKE2B 5476cde47baf2c548d03742567bfbcc3bbfb3d805cd23ae7b2facc10038c50ac728f846c77c19a59099cac089f7fc26d159e226e42154feee98d093766b6924d SHA512 598dd567a2363dd71b50566595712e83c30ce08f5283c6e6967bebf5caf5dfc88367590f910f6a1be3235a61377d32bda3575cd6221844c89a89faed69ef6340
-MISC metadata.xml 471 BLAKE2B 48eafeebaac36678c21c69f732de2764482c396ae1127d9741e543e8833347d414d8cf622bf91112a411252440b10523b456af9c2795136ac8364139be030de6 SHA512 81e2d8ef174afecc5bfa766d503d744b3e115012699ab16a681c8d21381a81176a864ab9ad26374d60e7b38c92b81be361dd1da116d20e87e0c0e0eda1ef1a42
diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
deleted file mode 100644
index 9da76f194598..000000000000
--- a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fixes building with sys-libs/ncurses[tinfo]
-
---- a/cmake/Modules/FindCurses6.cmake	2014-09-25 16:32:20.000000000 +0400
-+++ b/cmake/Modules/FindCurses6.cmake	2014-09-25 16:33:16.000000000 +0400
-@@ -11,11 +11,12 @@
-   FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH)
- ENDFOREACH()
- 
--SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY})
- # tinfo is optional (in 12.1 is not there)
--IF(${CURSES6_TINFO_LIBRARY})
--  SET(CURSES6_LIBRARIES "${CURSES6_LIBRARIES} ${CURSES6_TINFO_LIBRARY}")
--ENDIF(${CURSES6_TINFO_LIBRARY})
-+IF(NOT ${CURSES6_TINFO_LIBRARY} STREQUAL "CURSES6_TINFO_LIBRARY-NOTFOUND")
-+  SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY} ${CURSES6_TINFO_LIBRARY})
-+ELSE()
-+  SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY})
-+ENDIF()
- 
- FIND_PATH(CURSES6_INCLUDE_DIR ncurses.h PATH_SUFFIXES ncurses6)
- 
diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch
deleted file mode 100644
index 7c58ce47ab69..000000000000
--- a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6444e043b58bf7703e4fc9035f380f3817207525 Mon Sep 17 00:00:00 2001
-From: Stefan Hundhammer <shundhammer@suse.de>
-Date: Thu, 4 Jan 2018 17:21:56 +0100
-Subject: [PATCH] Removed function that conflicts with newer NCurses lib
- (bsc#1074600)
-
----
- src/ncursesw.h | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/src/ncursesw.h b/src/ncursesw.h
-index d25923a..c8b95bb 100644
---- a/src/ncursesw.h
-+++ b/src/ncursesw.h
-@@ -1607,14 +1607,6 @@ class NCursesWindow
- 	return ::wtouchln( w, s, cnt, ( int )( changed ? 1 : 0 ) );
-     }
- 
--    /**
--     * Return TRUE if line is marked as changed, FALSE otherwise
--    */
--    bool	   is_linetouched( int line ) const
--    {
--	return ( ::is_linetouched( w, line ) ? TRUE : FALSE );
--    }
--
-     /**
-      * Return TRUE if window is marked as changed, FALSE otherwise
-     */
diff --git a/x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild b/x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild
deleted file mode 100644
index 7567d80afdf0..000000000000
--- a/x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="UI abstraction library - ncurses plugin"
-HOMEPAGE="https://github.com/libyui/libyui-ncurses"
-SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="static-libs"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	x11-libs/libyui:${SLOT}
-"
-# Only Boost headers are needed
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.46.4-tinfo.patch"
-	"${FILESDIR}/${P}-ncurses.patch"
-)
-
-src_prepare() {
-	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
-
-	# TODO: set proper docs deps and USE flag for building them
-	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DRESPECT_FLAGS=ON
-		-DENABLE_STATIC=$(usex static-libs)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libyui-ncurses/metadata.xml b/x11-libs/libyui-ncurses/metadata.xml
deleted file mode 100644
index 906cb3b7b0b2..000000000000
--- a/x11-libs/libyui-ncurses/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription lang="en">
-ncurses plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">libyui/libyui-ncurses</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/libyui-qt/Manifest b/x11-libs/libyui-qt/Manifest
deleted file mode 100644
index 2a9dca62ba9c..000000000000
--- a/x11-libs/libyui-qt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libyui-qt-2.46.21-norpc.patch 653 BLAKE2B e93b1a1da1ef585d7f1caf34325eb8107dc952a84707565dce174a35ae37cb90ffb384c6a5852e490b15d002cf7083fcedc32882f4bea0b7f30e4fa30ca53515 SHA512 123b2b932318bbf71621bd37cea5be25a39ea796359cc0800bdbc2270b0240bca2a105562dfff79ea4b8d4d0af23c7933703d15740340119b31211d0ec42010c
-DIST libyui-qt-2.47.1.tar.gz 171152 BLAKE2B 54a8d1609ed717e97c1ec9b3eb6e86eed85446689223753db4b2dcb4c35f361675c42287378636708813b724c4120b14b6bab19c4c8fa17f91bbb612569d1a00 SHA512 9c5e23ff7bb08dd363a490a43c0347e4dbe1af3546bec85a9169da3267f87cbbe15f17f882058b2f3a813fb54efeb1594ec343b2b8d12e371ee77a105a8f4f99
-EBUILD libyui-qt-2.47.1.ebuild 1302 BLAKE2B c85b5c56918a1b4d210e01ebe1988638062fa480bbe368f0be9c3b996151e7224b587ba739c66be232dd99f24a4aea5335e7856f21dab30f3061e7982b7f522d SHA512 08c24070d3db9172b15ef9a15a982ba01b64ca937efb605029105ae0b749e2ce61e008519e77f8865cf24e5a0426e1d627821b4a03bbc9fc353c5e086ffb3361
-MISC metadata.xml 461 BLAKE2B 38c46848fc848386e5e641fec254a53c479fa95c1b5d8fae300f45b30db9327cf8c837ffc16f42370ce74a1f203e13f220f4d1b79a381b8bd1fbb4df9a3d8aaa SHA512 507106e4edc7d9375a2998f7c2de0eee03723a354207202cb1f194d1aa78646eb337dd0056a6cd138fdfd4695238e01fe8631789792e46e9d16307020428e8ed
diff --git a/x11-libs/libyui-qt/files/libyui-qt-2.46.21-norpc.patch b/x11-libs/libyui-qt/files/libyui-qt-2.46.21-norpc.patch
deleted file mode 100644
index 8258fe7b1910..000000000000
--- a/x11-libs/libyui-qt/files/libyui-qt-2.46.21-norpc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a6e599e79bd15f6a97ff6d8f2e3109759ff37aaf Mon Sep 17 00:00:00 2001
-From: Thorsten Kukuk <kukuk@thkukuk.de>
-Date: Mon, 13 Nov 2017 11:15:21 +0100
-Subject: [PATCH] Include sys/param.h instead of rpc/types.h for
- MAXHOSTNAMELEN, we are not using RPC functions and sunrpc is deprecated in
- glibc.
-
----
- src/YQUI.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/YQUI.cc b/src/YQUI.cc
-index 7c82468..f949979 100644
---- a/src/YQUI.cc
-+++ b/src/YQUI.cc
-@@ -22,7 +22,7 @@
- 
- /-*/
- 
--#include <rpc/types.h>		// MAXHOSTNAMELEN
-+#include <sys/param.h>		// MAXHOSTNAMELEN
- #include <dlfcn.h>
- #include <libintl.h>
- #include <algorithm>
diff --git a/x11-libs/libyui-qt/libyui-qt-2.47.1.ebuild b/x11-libs/libyui-qt/libyui-qt-2.47.1.ebuild
deleted file mode 100644
index 3672afb555d2..000000000000
--- a/x11-libs/libyui-qt/libyui-qt-2.47.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="UI abstraction library - Qt plugin"
-HOMEPAGE="https://github.com/libyui/libyui-qt"
-SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="static-libs"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/freetype
-	x11-libs/libX11
-	x11-libs/libyui:${SLOT}
-"
-# Only Boost headers are needed
-# QtSvg headers only required, no linking
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-qt/qtsvg:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.46.21-norpc.patch" )
-
-src_prepare() {
-	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
-
-	# TODO: set proper docs deps and USE flag for building them
-	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DRESPECT_FLAGS=ON
-		-DENABLE_STATIC=$(usex static-libs)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libyui-qt/metadata.xml b/x11-libs/libyui-qt/metadata.xml
deleted file mode 100644
index f3ffe9b8c465..000000000000
--- a/x11-libs/libyui-qt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription lang="en">
-Qt plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">libyui/libyui-qt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest
deleted file mode 100644
index 4cf75bbbb4ff..000000000000
--- a/x11-libs/libyui/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libyui-3.3.3.tar.gz 230452 BLAKE2B 4be43bb4959eac5cd7c5974774130cb948367cae55dc83ad67b26d0c57f79cd1b8a7328b695478c450c3373167d0d74e2455e7804b4f25fd51b8386ceb113df1 SHA512 1db31218703c90e7b8b877b613997e0984275a0923c7837c6e813626c0037d56d524168e0f56e8ca36561c1af5480a0f379e8f87fbc4a380570a6d9ab336977f
-EBUILD libyui-3.3.3.ebuild 1143 BLAKE2B 023dc46e1055c7aba6cbf9e6fde3a889bbcadecf3428404e77302e3401e4d2ed16902e39bb8290503e6f071f796f6488f09f8ebe2d5ffab3dce2d689eccd9f2e SHA512 a7e6ad53406ca5314c71533f766d1f5b791cb99395e6ced6fd9985be53bfbe921a4260af77d6a4d4d693f94d61a0615fa088487e1db661136ea044469197d0b9
-MISC metadata.xml 505 BLAKE2B d61ea9261584ac7655b5458d97af6fdde53813a5509ca0034cce650bd795661db3cf44d59e6949a121b0e486071b7b31f9e48fe5477121f828aebe10577c94ac SHA512 982c10436668c3ecfe26a96111d21094f8899c6366be4b8fcc9081f5d6fb0bfe1efaeb3dee87ef75cf4f5ac2b98ede57a369fc12a19805f86657178c873c572c
diff --git a/x11-libs/libyui/libyui-3.3.3.ebuild b/x11-libs/libyui/libyui-3.3.3.ebuild
deleted file mode 100644
index 75f632ca8ee1..000000000000
--- a/x11-libs/libyui/libyui-3.3.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="UI abstraction library"
-HOMEPAGE="https://github.com/libyui/libyui"
-SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk ncurses qt5 static-libs"
-
-# Only Boost headers are needed
-DEPEND="dev-libs/boost"
-PDEPEND="
-	gtk? ( x11-libs/libyui-gtk:${SLOT} )
-	ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
-	qt5? ( x11-libs/libyui-qt:${SLOT} )
-"
-
-REQUIRED_USE="|| ( gtk ncurses qt5 )"
-
-src_prepare() {
-	cp buildtools/CMakeLists.common CMakeLists.txt || die
-
-	# TODO: set proper docs deps and USE flag for building them
-	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_STATIC=$(usex static-libs)
-		-DENABLE_WERROR=OFF
-		-DRESPECT_FLAGS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libyui/metadata.xml b/x11-libs/libyui/metadata.xml
deleted file mode 100644
index d5d0469a37e4..000000000000
--- a/x11-libs/libyui/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription lang="en">
-YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). This can be used independently of YaST2 for generic (C++) applications.
-</longdescription>
-	<upstream>
-		<remote-id type="github">libyui/libyui</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index d704e96aed5a..bcd46bdf884c 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,5 +1,7 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
 DIST motif-2.3.8-patches-1.tar.xz 1896 BLAKE2B 7234860dadac55362c7f1804133a660da1ab468fb6c0f0c71cad76b956a5f0b1e58874496a6721f49bd6413e916014807e946112b48b9a22272db5e4d97d43d9 SHA512 22e5d8c590d2c1c57fc639cb46d16984dc5fbafb3b68fd647d180d6299a06f884a8ed69e2180da8153bb0f68821eb0031f93e9b9a3128ba93535fd7fb92b402b
+DIST motif-2.3.8-patches-2.tar.xz 4068 BLAKE2B 5466f824d71edd1d787eebe5b1fa09de5b52ffa20cdf733301722c4f1d7509af8084f226d68dcba14c2e8d15d5b1ea7d49e408eea8f710af3c0b27c86aba444c SHA512 27e10c2a5b3dec8597acb04940bb8e000fc43c325e5b6f578246ab4187ef34264940369bff1e9c999ba967e85e093434e16a447f1d4da805d0a5ab1576e5ef80
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
 EBUILD motif-2.3.8-r2.ebuild 3055 BLAKE2B 9e910be57aa656ff5234012c677c669814505537e78e6a56cecd0b97f14c94eb081332d8012972581d12fe8c4a0927276457f3a5e81d9429b2644973ea6df540 SHA512 465c166e1c5a6dd46faf07a915b6abb505ba04355e537cb43bca0447af5939c3a6ebf6a13d0f88adbb811c82a44febae2797e75cb8103c0464fd25caa4abe97c
+EBUILD motif-2.3.8-r3.ebuild 3053 BLAKE2B 5532b2a0fa173069c2198b7de210ed3ccec59b96b3e10f199cf464a6a093ede066929f8e43be773a4ad22a02b0fd09cf38846d87f22358728014e29f4583b2b4 SHA512 bc550f0d4d8204875a58b2921ba166ef018e4dd51fb005d532159bf37cb65b3e8b452e05f0ebb5efd133a5b39827f341f4ba0b641a6cdb0312e7b4a3666f11d7
 MISC metadata.xml 445 BLAKE2B 4cfd68cffe9f6c0fdccff74526669d1585ce47949682b911becb4508f40a13493be2a55b5cff6a90c0c9556b330a96bb478dbef2e1b16e4f4baf7a323d88ada3 SHA512 d8ada4a3a14db837ab11752d55bfec960de6a631fd4bbfa569dc4a09d8b3ff3f6908339888e83ad56c716ae9d940111c36030db870f2765b86db2303ed2fbaba
diff --git a/x11-libs/motif/motif-2.3.8-r3.ebuild b/x11-libs/motif/motif-2.3.8-r3.ebuild
new file mode 100644
index 000000000000..59092ddaa9c3
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.8-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="The Motif user interface component toolkit"
+HOMEPAGE="https://sourceforge.net/projects/motif/
+	https://motif.ics.com/"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-2.tar.xz"
+
+LICENSE="LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	xft? (
+		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-misc/xbitmaps"
+
+BDEPEND="sys-devel/flex
+	dev-util/byacc"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	AT_M4DIR=. eautoreconf
+
+	# get around some LANG problems in make (#15119)
+	LANG=C
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# feel free to fix properly if you care
+	append-flags -fno-strict-aliasing
+
+	# for Solaris Xos_r.h :(
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
+
+	if use !elibc_glibc && use !elibc_musl && use unicode; then
+		# libiconv detection in configure script doesn't always work
+		# http://bugs.motifzone.net/show_bug.cgi?id=1423
+		export LIBS="${LIBS} -liconv"
+	fi
+
+	# "bison -y" causes runtime crashes #355795
+	export YACC=byacc
+
+	# remember the name of the C compiler for the native ABI
+	MY_NATIVE_CC=$(tc-getCC)
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-x \
+		--disable-printing \
+		$(use_enable static-libs static) \
+		$(use_enable motif22-compatibility) \
+		$(use_enable unicode utf8) \
+		$(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+}
+
+multilib_src_compile() {
+	# The wmluiltok build tool is linked with libfl.a, so always
+	# compile it for the native ABI
+	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
+	emake
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use examples; then
+		emake -C demos DESTDIR="${D}" install-data
+		dodir /usr/share/doc/${PF}/demos
+		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
+	fi
+}
+
+multilib_src_install_all() {
+	# mwm default configs
+	insinto /usr/share/X11/app-defaults
+	newins "${FILESDIR}"/Mwm.defaults Mwm
+
+	# cleanup
+	rm -rf "${ED}"/usr/share/Xm || die
+	find "${D}" -type f -name "*.la" -delete || die
+
+	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 0cb01c51bb88..2bd333cfdc45 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -6,6 +6,9 @@ AUX vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 1375 B
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.66.2-command-notify.patch.xz 9672 BLAKE2B 8153a250f571f491845041627029065029bd32ab63c127aacc0852f42abee0834c716d63248120a49011857901d775b75fc0c31a513cfb113563e8ffb599e478 SHA512 d491f8332fbd21e8dfe225636ca035339ab1da3bd7dc74436cdd2f3de3c5f24f609f9825c4eb0b816c9f60862da62b97f36381c5cc5af0203b3698d56fc77d3e
 DIST vte-0.66.2.tar.bz2 503503 BLAKE2B 174a0d9bfdaf2318255e62041ed94aa53f8fc110ed55f3e7b24baa70dd01a4851306ac47cc3f1d6699341c9ab41f85aee57c460b9f96bfd14618f0f40e4bd657 SHA512 6e9e2cc03b72c2d04aa3d7633dcf86649dcef39fdfecbe7a0c4b063eaccdb2ea83207f592edf348fad5a36f091d9261cc46fd0a4e9e5db6006fcecb0d01a6ccc
+DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24 SHA512 89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7
+DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
 EBUILD vte-0.66.2.ebuild 2675 BLAKE2B 8e3e1e9f26f9c3d1d361b41071a906bc4b8b2946ba75d6fec3fff045826440ebd4b8655de5b926afc830a86c56a8c79dc73d9b33567d7b703716129dae7d19a9 SHA512 061cbe889760615a2aceb5ec2a9618b444cb92bc490aaf1293afce4f9cacde9690bd900f0538e05616a87bf53e6f097dda365831bd51def75e63e5ccb6318960
+EBUILD vte-0.68.0.ebuild 2665 BLAKE2B 780a895db6979253444942ec662e331c661ee164d81688dee0be34af2426c10131bee3dbf7510b0126f1394743d5b51950d267660760efaa04867f61fedad84b SHA512 90182c115d8b929d7f65a810cc0e21925522f188a31ef7a99db30277ae3491b56db8d12dc558db608ae0e8b62d868aa75f23a300631dc4fcec2e01b88c44e9cd
 MISC metadata.xml 519 BLAKE2B e34530c7e9882f9d61b6c1fe9cc1d523037bcc05034e3f98351ff33bb543a0a25d96c0debdd1572cfeb0d2166b41a324c7fdfed38482c11cbe053db96b312ef8 SHA512 313a0af6b28d47bf385594a9306f38476bbfcc44517d7219ba1d0a8ddee224a37cd4ee8f7c4f8aed8bd7eae0ad2b3461bc4ae49c5eb8b08bc61459c76bf7a5ef
diff --git a/x11-libs/vte/vte-0.68.0.ebuild b/x11-libs/vte/vte-0.68.0.ebuild
new file mode 100644
index 000000000000..161fb49fb97e
--- /dev/null
+++ b/x11-libs/vte/vte-0.68.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.48"
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte"
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91"
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.68.0-command-notify.patch.xz )"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.24.22:3[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.52:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
+)
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.68.0-command-notify.patch
+	fi
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=true
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=true
+		$(meson_use crypt gnutls)
+		-Dgtk3=true
+		-Dgtk4=false
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}