gentoo resync : 04.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-04 22:28:33 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-04 22:28:33 +0100
commit: a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree: 8c764c1cc0576389ce22abd317bceba71ea5732d /x11-libs
parent: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)
51 files changed, 1053 insertions, 76 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 169c3a23387d..bb006130789a 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 3cd17e711b12..575935e30fba 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -3,5 +3,5 @@ DIST c++-gtk-utils-2.2.19.tar.gz 3060284 BLAKE2B 5edd6a5042cb79cc95e8080cd76d284
 DIST c++-gtk-utils-2.2.20.tar.gz 3085409 BLAKE2B 2b0ca2a3beb3ee82416cb1d731704f43398db06bd9bc03dea2875a2d6a1f80dc14b9fe418bea1467caf29d5ba9d8e4feefe7451bb69734561a580ed012755a41 SHA512 1e834c163f1c236e1a2fbdf92e93e98e88ebd6da04b87be52087fa7f7f395a9bd90e111958f3b9473938e7563182ed5c37fd2d2c4ef683933cb16f3b4665d1b3
 EBUILD c++-gtk-utils-2.0.34.ebuild 746 BLAKE2B dd431696a569a2ac39d9d8d4bf2a750bcffc2fdf7ea4f40e82d88c557a3f873eae4545fdb07c99a2155e07df9741639c8a1d07a8528c6da0740b096062bd723b SHA512 08807c989f800413730a0591b1803c6295a960619eb5af48f4deae7b1da70d9d6aa2358e8329e7e1ae2f080ca7fcbd3831d1f4dc91e1cdb93515482df9f30d8a
 EBUILD c++-gtk-utils-2.2.19.ebuild 746 BLAKE2B 7e03e1d22caa067619be45fe7551551f34969f64011b25170f432c00f621e6e63a2a82b703b73ac715b43db3c78468574f8f515118cc2c030a610d073cc4112f SHA512 680c25fc481028baf29f172274824cc5960c13fa0e5be9ebc5ea95cf6e3e9dac8bcdfdad329e9fdfd1494b5fdb26f2cbf709d1e4088c6b8f73cb7b0348ec88d8
-EBUILD c++-gtk-utils-2.2.20.ebuild 748 BLAKE2B 5614bd2c8872e1964c91ad5f1a5ae7686f2d4aec937bd8b9fdf5df7328ab795a313ec4bb4c08e7ab1d2a6cb3bc26f1ebf5be52452068c60fd69891436eef711f SHA512 7292990a733375947a06dc28f00b8a887e4e74204edd5bfb2a530179982b1f02767f52204ed82716a7db6645c8fbdd050cd1ef4c2692d21ea0f9a59650b58480
+EBUILD c++-gtk-utils-2.2.20.ebuild 747 BLAKE2B a6ac9b2853cc569b88d1d15e64e2156a62bd5058dcd7660cad726b677f5afe9dc6fe3bbf5df6f266fca9ac0edd636fcff5416bfc68f046aa5cd3537a4d6b66e0 SHA512 40546bf3f78c255e03f7a9fbcd1929920885bb777a7c5fa89de51b7951d90d7ea68e9d466a8792f89250a7d59340fac00cb19460c3817b2dae983bfc6206a9e1
 MISC metadata.xml 326 BLAKE2B b51a3121700fbdd344226185544ad1ec113331afc17b622bfb31772619e9127f3acbb707741856f431762a71cea0e92bc7e51f286cd7b7cc4bf492cd6b875704 SHA512 ae8aad42f470349ad2a6a75190bce56720c71c5b06ce00ba6b479b6024a34c1674ed2382de222be783ef4ea9595f6991d82a7b6991e4ba41cd4ee374625867db
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
index 40a1c6ed5a62..c2d1776c2d61 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="+gtk nls"
 
 RDEPEND="
diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest
index 1ad630ee1b24..e271f34bce35 100644
--- a/x11-libs/gnome-pty-helper/Manifest
+++ b/x11-libs/gnome-pty-helper/Manifest
@@ -1,3 +1,3 @@
 DIST vte-0.40.2.tar.xz 923852 BLAKE2B 666f1e8bd5ce1392c8c533c180e7e6700a6b0023e9b0ab467f2d99a38661fb600c53d83bda10bc97302dc54801f8e1d8780eb27a2c5cd184d786a55d513dfc24 SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2
-EBUILD gnome-pty-helper-0.40.2.ebuild 802 BLAKE2B faf68b7d972cbf93f40e8ff82cba14dfda39237e394d39d0b6400a35a7a886d4d21313877e67a0f2c60e28b7e653d56c7aa1b6159443b69e2713dfa42ea50269 SHA512 2170b85faaa980df8274f4c8cbd35cf322d00597eabf8cfd7184921789cbc378109c227963e1a881f5ae9aabcfad95bdd9f902c0387af5f17688b3058365d6fc
+EBUILD gnome-pty-helper-0.40.2.ebuild 804 BLAKE2B c50025792698d73b6163a2b25704aa785c22bff19f7e3ef858f6fb31a7536c0656401051d3cebd446566edfa82d82bba943d105eef698c2a8a6b84bf5966b49c SHA512 c7d98def9c201a6202b28140ba2b973c640728d276a4b4589a08441954afc9d022bf4e91d55704426ab72177e898b5d600e42b6f1b5c7d4e52e07db88bc2bf42
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
index 8b4a5d716724..af04e5c38492 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -23,7 +23,7 @@ DEPEND=""
 S="${WORKDIR}/vte-${PV}/gnome-pty-helper"
 
 src_prepare() {
-	# As recommended by upstream (/usr/libexec/$PN is a setgid binary)
+	# As recommended by upstream (/usr/libexec/${PN} is a setgid binary)
 	if use hardened; then
 		export SUID_CFLAGS="-fPIE ${SUID_CFLAGS}"
 		export SUID_LDFLAGS="-pie ${SUID_LDFLAGS}"
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index e588aec97e1c..7f4a7f56a930 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,14 +1,19 @@
 AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b42dad26d44bda2f1a9b36ee7dae0f8e7c072f5a8e492d01429bb4ae679f886b3ef0fb9952bef5a08e75720908f2e8d616d SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2
 AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e355117aabd9c3e9dfd1a810eaa8dc7e60dbe3fb65a73719c272dc1ba2058dae95b3988d86f09fa8587963df34a7486b50e68e79732 SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48
+AUX gtk+-2.24.33-respect-NM.patch 273 BLAKE2B e7636db1e4a8a0de67ebeaf98a04d5dbc99d06da9dc0edee3f60a747cdd4ec1ec42ec2d3552d6c29566dbe9a744ad816bfac0d0e798ac60e8a0664b8a94e37e5 SHA512 b9e5f876f35f8f7f1fa07b82d2bd8ebbb4a4e6973e61ac9d9c678b76a8c653ca5b90504407b927e0023f504208a198d790f52cda9601eadff669d62e7db1dd1d
 AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
 AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2752d42dde343228c92144fa6194d19474735dc597818933433b1a33029f03d1cc42576621d381d8993d9d1da48e924a3eb154e SHA512 25ba99662299cbd9fb2427b3361dff9ae72c65d49aa14e90c367410908b8dd365f62c971f17cb24b2742d152d22b9d80789d707ba3841b21781c69207ea70f10
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
+DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
 DIST gtk+-3.24.26.tar.xz 21404732 BLAKE2B 8260b684b4d508af6b9a5060e47847254ae6bf647ae1dfa131bdbb35f2eaeb3f45ba749e9ad6e1920c05dab660d78424e38d974070928c56e91fc422a62d87db SHA512 d3023e9cd0c1f0de384266c4bd4549a7006ff475de82617de16378617a4a669645ad355cbabfe2ff43b19dddfbba7b9413ec98c14ed0f5ee3a61466b3d6eff76
 DIST gtk+-3.24.28.tar.xz 22783312 BLAKE2B b0a8dd5619feacf44880bb1ef168fce5431802c401fbb31408a4a4a9822755ca76cc309eb0f271e98cce63ad7f5cbec4d0d6c947a631843bfbe509a81836778b SHA512 65856ae06e4a863c56b3718c0cc3d0ca9f61a62a02ddef30904432300cd455851efee3fa1e5661659eaacbdfca45650ee7c8a2d4eca004ad2936c1e26c720c15
+DIST gtk+-3.24.29.tar.xz 21396876 BLAKE2B 1675e54b185d813965a6279fa80a62784fc6216408710fad0b07a3300eb08301c80779e6e3a6b1109ce29bacca4e7ff4710b670a68ec0c6ffa68e44cfb07ccc5 SHA512 00f71024686c2d11d5c0cdd683365c35fe4d28b5eaad4937e79690777500788818faa5bd0c483e54ba8ce734aa6411388a39e398dc638cfcf0ec0e542aae6c2b
 EBUILD gtk+-2.24.32-r1.ebuild 9837 BLAKE2B 73bfdd872a661f1e1385541d72ca41d459f8308bcc8b1ee0872091d38cd849a0bb7f301508f027eb7e4b3f50cb4bdeb134dd5698d45e5729361ec5b1518dcf40 SHA512 88477844a33d88bf0310bc065bc784a560fba01391a6eb17df991da347deab396e8a6909bf0e8de5332d25c741670d8e8cfcf3d835ad14221a454419af913ca8
+EBUILD gtk+-2.24.33.ebuild 9805 BLAKE2B e3f94a76f67e3ca448f786be637e7152d31c6723ff35ee3f440d5fc5875a202908519f14ed7289dce6b0f93f5e6926da3c4cc3bf4b1098346369d5807536224d SHA512 ddd4b7c5292fb401bd6f7d97c2b7d5da7022377d74adc94dcedbf62883fb0ef2439df3d99d043277361ffca646c1449d77c8aaa0041026acafa91f814f509178
 EBUILD gtk+-3.24.26.ebuild 7341 BLAKE2B 367ae9178237627f14d27617000c872814a7502d4fb81006d49314858ac089496220a53a9c0203b943c2d2361fb53849a3eb9811523a83c188be7a9158394de2 SHA512 430cdf514cf1b2ae6f215032a55e2b1b38237ba960eecdfe196ce5de542d0788568a68fb3f2f77daf35930d055fa5946e60048e3894bcf18bd0ed92cbfb0882d
 EBUILD gtk+-3.24.28.ebuild 7347 BLAKE2B 123f7b653d1410eecfbd2ea925faf17849efb427dd74b97e415064f1a949e3b4479ea2d91ce44229dae03992aa0233dbf97950a9b249af44217926eab03ae134 SHA512 6a77270475e499cb762a969a8ea4d25fba6acdcab4d9f3a57e9f8e7a766af0776e760863f07632294ed46d274356bb19a665e14959a5deadd37e86c2b3e4343a
+EBUILD gtk+-3.24.29.ebuild 7347 BLAKE2B 123f7b653d1410eecfbd2ea925faf17849efb427dd74b97e415064f1a949e3b4479ea2d91ce44229dae03992aa0233dbf97950a9b249af44217926eab03ae134 SHA512 6a77270475e499cb762a969a8ea4d25fba6acdcab4d9f3a57e9f8e7a766af0776e760863f07632294ed46d274356bb19a665e14959a5deadd37e86c2b3e4343a
 MISC metadata.xml 947 BLAKE2B 9024c57cf454b89700ce48a267162ce4672c1cd486f3b6218bfb2334154a1abdbe7c446cbe5c96e5d3abeed887891579c56ad26675e3ee833c5c3691fc4fc7ed SHA512 60065a6e79ea076dbe4b06e6ddcf222c9498ba755e7d5a214ac5401c4a9c7b61d170989c64771de69898524b0cc040aa036592a3cbeeb452e1dc5406b93e09fb
diff --git a/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch
new file mode 100644
index 000000000000..0c74d962ecf4
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/725852
+--- a/configure.ac
++++ b/configure.ac
+@@ -190,7 +190,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ AC_SYS_LARGEFILE
+ 
+ AM_PROG_AS
+-AC_PATH_TOOL(NM, nm, nm)
++AC_CHECK_TOOL(NM, nm, nm)
+ 
+ dnl Initialize maintainer mode
+ AM_MAINTAINER_MODE([enable])
diff --git a/x11-libs/gtk+/gtk+-2.24.33.ebuild b/x11-libs/gtk+/gtk+-2.24.33.ebuild
new file mode 100644
index 000000000000..8a86eaa76115
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.33.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="aqua cups examples +introspection test vim-syntax xinerama"
+REQUIRED_USE="
+	xinerama? ( !aqua )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	!aqua? (
+		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	!aqua? ( x11-base/xorg-proto )
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-themes/hicolor-icon-theme
+	)
+"
+
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Add blocker against old gtk-builder-convert to be sure we maintain both
+# in sync.
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-2
+	>=x11-themes/adwaita-icon-theme-3.14
+	x11-themes/gnome-themes-standard
+	!<dev-util/gtk-builder-convert-${PV}
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	x11-themes/gtk-engines-adwaita
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+# docbook-4.1.2 and xsl required for man pages
+# docbook-4.3 required for gtk-doc
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	examples? ( x11-libs/gdk-pixbuf )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
+edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
+[Filechooser Settings]
+StartupMode=cwd"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-2.0$(get_exeext)
+)
+
+PATCHES=(
+	# Fix tests running when building out of sources, bug #510596, upstream bug #730319
+	"${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
+	# Rely on split gtk-update-icon-cache package, bug #528810
+	"${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch # requires eautoreconf
+	# Respect ${NM}, bug #725852
+	"${FILESDIR}"/${PN}-2.24.33-respect-NM.patch # requires eautoreconf
+)
+
+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."
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+}
+
+src_prepare() {
+	# Various glib marshaller churn could break build against a different glib version, force regeneration
+	rm -v gdk/gdkmarshalers.{c,h} gtk/gtkmarshal.{c,h} gtk/gtkmarshalers.{c,h} \
+		perf/marshalers.{c,h} gtk/gtkaliasdef.c gtk/gtkalias.h || die
+
+	# Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
+	strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
+	strip_builddir SUBDIRS faq docs/Makefile.{am,in}
+
+	# -O3 and company cause random crashes in applications, bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
+	else
+		# Non-working test in gentoo's env
+		sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+			-i gtk/tests/testing.c || die "sed 1 failed"
+
+		# Cannot work because glib is too clever to find real user's home
+		# gentoo bug #285687, upstream bug #639832
+		# XXX: /!\ Pay extra attention to second sed when bumping /!\
+		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+			|| die "failed to disable recentmanager test (1)"
+		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+			|| die "failed to disable recentmanager test (2)"
+		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+			|| die "failed to disable recentmanager test (3)"
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
+		sed -i -e 's:pltcheck.sh:$(NULL):g' \
+			gtk/Makefile.am || die
+
+		# UI tests require immodules already installed; bug #413185
+		if ! has_version 'x11-libs/gtk+:2'; then
+			ewarn "Disabling UI tests because this is the first install of"
+			ewarn "gtk+:2 on this machine. Please re-run the tests after ${P}"
+			ewarn "has been installed."
+			sed '/g_test_add_func.*ui-tests/ d' \
+				-i gtk/tests/testing.c || die "sed 2 failed"
+		fi
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
+		$(usex aqua "" --with-xinput) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# 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() {
+	virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	# see bug #133241
+	# Also set more default variables in sync with gtk3 and other distributions
+	insinto /usr/share/gtk-2.0
+	newins - gtkrc <<- 'EOF'
+	gtk-fallback-icon-theme = "gnome"
+	gtk-theme-name = "Adwaita"
+	gtk-icon-theme-name = "Adwaita"
+	gtk-cursor-theme-name = "Adwaita"
+	EOF
+
+	einstalldocs
+	rm "${ED}"/usr/share/doc/${P}/ChangeLog # empty file
+
+	# dev-util/gtk-builder-convert split off into a separate package, #402905
+	rm "${ED}"/usr/bin/gtk-builder-convert || die
+	rm "${ED}"/usr/share/man/man1/gtk-builder-convert.* || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="/usr/$(get_libdir)/gtk-2.0/2.10.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_gtk2 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	set_gtk2_confdir
+
+	if [ -e "${EROOT}/etc/gtk-2.0/gtk.immodules" ]; then
+		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
+		elog "aware location. Removing deprecated file."
+		rm -f "${EROOT}/etc/gtk-2.0/gtk.immodules"
+	fi
+
+	if [ -e "${EROOT}${GTK2_CONFDIR}/gtk.immodules" ]; then
+		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
+		elog "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+		elog "Removing deprecated file."
+		rm -f "${EROOT}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+
+	# pixbufs are now handled by x11-libs/gdk-pixbuf
+	if [ -e "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+		elog "Removing deprecated file."
+		rm -f "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	fi
+
+	# two checks needed since we dropped multilib conditional
+	if [ -e "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+		elog "Removing deprecated file."
+		rm -f "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders"
+	fi
+
+	if [ -e "${EROOT}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	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 gtkrc."
+	fi
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.24.29.ebuild b/x11-libs/gtk+/gtk+-3.24.29.ebuild
new file mode 100644
index 000000000000..54b60dc29ad0
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.29.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2021 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 cloudprint 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 ~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-0.9:=
+	>=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.41.0[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}]
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+	)
+	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.3[${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 cloudprint)
+		$(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/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 4ad288f08544..078549a1cd1b 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,10 +1,14 @@
 AUX 2.0/gentoo.lang 3910 BLAKE2B 12fac758dc1c8029a87e2cb24e477e7ca037b34d89a6c68281b95f34c993f39c8c47b56c17209d84e9a72a818e930f8c1b89dbe7986530a879293b496504b418 SHA512 245fe194ced813fc1cda732d446664af85a7cd9f4443ba6bec14aacd5b6243428e23100fb6f9099004d20b7e52de9bee14f4017f754c6d915c3db580e0a6f8d2
 AUX 4.6-gentoo.lang 3898 BLAKE2B a47c411fa650a53cb9176c3b670b5189ea9ee0c268d09444e08756f49d1d73c14c9505a19d9354671254cbfe0bfdc69545c3d5b761998037ab2ec57ce58bb2d7 SHA512 fffb635074ed0de4cedb3836f37322c7b9b58b65e91a014b72bd6a41bcaf195f0b25d4031d65d60fa5abd1c7f4f5aaf19d61a77eb91ab6f59df814dacf0a0595
+AUX 4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch 971 BLAKE2B 0ff23c398baf4b0bc324b2fbc9227798efdb87262a6165cc92d5756bfb1987250a7cda195c905954cec3d557ec16a83e47044a8af1c50c51f6a578794b18e38c SHA512 036fe1cb0d3f460635dc738f2d06c15d233409285e3df513946ce995b5a651b06602e4923a9f9756a2504bd7f3404fdcf6117ed75fb217c06d5dc0b9a635870b
+AUX 4.8.1-build-ensure-access-to-resources-in-corelib-build.patch 1631 BLAKE2B 2535dea32425643cc47aa26571e9c2cb2c02553357f7efafaa03b7fdcdc28a88f5739d5310362f4321a50676eceab06b12d4d4f49bc25271710fceb7409458f7 SHA512 496acbeb7e92eaf5e56ec67f40e1a8d2c0759c22cefacaecf039b93cf3099a0441931f2e3e01ce219ca6ab3040dae797abd172b644e44e61e3287547478cb06c
 AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
 DIST gtksourceview-4.6.1.tar.xz 1162024 BLAKE2B 41f84dade9e48cc958fecbf887f4c733cb1631557be34e52ca5af39802455f115e9920d368406314299aad35b1d18995c4e403f0ec3a9b3a27254fd1952f37e3 SHA512 3341e6248a0abba6373a79742b4348d8aff58ca6a4b9093729d0d1fe2579ab8acbc61f1ecc6d350000edae60c963eeca866fa659b3f3d6ec320cdbf1ed21fdec
+DIST gtksourceview-4.8.1.tar.xz 1160032 BLAKE2B 3ed93f056ca8c6ae1982e28a675ccec448c301999f058abc5b9ec46f609c2649ac807fc20379480a8eb00408496912e1554e08d55ce5da70a97cee34be10fc20 SHA512 fe3bc05e81f881b97a53e6dfb807ded314f1953ebe74424b515d6c1333e72011e3b756b958cca40becad0f66434cf16c56d42fff950b8d643e65c9a03e9cb88b
 EBUILD gtksourceview-2.10.5-r3.ebuild 1317 BLAKE2B 80f626e2a5ded1e372760139354bc61a36c64620a2476c385f24e44d8711536ab162ed299b016fa1e4734afea2a48aa1346507b0c265440857bba8b0740bf406 SHA512 796445765875a51c6467d3a80a20007d892f40c0d71a5c8b768dcc2738f091b46f24e37d9fb45715152a72bfb709b6fa272c9f973ce22eafecbf5fa01a20e15e
 EBUILD gtksourceview-3.24.11.ebuild 1272 BLAKE2B d606bbfed3a72adf6478175516be05045a5ccdeace5b4f6e36c1f9cce337e01f27ab680f1da56462c187b5085a543cfe272088f3dc9ca385ee1c3b28af2ea2e1 SHA512 f54f0e0a88a3e5310c75f985eee92ff3cfe0db3b930c7eb520879b519d214394604c84155c3ee9fef23a12477b81d4de1848ee1c29aa6c352af986b0247b3489
 EBUILD gtksourceview-4.6.1-r1.ebuild 1741 BLAKE2B f5867f5eb784c3bf19117a5e6556146ecbd30b5d011bb84006a0a30252111654b15b6393ff07b0bd387c770207b196d9c19ed101f6e8559638f4df3a9b90bc02 SHA512 a44dcb68b000b6346f2063181f92591f00f7b065c6d5868e3c9fc8c11abe194935e9ae2a1d575b49213f3374be7d0c1cfacb8942621097eaa796e3e4b5ecc403
+EBUILD gtksourceview-4.8.1.ebuild 1920 BLAKE2B f1f8a6626e166c2241ce17f6a0714833424dc411c7deb5e86638bda418d1ddc3550cc8cbaa6bc650093f5a570d55fd9b6a182b6217e19c8b44f4710cafdef024 SHA512 84afec914c330b263cb985975462743c0d4c91583ff645a8d4695de83c3e29c9411297919c8a80dc4d665970ca5518c01019e05aadf8f48473a28b8640d5213f
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch b/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..e13a65c3bc4d
--- /dev/null
+++ b/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
@@ -0,0 +1,33 @@
+From d1ed58b2ab82bd5be55881088fc17ff1527511db Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Thu, 15 Apr 2021 08:11:22 -0700
+Subject: [PATCH] build: disable -Werror for incompatible-pointer-types
+
+This causes an issue with volatile and GLib in some configurations, so
+just keep it out for now. We will bring it back at some point going
+forward.
+
+We are already doing the same in 5.0.
+
+Fixes #179
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 826a3121..6ff5b155 100644
+--- a/meson.build
++++ b/meson.build
+@@ -181,7 +181,8 @@ else
+     '-Werror=empty-body',
+     '-Werror=implicit',
+     '-Werror=implicit-function-declaration',
+-    '-Werror=incompatible-pointer-types',
++    # Disabled due to volatile changes in GLib
++    # '-Werror=incompatible-pointer-types',
+     '-Werror=init-self',
+     '-Werror=int-conversion',
+     '-Werror=int-to-pointer-cast',
+-- 
+2.26.3
+
diff --git a/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
new file mode 100644
index 000000000000..3fde96b14850
--- /dev/null
+++ b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
@@ -0,0 +1,57 @@
+From 9bea9d1c4a56310701717bb106c52a5324ee392a Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Sun, 7 Mar 2021 08:54:15 -0800
+Subject: [PATCH] build: ensure access to resources in corelib build
+
+This should help with some transient build failures in dependent projects.
+---
+ gtksourceview/meson.build | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
+index fd080a9c..b6192604 100644
+--- a/gtksourceview/meson.build
++++ b/gtksourceview/meson.build
+@@ -172,12 +172,18 @@ gtksourceversion_h = configure_file(
+     install_dir: join_paths(pkgincludedir, 'gtksourceview'),
+ )
+ 
++gtksource_res = gnome.compile_resources(
++  'gtksourceview-gresources',
++  'gtksourceview.gresource.xml'
++)
++
+ core_sources = [
+   core_public_c,
+   core_private_c,
+   core_enums,
+   gtksourceversion_h,
+   core_marshallers,
++  gtksource_res,
+ ]
+ 
+ install_headers(
+@@ -216,11 +222,6 @@ extra_public_sources = []
+ 
+ subdir('completion-providers')
+ 
+-gtksource_res = gnome.compile_resources(
+-  'gtksourceview-gresources',
+-  'gtksourceview.gresource.xml'
+-)
+-
+ 
+ # We can't use the static libs on Visual Studio builds
+ # to form our DLL here directly, so we must use
+@@ -233,7 +234,7 @@ foreach int_lib : gtksource_libs
+   gtksource_objs += int_lib.extract_all_objects()
+ endforeach
+ 
+-gtksource_lib = shared_library(package_string, gtksource_res,
++gtksource_lib = shared_library(package_string,
+                 version: lib_version,
+         darwin_versions: lib_osx_version,
+     include_directories: gtksourceview_include_dirs,
+-- 
+2.26.3
+
diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
new file mode 100644
index 000000000000..8a04ceac09f8
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson vala virtualx xdg
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+
+IUSE="glade gtk-doc +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=x11-libs/gtk+-3.24:3[introspection?]
+	>=dev-libs/libxml2-2.6:2
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+	>=dev-libs/fribidi-0.19.7
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-build-disable-Werror-for-incompatible-pointer-types.patch
+	"${FILESDIR}"/${PV}-build-ensure-access-to-resources-in-corelib-build.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use glade glade_catalog)
+		-Dinstall_tests=false
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/${PN}-4/language-specs
+	newins "${FILESDIR}"/4.6-gentoo.lang gentoo.lang
+
+	# Avoid conflict with gtksourceview:3.0 glade-catalog
+	# TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
+	if use glade; then
+		mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
+	fi
+}
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index b30ad0471a1b..9c52d7a360e3 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,3 +1,3 @@
 DIST libFS-1.0.8.tar.bz2 347880 BLAKE2B 74f9079f4ac98ad8cc83e73a162f4e308c49b643dc11ab6d68d36afe5f70b9326023fafb7a17ab14a083bbda20f99d6e140bf85facc4a3177d356b7c5dd6e126 SHA512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f
-EBUILD libFS-1.0.8.ebuild 370 BLAKE2B 5ebafcced36a43e27290a8cec1cd4df38477ca9028a266d9359b9a5d39e0c60c6d3e4fabff0f1f6b30c2323a867cc8eb35250f78559ff2858cfe13ee1e2e6be6 SHA512 b19da9250fd58cd473472bd55e29ab9d4a4d83bedd20ae8ae873c1555c5f93ba873eae2e1775c0cf31a576e78715b0028dd8a6d77eb8a4a94c7ffb268fedb8cd
+EBUILD libFS-1.0.8.ebuild 393 BLAKE2B c626c506df5346d77d67f4f86644e9b3e98cfac0bae7721e1156f38ce9e84fca65a707760ef6f69d2c8192baa9bb5acd70119879f139acf26b15d40fa2d73018 SHA512 809f22b13acc18d2a296b2462b9530e64979dcb19639740df7343abf5963b472a344927b860a2ccdcd74d86c259b388737ca25f20ec882e9d21b60c02d0dcb08
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libFS/libFS-1.0.8.ebuild b/x11-libs/libFS/libFS-1.0.8.ebuild
index d09e896974b0..fcc892130f92 100644
--- a/x11-libs/libFS/libFS-1.0.8.ebuild
+++ b/x11-libs/libFS/libFS-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,12 +10,13 @@ DESCRIPTION="X.Org FS library"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ipv6"
 
-DEPEND="x11-base/xorg-proto
+DEPEND="
+	x11-base/xorg-proto
 	x11-libs/xtrans"
-RDEPEND=""
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index 821693088fa4..92ec12318e87 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,3 +1,3 @@
 DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
-EBUILD libICE-1.0.10.ebuild 641 BLAKE2B 50d02a382e1416e9ec49430b09842d2fcc3e4685c2a5d36ad159b52026358c8691641804d08de2d35e3b40906293b3a74f64058fec318076f11ec7dc2a7ce7bd SHA512 625b37be8b6c6a166fec10d6656f88e52dad08e3cf0210e5efebf9a5013c8461b75d69c48ee4e0fb36e027f939c74b5a007e92baef265e9d316b51f10020484d
+EBUILD libICE-1.0.10.ebuild 673 BLAKE2B 3548246cac66ef394801a6c9fc00b2104c1feb25c05af2454b4f354ded52926eb6c50ccd9c69bda8f75227bacfe7f267b34ec920f9803ae37011fa58e2d5886d SHA512 437e29b053c79d02871adf88fcef948fb3e787b9ec0ad71d20a540d6e9246286947a7e840679576f6ae770d951a7fa88a83d8a69953d743ee7aaa3efed0a6d23
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
index 6b3d3f96ab55..562ebccf2e77 100644
--- a/x11-libs/libICE/libICE-1.0.10.ebuild
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -16,11 +16,12 @@ DEPEND="x11-base/xorg-proto
 RDEPEND="${DEPEND}
 	elibc_glibc? ( dev-libs/libbsd )"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		--disable-docs
 		--disable-specs
 		--without-fop
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index ebe6400e7cb2..f3c020076671 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
-EBUILD libX11-1.7.0.ebuild 840 BLAKE2B 43d552e470b842d74c5e0ffa1d18b96816fa1ddff57328d3fd8f116ff8e49aed7b63abe0f882c47716a34d6cdca8f4a26788a0cd416df09733f2490630d498aa SHA512 57831c89dac9f6bcda040d96a40fc97cb7780f3d49e92581c6d8e977cf89b3432211ae4cb4512f6ce255eb7661c57ed4f1bc3a2c7d12763c6f87c1954618e81a
+EBUILD libX11-1.7.0.ebuild 879 BLAKE2B 86220953f41861753950b58fea111d9f7023514f9d8af00520d67753ab84ca7c9ea4d04be650c7fabf40a560c9ed60a0d4e9b6b29bd983c388622ddabfc2b657 SHA512 f276e0a0894432c99d6c16b4cd86501c83d141d1cf1301105a53bce3910cf0611576c9b748b4d3a95957ec9409d738dff2bab944b5637d1ab0cde89b8cb9d3ed
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.7.0.ebuild b/x11-libs/libX11/libX11-1.7.0.ebuild
index caba9f751d6a..903e051b027c 100644
--- a/x11-libs/libX11/libX11-1.7.0.ebuild
+++ b/x11-libs/libX11/libX11-1.7.0.ebuild
@@ -22,17 +22,18 @@ DEPEND="${RDEPEND}
 	x11-libs/xtrans"
 BDEPEND="test? ( dev-lang/perl )"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+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"
+	rm -rf "${ED}"/usr/share/X11/locale || die
 }
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index abadba9b6ca0..70582ab95a7d 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,3 +1,3 @@
 DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5
-EBUILD libXcomposite-0.4.5.ebuild 595 BLAKE2B 76110f01744da8187bfc3aa6e1d95fe407a3ca3c878ee1a3ad745e81326afde521eb4809a7c8379bdcb2b101c4e3d747dd3d3cc37ee7dabeace70913a504294a SHA512 d9fe3931c9f114dc23ebd0da98a7cb7d8dad41b1a80b424d2707fc468a4624e3ecfedc3f1a779a2b07726c74500326dd9efe97256a63e4de5c715fa0a07dbca2
+EBUILD libXcomposite-0.4.5.ebuild 619 BLAKE2B 5bed78382a36c9325d24c26a0aeb48f052b2b9e6c64202ff1f7d8aa3bc865f67060dc785e3729b2bf753f5ce62c04ce3c1f92f957885b980bb2127ff7ab085d3 SHA512 48204e88dfdf95eb3644a2e4ba900872a64a5d4904901d54e79bc57245a83cb6376cd2d4acef5766d2f1a052b63815a1c6ef625b7d2a8f81c071b1283dc9df7d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index 7e6f997b3ec2..864a509b8df4 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -10,7 +10,6 @@ inherit xorg-3
 DESCRIPTION="X.Org Xcomposite library"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -18,8 +17,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc xmlto)
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index f846e70c505d..902e3351a1bb 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,3 @@
 DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
-EBUILD libXcursor-1.2.0.ebuild 863 BLAKE2B 5bd194b269afef89626efb4f40744a55cb35913eb6c370c7c4519f312b0b0cb3a25a6a0cfcf1e0f82208ca01fae1026e5982e6ecac108070ac570e5e713cc809 SHA512 53ab28fbd17175c1cdd3212bcf1601d55ce0558fcb3aaf20fad32918849d4b7f42b60f13d98ed477025d95904c319dd28c394812d85c953fac196ed5edae3ac0
+EBUILD libXcursor-1.2.0.ebuild 875 BLAKE2B ee67c4eadfd3b54cdfff1a551ae87e28756aceba61f9973a4d0a057dcc2c9177df3d5e70bdd849f0db88f2deba499bfc0a2ff1c521fc4fe2fe71f7042de4cd4d SHA512 5e68d1933c01837257762d2b2317aa26b16cb7416c03c89ae14eab70473812a02007b4dac49ea7d1de549bb1311282277bde1f3d56f68a9c9d61f1038614d847
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index 81bf3e51b438..22a4854b1792 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -17,6 +17,6 @@ RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 DEPEND="${RDEPEND}"
 
 XORG_CONFIGURE_OPTIONS=(
-	--with-icondir=/usr/share/cursors/xorg-x11
+	--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/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 1f3e78c4d503..a33ae8339e58 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,3 +1,3 @@
 DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
-EBUILD libXdmcp-1.1.3.ebuild 640 BLAKE2B fc1e40770eec2168d56c101667dde3d26dd2e68da11a6d9bf01cb5953acedc4e66ad4fd1174f58c7d34c8806accc3555083b1e5a6f7b1a37baf6730a8a6ee987 SHA512 27a2fb790aa3522d04ce3a394849224562bd99e50be68cdfef0b3590fbe9df9859453b8fb77aa9aca61f6b77c3e1d1e9ebc7d7e4711bf2a388bdb9899c61ed71
+EBUILD libXdmcp-1.1.3.ebuild 664 BLAKE2B 38acad689f4b0aaa2dcc206725def077e746078872c2e7481f4dfd3687b505ef49f1927ade5ac49ad97b54a9dd7fa76054c3a29f5ae10ce690915e404ad3b646 SHA512 88baddd4876e8ade33a6394caf72f6d2805377a7f638871d20b4759ae3b3f0f4b3c2fba394e3abbe096dd7b9add4bdaf96fcce6a745ecb293841d73c9d61f396
 MISC metadata.xml 310 BLAKE2B d30b368c138282f71b307e21c101bceac3df72c78519e9a20b124602e84d46d19f18c781e29ed797329122c63459602d56c2be4c5ad62e255e3586865a9a0c99 SHA512 fcfd052b3bd6c53658fea8bf241ca82753c12be1d0850536b02f700d9f9d830304296fee70a3b551ffd0c5d9378e13119c3bb12fd986764c940a644f3ac96656
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index b1bacc30fa75..5ce4c7ca0789 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -10,16 +10,16 @@ inherit xorg-3
 DESCRIPTION="X.Org X Display Manager Control Protocol library"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
 
 RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc docs)
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index b747bf890bdc..0e4452e28c66 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,3 +1,3 @@
 DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
-EBUILD libXext-1.3.4.ebuild 624 BLAKE2B fae67f5cad77e8588275f5a4a7f7ef4a90a48804d867467a06435578e6be860d7835dfe117496710e095cca136e331c2680c1a5d89bad942f0b67c15c0b04003 SHA512 bb17a7fc0fad76f94f846de5578213bff2cd01527ce63b07f7ac12332b9c260dad1c9a37fe03b872fbddc00c75c40fa8adbdf8e0e39b7099fbe903196988dcf3
+EBUILD libXext-1.3.4.ebuild 648 BLAKE2B 1eebbe455f8448315f1b19855973cc622a944b0540ad1ec79302167dc60093430f60094e674bac546ba4ee620c3c758eac35d090a698916465c97a685c19f87d SHA512 04c56854a098a4839c07a6630a224cb71af5a7283a67b37325b90b06cb38eae705ab9ff2467e002498d29dcb84e4ef70f8711fb17112a068e4abb10e3410836d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
index b813cc143a9a..d05404352edc 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -10,16 +10,16 @@ inherit xorg-3
 DESCRIPTION="X.Org Xext library"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc specs)
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index e6a6ceb9839b..18c06826f9c9 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,4 +1,4 @@
 DIST libXfont2-2.0.4.tar.bz2 513167 BLAKE2B 924cf8462a8fc593755080866b63d6cca6e58b5d875f1d25b95271a56d883e983445f72f8950adf1964e0bf10ca5b8bb2ddfe0c56d4395086e460952a5933bd7 SHA512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106
-EBUILD libXfont2-2.0.4.ebuild 786 BLAKE2B 49eb210943c875e3cd93f2b5df20bb409b654cfe8dd3c31edf2164a3f25d36012213c7291d6f9de548e0d057ad083a4c26e08a099787edf3503a55a5ffe6e3ea SHA512 f55f351181f62897ceaab895d70a6ed709fa1d756cb5d4251cca7d974a2ba0ba2d6179423ae55c405e2cb030790999609fdeeede47a0c49e493216586a727002
-EBUILD libXfont2-9999.ebuild 626 BLAKE2B 2ff0a44a208e81f4ef7d6dd1b60e0c906e7d2e002cc58f9238c76feedbfb5a0eb7398063d6932c02bcde407f3dd2b0dbdf4a1305c8e3ab59715e420cd7884a92 SHA512 74f8f3bb14f814d9ce9f8630eb398bafeda87c28a15f95e6f7c3c1a306dc5ac6352bcaec48743510d102e31a31e983b3f969d94b16be69224cd7bc69a1d123b7
+EBUILD libXfont2-2.0.4.ebuild 818 BLAKE2B 4b7c1b96ccb56b853f6c8b83030418d509877975e2e2f584feb56c76ac5dae5da12394db6dab5f4024d0a2fa0944fcca5ea306154c8139b980f8d4382a2d2f78 SHA512 d79ca038b5d3bb8b2e72fb77536ca385175d26df67696eee83a058137f9fb0b51084ca4b74bbe2a51911a00615f2d2183bea3654e6dd3ea2bb0468e25bdfce93
+EBUILD libXfont2-9999.ebuild 658 BLAKE2B a0848ecd2fb9bda9e10b931a9210d1fb43d900dbe2ed2922f261170db9febdae3ce5bd3bc59b148994b89408108c0eefe956def6e8abb5d2e283188f6541a452 SHA512 77acd92aaea7c2030895df7246feb87a0fa4d8b250a86102871cddd581c6241034aa7aff7ef153369713a4b6aa7d6cd89c5b600f7156b462be41b41b2c83d0a7
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
index 22ade10fa26c..7a77ae024711 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
@@ -21,8 +21,8 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	x11-libs/xtrans"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_enable doc devel-docs)
 		$(use_with doc xmlto)
@@ -30,4 +30,5 @@ pkg_setup() {
 		$(use_enable truetype freetype)
 		--without-fop
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXfont2/libXfont2-9999.ebuild b/x11-libs/libXfont2/libXfont2-9999.ebuild
index cfd74911baa4..cc2376f181c1 100644
--- a/x11-libs/libXfont2/libXfont2-9999.ebuild
+++ b/x11-libs/libXfont2/libXfont2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,8 +21,8 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	x11-libs/xtrans"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_enable doc devel-docs)
 		$(use_with doc xmlto)
@@ -30,4 +30,5 @@ pkg_setup() {
 		$(use_enable truetype freetype)
 		--without-fop
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 61b1d5e58a79..0b234bd3bbbe 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,3 +1,3 @@
 DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
-EBUILD libXi-1.7.10.ebuild 730 BLAKE2B ea8571e8007eea0c786e923830348a6df33d1d541545a291eb337dd987dcab5e34371556eb1d970e55a7dcaf5534bdb283e556767b9197768d44f4aa1935b2aa SHA512 e1e817a0fec81f29c5e39d954785a9322942b64d24b1916503fc4d494018eb9e0f5a938629e2be40095d81a3a1f497f962aebd35e449a02f72e1ec661bd183bb
+EBUILD libXi-1.7.10.ebuild 754 BLAKE2B a647e927d860d95b5853a3e058f4648e7c5ac1eef7ddd2f613969131fb6e74b2dfdcf5281d65483781d7d18d1fd5c7c58e6a621b1079aeade70fffbd09541ae9 SHA512 20ce07261b42d992a721009b7d7dd1ccd8822f6722698f9be14a0ef3ca4b17ee0b6ada99a3dde1ef3c636408d184dd4bf5839c3a6ad595f2e194a4f7e8a2c296
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.7.10.ebuild
index 8b48636b5798..91e357dbaa91 100644
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ b/x11-libs/libXi/libXi-1.7.10.ebuild
@@ -9,7 +9,6 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xi library"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -18,11 +17,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc specs)
 		$(use_with doc xmlto)
 		$(use_with doc asciidoc)
 		--without-fop
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 47919ee67faa..7a8178e7f3f6 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,3 +1,3 @@
 DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
-EBUILD libXmu-1.1.3.ebuild 726 BLAKE2B 4a4c82bbacbb269dbbabdb090943032e1142c1e478d73f948e5bb1cdfc097e7e99bfaef91923dbafdad6cba186fd5d67d9478abe196bb20b05a6a4837531545f SHA512 60a6623c8ec6fe1a05c9f60c6b566a3d069774adea4e060567743cdfb853c4679cd40f208198cfdc2f5851071c047363ce6b1113b3b69c9e894bc1f4ab9b3510
+EBUILD libXmu-1.1.3.ebuild 758 BLAKE2B 5ec04de8e7341e7cbeb8db28aaf9a3cde558407a3c9922dd98b4494ee2cfc879eb7d93fe5819cbe8a530e7fe27f2d1123ca52b02dd067d3f10a06ccc4c791882 SHA512 fb6a8ff9470a14de84321f538197480b8a8d43a5d2069e69757185b9b285e41471c3877dc9df9ae29423399d87bc05e8945086628a36212851db520275674980
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index 314d30206083..a6421846f98f 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -19,11 +19,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_enable doc docs)
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 9c961bd30f78..ab2807d865e0 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,5 @@
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
 DIST libXt-1.2.1.tar.bz2 784610 BLAKE2B 69a1446a22acb50e625ab4a7b24b5db634d47a540d4543a3f58459dbb380d61aa4bbbde50328c76b2c31eaae3662a1c71cdbcf9bd3a0c915ae4e587f63fbee7a SHA512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c
-EBUILD libXt-1.2.0.ebuild 843 BLAKE2B 4fe50a60cfa90bec1bf2ed560ce281923816409e966984e8693b57ec7e792c61374021cbd184f06b579928533ded6bff124db05f130fe1a419a48f8122212fce SHA512 59ad452b50115158cfdd27a029597a4a14f37ddbb9280622183a62ed7b0fdec7e9c0350409c6b3894ab0b5fc2674e8062094f3c1098e6462de642bc713d503b2
-EBUILD libXt-1.2.1.ebuild 843 BLAKE2B 4fe50a60cfa90bec1bf2ed560ce281923816409e966984e8693b57ec7e792c61374021cbd184f06b579928533ded6bff124db05f130fe1a419a48f8122212fce SHA512 59ad452b50115158cfdd27a029597a4a14f37ddbb9280622183a62ed7b0fdec7e9c0350409c6b3894ab0b5fc2674e8062094f3c1098e6462de642bc713d503b2
+EBUILD libXt-1.2.0.ebuild 875 BLAKE2B d7139b22e4a29967a99a807004a4a56b210f44bfe7f5975077dcd17a60fa8f51bc64d5c7b49e8cc6661883b5c1cad091eaaef6ae9a94a300668b8c571dab5624 SHA512 5dbad6e7ace4f45106551511e21262b4b31c398712ffae506284dc54c01db353a8619685f20017dfbfb1d8d32aa923c8d8078b8ccea63e64b2bb4974c2c5c115
+EBUILD libXt-1.2.1.ebuild 875 BLAKE2B d7139b22e4a29967a99a807004a4a56b210f44bfe7f5975077dcd17a60fa8f51bc64d5c7b49e8cc6661883b5c1cad091eaaef6ae9a94a300668b8c571dab5624 SHA512 5dbad6e7ace4f45106551511e21262b4b31c398712ffae506284dc54c01db353a8619685f20017dfbfb1d8d32aa923c8d8078b8ccea63e64b2bb4974c2c5c115
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
index c3537018691f..b0e36cae59e9 100644
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ b/x11-libs/libXt/libXt-1.2.0.ebuild
@@ -21,11 +21,12 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	test? ( dev-libs/glib[${MULTILIB_USEDEP}] )"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc xmlto)
 		$(use_enable doc specs)
 		$(use_enable test unit-tests)
 		--without-fop
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libXt/libXt-1.2.1.ebuild b/x11-libs/libXt/libXt-1.2.1.ebuild
index c3537018691f..b0e36cae59e9 100644
--- a/x11-libs/libXt/libXt-1.2.1.ebuild
+++ b/x11-libs/libXt/libXt-1.2.1.ebuild
@@ -21,11 +21,12 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	test? ( dev-libs/glib[${MULTILIB_USEDEP}] )"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc xmlto)
 		$(use_enable doc specs)
 		$(use_enable test unit-tests)
 		--without-fop
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 1ced5835b058..bcbf69651b6b 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,3 +1,3 @@
 DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1
-EBUILD libpciaccess-0.16.ebuild 761 BLAKE2B a864f12bc4ff71136c2f72453ced77d3a3e70c0478d23d0866e8ce07eaf6505660cf9a79ec2061d2bdfeb936f6f43953fb65141f6d65ea54ff0354f400d4d8fd SHA512 b67c42ed3fb9a22b96041b3f806935a84ef61992f67f42c10305222023598f765122a186771662313a0c79047f1751a8e673a07cbf3606991a60067d73fae5f3
+EBUILD libpciaccess-0.16.ebuild 791 BLAKE2B 21de1ab783c0b7e3902b8e16fd4c58a52afb4924162fb2e1a96554e300f76332968ef290307bdcd044bde402205863e32b1ebec217abfd994d834041d676351d SHA512 4f053a5decf1b7b4942fce37f109132cc1a2aa97a6dc75513a53a3365d3282e4d961f9ce532c1cee94e794ae4eab3b2a633f3c2e1416a7346711b250e3aecc95
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
index 934d5c999f02..784b93f61478 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -16,15 +16,16 @@ DEPEND="
 RDEPEND="${DEPEND}
 	sys-apps/hwids"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		"$(use_with zlib)"
-		"--with-pciids-path=${EPREFIX}/usr/share/misc"
-	)
-}
-
 src_prepare() {
 	# Let autotools install scanpci (#765706)
 	sed 's@^noinst_@bin_@' -i scanpci/Makefile.am || die
 	xorg-3_src_prepare
 }
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_with zlib)
+		--with-pciids-path="${EPREFIX}"/usr/share/misc
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 26a02abfa44f..a54806894bcc 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,4 +1,4 @@
 AUX libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch 5795 BLAKE2B 0a864b0fbd998fdc6c151b9f9cdb2a31797ac693b4ffa164a6f9a3c0fc1c5430454ec97be4c52ed48489cb08e820a998086fc588cdd2348b16da122bd483b8bc SHA512 e5148c7c310ca395b7e0f3b76ef98d79e50d0ac58935ad6df3c71bfd426166ce736ccfff4970e9523a2418820cd7cb2cba6e8818f23dd5cc21dac69accc1c3f9
 DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
-EBUILD libxcb-1.14.ebuild 1429 BLAKE2B 7975bd295f195a7d313687d8287d179e5fa97337ce040e92539d38617884de9869ff4712216b7ec332a3b7622ebfebe18b93c8d4fdc8b33ffcc6d4489d6f71eb SHA512 fd6dc959413c4ad3772825b775ec3061cd44249a0bf8a59f738f1c4b7bd0a54bc7711e2300bf5c4cc8e98a45f87d5f5a1ed98745688cde7349f334139989745e
+EBUILD libxcb-1.14.ebuild 1495 BLAKE2B 343baa6e46fdadd33089ceec43278e3e2829a1b107145dc388f1ec36d921a485e00924603432fc97f7fd5ccee73e10147e335f8b64663bee8505df1456dc0929 SHA512 0191f5a55314291e5e2fcbccd4efc79d4325f07440e3dcfb4a59071dcec3e6d52c06423b68df8b97767c4dc0da1170f074748dfece1571a877baeb7b6df6b4c4
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index c1b19d34ac13..b20b8c3487cd 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -46,9 +46,13 @@ python_check_deps() {
 
 pkg_setup() {
 	python-any-r1_pkg_setup
+	xorg-3_pkg_setup
+}
 
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc devel-docs)
 		$(use_enable selinux)
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 50bf1a945936..a632df27f76b 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,7 +1,9 @@
 DIST libxkbcommon-1.0.3.tar.xz 432944 BLAKE2B 49dcefcc17cbbfe5623728e9852e700a623e07ad7e6df78c8d7c39784948eb230f9e141d8aaa1de94305cb552244fe54d384abbc8e57f5ec5846915b5ae484e3 SHA512 b05a2db0acd6628427baad1967979a161019dec90a078a926d41f4dfeffb84eab63e627803df1a401e42c8e48953d6c434ce08d7206eae21e890890f29b03d3c
 DIST libxkbcommon-1.1.0.tar.xz 439488 BLAKE2B ddccb9942af5f5d80b750bf8f02289e073615c99bed2a8f7ff1d03ca70bffdbe3b1fe15daef2346819887efe10a308d00f671fc2ae50e0fe33e76e4b748f6d01 SHA512 6137329653ada711abc0e093532627111ab1fb53e6b2b0d05ec4d77709cfc4368f094ebbf68b23c8e9af9a69826351b64466e81c11e6593eafa7e43cd3e7bf75
 DIST libxkbcommon-1.2.1.tar.xz 453172 BLAKE2B f8846befae348287032601f589607a9c899826135b325245824650d77435050fe7e300514cc9f16bd0f3c37693c9f8f08d78aa738c160676019338d72addcd80 SHA512 28de91166a289586a78068b725b904da46fca144936ea0677ec9234c7f0499b9ae321d79c57f15782b63c6e7a37b074fe44648673a2294bbde13110195567e3b
+DIST libxkbcommon-1.3.0.tar.xz 455256 BLAKE2B f53a47005dd411855d1d5c39a33ef58d22982b2d4c2014320722f7fe9a9b468366c6090fadd067e50a846f22de7b80164b684615a8bcb1b14a478609cc4deb74 SHA512 9585ab1df7f2d95b991a786ee1f1de0a645aa315edb93cb093f3409fc76ef7b8f8189a6a7bfd179dc01c5d105d9c9eea40a395762eeffe0618b0c3ee116c0d18
 EBUILD libxkbcommon-1.0.3.ebuild 1432 BLAKE2B 5514381f7eb6cc03053fb2544516395fc6c67a59d7e1c6fe7348167c6ebc719428aa28e6e5b37181fdb49cdf4f36167df8847f41ddc484f2c76a9f44eb0ffbd8 SHA512 44dd4acfa62d35cf1a0a8f0cf39c56872c4c589ef6a0c67d7b4e7bc09e0c77241f6cd8bf68632c864993feddc3fa72d5be7096992316956f115609795a3f8eca
 EBUILD libxkbcommon-1.1.0.ebuild 1484 BLAKE2B 1f2dc69b9799e90f1c0e10e1aea913badb6f9ed56eac8b1b2607992c89b8286d222344a6d96b4904523bf1325e1747c274ef5ae9edebb237ecca54eb29de68dd SHA512 50619d539aed08f4f3fa84b573814d3b51f79ed07b8cde27a85b31c00e5c738107d2bea6d2b1d5d53bfacadd090e3d69c78304dc78de07663e2a6bfb746d25d4
 EBUILD libxkbcommon-1.2.1.ebuild 1439 BLAKE2B 0e39989ff26c13f2c25501cde2b99df369ab325d9ee5a9a06a284f327d932f1f625d5cc9fed3662e5bb493a08579e3f36ca6f161728dd663f7c95dca510f921c SHA512 6eae5aafbbb1e12b193929ed6170647b1682ffd88e27a3d596c391db31b46f1a13e2a530c9580a4e227b3ba43122e18035d7fb5a7b5c0e94fcf9a0454516f3b4
+EBUILD libxkbcommon-1.3.0.ebuild 1454 BLAKE2B e82a282a3d1d52337b40d23938784b739c6f0bfd34e18f5d4920d03eb7dc17a85c15b6d25af6afe3e3076bfacab426f8ff53948a3ea96bb19f2d7b1f87510ebe SHA512 d80635ab2dca8e99b545f77413c659d1a33c25665981755e8c10abe62f55e7d1b547cb05a134d6160cb32633c08ca3160e03af892612ccd4a887e3546dd65c47
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
new file mode 100644
index 000000000000..ce2e09668261
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson multilib-minimal ${GIT_ECLASS} python-any-r1 virtualx
+
+DESCRIPTION="keymap handling library for toolkits and window systems"
+HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
+LICENSE="MIT"
+IUSE="X doc static-libs test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+BDEPEND="
+	sys-devel/bison
+	doc? ( app-doc/doxygen )
+	test? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+	x11-misc/compose-tables
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+pkg_setup() {
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library="$(usex static-libs both shared)"
+		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		-Denable-wayland=false # Demo applications
+		$(meson_use X enable-x11)
+		$(meson_use doc enable-docs)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	virtx meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index d8f990ecfa21..3edd056ea6e4 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -8,6 +8,6 @@ DIST pango-1.48.3.tar.xz 565956 BLAKE2B 6860ae9df2b8629bdd1c5acf03453e1c6d62d8fd
 DIST pango-1.48.4.tar.xz 1791332 BLAKE2B 281e1ba5b52b99c61bcd90dcefb3de64e45a6de0eec5a375e209cb4316562a03e81dea73e6fb8921a631ef854dca8b035e06b3cec7ff73bf8f0033151d2cd20b SHA512 ce754c5e915ed18ba0f0ec89d74a1094e5b235821514b247d16afba7b74ecf1d850ad2b7b7d0a43da83da126c74be1b2e4c4400dbcd447e388e75e6b3c8b4dbe
 EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
 EBUILD pango-1.44.7.ebuild 2095 BLAKE2B 9a07720373325ae342c1a11216270f79783cec72cffc5198a38af6877019688466bd6505692dab3c2e509c6bbed815ce0b7897c94c7263dab692d070dfec7758 SHA512 6194aaebf76ef26476ba68bd0ee5fee76e08efd5104c4c67cd4d6b6f766bb97391ec10e14b90a9dc18d4051b87299c5514dfd3bad733aeb9061e72060942aeec
-EBUILD pango-1.48.3.ebuild 2188 BLAKE2B f6dcf1c9543a28a04e6b08ef648d3706ea2777d41d4757fb80b4a434a30003d326cef89c20e6e8de3833fc1fd4c6a88f3765c3c1a54682f01d9dce4a93b88579 SHA512 9f2d1df16f2cbacd7d09ec66d435b794d6e5d5c11d5d3a8b7040d6614e29f62916b6f93448aefaaf4a90566298e3a4cbe839e3903249e0ed40318e290a2f9ee0
-EBUILD pango-1.48.4.ebuild 2188 BLAKE2B f6dcf1c9543a28a04e6b08ef648d3706ea2777d41d4757fb80b4a434a30003d326cef89c20e6e8de3833fc1fd4c6a88f3765c3c1a54682f01d9dce4a93b88579 SHA512 9f2d1df16f2cbacd7d09ec66d435b794d6e5d5c11d5d3a8b7040d6614e29f62916b6f93448aefaaf4a90566298e3a4cbe839e3903249e0ed40318e290a2f9ee0
+EBUILD pango-1.48.3.ebuild 2203 BLAKE2B 283d1f214dbf1c94accbe73cb113978adc609d3451c6c68146a8c50d33e0bfab5a865fed6a4df577f41deb37e604605a1da0b3272b8cee95c969c789f443b225 SHA512 6cc8bcadc61b038f54e3c209bddd3d16b522c88aaa69cdc2fa826909c06e0a84f81c74001376b819de4d1d9a25b64c0d11c4cf522dd7291387b91cec9e0e685d
+EBUILD pango-1.48.4.ebuild 2249 BLAKE2B f7f823d8761a4747332477b1bb6e75247c9ccf80131f5808e488718f5708df7ec5107d1dd4b920e471eb5ff65cd39d9705718bf29dac1f64bab8d4709e1a93c9 SHA512 766effb3ef63f7dfb82651464d5121d1174e7f30168a4c83efb278e97f8780ab2576606911c9cc816799ed01e60ef23a83f8d77bb7ad6b205c32119a50c7db26
 MISC metadata.xml 522 BLAKE2B 9e37b7287a6d6567d68daea4265ae5d13d3c336682408bdeb4f7ef92b9cd9907c4f69052fb52b59a8cd55eb40d04c660fedde562ac2a85e41844189810ed4fb8 SHA512 6af19288fc9a7e9f441f64df4e74f32ade7303df52e1c285275e41f34f0d7664b22167793c08e79e6667fe27f44afe5c1b8548d68f5878d63a432e293956fd82
diff --git a/x11-libs/pango/pango-1.48.3.ebuild b/x11-libs/pango/pango-1.48.3.ebuild
index e35db085707d..3928315b1d75 100644
--- a/x11-libs/pango/pango-1.48.3.ebuild
+++ b/x11-libs/pango/pango-1.48.3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
 	>=x11-libs/cairo-1.12.10:=[X,${MULTILIB_USEDEP}]
 	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/pango/pango-1.48.4.ebuild b/x11-libs/pango/pango-1.48.4.ebuild
index e35db085707d..e856f644a63d 100644
--- a/x11-libs/pango/pango-1.48.4.ebuild
+++ b/x11-libs/pango/pango-1.48.4.ebuild
@@ -11,18 +11,19 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64"
 
 # X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
 IUSE="gtk-doc +introspection sysprof test +X"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk-doc? ( introspection )"
 
 RDEPEND="
 	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
 	>=x11-libs/cairo-1.12.10:=[X,${MULTILIB_USEDEP}]
 	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -38,7 +39,7 @@ BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
 	gtk-doc? (
-		>=dev-util/gtk-doc-1.20
+		dev-util/gi-docgen
 		app-text/docbook-xml-dtd:4.2
 		app-text/docbook-xml-dtd:4.5
 	)
@@ -51,6 +52,9 @@ src_prepare() {
 
 multilib_src_configure() {
 	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
 		$(meson_feature sysprof)
 		-Dcairo=enabled
 		-Dfontconfig=enabled
@@ -68,12 +72,19 @@ muiltilib_src_compile() {
 	meson_src_compile
 }
 
+multilib_src_test() {
+	meson_src_test
+}
+
 multilib_src_install() {
 	meson_src_install
 }
 
-multilib_src_test() {
-	meson_src_test
+multilib_src_install_all() {
+	if use gtk-doc; then
+		mv "${ED}"/usr/share/doc/{${PN},${P}} || die
+	fi
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 374ea5487799..f9bc4f418ea8 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -2,9 +2,13 @@ AUX vte-0.28.2-interix.patch 1566 BLAKE2B 1d6b4b7cfc1fee464779e3efb8de09554c9e52
 AUX vte-0.28.2-limit-arguments.patch 1477 BLAKE2B 329e8eb93156244526ebe3ccb3c2a75234da7a57a994c2c1b42e283a65011d6245133f858778571efefec18bf18bc7db9afe5aeded0df0cec35a72a31507671b SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d
 AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f20415193bf9bc283399bcae4e3c2a23ff7f2f8ffee08e8a67c3af2956b137f788322e26bf2537e785c0d0ce6266b56269abe5a18e2e881ea548b5c1b4625 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec
 AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c3d4f97fa8d6b4ecfbaec8a35bf1989c0461c1ec1d31e1b22c9d35688775a30f34134028bcd4fdcae1b7d40129c4 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430
+AUX vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 1375 BLAKE2B 27ee298761155789aba19b77dcad97abbf2524a69de4540c38b814fa566e8f3e4003925570a12b75d85f56cb1b047c1895eb8c74df8c81f8334785dfc5055913 SHA512 983c7f4ab44417a5ca0e00f428882650b8a5c250aba328e8255bffb25cdff0505f0fa3a635d722a27467ac44e4e2880f8631b7ff3b20a35ea4e57db9537807ab
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.62.1-command-notify.patch.xz 4844 BLAKE2B 22301fdc5f1969beb2ad9b316fea8972f696f0e54e1a24d5eceedec71162afc2991b7963a71ce8925a94f6c40e5303d3db760b872d0eebbdc6d05b22d3c59ecc SHA512 491e241b0f5aae50e59d25751e95579d40c47e7e4c7f2b279522347f7f2f7f00c92bdf5fa4a651e4146bcfa9439f03b6311b4061fb20c5679c09b97a4924dcf1
 DIST vte-0.62.3.tar.xz 447152 BLAKE2B 2c55430490af577cdbad8bbcbb53902ccc4ab8d9643d5e8b3279e96b4285347e652e761644c957961732eeb50d12e33fa3d3c735be9899ad14c1e2f35377f2a7 SHA512 0475e2813b305bf1b5d48ece5959f2feb10e89b589fa3b75032ae466fd5254bf5c2fc6085dc296d65c5df84790a38892534ff401109843bf964ae62a8c540a81
+DIST vte-0.64.1-command-notify.patch.xz 4880 BLAKE2B d6ff5f4acac161980c8c18245e65795c7f0ea3d0819748894b055306ecd731d698cac578eff2750795a9180a9b17d79f220e814083012d5a04f4f351ff2a0e36 SHA512 174397aeca00399b138286fd4cc88941add041a1f2596fd42222d44c886c2e35b2a33041b58a102ee3acbcddc0cc40fcfde39d72ec46b640ee1db22d8ae684c4
+DIST vte-0.64.1.tar.bz2 486720 BLAKE2B bd8fb1f471a43aadf015cce8ae38c646521ca66e37652b72f7e94cec15a2a0a844d67116e9123ede44ba1b6ee569d1ecd0ff5e83067f6231802f5a77a798e446 SHA512 38bbbb4ed3d86740091c9ddee83f97bf5cb5c69c48e8a78592dd46e8f9334859a6c523e7b16dce110de71cd4a9a3b8b99a11816b61eae6e251dfc20cdbee6716
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
 EBUILD vte-0.62.3.ebuild 2204 BLAKE2B ee1cb85213d97e873afc657737d7a2f59caa7e5d8a229709aee2e3ef2a262772274f776f1408a3a3cf41e7c6b9cb7457cfbb7cc5c1216d4f95d79dc6ef22f813 SHA512 5143976afee177477ddadbbae0136a2eba5c83640ca96691582b00bfcca35276708f1a5bd00bc2d0663c73e4b726dafa819756b79bc0fa6d4cc21ef3659c81fe
+EBUILD vte-0.64.1.ebuild 2519 BLAKE2B 5c0090c36ff061e3ff7a305d8de2ca5a4b6ba630283b32004fb3df01d6205dae02b1a026d2c5ea15e6c8fb0b42a8bb328983b50a4e0b007eb4cac670140a2bd1 SHA512 7554f9feb2b32bb69a2e28769a91870956e3b34bb9220127796b3ff44f7130563fe3d4d573f4917ad44cc318d9f30b931c9af897233b3a247f7461664b7050a1
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch b/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
new file mode 100644
index 000000000000..79171d29dead
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
@@ -0,0 +1,48 @@
+https://gitlab.gnome.org/GNOME/vte/-/issues/350
+
+From d459d32126119c8d78f8239b8b857a255e6005d7 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 1 May 2021 08:31:45 -0400
+Subject: [PATCH] meson: Find python explicitly to honor downstream python
+ choice
+
+---
+ meson.build     | 1 +
+ src/meson.build | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 4f5a7c57..6404802f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -461,6 +461,7 @@ pango_dep    = dependency('pango',      version: '>=' + pango_req_version)
+ pcre2_dep    = dependency('libpcre2-8', version: '>=' + pcre2_req_version)
+ pthreads_dep = dependency('threads')
+ zlib_dep     = dependency('zlib')
++python       = import('python').find_installation('python3')
+ 
+ if get_option('fribidi')
+   fribidi_dep = dependency('fribidi', version: '>=' + fribidi_req_version)
+diff --git a/src/meson.build b/src/meson.build
+index a1440da5..4ac6a7f2 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -60,6 +60,7 @@ modes_sources = files(
+ modes_sources += custom_target(
+   'modes',
+   command: [
++    python,
+     files('modes.py'),
+     '--destdir', '@OUTDIR@',
+   ],
+@@ -92,6 +93,7 @@ parser_sources = files(
+ parser_sources += custom_target(
+   'parser-seq',
+   command: [
++    python,
+     files('parser-seq.py'),
+     '--destdir', '@OUTDIR@',
+   ],
+-- 
+2.26.3
+
diff --git a/x11-libs/vte/vte-0.64.1.ebuild b/x11-libs/vte/vte-0.64.1.ebuild
new file mode 100644
index 000000000000..5d3ccf349ace
--- /dev/null
+++ b/x11-libs/vte/vte-0.64.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+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"
+
+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 ~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.64.1-command-notify.patch.xz )"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.24.14: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() {
+	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.64.1-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
+
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+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
+}
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index 701f3226f09c..031a1fc14fde 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,3 +1,3 @@
 DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214
-EBUILD xtrans-1.4.0.ebuild 618 BLAKE2B 71e3fa40e3c27cc5cc0c876e306b88bb8f2eb6e3219195206b8db5066841fc355198dd97c96ab5b7c389bef772c53e0464f57f548363d957ffabd52c6acd2e2e SHA512 a93b56f7697b40e7a984f74b230ed1bc231e13993b4ef3da3c83e7db4063c18725ebb92da0a32f63fcbfb03e9d4afa0ac1b85580818228f081a0508ed035b0fe
+EBUILD xtrans-1.4.0.ebuild 620 BLAKE2B 15af968d55fbad924baf99074d7ef32fbddc6c9cc83f125e612aa8d31c18325ebcfdea09238e54dfd9927655aab32ec287999bc0a0b2356e7d853c7de1a823d7 SHA512 956b5ac9fc637ba185755cb6bfcc1f81467c73300172a5048d89d3e71c164f5ff93fae24c4e643a48f1664bb403065b595c5abfcae3a756f54d717048105cf66
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index 6f7b1b960fa2..d2a46b26aee9 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -10,15 +10,12 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xtrans 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-RDEPEND=""
-DEPEND=""
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable doc docs)
 		$(use_with doc xmlto)
 		--without-fop
 	)
+	xorg-3_src_configure
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-04 22:28:33 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-04 22:28:33 +0100
commit	a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree	8c764c1cc0576389ce22abd317bceba71ea5732d /x11-libs
parent	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)