gentoo auto-resync : 13:12:2023 - 23:41:49

3 files changed, 112 insertions, 2 deletions

diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 5377669dd796..9cb199d3f5e0 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,6 +1,8 @@
 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
 DIST xwayland-23.2.2.tar.xz 1298400 BLAKE2B a73d6595db3ee1f55b2d04fce652378f3a277fbff2ecdb0b0da25fe7618a8a70b337cedc2fd18044f52a597171c31f4da87147491366dcbac4f048e985e13446 SHA512 f5b319fdace7d7c078544730ecd26afeb63b1a0c779fb097455147945df85af32d9e91501ebdb70209d48e8a3ead3b23be31e9d5118358ac17e699abb4b6ac07
+DIST xwayland-23.2.3.tar.xz 1298840 BLAKE2B 65a0517fdee19f9144f8e661e17227d838dff0b040f383cf940623492919574d60c032d7ba84f13f35c8a259ca4783ffc3519cc35768946b5b2014e25d4ec93e SHA512 37198aa2f06313a0cb2add51cc78f81b26a42f2c9d55a0d3eecf958777107ea5560961c128f2d0af055f7460ba10fadb1b9050251c2c50f2251b40ab517e79cd
 EBUILD xwayland-23.2.2.ebuild 2370 BLAKE2B 4a1eb486ea329551dd8bdd92538d609425c6012d4db362032341426b4197fa8362c5c97b7da656ecfddd2da37adf4b25eb734bb96e39db2d326a222555208db3 SHA512 8c5c4ebcd76f31065473c36f04975122d5dcff20df244d7771ccdffb54ca81d6f8686a48c10abf7171982d49000ab03792b4a6eeb4f7d4d348bf3dbc15a33222
-EBUILD xwayland-9999.ebuild 2443 BLAKE2B ee5fa283c6cbfeee7f7d33f4ed67679da6906fc20844174d85bcf9fdc6cbefa93c6bcbd7540eac3b496c0eefd8ae90879a8159515b23fd7eff2769a6c5a261b6 SHA512 85e045ff59e981b6d0369f729684b90e6ce06b1b6f1e729fb94993fc1579474d466820d3fca2c0570937ef5af343ca065e54ae78e6d2a94a98acf2585ae5b329
+EBUILD xwayland-23.2.3.ebuild 2343 BLAKE2B b761de79363727ce40a949b953f1c75ef2af6920147fe5b2bca9b05a6f1916ae6a6bfa26af5877a8f5d0d958890b044e2fba2f0532713027cb9487645212f22d SHA512 36490d52be77df8c6ea24cbcdd6cd1cb89bf6ef03bacd01ef5b097038af7d386a2ec993a126e1d7c1947baa697f374086c292f3aebd0c17c70243aefeee54d62
+EBUILD xwayland-9999.ebuild 2410 BLAKE2B cc096cb2a9ca3cb7988cb070d36d20f2c18e87a672888c07854ada44eca2546ae4df46c3a05739f6b2388fad087af2b85ab3a70a619c4852576ac71bb4d6e349 SHA512 d4c3eef5dc9e4296ca6cd88908c904d866aba3e7317017e071f194fffd793b9758e4215c62ba5bb0a3a581a222ddfef83c2583cb7f5a4ae32e8e08dc85998083
 MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79
diff --git a/x11-base/xwayland/xwayland-23.2.3.ebuild b/x11-base/xwayland/xwayland-23.2.3.ebuild
new file mode 100644
index 000000000000..9b16fe1be5e6
--- /dev/null
+++ b/x11-base/xwayland/xwayland-23.2.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2021-2023 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"
+
+IUSE="libei selinux video_cards_nvidia unwind xcsecurity"
+
+LICENSE="MIT"
+SLOT="0"
+
+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 )
+	unwind? ( sys-libs/libunwind )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=x11-base/xorg-proto-2022.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="
+	sys-devel/flex
+	dev-util/wayland-scanner
+"
+
+PATCHES=(
+	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use selinux xselinux)
+		$(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
+}
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index 23efd8ee8752..915fd9a08bb3 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -52,7 +52,6 @@ DEPEND="
 RDEPEND="
 	${COMMON_DEPEND}
 	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
 
 	libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 )
 	selinux? ( sec-policy/selinux-xserver )