gentoo auto-resync : 22:03:2024 - 07:00:36

4 files changed, 4 insertions, 23 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 1a7284fa980d..1884403b4e3a 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 0b33c2f2b064..118a0372f1f2 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,9 +1,9 @@
 AUX xwayland-23.2.3-systemd-automagic.patch 2208 BLAKE2B abb9fa8f1e615d63bea84c9683d858ae182835d51eefe047af9c6ad126cd710bd7733a0dca0e2e3c158e098f75ee3d270f5c580cd2cee91c32f12c2e310015a2 SHA512 c4f379614b9772371c13febb78b32f932f405a20d82286f65bfb25cff3d4837de8b136208ab26c6d47753287a8f34e736ab168a67c20b9570508d16f0168dadb
 AUX xwayland-23.2.4-c99.patch 4608 BLAKE2B f7b897ebe48de9c3ce22dce3b8864eecbfc1471840e819ddb052350c12091d5c7ab962597e5018638ddf7b9bb09dfabcb31f997cf6ce06e5e09b531d7e6faa38 SHA512 6a8ce0aec44cb9b274ba9ba80c8ee6545d1d4cc44f70f57e927b9f5c2d28e97109976e0f90972aa7001fbc9aacfc06ce0c1497fa1697f98a591da216a9503153
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
-AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
+AUX xwayland-drop-redundantly-installed-files_v2.patch 336 BLAKE2B 14dc5ea3f1369a1f78dce4ba9974175ad62563617b033b53fd70d9e9d0918900b95ae54743a99106be135453c178375cf653499f99863d6d3bbe9a11e63e2364 SHA512 970a709b45b0138e79f194a1ee49eeb9d8ece2493ef691d7f100877c83cfbfc5a64f23397c35f32053c63f001581c33e62b74659b20d9b1ef78f9074c0fa7a71
 DIST xwayland-23.2.4.tar.xz 1299748 BLAKE2B 5427ff1f8b95b25c79df74eef18e2aeb7eecafa7d522e720e1072603108516cbaa57652e6439426d18d90320b67ec0764978450c76c6ce759d49fedfc6aedf65 SHA512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187
 EBUILD xwayland-23.2.4-r1.ebuild 2507 BLAKE2B 08d8f7cf243e6d7c74770f2115a67d25dfeb945f778aaeb6db18d1e5841243d43006073099e86e99b00cf0529aaa1def23eedc3fd869f23eb8033f110b715e29 SHA512 9e93fcd804f8a51106c63a016d21be25241b46220d23ab94e653d612c5731c16186ca57077d8d6cf0237d8d06f5b583628c3d2519c537c06cfc712d315dcc200
 EBUILD xwayland-23.2.4.ebuild 2460 BLAKE2B 6f2f739493ea332813745c8ec7fd701fdb1424ed92bc4cb40df6514e77452be56521d338fde5dc8643966a8f40b52847a182b7eb24da6099c0ea686c915da62d SHA512 5bd80924be0710fcac6e71b27fbfce71c01f509a7a925f307d7f7980b9e6c3f4c3804c48dffefd056c125d9e1bd2a3d790d86ecbc9780caf663d22650236d0bb
-EBUILD xwayland-9999.ebuild 2416 BLAKE2B 26d83d501ed780215928ce0f86c9ced213893004a3af6ff95d938b40729a761856fa704398b33e4565b74b25552a077121e33d4153c3371b4dce7a8f36af2cbe SHA512 8dc1bd6e4330547d59b79c04d97e84303c4d9983766d63654958b2f729b19c72ac95a901c5134e200728c95012bb9f5fa827c5e46d392899356c2aba14ec904b
+EBUILD xwayland-9999.ebuild 2298 BLAKE2B ab10657c0ca02fac94c9ba5aa4494b810b074e5438370ad297732e4257c7259a9d1a75fef12212ff65799fc2874d03247b7e690ca5a01aa2c3f6283313c90842 SHA512 c04665527b7cb62a4e6c7e7b9b1a470436924782f49991c7613ba276310cf39c32071f6e9b3f1820eb9b02b97c6d95417702939af6cebf04fa8d599cbca99ff9
 MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79
diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
index ea765d3dcfcd..f92eaf28ac90 100644
--- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
+++ b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
@@ -11,20 +11,3 @@ index fbbcf8646..15ca7d3b0 100644
 -    'protocol.txt',
 -    install_dir: serverconfigdir,
 -)
-diff --git a/meson.build b/meson.build
-index db1d63f3e..b9cef5a56 100644
---- a/meson.build
-+++ b/meson.build
-@@ -806,12 +806,6 @@ if host_machine.system() != 'windows'
-     subdir('test')
- endif
- 
--install_man(configure_file(
--    input: 'man/Xserver.man',
--    output: 'Xserver.1',
--    configuration: manpage_config,
--))
--
- if build_xorg
-     sdkconfig = configuration_data()
-     awk = find_program('awk')
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index 03adecb51898..4a8a4745cdfb 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -16,11 +16,11 @@ fi
 DESCRIPTION="Standalone X server running under Wayland"
 HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
 
-IUSE="libei selinux video_cards_nvidia unwind xcsecurity"
-
 LICENSE="MIT"
 SLOT="0"
 
+IUSE="libei selinux unwind xcsecurity"
+
 COMMON_DEPEND="
 	dev-libs/libbsd
 	dev-libs/openssl:=
@@ -42,7 +42,6 @@ COMMON_DEPEND="
 
 	libei? ( dev-libs/libei )
 	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -70,7 +69,6 @@ src_configure() {
 		$(meson_use selinux xselinux)
 		$(meson_use unwind libunwind)
 		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
 		-Ddpms=true
 		-Ddri3=true
 		-Ddrm=true