gentoo auto-resync : 11:04:2024 - 00:32:37

3 files changed, 114 insertions, 0 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 2c6afcdc4b10..95714b940e3f 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index ba0f19327a2a..ef6592b59a9f 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -4,8 +4,10 @@ AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f98
 AUX xwayland-drop-redundantly-installed-files_v2.patch 881 BLAKE2B bf2b22420c1bcda7967cae62189d2f2205d4cf5da7b01eaf392cd6dc1ad42068af85ee7a0717c42603f93262fa37deeec83346154e157854e1395be889a4505a SHA512 7d760c1e11cb70c9b20a4ae4be43f6a89c6376b792e9bb1d1b01a693df0d2c5d931d31f5ce5b81789c151cc033a10436c61144787c7dd8a15ea4543e2c19ca8a
 DIST xwayland-23.2.4.tar.xz 1299748 BLAKE2B 5427ff1f8b95b25c79df74eef18e2aeb7eecafa7d522e720e1072603108516cbaa57652e6439426d18d90320b67ec0764978450c76c6ce759d49fedfc6aedf65 SHA512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187
 DIST xwayland-23.2.5.tar.xz 1299988 BLAKE2B d0f4ff06c5eef3c4863aae53496dbd02e89fb186b06001c81f5a7e261fe5a7eefd8a327a9489a5eaed34c91ac68e02664256d948cca6c4efad116580ec9340f6 SHA512 8cf90d51db7c4c7e8191b5919e6529fe577bc735bb1d00fbc0139cb67ef95d30eb56c2026f3b2f639745c6a621b33bbd60f9ebabdd12175148dd192393ce1169
+DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49
 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-23.2.5.ebuild 2507 BLAKE2B ad8ffdab8604dfe72ef25f69e4a018cbc8c203bd059dde4dbbfc32146833f6e466a1fd63314423634e9323fb58148db0638a0f417452cc3ab2b4187ace65592b SHA512 5a0920791ed12dc84772731c6969ea76a8a22eeec85cf85e0ba7e147e3fb76fbdf76d7fbc8ea04e0814d2b766571870e374ef878ce433f7863a717d71e327db9
+EBUILD xwayland-23.2.6.ebuild 2466 BLAKE2B 5007c0c842a09dcfb24bf72215c76effc7a339b61adf64d2931d22a187c00f3638e415d609c4c374b4d3f7b741587a870b50809286212faa7b101fe8fb8ac7b5 SHA512 04483c140a11613af1d1b919a2cb48032ffdb24014b6940a235aec45ee72cd50b66407e7f3d81306166c3289d2607b8ce139d7b48ad31c485c532136bdc11bd2
 EBUILD xwayland-9999.ebuild 2298 BLAKE2B 89e55a9e1c6191540393f668374c0fabd6e7b13b06c4ecd391a7cb300ab64d57d8dfd82a690a86ec95a4dde446bcb1883e49caca4e0e74bd53694daf71e66bdb SHA512 439d05504a08cff05348cf2d731445074e26bc4e227a83f7842d9127a27efadbb312f052998538840105909b2d9f650e711209eda0ff1263c6b4211bc9ef05cf
 MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79
diff --git a/x11-base/xwayland/xwayland-23.2.6.ebuild b/x11-base/xwayland/xwayland-23.2.6.ebuild
new file mode 100644
index 000000000000..c753a669db77
--- /dev/null
+++ b/x11-base/xwayland/xwayland-23.2.6.ebuild
@@ -0,0 +1,112 @@
+# 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 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}"/xwayland-drop-redundantly-installed-files.patch
+	"${FILESDIR}"/xwayland-23.2.3-systemd-automagic.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
+}