gentoo auto-resync : 22:04:2024 - 12:05:36

15 files changed, 45 insertions, 176 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 8cf45e96ae01..dc94d74275b9 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index 3f991bfd4c57..4bf1c2187aca 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,5 +1,3 @@
 DIST iceauth-1.0.10.tar.xz 134560 BLAKE2B e5559f7b2b57c98d6f294cd30312e42827975cc4b9111918bcd81e46cf8946ce2b76a10e613fe2a592cd51509a372523ee0440557e42178d279c1ce30589cbf9 SHA512 cfadac03a3f72f3c0bb58f67984a033847c76e7e3fdd9ebce583c0554d7f9484faf5053d878f5a82a543cdcc8e2ef8acecadb8830bd3c53584d7ec950cb51cc3
-DIST iceauth-1.0.9.tar.xz 130724 BLAKE2B 39848a28a289f38b43184bc579d8263509dc71bf78ed0a0282e8c22a9f5f468606308ca7785481ce7ff1b683d7854b15cbbadc6ff7c9d0c4d9ff4beef9598211 SHA512 16b2f58008587cf1544037ca8b1c76dbb75eb043b3048b3064e66ba6b147962233f1453c2cf18bfb136dd6dd21d3e27b5219e17e1ab7b81dbe93fb6aff801a72
-EBUILD iceauth-1.0.10.ebuild 397 BLAKE2B 607645035c308bbfbcd8b8843bd33303107a5e38efd2a59dc2beceaad8539cbbe6984963487bbf81ea7c401f2637ecc65dbfbbb80a6ae158d5aec33240f35af1 SHA512 2f703b035b735ed4f0abed24a089a6b13e646e7cd2e2afc61d90d77758e758aca4e32a204732bceff3a75705a40036dac639a6ce8b11db4f7ef6dc65fdbc4833
-EBUILD iceauth-1.0.9.ebuild 396 BLAKE2B a9ce4b5fcd22aeb4ab3bf038db9b436d4fe838f104789ae2642a669cf4769c7079bf289922d85fc923fb8109d94832d56534eecac95bb2a06d0be8176a003bb9 SHA512 fddf9efb620b2f3730b1fd7c607c212c3aa0a74c8c5224a3ba6c398d639128c0c67691b6d0a1e3d62d3bedb941462a516abbaa4ea93949928366cc99ca9ecbdf
+EBUILD iceauth-1.0.10.ebuild 396 BLAKE2B 97bb563f9b7e2c31691d83d41048b4017f0e371d966d76b5947fba3bb54b3b0dc95b91dc25cba919b9e01d5dcd96ae81aa85126f84942b73113800a5291002cb SHA512 2d61632aff17f33891c688ed6b2280a09d2128621a036a8a848edeba96f421a2511e966cfd6c41908ae80fa6c1e6441ec8feb8a80ded41d6b8ef84957540f850
 MISC metadata.xml 338 BLAKE2B 6bfe419cd899575e462da14afe1b022e223f387e1698e9ff3e3ee7b4f7bd8cf5521a9ab470c65932733f3fd8c981e7e6f6a7d0639e3a79f633c5ce97d91adaa2 SHA512 31e0c085f971046bb97a5bb30d76e50f080d0c5f9ca83578b4218a5130c37fc2750108ef1a247d8692a74d448ee600df07546a3edeaac70bc1e4061f20177989
diff --git a/x11-apps/iceauth/iceauth-1.0.10.ebuild b/x11-apps/iceauth/iceauth-1.0.10.ebuild
index 1c5fda38f415..bcc66302e522 100644
--- a/x11-apps/iceauth/iceauth-1.0.10.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="ICE authority file utility"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="x11-libs/libICE"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/iceauth/iceauth-1.0.9.ebuild b/x11-apps/iceauth/iceauth-1.0.9.ebuild
deleted file mode 100644
index a29d39a5ece4..000000000000
--- a/x11-apps/iceauth/iceauth-1.0.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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="ICE authority file utility"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="x11-libs/libICE"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 5e1f69055dba..856eab21def7 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,9 +1,9 @@
 AUX 8.5.0-Disable-things-we-don-t-want.patch 5868 BLAKE2B ed8b2e78ce7e05076a74f7ec415afa315db6d6e197936f03a2cb2a322d9ea33e2cdbb15431cc67d26c40ae07045d941fcad357a61eee56e1c26b6b21d1ad0e59 SHA512 8546b12244339fecbf49ce6d1e32701eefaf915d482adecc58c1190cdcf9a918ea7a135988381173c4742bb3b1ba78fcb96285ce6056744f0ed0cb4395855945
-AUX 9.0.0-Disable-things-we-don-t-want.patch 5041 BLAKE2B 1ba9db48d675c3dc57327074d0ec48d5968de2b9ab8a50d16af7009897ae0cfdcfcdfed5751f7ceec1fdd0bb687077cbca914caec953a6ea13cf1feaa60f9760 SHA512 ee7ff231520742dd090290837faab3d7d2bdc73b92b47e84daea8e665a745aa18aac9ee905e3e4e84367888aae6d32d17b735777fb9671b93260ffec70d6005f
-AUX 9999-Disable-things-we-don-t-want.patch 5321 BLAKE2B 03a82c7f4d0705ba5b4e86cbbacaa320fcb5d5ec076cc690699c737aebc46634734852717b8a9785f29e6cfa8ab981199db9a0b92813096da79b62d094a86b2e SHA512 bfce315c804637bcb2ab079e07149d876e169419f18cd109f9bf0158e272d8d48002c38565d5327643416a7a5056b5867c392665a1f65f2fd3bd57c1a1bcb7ed
+AUX 9.0.0-Disable-things-we-don-t-want.patch 5278 BLAKE2B fd62af8ac9d08bdf6167d873745f3c436d4c66892a4eae562f0babe25068edd2de8cf21893c856b61dece90a3a0ef3dddea1550d3486f23f1f246143d8391e9d SHA512 8c4248f5363b6d406c3ae1c8448d77bfd0f28a4cf3c58ab1b088f0f2b547774f9ac0c959f6a5d85c3b7aa191b9a3f7370d1ac8a524c7569bb41a18f265644b5e
+AUX 9999-Disable-things-we-don-t-want.patch 5580 BLAKE2B 99de3b214895095cacc2c200517cf7ccd03eca121fdf339f728ef23ef16032f82558a80f9cbdab964c482ff6e27c389b2575779bd23f7eb335bb0296711977f3 SHA512 59b83c62c872f76b2c08235b87add8846b3b8ea9ba1e58fc1d4c461f09153db934e84b23423bd68a7e258ac57b01a67622c66ae45afb331a6b053d157bf5e7a4
 DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
 DIST mesa-demos-9.0.0.tar.xz 14839368 BLAKE2B 426211886344e88616670f0da8c71385e0ab86fd7dab60c7a477b165f33d2f7bd5fd9297f1f67c78e60fed5c98ab8851c1bd4ae92a6b0b486fd158196b109eb0 SHA512 af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1
 EBUILD mesa-progs-8.5.0.ebuild 1803 BLAKE2B 998a7cb2d24b3c86320af4f2be565cf416951898a05afe4dea7a89f05c8aad9767cf3eb1f969a692ffe3a09c1044e725b35346925b16fea6ddaa2ea68087b2ac SHA512 5eac4d8bb3d7041b8f504b73f5e6e463bfee23986c70e2049f10b4a6dc43f2e3e2509eec743c77ed35f3afbe4b56924037c8bf6c46b7438d9044cf4b5affa9ab
-EBUILD mesa-progs-9.0.0.ebuild 2085 BLAKE2B e6e3e8232f4e92e0f2e3f96487f41b37092898270a6165534285145ed98d49e44cbd6ffd78ff4e46c1a6a90a83ee69c27188aed1fdec1757327c3822f80c324d SHA512 7b1d53ba4b85fa9667c175b889e432912d3dcd16069fdd34142c006f6e1b5e4c1341df43293e412263c996973f3d4fa5e7e1fc21d0f1c86d261d3f8067fc8231
-EBUILD mesa-progs-9999.ebuild 2051 BLAKE2B fcfea7243773905fceed9a0e06abddbe6c479decdcf9ccdf75dc1086aa0c42030d2e7dbeedaeab813a7704e9272b6cffbe7dc5456ba4874298676fd6dad3fb9c SHA512 f43747c791e029e007c7ad87c4e84457c71e5dd47b5444bb31f45ffbbff552b5a8456786033321e9859888efa37f334787cd3d4642559658ea899477a27fd322
+EBUILD mesa-progs-9.0.0.ebuild 2129 BLAKE2B f02fd4a537c9079debc242fde541db92bb100f5c144a563dc401a16736a664706af17992ffeab833448084e868abd50ecff50a0e14bb46ee33a7a1bf89efdcf1 SHA512 2d2c90b177fd7f0e52cb31e5d3cc91947dcc7bd90476fcbfc5b123a659c404c8f3d74ac91d1a166fcec7457ba87a6768fa8b2f816fabbfe8574dedb8623bb9bd
+EBUILD mesa-progs-9999.ebuild 2095 BLAKE2B 7ce407fc67808684f05498a72c8ebd6572f431a6c435da221309109bb9e1688d22ab70db5619915e5ab4177409e9e223d53072be5ac9f517cadbaf7e52bf65ed SHA512 874e02458f238b84de3752ad4a523c6f7f7389d7eda98597145788c1b9049496496bdf1b161c194e7be20c262f8a12dd65ce133e924424281155e284bb10d46b
 MISC metadata.xml 332 BLAKE2B e04fff442530a88cc9d5601e87b439c2dacf38443bce413174f0bf5923a490140c7f43d8c1808e6011936e4bd77306d6d7e5be4f18d0cfecdd4841f252714a19 SHA512 c1f234a2663a6c51177ee9dcb7b33a94deed4dde8c13b53018b5bc429efe269faae54ac7693608186d939d9e7e493209a450852f2f68310e41422e31836f71ca
diff --git a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
index 5b1104e71a13..dcf7fdcc17ac 100644
--- a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
@@ -1,20 +1,20 @@
-From 0e87b772b5d291ecf2cdc3f209321ea586918375 Mon Sep 17 00:00:00 2001
+From beccb3024fee949bfb7bdfd19225e93a7cb0e906 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
 
 ---
- meson.build                   |  3 ++-
+ meson.build                   | 13 ++-----------
  src/egl/opengl/meson.build    | 28 ---------------------------
  src/egl/opengles2/meson.build |  5 -----
  src/meson.build               |  2 --
  src/util/gl_wrap.h            |  2 --
  src/util/meson.build          |  9 +--------
  src/xdemos/meson.build        | 36 -----------------------------------
- 7 files changed, 3 insertions(+), 82 deletions(-)
+ 7 files changed, 3 insertions(+), 92 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index c1853f94..5424dc73 100644
+index c1853f94..d1457a35 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
@@ -26,10 +26,20 @@ index c1853f94..5424dc73 100644
    required : get_option('x11'),
    disabler : true
  )
-@@ -97,6 +97,7 @@ if not dep_glu.found() and host_machine.system() != 'darwin'
-   dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
-     required : dep_x11.found())
- endif
+@@ -87,16 +87,7 @@ endif
+ 
+ dep_threads = dependency('threads')
+ 
+-dep_glu = dependency('glu', required : false)
+-# GLU is part of OpenGL.Framework
+-if not dep_glu.found() and host_machine.system() != 'darwin'
+-  _glu_name = 'GLU'
+-  if host_machine.system() == 'windows'
+-    _glu_name = 'glu32'
+-  endif
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
+-    required : dep_x11.found())
+-endif
 +dep_glu = disabler()
  
  dep_glx = dependency('glx', required: false, disabler : true)
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 9c352fea35db..02855c749e3d 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 b7bced77da267e51eaceeef68a213007ba54aa86 Mon Sep 17 00:00:00 2001
+From 6622a4e4a170d6c784d46638a128068ea5203493 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
@@ -7,18 +7,19 @@ v2: Enable libglad to satisfy egl dependencies
 v3: Enable most of libutil to fix undefined references in es2gears
 v4: Disable dmabufshare and remove dep on libXext
 v5: Drop trackball.c and showbuffer.c
+v6: Fix disabling GLU
 ---
- meson.build                   |  3 ++-
+ 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/xdemos/meson.build        | 36 -----------------------------------
- 7 files changed, 3 insertions(+), 89 deletions(-)
+ 7 files changed, 3 insertions(+), 99 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index d487a11f..ff360c2e 100644
+index d487a11f..4cd6abf7 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
@@ -30,10 +31,20 @@ index d487a11f..ff360c2e 100644
    required : get_option('x11'),
    disabler : true
  )
-@@ -97,6 +97,7 @@ if not dep_glu.found() and host_machine.system() != 'darwin'
-   dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
-     required : dep_x11.found())
- endif
+@@ -87,16 +87,7 @@ endif
+ 
+ dep_threads = dependency('threads')
+ 
+-dep_glu = dependency('glu', required : false)
+-# GLU is part of OpenGL.Framework
+-if not dep_glu.found() and host_machine.system() != 'darwin'
+-  _glu_name = 'GLU'
+-  if host_machine.system() == 'windows'
+-    _glu_name = 'glu32'
+-  endif
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
+-    required : dep_x11.found())
+-endif
 +dep_glu = disabler()
  
  dep_glx = dependency('glx', required: false, disabler : true)
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 273d964dbbc7..78556231c06d 100644
--- a/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
@@ -22,6 +22,7 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="gles2 vulkan wayland X"
+REQUIRED_USE="vulkan? ( || ( X wayland ) )"
 
 RDEPEND="
 	media-libs/libglvnd[${MULTILIB_USEDEP},X?]
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 6b089521e986..087690bcddb1 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -22,6 +22,7 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="gles2 vulkan wayland X"
+REQUIRED_USE="vulkan? ( || ( X wayland ) )"
 
 RDEPEND="
 	media-libs/libglvnd[${MULTILIB_USEDEP},X?]
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 15e958cd17f6..c5f0070dbe21 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,5 +1,3 @@
-DIST mkfontscale-1.2.2.tar.xz 143436 BLAKE2B 796c6b95f4eb0959db93ccfb1ebae9c73afc618645d85b7ba382559fe4e008ece16c9d86ab32c815923cda9928f030d75c47f2dd5ee6c9857b9e861f9bab0dc9 SHA512 4c846816325347c91008d76b3a5610c1e58a8414fd55117e7ccf51310db4b20b8397ecf6c9177ff77322e27ee088bf034fd175c9210465c50b094bab8dada4b3
 DIST mkfontscale-1.2.3.tar.xz 145584 BLAKE2B 93024a607ebe789682c00490528de1688d073f016b97f7c9fd86b225ee1ac96616c3666708b72e3984383f13f89025e12f591fada324b8a14e99764c5cdf33e9 SHA512 816e7b2885bb7a4b2eb0e506b659600011bfa4ec1a3010243c2cc2241fa0b792f3c8de1dec1855a4d13de89405973967074e379b0d01dcf9de8a1277a2fc4296
-EBUILD mkfontscale-1.2.2.ebuild 540 BLAKE2B 2c1ec33636fc4af55c057a81dc93dbce11e244ae08b7364e1304c9b315313f0cffb992b710b25fad374743f5e215832515a84df12ff17dca454432218e52a43b SHA512 1e2dd1e88e6b1beb2b7cb4d6cebb56d379ff7a0954c7240fa30315c40f17a18c0427656636de095a37b410f5e939ffa9c879835ddf600161c0ca66f7797b7538
 EBUILD mkfontscale-1.2.3.ebuild 540 BLAKE2B 1dd80f87e59fca508f8f76f185c4d70969ff905de108704f828719b0db18a40d480aa96dd1ab13b66357b6c466f3e895d31b94a3bc8ef2a4a29c1011fce91cb4 SHA512 736faaa018fb379b20575a722afa1ee88395af3997e8bbec551956415e9afe6e127453b81261503f90683e2cb3c8e4931aac01a885016a32bd5532e90c877e08
 MISC metadata.xml 342 BLAKE2B 5937f65d98e050b0d560044d2dead3165da6eb82f2865cb61c39ad19e707a5842f95342db2665ee787788d270af3ca4be919eda8f6d19c77c2fa34fa47b15bd6 SHA512 48963d11b414e4be679a173c42023101acbc716d437e279ca8c342376ffaaaaa6210b9dff8cc98aa05794b9a10213d123dcd7985ab4821d12486ce30a3a1f4e5
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
deleted file mode 100644
index ef565b91233d..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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="create an index of scalable font files for X"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	x11-libs/libfontenc
-	media-libs/freetype:2
-	sys-libs/zlib
-	app-arch/bzip2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 7488fbbb354c..c89c33654021 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,5 +1,3 @@
-DIST xauth-1.1.2.tar.xz 156960 BLAKE2B 2ba168229bdf0c1d0fdd4c352e434abfc6f527cbafce35abac8d403a0dea91f00fd858f91f177128d13a0e618d1d95061c71ef32a3e12ac91b72a257dcfcd12b SHA512 ac23fcd166b45abf7b030994ff3332c9906023dc1ddfa9b9d3000e6a914dc5e0213c4a2aa409cb3ddb93e1f9f4f6374376109241a95ef8c36af842de1f6f76e8
 DIST xauth-1.1.3.tar.xz 159500 BLAKE2B 6acc6f360b7ed947d5dbc0b197b7ed0a87916f38cd8a0c74215b96ca44e98ead45987614e88833b0d2a957776b6e6a1d69d1a3dc4563774e451c2d5f5c55394d SHA512 536434f6c607673c00b9658ea591bf32419cc151d138f991ea38167220563519a6a84a5504003da15820f2a7ed50ea2449c6ce9c991d1446ee9a7305c647d694
-EBUILD xauth-1.1.2.ebuild 579 BLAKE2B d55c98e00d10c1eb227a52aa5af0fbb95abdb51946a58f61750cf1f9e754fbf93badb4452c05af65dd3a40ac61a484cc75a71357601bb9a5297aabe932b18780 SHA512 eb42c83edf30f49f2110c2cf04a08feb72c1cd5e6a3c0fb06ef28c8eb09feb8b97d143459ff0850a8b050d42090e2b1f3f851e43af72b21e6801a4ee80baaadb
 EBUILD xauth-1.1.3.ebuild 477 BLAKE2B 79d29c377f768ce4433573691bad3ef2c14291426ec9b2e5ae68dafa8221ee3de9642bd48c39d16171e54b152cf36fbe910b39d01a2c9c255a3c45f81e4ce2d9 SHA512 90ca6afb849b19d5b3c09739973e7ba164841026f57751724ea8f4980de46619c7c62750f781fd964e4cc471566e834f706278e1814fba033ea518bf2cb06a2c
 MISC metadata.xml 336 BLAKE2B e7efb568e90d3de70da870d88a12988c62c876085291bd426de3a6b3123e3f989eea78d4dc36e2e47cdd68b2f62c2f7c912c1f0e9ed8e92f4eecc017c63676ea SHA512 f210a30ab5f02fc443a1ba611bf07e72815d3089015ba5509dff6b62ee177cc50b6729157eff68633fe6163b7cd5d0d4a0b1a75f739984a50724639d043a2d58
diff --git a/x11-apps/xauth/xauth-1.1.2.ebuild b/x11-apps/xauth/xauth-1.1.2.ebuild
deleted file mode 100644
index 46bc236bb5b9..000000000000
--- a/x11-apps/xauth/xauth-1.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-XORG_TARBALL_SUFFIX=xz
-inherit xorg-3
-
-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"
-fi
-
-DESCRIPTION="X authority file utility"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--enable-ipv6
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 771c7104eed5..6d899e3cc586 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,9 +1,7 @@
 AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7cde7fa33964cbc4f51aa41a537a027749e40c69c3f8543c41924d9d05b54226a0e4400a3a1 SHA512 6cb72d93ab8004e42e9f5002f7f8bb6eb7d9833fd7d3fb0acf7b7b481ead5fb55cb1b836a1e6010fe859e9e04e14064c442e23fdde5991ffb8556ed5aa5af555
 AUX xdm-1.1.14-c99.patch 1486 BLAKE2B 5a8ce9665c0027bf255b1bb5dc42c141ac569dafd156e170ee90a69195473487caa980f06647e9e757bdef68c08f52a5b704b9d9440a724a9ffe46831ea5b168 SHA512 cc6d04207af46fddb423ad16ebce103d8ceafa9c5304c9f2c9f9ddb3606a186948d22e23c70636c90cd52588b1884744de17798447057960d71d955b52dfac42
 DIST xdm-1.1.14.tar.xz 419324 BLAKE2B e1c4f1db1af670171e80b7ab759f8e477c84997a873401eb27042590eebe457b38dc7bc998c42e954012ce06c1f4c216655a9c2809a22d88e372c9f7b57e0ff0 SHA512 8ed1d2c946916c24cb4b2de9326f65629c97e53b145312c9cb9c6e4308d8b47d67d3981319fbd4feac9b3ed436b9dfb24a1c905d37d7bcf07b49c18a68c7a6e4
-DIST xdm-1.1.15.tar.xz 420844 BLAKE2B d171f46322fb346e7844ebf4095f9b3f86992984a59d5b42644e82ef2efbada8d0c0c465a0caa73ee0d6ed8e137ee883ef2efdd38bb240decb1b8047b518ee2e SHA512 b36c978b6a54e3db43f929c52cbf47ea226dc0fe018f8284d8c495c73f269af33a7441d5a5072d8e9b2a34e9c71767de9d8762bc3ed196b1bebc78b016f7d8bb
 DIST xdm-1.1.16.tar.xz 420072 BLAKE2B 1a970b99a0848b0bcb55870c1665281afc355685b4e08148cefd953456fbed5dc71a9a66fa670e80f07de3502615e3c2e81293e9476f04ce965d73be5365bd9e SHA512 a7e0aca67b770b3939aee2c12feac3c0f5efa531ec4a6045ab8b53d9c35b701ab5533447feb39b7cbe0df74ff8483ee1637314b847b37a6c3f7e9c8fdf5e172d
 EBUILD xdm-1.1.14-r1.ebuild 1855 BLAKE2B 5b2d9ed260f9639dc8e00f33d7cb023d510e18be54a69bd7291cdb07c663f10b29ebbf409525a90b64ad29131ea90fdc959d9c2ff25755551c761ad3c9f62427 SHA512 2f3f15f5f49e086623bb4f92a5db4f6817258425d47f5d57ce12cd2bfb7875168db6407ae7397b2192091f5231f583daa4c4de0dcdd08631b3824c4ec8fd21f6
-EBUILD xdm-1.1.15.ebuild 1811 BLAKE2B fe70736cfa034898cab7610525c74dee25f4f3ffe9fc860c38b92b3d4eb472666639c9843559d4a63d0c6fe452236a42941d186a1550d80c1661b32d5cfa4544 SHA512 88f3cf1b05c0a29e71f40204266bf9920066a4453133de914d1315c64cd43d8ac7e4ec71a280a061a85bb1f7e428cffff621f46dab4aaf3e62d7403ddb380b2f
 EBUILD xdm-1.1.16.ebuild 1811 BLAKE2B fe70736cfa034898cab7610525c74dee25f4f3ffe9fc860c38b92b3d4eb472666639c9843559d4a63d0c6fe452236a42941d186a1550d80c1661b32d5cfa4544 SHA512 88f3cf1b05c0a29e71f40204266bf9920066a4453133de914d1315c64cd43d8ac7e4ec71a280a061a85bb1f7e428cffff621f46dab4aaf3e62d7403ddb380b2f
 MISC metadata.xml 334 BLAKE2B bb9f203babfde01fc5cce539d89df522147c0a2e58fea1453f826749fa1399722e3dbaf301a2e23509c074c757ff25676bf67ef0b9f1c0ed958f909778ba1dbe SHA512 361b9416bd1b55df4466e419b407c2ce3d4eabefb301cab1c702c8fc961de78ab28894550cb1287418d3398b2611fa60ddfe370cd506be863eeddf2792f75b25
diff --git a/x11-apps/xdm/xdm-1.1.15.ebuild b/x11-apps/xdm/xdm-1.1.15.ebuild
deleted file mode 100644
index 768e12532ef5..000000000000
--- a/x11-apps/xdm/xdm-1.1.15.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3 pam systemd
-
-DEFAULTVT=vt7
-
-DESCRIPTION="X.Org xdm application"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="pam systemd truetype xinerama xpm"
-
-RDEPEND="
-	x11-apps/sessreg
-	x11-apps/xconsole
-	x11-apps/xinit
-	x11-apps/xrdb
-	x11-apps/xsm
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXaw
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	virtual/libcrypt:=
-	pam? ( sys-libs/pam )
-	systemd? ( >=sys-apps/systemd-209:= )
-	truetype? (
-		x11-libs/libXrender
-		x11-libs/libXft
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )
-	elibc_glibc? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
-		xdm.service.in || die
-
-	# Disable XDM-AUTHORIZATION-1 (bug #445662).
-	# it causes issue with libreoffice and SDL games (bug #306223).
-	sed -i -e '/authorize/a DisplayManager*authName:	MIT-MAGIC-COOKIE-1' \
-			config/xdm-config.in || die
-
-	xorg-3_src_prepare
-}
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--enable-ipv6
-		$(use_with pam)
-		$(use_with systemd systemd-daemon)
-		$(use_with truetype xft)
-		$(use_with xinerama)
-		$(use_enable xpm xpm-logos)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-default-vt=${DEFAULTVT}
-		--with-xdmconfigdir=/etc/X11/xdm
-	)
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-
-	exeinto /usr/$(get_libdir)/X11/xdm
-	doexe "${FILESDIR}"/Xsession
-
-	use pam && pamd_mimic system-local-login xdm auth account session
-
-	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
-	keepdir /var/lib/xdm
-}