gentoo auto-resync : 03:04:2025 - 01:34:01

9 files changed, 22 insertions, 22 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index c3fb4ce878e8..475cc3144ede 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index b61fbda28322..9a5794eaff2f 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,7 +1,7 @@
 AUX 9.0.0-Disable-things-we-don-t-want.patch 5612 BLAKE2B 2890a41155cff6c085789fe29330cbe9f4147cfa6adcade4e3bea94729f8c984fcde89d240977ad81502d7c8945258b323df13464ab00e854c73943ef03960df SHA512 3a00e2c00da613978f830f159634b848cb0ceba2a6f9faf6e1f71fb50d8a0a113038f23b3354745fbb586cc250f62b5645019a2b1f57f5a32408e56b61c07b2f
 AUX 9.0.0-uint.patch 2434 BLAKE2B 1a794373229e8b362c107106e594b7fcab70ee1d119e31b732282b435521f1de35bc7c182e2038619388ee4b63bd8844c250612cee0b225c1488b7ca2933af40 SHA512 8bc04ced2dd02e1b3b0a9b287716e6f7df67c5074b0e02d10530a65f2618660226776ec77a9eacee4c02bc3698bf1d556b9a5a1c9d0dd4e4ea04fb88f15a7f20
-AUX 9999-Disable-things-we-don-t-want.patch 5684 BLAKE2B dd286c692f1c1cbe41814240ced62ebb8c0aabc0e860d942afcf9349019f5172c5cdeb7336fa956138f18aba3999d89a97ce7eeb2712bc3dbb4f03788484c51e SHA512 1d4132d5705c1f2d1ff1cc9d35970af39729f78c7c022d640d14c608a2665e8bc339f2c66bfc85a11030a0ab03860f99990157cc698bdb1e9945a0fc27194328
+AUX 9999-Disable-things-we-don-t-want.patch 5681 BLAKE2B 665896a293b7b2024e7240f70b3152f97583c63cd92ea572e6001605c5a0ff04fc20a07d6725e4e45ca794535ac2a98ec7d027140bd60f0e5b10fee8ed6849bf SHA512 b4bb75515b75f968321a56fe3d470de58251b096dc171c3dd6a0e569a61ea29812e3e309a736468f8836fee5369bcb948cc7097376f52a536958e5ac9444d980
 DIST mesa-demos-9.0.0.tar.xz 14839368 BLAKE2B 426211886344e88616670f0da8c71385e0ab86fd7dab60c7a477b165f33d2f7bd5fd9297f1f67c78e60fed5c98ab8851c1bd4ae92a6b0b486fd158196b109eb0 SHA512 af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1
-EBUILD mesa-progs-9.0.0.ebuild 2179 BLAKE2B 36932864c85de88d4c5fe2c5564a43593a6d1673d9131cfe75b46021f3cf3475cdb16e034c8089d97667660924062085310352e2942d5325c560594fb34591df SHA512 9efabff43e59d9ddaf78f77046ab2ce1e5e15f914e96cf6cdc083a5f1d1428ff7dcec5468e69d67acb223688d47d8671c5eb6aea7d32683ecffd695763d7ae5d
-EBUILD mesa-progs-9999.ebuild 2089 BLAKE2B 12341e3fea863e19ffea457d41ff8a140646c4cbb62f2ecdef6122a008cfdfd2088915cdeda680fe88009fba05fbe39ed42fa965f0b1c7690359d05c54182952 SHA512 7b3056dccbfdbae4ee552c90f0b3118ec03f940bcf5c6346886adaa3b24887dd0a7f3faf5bf3848a7106bd4b5d54cedc29ba1759e37ee49b11feab79361528a5
+EBUILD mesa-progs-9.0.0.ebuild 2181 BLAKE2B 92662598c116ab935828f9d62a95a51a3dfe94b5cb412ee4caf1d4b546483f5c24f1fa3ba37cbe34afc65e32ccd779be0d206526b45cb4454ea0c57cbf033ea2 SHA512 a49c7e9346c6dfe0028b02692a40b7f542440580f843598ae63a3590488f1ccd72b83a9a41a42c3a56e596d0670d555dd9724e5c0339ceef8e8b3946497986bd
+EBUILD mesa-progs-9999.ebuild 2091 BLAKE2B 65031887f60214f6ba44cd8c971316916b12f311e7c1896908e821742353b74dd6e56a3b94605c81acad514d5298178ebcdc56d3375313511eb89bed0924ab92 SHA512 18300a4c20d219f16c1dce0ce07b44bda8b6130727710d39ae319678c5122ed922b703697ec2f9622e1d1243f0cbca9a37016db1e3570add80a5e0e9a0a21070
 MISC metadata.xml 332 BLAKE2B e04fff442530a88cc9d5601e87b439c2dacf38443bce413174f0bf5923a490140c7f43d8c1808e6011936e4bd77306d6d7e5be4f18d0cfecdd4841f252714a19 SHA512 c1f234a2663a6c51177ee9dcb7b33a94deed4dde8c13b53018b5bc429efe269faae54ac7693608186d939d9e7e493209a450852f2f68310e41422e31836f71ca
diff --git a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
index 583ce62e5869..2546ad9be239 100644
--- a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From 46213b2474e3a564a5f6d8b65ecaa428bd87fc7b Mon Sep 17 00:00:00 2001
+From 355e125cb5d8b899b18f6b2bfa94291cfc68f09b Mon Sep 17 00:00:00 2001
 From: Matt Turner <mattst88@gmail.com>
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
@@ -12,21 +12,22 @@ v7: Link against libOpenGL rather than libGL
 v8: Rebase
 v9: Rebase
 v10: Rebase
+v11: Rebase
 ---
  meson.build                   | 13 ++-----------
  src/egl/opengl/meson.build    | 35 ----------------------------------
  src/egl/opengles2/meson.build |  5 -----
  src/meson.build               |  2 --
  src/util/gl_wrap.h            |  2 --
- src/util/meson.build          |  9 +--------
+ src/util/meson.build          |  8 +-------
  src/xdemos/meson.build        | 36 -----------------------------------
- 7 files changed, 3 insertions(+), 99 deletions(-)
+ 7 files changed, 3 insertions(+), 98 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 4949c726..7f5ab5e7 100644
+index c09153cf..126009c0 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -60,7 +60,7 @@ dep_drm = dependency('libdrm',
+@@ -68,7 +68,7 @@ dep_drm = dependency('libdrm',
    required : get_option('libdrm'),
    disabler : true
  )
@@ -35,7 +36,7 @@ index 4949c726..7f5ab5e7 100644
    required : get_option('x11'),
    disabler : true
  )
-@@ -95,16 +95,7 @@ endif
+@@ -103,16 +103,7 @@ endif
  
  dep_threads = dependency('threads')
  
@@ -125,10 +126,10 @@ index abf9eeee..729c0df6 100644
    'texture_from_pixmap_glesv2', files('texture_from_pixmap_glesv2.c'),
    dependencies: [_deps_x11, idep_util],
 diff --git a/src/meson.build b/src/meson.build
-index fd4a1673..cea622a6 100644
+index ae225884..896549e9 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -57,5 +57,3 @@ endif
+@@ -55,5 +55,3 @@ endif
  if host_machine.system() == 'windows'
    subdir('wgl')
  endif
@@ -150,14 +151,13 @@ index b2ff9c8f..f482df5e 100644
  
  #ifndef GLAPIENTRY
 diff --git a/src/util/meson.build b/src/util/meson.build
-index b4fe614f..d2c42dc2 100644
+index 9304ae67..f59606b6 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -22,17 +22,10 @@ inc_util = include_directories('.')
+@@ -22,16 +22,10 @@ inc_util = include_directories('.')
  
  files_libutil = files(
    'glinfo_common.c',
--  'readtex.c',
 -  'showbuffer.c',
 -  'trackball.c',
    'matrix.c',
diff --git a/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild b/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
index fa1556695a6e..caf1969fd330 100644
--- a/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ RDEPEND="
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		vulkan? (
 			x11-libs/libxcb:=[${MULTILIB_USEDEP}]
-			x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+			x11-libs/libxkbcommon[${MULTILIB_USEDEP},X]
 		)
 	)
 "
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 6ef966085303..701fa8eb80d9 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ RDEPEND="
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		vulkan? (
 			x11-libs/libxcb:=[${MULTILIB_USEDEP}]
-			x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+			x11-libs/libxkbcommon[${MULTILIB_USEDEP},X]
 		)
 	)
 "
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
index c5b74a2506b7..de5ebc8f8b93 100644
--- a/x11-apps/xhost/Manifest
+++ b/x11-apps/xhost/Manifest
@@ -1,5 +1,5 @@
 DIST xhost-1.0.10.tar.xz 137076 BLAKE2B 04e1f14099571966c53f724e4010f90d9606bbf691d02da8652ae2d3921e4404be158227a92216599e4f9a25d97a93acb9dc59be8a60766bab9f20d8ba28cdb6 SHA512 65467b0a096455dae681f8397f5b8b0490a2f80db5cb9f92757cfff8d7822b43833202a275eed8467c6a6aaf3b02e0a7b1a069c5d587d32e56b1893297903051
 DIST xhost-1.0.9.tar.xz 132828 BLAKE2B 31304ee5db863b3448057a1702e0bc7739fd01be8b334ba7dece8b4db2b5384ecc11882fad5957e4e9fa491c2ad6e2d22f8ce6cd79988ceac7ce08401ebd886d SHA512 d281a0df0a036d693ce7dbe0d1d53839110d203f42454bf4d33a49fbfddec078149969b6ad76641e40e207ddc8317ea563088c59025fc57d8245e5ed27f79818
-EBUILD xhost-1.0.10.ebuild 483 BLAKE2B e989d7c3e5a2e887540c3b8ee8603e869db9ddb3faecb10b86ddfd66bd5d54ac977e6874ee96dc3300c9747332c4e6f3475e46fb186cf03bd4d6a1940b156a2f SHA512 7af5580d078315cf471f09a05a3f165ec3cb97b39d703fb763bb00abf210645c6a87dcfb4b3f092d5ab3d03b2fce6af562a24bc940a481381d0006d00f84994c
+EBUILD xhost-1.0.10.ebuild 482 BLAKE2B cca2cfbd207aa39a3fff9faa8f11244956b21cb062f7b99c41465c483df7cd9da42d94a0d2f23b07dc8678b9c616b7af14f79666885c75de8affa33b2ab1674c SHA512 a78b5d5bc03edd1beb561efe93105a75ca0f14cc9f5ac5c0f77097b72ff4316573b97f38868c277fb3d86f47a8877e671241cca6e3e126c3aeb5daf44b30cb2d
 EBUILD xhost-1.0.9.ebuild 482 BLAKE2B 599122a17731200dec3936764b8b11810036fe3434bb2a66ef3fa470c2557e46f773323a7706af4fc22a40208782b496060162c54b846cfd3c2c6a1c3ca489de SHA512 764ef1b1eb076f9f9d8b4517d7c15186dac82a8b484817f5fcbdbb8b1207e45dd7846618b0a7afe76897df005d30f2d6a062ded596f965e9406c3954dcd195a8
 MISC metadata.xml 336 BLAKE2B 4ac510f48734a3d057912f12ab061568620275dfb05bb28f5226f2221fa91567d074047f6e45db79a5e788a0a7387c2a5cadf279ed59371a270aa3f1031d8e94 SHA512 462475533ea9306043d4631f3eab65fb1b333bf002705dfc7bd1cde51ffc3c3a4b6416703ae80980dd6304b3fc07172789a6e66a6c91679f69e0736bc6ac00bf
diff --git a/x11-apps/xhost/xhost-1.0.10.ebuild b/x11-apps/xhost/xhost-1.0.10.ebuild
index 0c7776c0915e..41aa44497960 100644
--- a/x11-apps/xhost/xhost-1.0.10.ebuild
+++ b/x11-apps/xhost/xhost-1.0.10.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit xorg-3
 
 DESCRIPTION="Controls host and/or user access to a running X server"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 50fdbd0145c7..9463184fe682 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -15,6 +15,6 @@ DIST xinit-1.4.2.tar.xz 156728 BLAKE2B 8f5c16d5ec9cc16c734b1661def4f7e68321259f2
 DIST xinit-1.4.3.tar.xz 158348 BLAKE2B 321400aa6572a7309ece961c1f053382825de5c12a235eb7f4345d5da4f95a199a9e1987e21baa5c3a472d2638e8c18a1610e4f0d617f3205f58cd66415efb6a SHA512 ff754567d2224d1ff5023b302cae3a435950a6f24a773e214ea108b96d18b722d4cc86d0e25a7d92edea1307e3037248b4da004c1b392f73ba7bc1e04a94b77b
 DIST xinit-1.4.4.tar.xz 162496 BLAKE2B 54da6f5d31658a228987d4e3a17636bb5f3a36bc7067dfc8bcbe35c2944831e320edd7a92b172a55b2db41d6d757b22cfa2b712beb9d17c8f39d539a4294ba23 SHA512 387285c952bbe074d2ed2dbbf745d1634763bb71f7f7edb22b3306b9e96ae4e28e59ecd6c48cc646b12dbdbcc68d42036bd127da75ef3c16fabdae87794ad6d1
 EBUILD xinit-1.4.2.ebuild 2229 BLAKE2B e4a75c2c6afb45f43f4eb987c1b42dcf37ec24d61ff83ae09b92903faf9912f4fb5511e4a53006d09db98277a86223fbab2e12b01a7e5eefb6af53f64b447c1f SHA512 86f54780baf5cbb5157e5d4a394a8af2ebc613e8aab5def17def7537305075f9f22469df11eb6306a51a5346028b27b1dc795fc6dcc1717859388b16240e947d
-EBUILD xinit-1.4.3.ebuild 2188 BLAKE2B 486bd4def52b572b0aeea9f71315bff288e1829a9b835f9c86431c99645bdbc8c896f5827793be50df813c6356655bb7d2e47af621fc14eff902314a6bb368a1 SHA512 522121a2803d3c7bf1bcd0c7fdad9160613cd24a4ab93c401b8b8fd4da8e31882f0d8121697413d2a231e24f56fa1422a52970ca9f3ef4b9561d9da6377984e8
+EBUILD xinit-1.4.3.ebuild 2187 BLAKE2B a1666ba7ca39cfac7fe7ed752927c3c3d82c18a0f7dddd05b2256908b9ae9d6c20f275c1f9a866594520c4e6dd098e2c3bf1042112a9aae2bf59bd071c5d7a2f SHA512 146017bf7e1484239146169b2fe0baaf582a5c46f80f23139a15a21e6c08ec80d5d3a28934fc26497d45036d4961b8f496c11928e0377fb0510d06cdeb204c0d
 EBUILD xinit-1.4.4.ebuild 2195 BLAKE2B 6f9f09cf428f40a00b8f42fb8a9bb216cbbc7059517bbcad02ee72f1060936d7f0ef4d22e78fc5ac27ee7bff818d75333ba2ad2c98fea08664ff3a8438290da2 SHA512 5cb193c44e0c1c944864beef4c769b0b8636a2771709c9a6edbf89676ef75ad1f878be54782da01c536f92cad7d3372def98e9a20a42449a1c248c78ed2b793e
 MISC metadata.xml 550 BLAKE2B 3c7e6936cc7db503b1f4e654e6cc42edfa82524403d8de329e058cb4a8e084075f1c7047e494952847ef137c0d411b4ab20e1f54e4264448040e4d62af0f1ee2 SHA512 d903eb4c148009926f925d6f20ee29316d98adf4ee3431fd47f098d907fc9e777bfa33d34d90163fdc69e6ac7c895f67852269cc938deb2c22102ccb1ca5393b
diff --git a/x11-apps/xinit/xinit-1.4.3.ebuild b/x11-apps/xinit/xinit-1.4.3.ebuild
index 74b62c27b392..f7a74a59be0d 100644
--- a/x11-apps/xinit/xinit-1.4.3.ebuild
+++ b/x11-apps/xinit/xinit-1.4.3.ebuild
@@ -8,7 +8,7 @@ inherit eapi9-ver xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="