gentoo auto-resync : 17:05:2024 - 00:01:35

4 files changed, 168 insertions, 39 deletions

diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index f1ec60094020..4b5b4868585d 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,10 +1,11 @@
 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
-AUX xwayland-drop-redundantly-installed-files_v2.patch 881 BLAKE2B bf2b22420c1bcda7967cae62189d2f2205d4cf5da7b01eaf392cd6dc1ad42068af85ee7a0717c42603f93262fa37deeec83346154e157854e1395be889a4505a SHA512 7d760c1e11cb70c9b20a4ae4be43f6a89c6376b792e9bb1d1b01a693df0d2c5d931d31f5ce5b81789c151cc033a10436c61144787c7dd8a15ea4543e2c19ca8a
 DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49
 DIST xwayland-23.2.7.tar.xz 1295016 BLAKE2B 9c8b5490eb4c468f0ee7c4e267ee9f3f9eba04bd9535a0a06a461fe0f3c7c8708d19deb8473ba4eacb446b9207637555a379bd768f8459c1ebe10cfed59010d1 SHA512 d78bd1ffed5a8149c55b453a464e46d2d658169bb814a96b8b75119349ba5506bb9d5c131c3ff28d94b4a27db894963b8f039b89843a0164d4463d7015d74c1b
+DIST xwayland-24.1.0.tar.xz 1301180 BLAKE2B d20f91fa6c1d404cafb69a7e1cf843458be084a5e0d4feb5266e6bc78a6ee0445aeb178e97c569eb17d13a8a3cc566ac664afcec02e1b56c92f9ea0b95be85b5 SHA512 7592609ad112652cb870761f938f280802d7d3b4bbc82acc7bf741a763d862aa97bbbd7f78250c63a961d76be73fb55555832045514092d89e406839564f0003
 EBUILD xwayland-23.2.6.ebuild 2541 BLAKE2B edc4b12da17dec0c1977091244e16ffe3f3703d887057d0793729a8b74449be1004fe15fb9f07773ecf831598976da63479e85632ea87867708ab9da607852fc SHA512 2a677167a631ea1661995c2f0cb8042a37da180cb31f3d9e02706728cede83ef888374316ba622f6e8491bd0252a7a55d9d2aaaec748dbc7b79f48f5317bcc9e
 EBUILD xwayland-23.2.7.ebuild 2547 BLAKE2B 440d071818eabf42dd83e5945feb9c9dc66cb74bc07085750f0ecb412da832a3dcaab905b1262bdb4dec4611e23ddb36ceba6e5fbde02d40687736fd70548fd9 SHA512 3d33a1082675ad9e27c8a428510c0b28e4f535f1b73c28cd39e6b206a0afefc2825c2a5a292e47cb52a67b47b9766c1ad16b844cfb4e30820ea905cccf0d5f7f
-EBUILD xwayland-9999.ebuild 2298 BLAKE2B b5f34180d5798cd226e56220a4908441ac8e768727c740d4a3988345b163ec84ecb6ab10438745313d7b29589b826cdafbae915571ff5c6536407612ef0a4d3e SHA512 c3496c6ffb575591e3fa87de31894f0c7ac431d02d476ac13a32737223fe09c9ed6086364ec932e4db32b128ea7567943abcb9749b833e99807000e0548bd3f0
+EBUILD xwayland-24.1.0.ebuild 2717 BLAKE2B 5d7a071d31160db68cad4d3d77bf9470d72b759a05827db7e3f46c3a76ca4198f510793ccd03c3ffa42ca8ad19b749f1cc90ab77a5c2e8fb5e757ccd09faaa5d SHA512 f68ff61e0d9c4f7cd2fb943ddb3959144fbd6d20486735b45bc5433ce8f33eca94a26af4b6f61b915eb8a4f34ef4898a08efb1a3552d9f1ada2fbde117ea5ca5
+EBUILD xwayland-9999.ebuild 2717 BLAKE2B 5d7a071d31160db68cad4d3d77bf9470d72b759a05827db7e3f46c3a76ca4198f510793ccd03c3ffa42ca8ad19b749f1cc90ab77a5c2e8fb5e757ccd09faaa5d SHA512 f68ff61e0d9c4f7cd2fb943ddb3959144fbd6d20486735b45bc5433ce8f33eca94a26af4b6f61b915eb8a4f34ef4898a08efb1a3552d9f1ada2fbde117ea5ca5
 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
deleted file mode 100644
index 11c9bed1e235..000000000000
--- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/dix/meson.build b/dix/meson.build
-index fbbcf8646..15ca7d3b0 100644
---- a/dix/meson.build
-+++ b/dix/meson.build
-@@ -57,8 +57,3 @@ libxserver_main = static_library('libxserver_main',
-     include_directories: inc,
-     dependencies: common_dep,
- )
--
--install_data(
--    'protocol.txt',
--    install_dir: serverconfigdir,
--)
-diff --git a/man/meson.build b/man/meson.build
-index 2961469c5..1183d741d 100644
---- a/man/meson.build
-+++ b/man/meson.build
-@@ -28,9 +28,3 @@ manpage_config.set('modulepath', module_dir)
- # manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), libexecdir))
- manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), 'libexec'))
- manpage_config.set('default_font_path', default_font_path)
--
--install_man(configure_file(
--    input: 'Xserver.man',
--    output: 'Xserver.1',
--    configuration: manpage_config,
--))
diff --git a/x11-base/xwayland/xwayland-24.1.0.ebuild b/x11-base/xwayland/xwayland-24.1.0.ebuild
new file mode 100644
index 000000000000..3b5d437dd588
--- /dev/null
+++ b/x11-base/xwayland/xwayland-24.1.0.ebuild
@@ -0,0 +1,133 @@
+# 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 ~ia64 ~loong ~mips ~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 test unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/libbsd
+	dev-libs/openssl:=
+	>=dev-libs/wayland-1.21.0
+	>=dev-libs/wayland-protocols-1.34
+	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.116
+	>=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 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=x11-base/xorg-proto-2024.1
+	>=x11-libs/xtrans-1.3.5
+	test? (
+		x11-misc/rendercheck
+		x11-libs/libX11
+	)
+"
+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
+"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use selinux xselinux)
+		$(meson_use systemd systemd_notify)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		-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 [[ ${PV} == "9999" ]]; then
+		emesonargs+=(
+			-Dxorg=false
+			-Dxnest=false
+			-Dxvfb=false
+			-Dxwayland=true
+		)
+	fi
+
+	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
+
+	# Remove files installed by x11-base/xorg-xserver
+	rm \
+		"${ED}"/usr/share/man/man1/Xserver.1 \
+		"${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
+		|| die
+}
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index 4c325088c840..3b5d437dd588 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -19,18 +19,19 @@ HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
 LICENSE="MIT"
 SLOT="0"
 
-IUSE="libei selinux unwind xcsecurity"
+IUSE="libei selinux systemd test unwind xcsecurity"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/libbsd
 	dev-libs/openssl:=
 	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.30
+	>=dev-libs/wayland-protocols-1.34
 	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/libdrm-2.4.116
 	>=x11-libs/libXau-1.0.4
 	x11-libs/libxcvt
 	>=x11-libs/libXdmcp-1.0.2
@@ -41,12 +42,17 @@ COMMON_DEPEND="
 	>=x11-misc/xkeyboard-config-2.4.1-r3
 
 	libei? ( dev-libs/libei )
+	systemd? ( sys-apps/systemd )
 	unwind? ( sys-libs/libunwind )
 "
 DEPEND="
 	${COMMON_DEPEND}
 	>=x11-base/xorg-proto-2024.1
 	>=x11-libs/xtrans-1.3.5
+	test? (
+		x11-misc/rendercheck
+		x11-libs/libX11
+	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -60,13 +66,18 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files_v2.patch
-)
+src_prepare() {
+	default
+
+	if ! use test; then
+		sed -i -e "s/dependency('x11')/disabler()/" meson.build || die
+	fi
+}
 
 src_configure() {
 	local emesonargs=(
 		$(meson_use selinux xselinux)
+		$(meson_use systemd systemd_notify)
 		$(meson_use unwind libunwind)
 		$(meson_use xcsecurity)
 		-Ddpms=true
@@ -89,12 +100,17 @@ src_configure() {
 		-Ddocs=false
 		-Ddevel-docs=false
 		-Ddocs-pdf=false
-		-Dxorg=false
-		-Dxnest=false
-		-Dxvfb=false
-		-Dxwayland=true
 	)
 
+	if [[ ${PV} == "9999" ]]; then
+		emesonargs+=(
+			-Dxorg=false
+			-Dxnest=false
+			-Dxvfb=false
+			-Dxwayland=true
+		)
+	fi
+
 	if use libei; then
 		emesonargs+=( -Dxwayland_ei=portal )
 	else
@@ -108,4 +124,10 @@ src_install() {
 	dosym ../bin/Xwayland /usr/libexec/Xwayland
 
 	meson_src_install
+
+	# Remove files installed by x11-base/xorg-xserver
+	rm \
+		"${ED}"/usr/share/man/man1/Xserver.1 \
+		"${ED}"/usr/$(get_libdir)/xorg/protocol.txt \
+		|| die
 }