12 files changed, 73 insertions, 39 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7ec3a2f8e9f0..c86756d4a9bd 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index 43667169b44c..0f2ed86d8985 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,6 +1,5 @@
-AUX libICE-1.1.0-static-assert-fix.patch 1040 BLAKE2B fb50f4c5ddc227f468bf69a91d5de9ac275f6f37bd3e12082f1d7084bcf9feb46862a33f1109e6572fa66fe094221d428266b14e032dc8d490d32d9bf800e424 SHA512 07e462df794f5b12eaa045c66deb7685994814c45155089339efc094895b197179d1bd9766049cf900374c2c70a004ddd9bed5662fc96276f71cc4fe61682d8c
 DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
-DIST libICE-1.1.0.tar.xz 335864 BLAKE2B c18ae08d61632d6a495b479045cafadaabb556fc55d5107b8b6c323cc7523a153d083a89016e2a84aa810735c542ba7bac7fa70620036b74125f65bdf920c40d SHA512 bf8ca11a20bc120337003a8ef1c190e26e3650dede653287aae7893abd8c72191401d90ddc4bb9b367ae832eee23a22d02b0d4a3b9071c392f865379034b2838
+DIST libICE-1.1.1.tar.xz 335960 BLAKE2B 2849418aa0a66a9137481194bb91208fae4a1eb9a4f9f509b52da7668b8281b6c36f4ba4bdc686eb008a2561b89801fb9270b22887b7c5044e6c14a1ae94dfae SHA512 2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3
 EBUILD libICE-1.0.10-r1.ebuild 705 BLAKE2B ec84151d3792e185d97aee46735e9702f5396623b1ecb184b6efd125f534e2420686570e7e7153f1f52cebd90f45ee7551b749107ca5f9980995d6f9fe3d5d37 SHA512 5400d1d21ac457b08b33c0b78104fe2e1d4563465803853c119b412c33b7dabd8010f68a2f30ea2e0b532e8a82f8472bbad9cd7d0164d9e89fe37b5c44da11d0
-EBUILD libICE-1.1.0-r1.ebuild 763 BLAKE2B 4ec6b574097f36a405fb26f8374a8243b880ef9a5e89a9286ba0701ff73f3573c447ce5f97585adbd8bbe307ab7888ccccab8ab54d34331ab21ef046de28c1c5 SHA512 8c3aa394e54351b8e8cf5e0abdb7c78f5f252eee44948026b1b8fcf47d5e530b5c2691f5143974403f50e65371e40d3b3e46aa1574c4f54bfd624d121f7a66c6
+EBUILD libICE-1.1.1.ebuild 699 BLAKE2B 8a4aed4393d107ba69e7d7b23a81999e9176acc168aa283133454bbedb6fb841df39241649aff8197e2e29877b8331c644a4500221ade297ff55e1872937503e SHA512 2362caae0fde4fcd8ebb5696cd7ec44da8122282bd165b0d8dd49c49870bc082be4f9643d916ed4b8b15c27b118ec0b890264db76aa0df6a83f0f8f77ec1479c
 MISC metadata.xml 337 BLAKE2B c895594110c07848bd58cf4a28df82dbdc5f26671689386a667afd32f3925d4b401887d992282416213be51536ee4d24fd00c0f85d52c98eb71d66854209055b SHA512 2718c47a51ba70e9622bd3bf5e6d987fa2f57d122e25aa972f71585ddf3dbdb8bf34eaa0492846e6230d951f8d557948e1d7e3f54ee27765b63e8f9f2e6fe604
diff --git a/x11-libs/libICE/files/libICE-1.1.0-static-assert-fix.patch b/x11-libs/libICE/files/libICE-1.1.0-static-assert-fix.patch
deleted file mode 100644
index 5d6d4bbc441d..000000000000
--- a/x11-libs/libICE/files/libICE-1.1.0-static-assert-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e176b676cff17948d68299c00dddefe41638c752 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Sun, 4 Dec 2022 22:19:20 +0100
-Subject: [PATCH] ICEmsg: Fix C++ interoperability error due to static_assert
- define
-
-Commit 0269c687e954db7aca2a4344e32cb203315a00b6 added a static_assert helper
-that gets defined to blank if left undefined by assert.h.  As this is not a
-macro in other languages that use this header, this can lead to a compile-time
-error.
-
-Bug: https://bugs.gentoo.org/884369
----
- include/X11/ICE/ICEmsg.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h
-index b6bad13..13e1509 100644
---- a/include/X11/ICE/ICEmsg.h
-+++ b/include/X11/ICE/ICEmsg.h
-@@ -34,7 +34,7 @@ Author: Ralph Mor, X Consortium
- #include <X11/ICE/ICEconn.h>
- 
- #include <assert.h>
--#ifndef static_assert
-+#if !defined(__cplusplus) && !defined(static_assert)
- #define static_assert(cond, msg) /* skip for non-C11 compilers */
- #endif
- 
--- 
-GitLab
-
diff --git a/x11-libs/libICE/libICE-1.1.0-r1.ebuild b/x11-libs/libICE/libICE-1.1.1.ebuild
index 1d54eb6c66d3..4166e1d11bec 100644
--- a/x11-libs/libICE/libICE-1.1.0-r1.ebuild
+++ b/x11-libs/libICE/libICE-1.1.1.ebuild
@@ -18,10 +18,6 @@ RDEPEND="${DEPEND}
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-static-assert-fix.patch"
-)
-
 XORG_CONFIGURE_OPTIONS=(
 	--enable-ipv6
 	--disable-docs
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index e3051147e777..01bbc731769f 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,3 +1,5 @@
 DIST libXau-1.0.10.tar.xz 271724 BLAKE2B 391296f1a59ab6cf93323bbd6e297c88ace6bc769eaed1d9ed3047ac8ab49498c7e9022708597e071da342fc3581de37f347d1049dce9c80c3191a89e2f147c1 SHA512 e56a862a7bbccb108c9683eeb8b643d2587a121dd96982e1e7edc5bd0b676302d244bfaa750afc7fb2ad31df8b825095d779b6e2ab2c76f94e47095d90071ebb
+DIST libXau-1.0.11.tar.xz 274108 BLAKE2B ffd037d6a5bd8bbf10d15747469c5277b3061b87793d8acf095f60aa121bdc0831da9d3e6c369846fd40d2ba03ef209e1e8febff64736d4ececd135a8fabb0a3 SHA512 f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd
 EBUILD libXau-1.0.10.ebuild 484 BLAKE2B 7db594594fcf1d8634aed71a0378c90ea89c1aa7b9e5a845075ee563239773c5efc0b858650fddf1dbb5a810dc94027d6d912eafe90cdd4f566bea8be9aea70b SHA512 3ff6b92b19efe828022d19c3dacac4ba77d38559dad70bfbc2cea1df857dd3655f065c75b89f0a465538a0b77f0e8897dd9ec2912c2ba4890f272809ef9a4c57
+EBUILD libXau-1.0.11.ebuild 492 BLAKE2B f8ab9bb344705d9ed10a28d53497c4832dac6972ea7fc48dcf69dafc31b7083d08470059fd14d2a6a67d80e3dd34d6f11e8652250363f59727ed884cc3cfcf9e SHA512 dab53e3922722dbfbd422256711ac0b74670df93b63453692deabe6fd33e90f963f7a541adb10b5d5e49bf1d549c06f616b0e9f1b94de0bb1ef4fe16bb149789
 MISC metadata.xml 337 BLAKE2B bccad5dd3ea84c6ca278438b94fbfc3e94b65b1808a5004c71c10023c774528084e5afd9e17bc852d2e0b8cc966539d02985ba4485e05e92c7b404277250e50c SHA512 8c81a02a3f99267055e0d044a99b3add40e6737236718e1d5cca35b21b417295a4eae9405c6becd7b42792bb1e387c44bf9c3c31f163f8414da265ff21f41904
diff --git a/x11-libs/libXau/libXau-1.0.11.ebuild b/x11-libs/libXau/libXau-1.0.11.ebuild
new file mode 100644
index 000000000000..43f66ed82b4f
--- /dev/null
+++ b/x11-libs/libXau/libXau-1.0.11.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org X authorization library"
+
+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 ~x86-winnt"
+
+DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 397426c49d2f..8e5a7c1c9c2e 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,3 +1,5 @@
 DIST libfontenc-1.1.6.tar.xz 272520 BLAKE2B ccfe4f9524655862e2e5ceed8edccd7da8ec1872b3a8166803540b69fe4f42f1b5b6f2128a00b702368f9009e1bb1edcec5d28c36815abd6d591dc9fc46cd291 SHA512 524247caf035e5d69280575c79ec5a3259c4cd0a4afa375b01985fedf800b42ecd75102e38f85cdce5591d020d361ffa9390adcb7906e939df289e5131088683
+DIST libfontenc-1.1.7.tar.xz 272752 BLAKE2B 19f675c001d12c36103e7fbdbe99c22fe972659c6db503b67271d875426da27557fd3bd57cb0ee4a3bd99ea4bc59d34d0ccc35204ceaaddf24d49cd5b394cf1a SHA512 fd8578a81090fa938dd75ad9081ab62c6c54fa2535d1c6291afd799ac8dc7c344a43f07cea5cd4433af16df0d926c22e7c169877bc8b13d92584e7dec173d701
 EBUILD libfontenc-1.1.6.ebuild 540 BLAKE2B d7a9a68c2e53f687d626f17aeb401f3568c389073c878fec0ea5962d19ca502fb5c4e3512053a1b5f584c3c60dc7a5f4687c336235db714bf4852c3191def02b SHA512 8d419e99814129452573aad90c58a4b7a91e61b302314ffb6512bc53dce4d16de3dea19647662784b82b461a52333c3b4a0a473aee2d2852eed9c74cdfb1344d
+EBUILD libfontenc-1.1.7.ebuild 548 BLAKE2B 7ed2de204110ef7705ded7be9ba576f8ef5c6d6e7da2dd0dec8e39d8528a89fe58b36b9541d090d72d0afe29b94e13b3a8f6d865e650fb467a7f8ad0c0454ea1 SHA512 db6537efbf86ae23378077e24c346aeeb0cdbb35489757a2c7de75b723bd5984a3a416c439b06d41e73d768ca958bf07f3987242999a8fe88163da24ac056059
 MISC metadata.xml 341 BLAKE2B 8eef39a5f51bea7f961c5605b9bf18c25ecc2a3937f3610275212ef0d6e99903102e7f9cd16c632b7bc22f4968cb259f63470e1e4594eec09752d3985538a3ec SHA512 4c3d24add9b54f986acaa2aceb12df8e59571d0df7370a4fba731d89618d4bfe443fb766f3305f45d46164fe7d465ec65bfe7b617b22e5151f075f8b133a04dc
diff --git a/x11-libs/libfontenc/libfontenc-1.1.7.ebuild b/x11-libs/libfontenc/libfontenc-1.1.7.ebuild
new file mode 100644
index 000000000000..2b5519b3a8e5
--- /dev/null
+++ b/x11-libs/libfontenc/libfontenc-1.1.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org fontenc library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
+)
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index f365235a7f0a..7854891e3302 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,3 +1,5 @@
 DIST libxkbfile-1.1.1.tar.xz 308832 BLAKE2B cc3042a05dc4859edf96235b8ce95b7da33878e9c9b8b7f82f83280f84cbb215f5d3bc32c7f77d8667f0dad7a9500abc68695c8e784dcc7e83e4b30196bc0257 SHA512 2902d21860e27a27159123a19f7d4e0cf9cf8933685f1d2477e69ec647f0f8629b58bbfc391ed45e8b51a10033f18a9d0f16f7f519da9923cd7ed3bd497cf1a2
+DIST libxkbfile-1.1.2.tar.xz 311428 BLAKE2B a7087fe8a752c83fc7c05e4765469d87eb75eb33686c5bcdcbbdc46d60b23d453053aba35082fd2adf5f95a464909e7b7aac1f12ba364ee1fded1c0559dd3a4b SHA512 0639fad7b64b36a85f8d24cdd40085e0ec18d7a671793b8b5c26449e9cc5a84c37117e7757fb1238ac353044935dd00013e42166de5af9dec428e873a47e598d
 EBUILD libxkbfile-1.1.1.ebuild 508 BLAKE2B b010b2ab9a6f8dcfec3235a4b123818a90e1e1dda0a974889e044c91564df8097407df901abd29456f46e8834dc6bdb17c47fa5cca7aafc330996518099bf573 SHA512 20c86965706e6c6720a990ac60a7e91366165fa625aeda8fe2eb6541a3b6a9d975c86d6ab51aacc97b33b407d9b5bff2bbeffdfb811dc55eb4d1addaf5057920
+EBUILD libxkbfile-1.1.2.ebuild 516 BLAKE2B 78252e8737d5a18438db001162da4ea86d17a5c731c974423fde60c96d84151f6f087a6a710656bd399e280b77e208a0fc10b939b6371dd7c0f35dde38da07c9 SHA512 56d33a38db2c79849812339525b3737717968cdba793ddb21d5aae6dc557788c6162da7d9da5e4e6d732d6396429c668d8f7c66e2f333557500db35d8159764c
 MISC metadata.xml 341 BLAKE2B 6bdfd118881a6eae282b380680ff6484fe69747cb1b1d0cabb00607d1cf06535de084ed07bb8664bc5027db274f263ed34175881cefb7464124891a9eb38e117 SHA512 436ec0aaca5f4a4392dfca223787672744e65354de323e5a6222e6a3eda53cfdbee00dcdacd375e587eb8a9277a0fb8da1c0f84723e577d8764ff884f37ccba9
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.2.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.2.ebuild
new file mode 100644
index 000000000000..b358799d6f2e
--- /dev/null
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org xkbfile library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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"
+
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index c81bb9509b60..ba88b8a0115a 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,3 +1,5 @@
 DIST libxshmfence-1.3.1.tar.xz 257104 BLAKE2B 22c5ac15340e4aeac25e3f9e92ce25055ea668c60d1c8fb0d8a0801c6a83a3e405dcc32f733a89c8f6f689ca3c205c500ffec41dff000699a29369d8c6a8455d SHA512 f0c33b97204d62dc8352e2728ce12694bdb83ccbd1fd11c19db17246cd62bcd3e675f5b5b88a4e14bda59b4174003c758c24a3d93abc4bf574fdadc3bf07da71
+DIST libxshmfence-1.3.2.tar.xz 259024 BLAKE2B 2f0ef0767fbb29349acf43b4cb4d7177956c06c389f0443db06e398c4e0f3b424432ce6fe8946d70fdd59b9446c53bf2f1ee126df4d41b3065f1e94438facecf SHA512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c
 EBUILD libxshmfence-1.3.1.ebuild 414 BLAKE2B 73f42e6ea33b0744426be88e7fa3e6bdb03a24cf4658a37ec6ce7aaf3f04e638a62a87b89fdfe83a22a350bc2a16dc3e4c058c9efc719217aec515b359eefa81 SHA512 7d0bb347be47d5a0c19aa75656d3bc941833ef080f9ab90c589958ebc4f0193a919cb8613b2c251d731f018bd8224d44bb55aea76a70ac1cae83e140e4d8f6af
+EBUILD libxshmfence-1.3.2.ebuild 422 BLAKE2B a175819fbe78a45dabe2062647f708ce51edd18e88c01d8d72376d2972c19721eeee4d22d9ea3a8d9f06ba7518695fb502dec67c2d0673af8607ed552d64a4c3 SHA512 b858a1ce4de99344586500874515116ff8d9533cb9e54c0de1b1c6d75d9d54d25b3f3bfad94698163498af9b17b2a998caab0f5daa592baaa053b9bcea4a6377
 MISC metadata.xml 343 BLAKE2B 4b6c3bd00d5e71b96c4cb0c1eebd1606f5a7e219882a4310251f7b68b0230b4cb76ce1d5ea7f3911fe57a33c07c08ee5bd2ca6ac9d1fe690713a2ed39b0e199e SHA512 f58bff9c90477bd61d09f59b3e92b9d899d0329a1be77a76b3ac74c89e4a20a8b88daa37f4c64a06e5367fd25a40bc9709e98d141be271652185e4f2a3c350aa
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild
new file mode 100644
index 000000000000..64fd743beb41
--- /dev/null
+++ b/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="Shared memory fences using futexes"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="x11-base/xorg-proto"