gentoo auto-resync : 28:03:2023 - 09:49:10

3 files changed, 110 insertions, 6 deletions

diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index ac095e7094af..74eb9dafb92f 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-22.1.8.tar.xz 1273668 BLAKE2B ad1f3e0a6a3782b271653864380d0beb0db60293fb96ab8f218caaeef245967ad46ca505fb516a936115c9d49e6a32bffb725bc6c95dc98a6c4c24521c6022df SHA512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a
+DIST xwayland-23.1.0.tar.xz 1286056 BLAKE2B 19f3cee10f9b86a1ee4529f91de3125c303a771ddb00ab1d76764fec2d8d2639e20585de777741fc3706ec6e2f03a1295024cd9c582c1e4a744fa1a43d8997e6 SHA512 984213a193b903e6023ecb3144a15f483dc3e9ec7cb02c36d8e67c6859b501b8b3e5a6e1ade9cb245450ad93002322f392b81d9286377ac34350cc3ea1f9679f
 EBUILD xwayland-22.1.8.ebuild 2148 BLAKE2B 18cef7685e1060f847a7af995453fbdb2944a3aee5a0f516362cda8abc919c2b4b703781f0caab9cc09ea86cf9454854c349467460a1ec11b35ef03d27039a60 SHA512 0d559bb84d07b6a4d16b35c268174dfd0d4eb5ca15eef5fe0ce64187d17f9842decf40ae61d73ad8983046e66f548c698b4f10f4741d6344727402f49b0c5b7c
-EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a
+EBUILD xwayland-23.1.0.ebuild 2185 BLAKE2B d3db88021aa4a3347de59b409e3a68f12ac4064ddfd6af941b96d7f7f2d5278581fc59ac2b0cc25d542723c757a0de8588028e50ddfe27b680fe20815f1c3870 SHA512 2788a3592698f906b211d237da3b20acff26050a233600e1e63a4e2c16b4c674b456368164e16af040a5bf88c02e18cbaa48c3cdbd49a78b7748bdbde86820d8
+EBUILD xwayland-9999.ebuild 2252 BLAKE2B 33c7487e426507767c262dcd0d74aa3384bb63c2cbaf6968a57c7c259a213bbd72d4d4b6f276132f8764fd2dc42f13a9db7eeab4ae78e5e570d19cf4386f0d6b SHA512 2650874f3f640d35b8f93e73c5b3463893d1b718d713fe9c7af3a9c18c8b9025b942d96335b16d88eecdc47885bb2876ffe84726a66765515be6a675237d15cd
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-23.1.0.ebuild b/x11-base/xwayland/xwayland-23.1.0.ebuild
new file mode 100644
index 000000000000..d7e53ec8adcf
--- /dev/null
+++ b/x11-base/xwayland/xwayland-23.1.0.ebuild
@@ -0,0 +1,101 @@
+# 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="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.28
+	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
+
+	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
+	!<=x11-base/xorg-server-1.20.11
+	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
+	)
+
+	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 beed9ee6c40c..cd8c1b8fb8d2 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,13 +24,13 @@ SLOT="0"
 COMMON_DEPEND="
 	dev-libs/libbsd
 	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
+	>=dev-libs/wayland-1.21.0
+	>=dev-libs/wayland-protocols-1.28
 	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.89
+	>=x11-libs/libdrm-2.4.109
 	>=x11-libs/libXau-1.0.4
 	x11-libs/libxcvt
 	>=x11-libs/libXdmcp-1.0.2
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
-	x11-base/xorg-proto
+	>=x11-base/xorg-proto-2022.2
 	>=x11-libs/xtrans-1.3.5
 "
 RDEPEND="
@@ -85,6 +85,7 @@ src_configure() {
 		-Dxvfb=true
 		-Dxv=true
 		-Dxwayland-path="${EPREFIX}"/usr/bin
+		-Dlibdecor=false
 		-Ddocs=false
 		-Ddevel-docs=false
 		-Ddocs-pdf=false