gentoo resync : 08.07.2021

21 files changed, 221 insertions, 30 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 42643697b64c..1f16c0fcece7 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 5f8809edb28a..7bf6ea5f942c 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -2,5 +2,5 @@ AUX fox-1.7.67-no-truetype.patch 1660 BLAKE2B 73e67b75b851ea5dd0fa5ccb0c2b79e1b6
 DIST fox-1.6.57.tar.gz 4284018 BLAKE2B 3efbc6188225f9444fbd347359e8b4041a08fe654acb99c48e4966e501a2f72a44863f2e9b60ae810a259951f89cfc27b9a8b6341e029627066712e0dbf20e40 SHA512 e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087
 DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
 EBUILD fox-1.6.57-r1.ebuild 2517 BLAKE2B 262d0c514bbd6620b3fff9b9895014016fe38ff19a693d544971ad12e0b36dc6c49b1a3956d4fedfb5c91b16fea3f4f30d096844abd15bee7c92037d9cc2b450 SHA512 af4d7cc85a107f6b9d1f657edb2066f6b834fcf61bbc17358174306b458b720360bf268c4fe33ecf925ae63928f25d87a1778e348d227a3c3a4b792f5f60860a
-EBUILD fox-1.7.67.ebuild 2736 BLAKE2B fb890e94596bd3284229108b0d2e28ff2806a2fbdd7bea4054c1257bd3286fa34fa6076dffd48c2a74b4f76eb719298e367bf0df0d716cdbda8400a66a5cbf6f SHA512 975651b80cc72854d6ccdcfdff17228460590afcd54664b9c886b6eb5384b98e5eaaaf0ae62e1176722bf922c6ae8e81da3eb7eeecdd4f4dad09cd8b11f6481b
+EBUILD fox-1.7.67.ebuild 2734 BLAKE2B c2c4df40118d76ef25282b74bd4eb927bc0cb4463e320d759d027f424dc3a6f53d12a6400691dfe57f3cd19cd8edebf8e71a4eeafce7000e99fe66afdc374788 SHA512 6f2ec0f7065819ce214699bfc91c6a5e33550d3de82b5e10c6c0e1614c8701d33a24f700337591e07fe34cb0a3b464307fdc841a1551739634a7f3ffcb31b428
 MISC metadata.xml 352 BLAKE2B 92d42784403554fc3a6dc83627054123a5c717a1145ceb519715ed8b1644ade846b5e497fda557db631a0f6926eef23941597f09e1b272030d040422c1a91dba SHA512 adca24f9753e5f22122994f96ea42f9c11fc60b72d7e93386cfe168ba3ee36b226725c847974772cede33d576658849a3af5a2f7ea3fdca4092afe2eae893b34
diff --git a/x11-libs/fox/fox-1.7.67.ebuild b/x11-libs/fox/fox-1.7.67.ebuild
index 46ddd5fdb5e2..6b13f28ddb1e 100644
--- a/x11-libs/fox/fox-1.7.67.ebuild
+++ b/x11-libs/fox/fox-1.7.67.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
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.fox-toolkit.org/pub/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1.7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib debug doc profile tools"
 
 RDEPEND="
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 0bc15e5847f6..155f6d756c96 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -3,5 +3,5 @@ DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8
 DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 EBUILD libX11-1.7.0.ebuild 879 BLAKE2B 86220953f41861753950b58fea111d9f7023514f9d8af00520d67753ab84ca7c9ea4d04be650c7fabf40a560c9ed60a0d4e9b6b29bd983c388622ddabfc2b657 SHA512 f276e0a0894432c99d6c16b4cd86501c83d141d1cf1301105a53bce3910cf0611576c9b748b4d3a95957ec9409d738dff2bab944b5637d1ab0cde89b8cb9d3ed
 EBUILD libX11-1.7.1.ebuild 933 BLAKE2B 3f04d4391f7a64679b7a10aeb3f68b1178ad9bf6389bd6607fda2cb654694a9b862da89856dc7e60e951a11908f065ca269a829f7181bf7b20300ba7dee73fba SHA512 8dc77dae5065e805a0f8af0c0f2c95c3c2541fc9b5cc19decc064cda661640673ecc2d8ca56daeb95e0ff1618fdd109376f6d0b13f7d54022789afe051e76ff7
-EBUILD libX11-1.7.2.ebuild 940 BLAKE2B ea5def42121b86284e0e2b5bf5f8aa65d05d39eeb5c15f90b86a2dff0fb164b8d4b4e640f0688a9d615ac910ba87edc325e5f008463833459dc7dc57a9e1d7bd SHA512 ad1d7ba5efde59606e7d9a7904d3cadbe5f7b45d21d57ce39266703524192bd0c0ea126c82453d0d0b01bd40068fa8fd05f2c703493e56ee62a719b458aa461b
+EBUILD libX11-1.7.2.ebuild 938 BLAKE2B 844ddee613fdefcdb058d0b58681997dad49d7e6eabf3184d0280fce5ee5cfae399d5af54c1d4d805473f9ece90dbd1dc2668982d4086dc486a0e9660abec003 SHA512 42a6be332d686dfc4182ba6a3e6ac4d71d05278dc6b9d18d785b2d7a482e6ece10f006e3fb2de5989099f0833f1826f9b275451804f639a64521bdb66ab9fa84
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild
index bf033e3cc6be..fb5b68059871 100644
--- a/x11-libs/libX11/libX11-1.7.2.ebuild
+++ b/x11-libs/libX11/libX11-1.7.2.ebuild
@@ -10,7 +10,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index e05adafe4997..3b31ef3d88d3 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,3 +1,3 @@
 DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955
-EBUILD libXvMC-1.0.12.ebuild 576 BLAKE2B 7ae3c4f0c072c5f7b78fe54b4e30b77a713b6addf7e590a33a104d8d38df51dddb904a03d73fc759ba2c639f4bdef82bb2429cd8811be12d19360522061c2f8c SHA512 c4105723af334c5f73d25db6417c4a2b7c4ab0a6aefdf6d0ac99764a5207ac929525045e65270de653eb38cd8aaa520bc8c1fa4742e5809cea496160c9bc791f
+EBUILD libXvMC-1.0.12-r1.ebuild 533 BLAKE2B 9046b13633b260e85afd2cb81745cbc5c2ecf437e4a914ff5e3e17ca8a523bedc9206dcb466d00fe370aa35f83165d7c5d4efedc0e5c73b4dc1e97fa558cdac0 SHA512 fb00943b7cb92d3b751750ed709d4f79fb1d31ca8996d8027405f769be49977f8d4d505da72966c93af17783c50623c36daea045e7c935b9488737dc15f730ee
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12-r1.ebuild
index 2ae1d36c514b..33757667d0b2 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.12-r1.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
@@ -9,7 +9,6 @@ inherit xorg-3
 DESCRIPTION="X.Org XvMC library"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -18,4 +17,3 @@ RDEPEND="
 	!<x11-base/xorg-proto-2019.2"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
-PDEPEND="app-eselect/eselect-xvmc"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 7e970d12d19c..7cbc4a1639e4 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,8 @@
 DIST libdrm-2.4.105.tar.xz 420376 BLAKE2B 1443dd378263358e7af64ee63ac6d25d2c5efaacaf2f76be1a0021f03dd08ce4580ef8531af076504c5a29e538d5c66d1773fb0439dd8bc312f3a038535dd07d SHA512 083a04af7208e58be21b89c6ebdbe2db3ba00cd29f0d271bd38bfe97dfca741edafddaaf9b5b95c20fac2c9b700434ea5b21397de26f7073169ad6f5b090f715
 DIST libdrm-2.4.106.tar.xz 418176 BLAKE2B b0f935297239560179ec8994b62c7161494d4c1aa33bbfdc4d5e4ecff97d252f7556575391ebf486e24257c365415e656b9f84ac883dc9d56baf39e79ff8c5f2 SHA512 33140e579906ab54b716149056af500c628ce41cd9ae3b0c33496693d2f5903fbcfccee8a942dd1560e1591111ed240da42612d5af5e75558db6f6a85d14617d
+DIST libdrm-2.4.107.tar.xz 425612 BLAKE2B a685cd9a6549c7bdf1efb4e7ebddd0ea49554fa718f8328c868a1f245e7c072933e49546591c056ba7ece8d8841b8138e4247dd8697238a18c2cd92fe5446341 SHA512 c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0
 EBUILD libdrm-2.4.105.ebuild 1988 BLAKE2B cfb94eaf9f6bc949b597d915556b52f9de85d0c10aa20aca571a27f99500f9543dc368771ee61c59b89e18f5d9ecbd72eb17f716b9a7ecea35a6d7b4f9b18efd SHA512 32c0df2d09c9088ff2fd2dcfff73ebd78355c8132e2f042413300b31e63b4ffb878f57cc513733da190b6e19b241b5c2a0cba5b7aaf7d5f46d3f5358664ffa8f
-EBUILD libdrm-2.4.106.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
+EBUILD libdrm-2.4.106.ebuild 1747 BLAKE2B 7c973324315284b00954709be7e6151f3b23bca0e04109bc605063d5cad186b812e072007269afafb5390df603d1894a27c48407eb7e50d6cc720972ab1cabfe SHA512 3cc01a6b0a1491258db56ff25e6e8a76e75c53f69411e964f11e3031f779805e31c8263a21d20d126bc986b5002876fbccb63bb415b1e0fee18db533ea19b9de
+EBUILD libdrm-2.4.107.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
 EBUILD libdrm-9999.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.106.ebuild b/x11-libs/libdrm/libdrm-2.4.106.ebuild
index f603cf783700..c496d7b4e6b9 100644
--- a/x11-libs/libdrm/libdrm-2.4.106.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.106.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-2.4.107.ebuild b/x11-libs/libdrm/libdrm-2.4.107.ebuild
new file mode 100644
index 000000000000..f603cf783700
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.107.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson-multilib
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Udev is only used by tests now.
+		-Dudev=false
+		-Dcairo-tests=false
+		$(meson_use video_cards_amdgpu amdgpu)
+		$(meson_use video_cards_exynos exynos)
+		$(meson_use video_cards_freedreno freedreno)
+		$(meson_use video_cards_intel intel)
+		$(meson_use video_cards_nouveau nouveau)
+		$(meson_use video_cards_omap omap)
+		$(meson_use video_cards_radeon radeon)
+		$(meson_use video_cards_tegra tegra)
+		$(meson_use video_cards_vc4 vc4)
+		$(meson_use video_cards_vivante etnaviv)
+		$(meson_use video_cards_vmware vmwgfx)
+		$(meson_use libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto false)
+	)
+	meson_src_configure
+}
diff --git a/x11-libs/libtinynotify/Manifest b/x11-libs/libtinynotify/Manifest
index f810d49bc8da..56ebcb90d946 100644
--- a/x11-libs/libtinynotify/Manifest
+++ b/x11-libs/libtinynotify/Manifest
@@ -1,4 +1,4 @@
 DIST libtinynotify-0.2.1.tar.bz2 286167 BLAKE2B 004ba5fb4f9dc2f118bdcda35162a8a4bf7048b97ea1b1cf1c5739b368404a5df05b7477eca02b56b977ba58909d375c2f570943f8a84814481c715efff04078 SHA512 4d1d4eb56a654aef523aa5a81cafd51b64f7bf44130f3043d5d6b6ea88fbc7681d96cbde3c16cd00eb141145cb551018129f4bab03f542bf88425beda41cdca3
-EBUILD libtinynotify-0.2.1.ebuild 730 BLAKE2B 30cfe69ff04776771ebbdf0435d0049868e50191a6ee0aaee887798ddd69f8bc592c3b9305de997789cea36596b342745aa9b4b059c3f0c394b423301b7dc825 SHA512 41b3a4f1844466891429e06b751ac33430a69a47147f24ed8000a7cef6bb16385421d71e10b818a2cad7bed2377fc2aa8b48e28a716ea1af87c70eb490eafe16
-EBUILD libtinynotify-9999.ebuild 771 BLAKE2B a20e30a7119c83e477b731ffa4fd484832a60ac2265b9a51a85d969940011f3ee22c919d3df94d9ddf1664d4dde6ca874e6b7c61f668f1e4d18b8595eafdcd13 SHA512 6b1f6f508b6cdd950f77796d6b31bf3495f71b22446b3e259d83c436ed9a39769468fe64ec1de62c5b1abc0117e1bb14cadb82e14b4caf7b1b7420e4b68ba518
+EBUILD libtinynotify-0.2.1.ebuild 670 BLAKE2B 8abc91e2342e18db8562f73fce622fd92404e017741c6e0449169fdaf5b8caf8bead3bf9da5793f9afe1717409b96cf87e4f052305660884f393e48d71408b88 SHA512 a989c1e72e37caa405275514b6e3aa6456071fed19cf9b10207321d797f47ecf7953a9cc8c36b8602fb3195876d9f1d24c33b5277739f27130ec374b6b309568
+EBUILD libtinynotify-9999.ebuild 686 BLAKE2B aad6ff1c9f696fa5554aae67ba88359546a7bb6e41def61c267df83e5bbf05cbfe15fa53bb39e223efd6f4b8bf8180b965e595a80ca53d3cb17f7c92fa095aa6 SHA512 88ec5a49a1903b9c637cd42dad2d3c6a123246883135748244f4af7e49d6a4f1b61a90a334e2fc89eb78fcd9a30e8b8f0171a3f8f8c3316ff91754e3d70403d1
 MISC metadata.xml 515 BLAKE2B ab08592e24b35ed8c22d610ab8eddac7f604eaa1fb5064ccea2f3d33be498ae8b57280779c31b15e6b614f26680339792396a9acec3e7f5761394e7a9060753d SHA512 dd7762762cd42f07aa00f3326a2dc4f94fb99acdf973e1b9c0a9e4eb83b361daeff02f0d79bc553c44b2379f26ba0eeb1727b8d7715ec50e03cd155e13c62a03
diff --git a/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild b/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
index b87cfbb96ab0..fee73d38bf30 100644
--- a/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
+++ b/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A lightweight implementation of Desktop Notification Spec"
 HOMEPAGE="https://github.com/mgorny/libtinynotify/"
@@ -10,19 +10,17 @@ SRC_URI="https://github.com/mgorny/libtinynotify/releases/download/${P}/${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc static-libs"
+IUSE="debug static-libs"
 
 RDEPEND="sys-apps/dbus:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.18 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( README )
 
 src_configure() {
 	local myconf=(
 		$(use_enable debug)
-		$(use_enable doc gtk-doc)
 		$(use_enable static-libs static)
 	)
 
diff --git a/x11-libs/libtinynotify/libtinynotify-9999.ebuild b/x11-libs/libtinynotify/libtinynotify-9999.ebuild
index c2e029412ac2..17f57c6cdd00 100644
--- a/x11-libs/libtinynotify/libtinynotify-9999.ebuild
+++ b/x11-libs/libtinynotify/libtinynotify-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 inherit autotools git-r3
@@ -13,13 +13,11 @@ SRC_URI=""
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc static-libs"
+IUSE="debug static-libs"
 
 RDEPEND="sys-apps/dbus:0="
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-1.18
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.18 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
@@ -29,7 +27,6 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		$(use_enable debug)
-		$(use_enable doc gtk-doc)
 		$(use_enable static-libs static)
 	)
 
diff --git a/x11-libs/libxcvt/Manifest b/x11-libs/libxcvt/Manifest
new file mode 100644
index 000000000000..4f3f7ffd8ecd
--- /dev/null
+++ b/x11-libs/libxcvt/Manifest
@@ -0,0 +1,4 @@
+DIST libxcvt-0.1.0.tar.xz 7912 BLAKE2B 31653a085fc8c60ff3eb1cb3749e382f2b98b1aa967bfe6f4e8ec94536b35ec73f0d8cbd76be782f46c81255c166a889141dfebb41448db5ad8e29797b340d3b SHA512 c2ca7abfc2954cf4427e0b3c3e302aad438525118dc9fa2047fce2bce6578863696387af8eb7adfad40af6313d9d9c87a9dcaf7e026e8049d48118063f6f0088
+EBUILD libxcvt-0.1.0.ebuild 436 BLAKE2B b13a64eaecaf9289bcd697cf0079cca9e94d0aa381b9b3d8972b9533f11a3ea0977bf1c275c0babd38b8287b967032dbd9dea30264f831969dcab1c12b849a2c SHA512 7fce6832fccf4106d8b0db634db441c985cc91b79be636a2ee28c2571f38e6b7ed090488c636edd2d34f4a528d408b08462e62e78546ffe5fa7a101e065a6345
+EBUILD libxcvt-9999.ebuild 436 BLAKE2B b13a64eaecaf9289bcd697cf0079cca9e94d0aa381b9b3d8972b9533f11a3ea0977bf1c275c0babd38b8287b967032dbd9dea30264f831969dcab1c12b849a2c SHA512 7fce6832fccf4106d8b0db634db441c985cc91b79be636a2ee28c2571f38e6b7ed090488c636edd2d34f4a528d408b08462e62e78546ffe5fa7a101e065a6345
+MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-libs/libxcvt/libxcvt-0.1.0.ebuild b/x11-libs/libxcvt/libxcvt-0.1.0.ebuild
new file mode 100644
index 000000000000..0ad3f5af940d
--- /dev/null
+++ b/x11-libs/libxcvt/libxcvt-0.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_TARBALL_SUFFIX="xz"
+
+inherit xorg-3 meson
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="X.Org xcvt library and cvt program"
+
+RDEPEND="!<x11-base/xorg-server-1.20.11-r3"
+
+# Override xorg-3's src_prepare
+src_prepare() {
+	default
+}
diff --git a/x11-libs/libxcvt/libxcvt-9999.ebuild b/x11-libs/libxcvt/libxcvt-9999.ebuild
new file mode 100644
index 000000000000..0ad3f5af940d
--- /dev/null
+++ b/x11-libs/libxcvt/libxcvt-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_TARBALL_SUFFIX="xz"
+
+inherit xorg-3 meson
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="X.Org xcvt library and cvt program"
+
+RDEPEND="!<x11-base/xorg-server-1.20.11-r3"
+
+# Override xorg-3's src_prepare
+src_prepare() {
+	default
+}
diff --git a/x11-libs/libxcvt/metadata.xml b/x11-libs/libxcvt/metadata.xml
new file mode 100644
index 000000000000..7a7bbf810544
--- /dev/null
+++ b/x11-libs/libxcvt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 7c2b500bfe21..499fb46b990f 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -3,6 +3,8 @@ AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbe
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 DIST pango-1.48.5.tar.xz 1819476 BLAKE2B 8529e8cbcf0f33be56cf09229abe45fb3525e12a9c2a6ad7cca416ff67a92eb010abc2ce814fa4d19a924186369eede4a576efdd2f4c64b39e31c9821c5e414a SHA512 2c758e649af5b9f9fa960c26a6f4dcf5abd8035101fdfe4a02fe02cb892250b615584b02d63aaa06f3da5cbe7bb848459ac969f43437c34cec084b51bcf48cab
+DIST pango-1.48.7.tar.xz 2050880 BLAKE2B 2ee048d9713aed0972ffdf3feb96c7c0683ffa1494ac2b798a4f6b1f5797d689b0e0c06bcc3f4a10130d23279ed295a3a59141c75bd3a0f2da7facf62d6c3baa SHA512 e5680d628f531bea7633945bd74dc51a93c4c881dec58fcf9f6271043e77b82a4805e311355cb4d9f8cdfcdf52785a5a6391517a264b62416c26e82dff4aca39
 EBUILD pango-1.42.4-r2.ebuild 2310 BLAKE2B 6068b613ba19c35420774bfff3ff2f292d67430ca167246e8b7c4132f34f5165ad2e4f24df5080ce7c8f677f45d5e48ba555e04eefcb8c751243ed2354d2bf6a SHA512 5c05c5db53a1127119981966f9f144e95fa04c07dccde5df9341a24aef0479a6cddf3b0e7bae0f339f32737618efbd89f367d6f512ed0a01715008226ecc640a
 EBUILD pango-1.48.5-r1.ebuild 2140 BLAKE2B e53a8cab9f9de8c8e5828fbfe3784877ef4c416ee39a1780a49b0978c5f4a85ff21e2a53a3204c65a51458d25b143ce8361dc8323fa34167981066040cb982ab SHA512 ebadd72e5bfb7ed5fccc1da685d6b973c7931fcc076c6a466e49e8c41980e0a781f3ff42272b83b0b9db02224b9a30881fd2f0c484c9f0f163101f17e1b5b3c9
+EBUILD pango-1.48.7.ebuild 2196 BLAKE2B b92d4c797ae5df84f74f1da45d929aacf0f11f11cbf7c5aab1d05b9e768a9fd0a7776ddaad35e69151f5dd27cb8aad679531a40ad78427374986afe8857c1c9d SHA512 e7533e869889da752aced398dc696e3a82b5f774c45ddf49a3c71913f0e33f0aca1616296c43d43df6244f4e2be46e7d5ff2f63b55745b213c822c5f2533102b
 MISC metadata.xml 522 BLAKE2B 9e37b7287a6d6567d68daea4265ae5d13d3c336682408bdeb4f7ef92b9cd9907c4f69052fb52b59a8cd55eb40d04c660fedde562ac2a85e41844189810ed4fb8 SHA512 6af19288fc9a7e9f441f64df4e74f32ade7303df52e1c285275e41f34f0d7664b22167793c08e79e6667fe27f44afe5c1b8548d68f5878d63a432e293956fd82
diff --git a/x11-libs/pango/pango-1.48.7.ebuild b/x11-libs/pango/pango-1.48.7.ebuild
new file mode 100644
index 000000000000..5f44d49490dd
--- /dev/null
+++ b/x11-libs/pango/pango-1.48.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson-multilib toolchain-funcs xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+
+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=[harfbuzz,png,${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	dev-util/glib-utils
+	sys-apps/help2man
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+	)
+"
+
+src_prepare() {
+	xdg_src_prepare
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		$(meson_feature sysprof)
+		$(meson_feature X xft)
+		-Dcairo=enabled
+		-Dfontconfig=enabled
+		-Dfreetype=enabled
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_feature introspection)
+		-Dinstall-tests=false
+		-Dlibthai=disabled
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	if use gtk-doc; then
+		mv "${ED}"/usr/share/doc/{${PN}/reference/,${PF}/html/} || die
+		rmdir "${ED}"/usr/share/doc/${PN} || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index cde2208ba0e2..2dbf05dc1c62 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -9,5 +9,5 @@ DIST vte-0.64.1.tar.bz2 486720 BLAKE2B bd8fb1f471a43aadf015cce8ae38c646521ca66e3
 DIST vte-0.64.2.tar.bz2 486837 BLAKE2B 3e127d61e4018607ca2df170108aef65b224a48df4d57545c98cbdb9753cbe7b9821e91a5bccd09d8c39af95d747a2ff01c69320e9245f5a82e7887b62c32c97 SHA512 6cbc1ee25a0ef2b00bcf26c07042eccc14fdea323e4445123db9fad05bf2e799579d723f6147c08712aec9b94e17003ce8f9e6ebe65278fdb3832cf77cba5be5
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
 EBUILD vte-0.64.1.ebuild 2519 BLAKE2B 8bc513c5b6b024735dc09dd72c10d3a45020470a0ee1221750e249e2afacce105c833360cf812086af95eb774c5f99e46701627b5ba92de433281783d4ed973e SHA512 fcf3ed398d972b5e661d0396995e9cdd4d9d15dfc4a88e441084f8805673d6f933da05618ab80c5babd7c689883129976e9b8d9c4f9439c367ef6d00ead66bee
-EBUILD vte-0.64.2.ebuild 2526 BLAKE2B 95aacd09bc88b0b14012db2c647e9fd09dea5f25aeb13858d3f960e9e418dd921e4bde5b42d7c8504bd85041d1f6a826f9b856d2b6afe1eb6976e25ec99f666f SHA512 a745d9c6f8f0a252328a984338915c0965f93ae60a7515055f3b10da52542ada554fe9bd174ea1181131cc3d0532c68e61ab20d4de27299693087843e3d58d22
+EBUILD vte-0.64.2.ebuild 2525 BLAKE2B 8d89347b956eb3b2ce884f2ed4fbaf5eb7c862acffec1d5a5a8ccf6858aa1eb8b4db9f69fa7b8a2141a52b68bda646339a08140146e7a2b43e7d22863745987a SHA512 9afd2c1abbe5e2fb2c7ef93d8b0de554276149707a67b36f25dae8516cbd78af315d7e4610ce5b483d91e7d67d3f0ede9bdea2b119b7c6ac72ce9b314c79d698
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.64.2.ebuild b/x11-libs/vte/vte-0.64.2.ebuild
index 66065238917a..9d03abf19b6d 100644
--- a/x11-libs/vte/vte-0.64.2.ebuild
+++ b/x11-libs/vte/vte-0.64.2.ebuild
@@ -14,7 +14,7 @@ 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 # Upstream is hostile and refuses to upload tarballs.