6 files changed, 0 insertions, 233 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 5802a8f79cb9..af9fb090eab4 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index ebd3d36b1b87..7dce0b7cabd7 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,9 +1,4 @@
-AUX xwayland-23.2.3-systemd-automagic.patch 2208 BLAKE2B abb9fa8f1e615d63bea84c9683d858ae182835d51eefe047af9c6ad126cd710bd7733a0dca0e2e3c158e098f75ee3d270f5c580cd2cee91c32f12c2e310015a2 SHA512 c4f379614b9772371c13febb78b32f932f405a20d82286f65bfb25cff3d4837de8b136208ab26c6d47753287a8f34e736ab168a67c20b9570508d16f0168dadb
-AUX xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch 1170 BLAKE2B 709a801bb4752e996fb2f4f31faff3fa1e451fda26058b18250d9ef85cfbd6f7071b08523ece50899e55a7a2f87d460854ce4a3fb90b7169a486e0e9d0f91df9 SHA512 7d3a1eecdb23d8d5815565c120fac538d4c17fda8353ac486b9fd764a22f242ce4eee23884cbad7910ce29938d2f6da15a7d6dbcf58997e90e00b679b902a0a4
-AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
-DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49
 DIST xwayland-24.1.2.tar.xz 1302068 BLAKE2B 761cc7da4e73da8120d5006ba085808e2c383fa991e29d3948c610671a11fee16295584d59409417ebb216fc8ae23de26d69eda7e453725067229672911ae85e SHA512 2788f6954c999c29be54d5b1e6e2c81327de9fbefae140f7cd322c1ff21f76fdd17cb74cf8243035ea850bfa4573d2013ab895426790b7959cceb7120ba9531c
-EBUILD xwayland-23.2.6.ebuild 2529 BLAKE2B d223e34001e5c8e03cce6339184da44b9c642211f6369e2cffa6958050b16fc767435e9714494b9ba8d0d40c0b523c27ff89353d7343af3e1e832a5962570cc7 SHA512 aa0c776b8ebc725eea46749af4920223e5698316546d0e993821bf3c7ec505ca8a531bbfd59e4698d728c9863d86a7a834b4cc518bb8f2c4f1bf854d8507ae46
 EBUILD xwayland-24.1.2.ebuild 2699 BLAKE2B 9b23fe1ba2a9efc518296c1dca0b97392cd0dd55b9208383cef6af5e8845c1c599c1280a32ffdb504c3ea6f018b261a047b336b3869f50d7354421057375a21d SHA512 cfc26ae1f34a7069465b232c1f290a302a92612438347b42f4d26ad1cb41efa692b2f0311790941488943fbdbc4ca221b2e85f02255bba63101c95d42a608f63
 EBUILD xwayland-9999.ebuild 2684 BLAKE2B f60153f9a0659ee758f8b77bf2b8956625a0ff86d54bcdd93447ab8c321e2babb84f0f260627105977e43d90ce75a7764580a357a77aea59bc810a4087b9b5b6 SHA512 81e17d04515359bd43209a8cf5b887a6de48c002aacb5a51cfb832ee37ec7af94935e486386854d99d018d5359ee658ad43aeb794d6cff893c8987363b9acf82
 MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79
diff --git a/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch b/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch
deleted file mode 100644
index 9af034c46fd5..000000000000
--- a/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1230
-
-From 010f6e751e86207a7e88f3504191bcae2d77b458 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 31 Dec 2023 23:37:19 +0000
-Subject: [PATCH] meson: add option for systemd
-
-Without this, systemd will be used if installed on the system automagically,
-which is a problem if the built e.g. Xwayland is going to be used on a non-systemd
-machine.
-
-Bug: https://bugs.gentoo.org/908254
-Signed-off-by: Sam James <sam@gentoo.org>
-
-diff --git a/include/meson.build b/include/meson.build
-index e6e3d553f..ddc18407e 100644
---- a/include/meson.build
-+++ b/include/meson.build
-@@ -91,7 +91,7 @@ endif
- 
- conf_data.set('HAVE_LIBBSD', libbsd_dep.found() ? '1' : false)
- # Note: this symbol is used by libXtrans.
--conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found() ? '1' : false)
-+conf_data.set('HAVE_SYSTEMD_DAEMON', build_systemd ? '1' : false)
- conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found() ? '1' : false)
- conf_data.set('WITH_LIBDRM', libdrm_required ? '1' : false)
- conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF',
-diff --git a/meson.build b/meson.build
-index 60164d73b..de984760c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -99,6 +99,7 @@ xkbcomp_dep = dependency('xkbcomp', required: false)
- xkbfile_dep = dependency('xkbfile')
- xfont2_dep = dependency('xfont2', version: '>= 2.0')
- 
-+build_systemd = get_option('systemd') == 'true'
- # libsystemd-daemon was moved into libsystemd in version 209
- libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', required: false)
- if not libsystemd_daemon_dep.found()
-diff --git a/meson_options.txt b/meson_options.txt
-index af094df70..62c539fbd 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -47,6 +47,8 @@ option('listen_unix', type: 'boolean', value: true,
- option('listen_local', type: 'boolean', value: true,
-        description: 'Listen on local by default')
- 
-+option('systemd', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
-+       description: 'Enable systemd-notify support')
- option('dpms', type: 'boolean', value: true,
-        description: 'Xorg DPMS extension')
- option('xf86bigfont', type: 'boolean', value: false,
diff --git a/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch b/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch
deleted file mode 100644
index 173daa3c6265..000000000000
--- a/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d5ef57f1efc967fbc88dfa0f0177be354caf039b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Tue, 26 Sep 2023 17:23:32 +0200
-Subject: [PATCH xserver] test: Skip Xwayland test early if PIGLIT_DIR /
- XTEST_DIR isn't set
-
-No point starting weston and waiting for it to start up in that case.
----
- test/scripts/xwayland-piglit.sh | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/test/scripts/xwayland-piglit.sh b/test/scripts/xwayland-piglit.sh
-index 97a1759d9..9d6e54d01 100755
---- a/test/scripts/xwayland-piglit.sh
-+++ b/test/scripts/xwayland-piglit.sh
-@@ -1,5 +1,17 @@
- #!/bin/bash -e
- 
-+if test "x$XTEST_DIR" = "x"; then
-+    echo "XTEST_DIR must be set to the directory of the xtest repository."
-+    # Exit as a "skip" so make check works even without xtest.
-+    exit 77
-+fi
-+
-+if test "x$PIGLIT_DIR" = "x"; then
-+    echo "PIGLIT_DIR must be set to the directory of the piglit repository."
-+    # Exit as a "skip" so make check works even without piglit.
-+    exit 77
-+fi
-+
- # this times out on Travis, because the tests take too long.
- if test "x$TRAVIS_BUILD_DIR" != "x"; then
-     exit 77
--- 
-2.43.2
-
diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch
deleted file mode 100644
index 39e0548eaaa3..000000000000
--- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/dix/meson.build b/dix/meson.build
-index ddc5cc3..bf5bfa3 100644
---- a/dix/meson.build
-+++ b/dix/meson.build
-@@ -56,8 +56,3 @@ libxserver_main = static_library('libxserver_main',
-     include_directories: inc,
-     dependencies: common_dep,
- )
--
--install_data(
--    'protocol.txt',
--    install_dir: serverconfigdir,
--)
-diff --git a/meson.build b/meson.build
-index 4af03ef..791465d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -520,9 +520,3 @@ subdir('hw')
- if host_machine.system() != 'windows'
-     subdir('test')
- endif
--
--install_man(configure_file(
--    input: 'man/Xserver.man',
--    output: 'Xserver.1',
--    configuration: manpage_config,
--))
diff --git a/x11-base/xwayland/xwayland-23.2.6.ebuild b/x11-base/xwayland/xwayland-23.2.6.ebuild
deleted file mode 100644
index b2c72b5e40de..000000000000
--- a/x11-base/xwayland/xwayland-23.2.6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-LICENSE="MIT"
-SLOT="0"
-
-IUSE="libei selinux systemd video_cards_nvidia unwind xcsecurity"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.30
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.109
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	libei? ( dev-libs/libei )
-	systemd? ( sys-apps/systemd )
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=x11-base/xorg-proto-2023.2
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-
-	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	app-alternatives/lex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-drop-redundantly-installed-files.patch
-	"${FILESDIR}"/${PN}-23.2.3-systemd-automagic.patch
-	"${FILESDIR}"/${PN}-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use systemd)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Dlibdecor=false
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	if use libei; then
-		emesonargs+=( -Dxwayland_ei=portal )
-	else
-		emesonargs+=( -Dxwayland_ei=false )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}