diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 47e7fa4..8a02025 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1 +1 @@
-DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
+DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863 SHA512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d
diff --git a/x11-base/xcb-proto/metadata.xml b/x11-base/xcb-proto/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-base/xcb-proto/metadata.xml
+++ b/x11-base/xcb-proto/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
similarity index 89%
rename from x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
rename to x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
index e2e5236..b0ae9e3 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 XORG_TARBALL_SUFFIX="xz"
 XORG_MODULE=proto/
 XORG_MULTILIB=yes
-XORG_STATIC=no
 
 inherit python-r1 xorg-3
 
@@ -22,7 +21,6 @@
 DEPEND=""
 RDEPEND="
 	${PYTHON_DEPS}
-	!x11-proto/xcb-proto
 "
 BDEPEND="
 	${PYTHON_DEPS}
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index afc5b7f..1ee1022 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1 +1 @@
-DIST xorgproto-2021.4.tar.gz 1141941 BLAKE2B 016a3c2f30ed064855de2a13d86a4b7bc9420ff10e8ac3ba97e08512fef6f0495a69dcaea7f12c7d8694a52284b500a38aee73de7bf2ff0a295715354d04eab0 SHA512 5f4c94d3ee20635f2358d7644be54d5e291bafba15a7713583acbb3564c2799da4ba33ffba625273fe015e4ab733cbaec146467804fd2174eb5fd1ff3bf21019
+DIST xorgproto-2021.5.tar.gz 1132811 BLAKE2B 3fe288cf8a848436dacc0ebf437b6a1d2c81878abaf8c542ff45e70389643cb2bc25bdab5ab6ff9d44a4f9bbdbd24757d21617c2c6a0754870afcd9f60ccbb05 SHA512 9c9ec62f0af68fd0dff24010986326a2b201be2b56b8b94abfe7258bf66b3c4c37088596c43a234aae63b1d781f7797caf408e434c98e8805803bc890b8aacb0
diff --git a/x11-base/xorg-proto/metadata.xml b/x11-base/xorg-proto/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-base/xorg-proto/metadata.xml
+++ b/x11-base/xorg-proto/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-base/xorg-proto/xorg-proto-2021.4.ebuild b/x11-base/xorg-proto/xorg-proto-2021.5.ebuild
similarity index 100%
rename from x11-base/xorg-proto/xorg-proto-2021.4.ebuild
rename to x11-base/xorg-proto/xorg-proto-2021.5.ebuild
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 21782ab..5fa25eb 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>gnome@gentoo.org</email>
diff --git a/x11-libs/libICE/metadata.xml b/x11-libs/libICE/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libICE/metadata.xml
+++ b/x11-libs/libICE/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml
index 7338425..eda7589 100644
--- a/x11-libs/libSM/metadata.xml
+++ b/x11-libs/libSM/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml
index e1e8e6f..63a0c8a 100644
--- a/x11-libs/libX11/metadata.xml
+++ b/x11-libs/libX11/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
   <email>x11@gentoo.org</email>
diff --git a/x11-libs/libXau/metadata.xml b/x11-libs/libXau/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libXau/metadata.xml
+++ b/x11-libs/libXau/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXcursor/metadata.xml b/x11-libs/libXcursor/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libXcursor/metadata.xml
+++ b/x11-libs/libXcursor/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXdamage/metadata.xml b/x11-libs/libXdamage/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libXdamage/metadata.xml
+++ b/x11-libs/libXdamage/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
index 8b173f9..16fbeb6 100644
--- a/x11-libs/libXdmcp/metadata.xml
+++ b/x11-libs/libXdmcp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXext/metadata.xml b/x11-libs/libXext/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libXext/metadata.xml
+++ b/x11-libs/libXext/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXfixes/metadata.xml b/x11-libs/libXfixes/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libXfixes/metadata.xml
+++ b/x11-libs/libXfixes/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXfont2/metadata.xml b/x11-libs/libXfont2/metadata.xml
index cb2e6a7..6d675fe 100644
--- a/x11-libs/libXfont2/metadata.xml
+++ b/x11-libs/libXfont2/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 0d5a09a..285f5da 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1 +1 @@
-DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
+DIST libXi-1.8.tar.bz2 494579 BLAKE2B 6804aa5c666ff489180c7d468e666fd3c986c7e24396f80f69164cc351c4aff5ab3c8e22ded61f03b96e37bceb5fd86d707220479100c5ec44a2a05fe5345d60 SHA512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.8.ebuild
similarity index 93%
rename from x11-libs/libXi/libXi-1.7.10.ebuild
rename to x11-libs/libXi/libXi-1.8.ebuild
index 00930cd..92cc650 100644
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ b/x11-libs/libXi/libXi-1.8.ebuild
@@ -15,7 +15,7 @@
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+	>=x11-base/xorg-proto-2021.4.99.2"
 
 src_configure() {
 	local XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/libXi/metadata.xml b/x11-libs/libXi/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libXi/metadata.xml
+++ b/x11-libs/libXi/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXrandr/metadata.xml b/x11-libs/libXrandr/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libXrandr/metadata.xml
+++ b/x11-libs/libXrandr/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXrender/metadata.xml b/x11-libs/libXrender/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libXrender/metadata.xml
+++ b/x11-libs/libXrender/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXtst/metadata.xml b/x11-libs/libXtst/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libXtst/metadata.xml
+++ b/x11-libs/libXtst/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libXxf86vm/metadata.xml b/x11-libs/libXxf86vm/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libXxf86vm/metadata.xml
+++ b/x11-libs/libXxf86vm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libfontenc/metadata.xml b/x11-libs/libfontenc/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libfontenc/metadata.xml
+++ b/x11-libs/libfontenc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
index 396f8bd..3fae52d 100644
--- a/x11-libs/libxcb/metadata.xml
+++ b/x11-libs/libxcb/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>x11@gentoo.org</email>
diff --git a/x11-libs/libxkbfile/metadata.xml b/x11-libs/libxkbfile/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libxkbfile/metadata.xml
+++ b/x11-libs/libxkbfile/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/libxshmfence/metadata.xml b/x11-libs/libxshmfence/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/libxshmfence/metadata.xml
+++ b/x11-libs/libxshmfence/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index ce9f853..eac868b 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
   <email>gnome@gentoo.org</email>
   <name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
+  <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
   <flag name="X">Build and install the legacy pangoxft library</flag>
 </use>
 <upstream>
diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
index 46b4979..b6b501a 100644
--- a/x11-libs/pixman/metadata.xml
+++ b/x11-libs/pixman/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>
diff --git a/x11-libs/xtrans/metadata.xml b/x11-libs/xtrans/metadata.xml
index e943b72..e17a5bc 100644
--- a/x11-libs/xtrans/metadata.xml
+++ b/x11-libs/xtrans/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>x11@gentoo.org</email>