gentoo resync : 29.12.2022

3 files changed, 9 insertions, 11 deletions

diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 165cd679c9ca..f6dcde211ef5 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,5 +1,5 @@
-DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863 SHA512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d
+DIST xcb-proto-1.15.2.tar.xz 148108 BLAKE2B 0d6cc87ea0d2de594ba11b11255779e90d3c7507f0002453b3d1b2ac73fb604e5ee52e516bbcf76bce2a89027f8c8de6289d21aa2bb23d7d3e2ee77211b54946 SHA512 9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d
 DIST xcb-proto-1.15.tar.xz 146628 BLAKE2B d7f38f1a415a7c70af372c64726e089ee454ffb981c031e4b8e93f345a1ada9dc40fb4e8b59adf553af8b4d9b7ef52730c9df56a0c24e53f98b3403346c7e810 SHA512 a333ac7c39f17ff2567419d09a9a77210c943a4e88d79eb152d416ae26bf6fb14e2446f9817abc806edd7aa3733bd4de5852b5ae90a25cbcc9d40e59c211aa36
-EBUILD xcb-proto-1.14.1.ebuild 1267 BLAKE2B d1c880832af5a8c6a774829d97fbd1b28c5cae334bc7a07ec3758f0624b20cc05cda6adb28decf3f8115e59410e49a263516d3a56fb1c244846f2a6fbf113079 SHA512 d1af50d1aacddb902f7bec51a765bdf569c3331ffccaaf2dc080af54bc01c31d2780aaf293364050d18814d8b620bbb9faabc9b89a142463655954fae53a277c
-EBUILD xcb-proto-1.15.ebuild 1282 BLAKE2B 3d45f1d315bbd6719e4d849f83b240cf666107b2c95fcf1baafbf55467696659070da4a8220e1c65d0dac6dc5d240e59c1f398bd70b7e17da5ab5ee16bb1a6d3 SHA512 4c5e2233d557410bb7d31de42faf896449ce387e118941e84b1917743b60e8e606d8c29593b9b2aa8028a9795235a8b7a848d96b5e909286233d75ffd2fae341
+EBUILD xcb-proto-1.15.2.ebuild 1212 BLAKE2B c5c1880bef3d50009d7dec6075282093f54e28bdcdf4dfc69e5cad8b2b476f464f35301cfa31f0ea1469b0cb9ad59149bb837b0d0315faa265e8b2302a6e2330 SHA512 c26abd6c262487baf6376fa4fe65803ddf8f1ca0db4f534f9dcb1e17ea10d566f53a7b4912711626b020cb32f05bfe2a2eab3529d8cf6b7ba12f586603fbb0a3
+EBUILD xcb-proto-1.15.ebuild 1274 BLAKE2B dacbfa8fd5b5db71b4820ddb6fc46d77099bce70f0df1415a30302a6447415cf4a96f1efcff27f22e460d6d8603ae171ed66aa26388bd33ba585982379bb9d59 SHA512 ee3bf836c669c92f76acebd8cd7bb29ebbd20ae940aa0ff52c99cd901091ff04311e9d0fcedbd1943dfc7dfb8d95dc8b237b0635933b03c7bcff5d3ca2b963a2
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
index 26b96ef6fdbb..40e67119e4ae 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 XORG_TARBALL_SUFFIX="xz"
 XORG_MODULE=proto/
-XORG_MULTILIB=yes
 
 inherit python-r1 xorg-3
 
@@ -14,8 +13,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 
-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=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND=""
@@ -29,7 +27,7 @@ BDEPEND="
 
 ECONF_SOURCE="${S}"
 
-multilib_src_configure() {
+src_configure() {
 	# Don't use Python to find sitedir here.
 	PYTHON=true default
 }
@@ -44,8 +42,8 @@ xcbgen_install() {
 	python_optimize
 }
 
-multilib_src_install() {
+src_install() {
 	# Restrict SUBDIRS to prevent xcbgen with empty sitedir.
 	emake install DESTDIR="${D}" SUBDIRS=src
-	multilib_is_native_abi && python_foreach_impl xcbgen_install
+	python_foreach_impl xcbgen_install
 }
diff --git a/x11-base/xcb-proto/xcb-proto-1.15.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.ebuild
index 4c7003b79e92..be888b602cd4 100644
--- a/x11-base/xcb-proto/xcb-proto-1.15.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.15.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"