gentoo auto-resync : 16:05:2024 - 00:01:30

6 files changed, 8 insertions, 140 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 8b5dcf2ddd58..6068c98ff789 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 221504dadc5a..8e18d79b5895 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,6 +1,6 @@
 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 5612 BLAKE2B 2890a41155cff6c085789fe29330cbe9f4147cfa6adcade4e3bea94729f8c984fcde89d240977ad81502d7c8945258b323df13464ab00e854c73943ef03960df SHA512 3a00e2c00da613978f830f159634b848cb0ceba2a6f9faf6e1f71fb50d8a0a113038f23b3354745fbb586cc250f62b5645019a2b1f57f5a32408e56b61c07b2f
-AUX 9999-Disable-things-we-don-t-want.patch 5960 BLAKE2B fc62fe23cadf60e99beee8de58d0aba18e1370d3333a6ee9366cef5a79321fe0fbcf3d95f0e61b2327b9a72eddb6ae609bb1438891b36b626aef099bb4af17c2 SHA512 05d56e875c2cac70d8faf3e5614ba95bd87f3515712c45000013c54abdbfa281d2b735d18b68ab144176f2c65e60a4b4a2078305e9d8ff8f450be45e6c9f764d
+AUX 9999-Disable-things-we-don-t-want.patch 5636 BLAKE2B a86907f9f094aaef6f6e67b02fac30651d29f50b87ea85593557219f7db44c819f42b08c3a2bed40d1bb467ec3b08a97bd8e2816c72e14213d7fc46b31846622 SHA512 11ddb1a053a6206687337e313d394164bb7c3d882a864cbe22292b09035a589477b30a9c6eba9723d97eeecc49aee470789cde3a3514d4c7cda5237827bf3aa4
 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
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 5566a8de45d3..5e0dccb6445b 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 c2e2f995bca3086cfc40b698533e7ec0bba98d85 Mon Sep 17 00:00:00 2001
+From 5736ae25541e414a0e950e8c8bcf80d374f3308d 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
@@ -9,30 +9,22 @@ v4: Disable dmabufshare and remove dep on libXext
 v5: Drop trackball.c and showbuffer.c
 v6: Fix disabling GLU
 v7: Link against libOpenGL rather than libGL
+v8: Rebase
 ---
- meson.build                   | 15 +++------------
+ 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, 4 insertions(+), 100 deletions(-)
+ 7 files changed, 3 insertions(+), 99 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index d487a11f..31625a99 100644
+index 8d495ec9..3f5c5c9b 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -39,7 +39,7 @@ add_project_arguments(
- dep_m = cc.find_library('m', required : false)
- dep_winmm = cc.find_library('winmm', required : false)
- 
--dep_gl = dependency('gl')
-+dep_gl = dependency('opengl')
- 
- dep_epoll = dependency('epoll-shim', required : false)
- dep_gles1 = dependency('glesv1_cm', required : get_option('gles1'))
-@@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
+@@ -55,7 +55,7 @@ dep_drm = dependency('libdrm',
    required : get_option('libdrm'),
    disabler : true
  )
@@ -41,7 +33,7 @@ index d487a11f..31625a99 100644
    required : get_option('x11'),
    disabler : true
  )
-@@ -87,16 +87,7 @@ endif
+@@ -90,16 +90,7 @@ endif
  
  dep_threads = dependency('threads')
  
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 776a04af3f1c..f74b460d41fa 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,7 +1,4 @@
 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.16.tar.xz 420072 BLAKE2B 1a970b99a0848b0bcb55870c1665281afc355685b4e08148cefd953456fbed5dc71a9a66fa670e80f07de3502615e3c2e81293e9476f04ce965d73be5365bd9e SHA512 a7e0aca67b770b3939aee2c12feac3c0f5efa531ec4a6045ab8b53d9c35b701ab5533447feb39b7cbe0df74ff8483ee1637314b847b37a6c3f7e9c8fdf5e172d
-EBUILD xdm-1.1.14-r1.ebuild 1855 BLAKE2B 5b2d9ed260f9639dc8e00f33d7cb023d510e18be54a69bd7291cdb07c663f10b29ebbf409525a90b64ad29131ea90fdc959d9c2ff25755551c761ad3c9f62427 SHA512 2f3f15f5f49e086623bb4f92a5db4f6817258425d47f5d57ce12cd2bfb7875168db6407ae7397b2192091f5231f583daa4c4de0dcdd08631b3824c4ec8fd21f6
 EBUILD xdm-1.1.16.ebuild 1804 BLAKE2B ae0cbbf412f71c1eadb53df0d904c2dfbce411dacf58bd888598c304a8d47f56518590ea872325ba534e4cfafec3bc2a5e782707c29d51d24f9019a1a9f17fd6 SHA512 a6d7beba9d14490065ab72b7d6a62a25b1fd99759aa1e5599ae9fa7c4873e75155f3612a55ef7b44f669f240050832179f071a1bf76f48cf1db30456691bcd2f
 MISC metadata.xml 334 BLAKE2B bb9f203babfde01fc5cce539d89df522147c0a2e58fea1453f826749fa1399722e3dbaf301a2e23509c074c757ff25676bf67ef0b9f1c0ed958f909778ba1dbe SHA512 361b9416bd1b55df4466e419b407c2ce3d4eabefb301cab1c702c8fc961de78ab28894550cb1287418d3398b2611fa60ddfe370cd506be863eeddf2792f75b25
diff --git a/x11-apps/xdm/files/xdm-1.1.14-c99.patch b/x11-apps/xdm/files/xdm-1.1.14-c99.patch
deleted file mode 100644
index a72d961e3f60..000000000000
--- a/x11-apps/xdm/files/xdm-1.1.14-c99.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/919207
-https://gitlab.freedesktop.org/xorg/app/xdm/-/issues/15
-https://gitlab.freedesktop.org/xorg/app/xdm/-/merge_requests/18
-
-From bccb77746528134aa2e865ca4f44fd9424738b3f Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Tue, 5 Dec 2023 17:25:28 -0800
-Subject: [PATCH] Fix -Wincompatible-pointer-types warning from gcc (issue #15)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-chooser.c:280:26: warning: passing argument 2 of ‘XawListChange’ from
- incompatible pointer type [-Wincompatible-pointer-types]
-  280 |     XawListChange (list, newTable, size, 0, TRUE);
-      |                          ^~~~~~~~
-      |                          |
-      |                          char **
-In file included from chooser.c:59:
-/usr/include/X11/Xaw/List.h:170:27: note: expected ‘const char **’ but
- argument is of type ‘char **’
-  170 |  _Xconst char           **list,
-
-Closes: #15
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---- a/chooser/chooser.c
-+++ b/chooser/chooser.c
-@@ -277,7 +277,7 @@ RebuildTable (int size)
- 	    newTable[i] = names->fullname;
- 	qsort (newTable, size, sizeof (char *), HostnameCompare);
-     }
--    XawListChange (list, newTable, size, 0, TRUE);
-+    XawListChange (list, (_Xconst char **) newTable, size, 0, TRUE);
-     free (NameTable);
-     NameTable = newTable;
-     NameTableSize = size;
--- 
-GitLab
diff --git a/x11-apps/xdm/xdm-1.1.14-r1.ebuild b/x11-apps/xdm/xdm-1.1.14-r1.ebuild
deleted file mode 100644
index d33d52bc8907..000000000000
--- a/x11-apps/xdm/xdm-1.1.14-r1.ebuild
+++ /dev/null
@@ -1,83 +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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.14-c99.patch
-)
-
-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
-}