diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/Manifest b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/Manifest
index 1ee1022273..25c2c1adeb 100644
--- a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/Manifest
+++ b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/Manifest
@@ -1 +1,3 @@
-DIST xorgproto-2021.5.tar.gz 1132811 BLAKE2B 3fe288cf8a848436dacc0ebf437b6a1d2c81878abaf8c542ff45e70389643cb2bc25bdab5ab6ff9d44a4f9bbdbd24757d21617c2c6a0754870afcd9f60ccbb05 SHA512 9c9ec62f0af68fd0dff24010986326a2b201be2b56b8b94abfe7258bf66b3c4c37088596c43a234aae63b1d781f7797caf408e434c98e8805803bc890b8aacb0
+DIST xorgproto-2022.2.tar.xz 757080 BLAKE2B 0fee7910fced83548780fd1c7bfd214c932c7c5064c6ebd40ac9285d071837056b9eca24dadb53a572a05768f8762c4dd81ac58fcf6b43028f557ed56a98f7f9 SHA512 8e6108110600d076a94cc6d0e465b2e9adfbbe8d7e6b75fae9c5262d99dc6074ab1ed561a74d6d451f00f5b7af9f507a6317be9c0770efeed9e60b64beb7a1c9
+DIST xorgproto-2023.1.tar.xz 759168 BLAKE2B e794f8acb2b01f97cee80b01b3b67aa0691517d4eb17c5304768932785b087d86bc610e9e448c623e31b665e72c4b4c0432766767e01e8d835d88a3bf45adce6 SHA512 342128ca2e9a6806a7ff33f426434bee29626a13a592b9544654a010cb7be208b0862e3cd063773a0003ca0ec7d48361cfcc384fe207efe9ecb6ec3f2b8e7d56
+DIST xorgproto-2023.2.tar.xz 759040 BLAKE2B ff255b91770ad11cdcc48d12815317285d8d16d28011a86166f3e07af18b30fdf35c2eb7b6537504eb4c0e9ca65b3116493422b6faebe04ee80e6aee92387675 SHA512 af0a8c8094fc6a490a886a8c048175762b6334798f2e48b6f6e19a7bb39ddbef05fa1237c4e9d9f1d870d24f5ca7a7c463044c41ceebd108f8ab0816677a582d
diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/metadata.xml b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/metadata.xml
index e17a5bccb7..403bdb5928 100644
--- a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">xorg/proto/xorgproto</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2021.5.ebuild b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2022.2.ebuild
similarity index 72%
rename from sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2021.5.ebuild
rename to sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2022.2.ebuild
index 6bd2e9b7da..6c7649b6fd 100644
--- a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2021.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2022.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
 
 MY_PN="${PN/xorg-/xorg}"
 MY_P="${MY_PN}-${PV}"
@@ -20,8 +20,8 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -30,17 +30,16 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	test? (
 		$(python_gen_any_dep '
 			dev-python/python-libevdev[${PYTHON_USEDEP}]
 		')
 	)
 "
-RDEPEND=""
 
 python_check_deps() {
-	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.1.ebuild b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.1.ebuild
new file mode 100644
index 0000000000..5e165a925d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson python-any-r1
+
+DESCRIPTION="X.Org combined protocol headers"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die
+}
diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.2.ebuild
new file mode 100644
index 0000000000..e7f87e6509
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson python-any-r1
+
+DESCRIPTION="X.Org combined protocol headers"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die
+}
diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild
index 865b171e53..e8ac7166da 100644
--- a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
 
 MY_PN="${PN/xorg-/xorg}"
 MY_P="${MY_PN}-${PV}"
@@ -20,8 +20,8 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -30,7 +30,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	test? (
 		$(python_gen_any_dep '
 			dev-python/python-libevdev[${PYTHON_USEDEP}]
@@ -40,7 +40,7 @@ DEPEND="
 RDEPEND=""
 
 python_check_deps() {
-	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {