[gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/

[Matt Turner]

commit:     1cb236dd023bd9a57a7a83341cfecf69e450533a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 03:04:52 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 03:23:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb236dd

x11-base/xwayland: Version bump to 23.2.0

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-base/xwayland/Manifest                                       | 1 +
 .../xwayland/{xwayland-9999.ebuild => xwayland-23.2.0.ebuild}    | 9 +++------
 x11-base/xwayland/xwayland-9999.ebuild                           | 3 ++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 5a2b2a76226a..86298681cb7d 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1 +1,2 @@
 DIST xwayland-23.1.2.tar.xz 1287396 BLAKE2B 
56e213ea9d8cfa0ab316fb0a09d623427b7fa6effc6feb2b1d4364ee494b54d82e1863fbba86f824b09bf07b0b83fe5e85595f5cd00fdfa38fd72923922c2ea4
 SHA512 
796939106e8c986f2e8d6a1ff27f3a51cda0718825c3a6da678573de95a61bcc9fac484a34c6f8f762f7078f5289aa35c393725ea0b0f7e5d153352ab01a48f5
+DIST xwayland-23.2.0.tar.xz 1298020 BLAKE2B 
7b4d1b74c8c8d537395dfb277ff012b2761c5e6dc2d5ed20ec0f8b7da35c04d000a20efaff9ea9d2097b5b7ab1df7778162ec23f4623d0a63e38a4253a7bfa06
 SHA512 
3b490839026da4d34136d50050397d87e205d4fdb9c3cc9896eb2980bf90f3c951e7ce5271d7f7379c56a376d36f9e1fe1242211b64e680b715dd065ea58532d

diff --git a/x11-base/xwayland/xwayland-9999.ebuild 
b/x11-base/xwayland/xwayland-23.2.0.ebuild
similarity index 92%
copy from x11-base/xwayland/xwayland-9999.ebuild
copy to x11-base/xwayland/xwayland-23.2.0.ebuild
index cd8c1b8fb8d2..60ed3a76cb3f 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-23.2.0.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
        dev-libs/libbsd
        dev-libs/openssl:=
        >=dev-libs/wayland-1.21.0
-       >=dev-libs/wayland-protocols-1.28
+       >=dev-libs/wayland-protocols-1.30
        media-fonts/font-util
        >=media-libs/libepoxy-1.5.4[X,egl(+)]
        media-libs/libglvnd[X]
@@ -60,7 +60,7 @@ BDEPEND="
 "
 
 PATCHES=(
-       "${FILESDIR}"/xwayland-drop-redundantly-installed-files_v2.patch
+       "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
 )
 
 src_configure() {
@@ -82,6 +82,7 @@ src_configure() {
                -Dxace=true
                -Dxdmcp=true
                -Dxinerama=true
+               -Dxwayland_ei=false
                -Dxvfb=true
                -Dxv=true
                -Dxwayland-path="${EPREFIX}"/usr/bin
@@ -89,10 +90,6 @@ src_configure() {
                -Ddocs=false
                -Ddevel-docs=false
                -Ddocs-pdf=false
-               -Dxorg=false
-               -Dxnest=false
-               -Dxvfb=false
-               -Dxwayland=true
        )
 
        meson_src_configure

diff --git a/x11-base/xwayland/xwayland-9999.ebuild 
b/x11-base/xwayland/xwayland-9999.ebuild
index cd8c1b8fb8d2..738f4ae7b687 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
        dev-libs/libbsd
        dev-libs/openssl:=
        >=dev-libs/wayland-1.21.0
-       >=dev-libs/wayland-protocols-1.28
+       >=dev-libs/wayland-protocols-1.30
        media-fonts/font-util
        >=media-libs/libepoxy-1.5.4[X,egl(+)]
        media-libs/libglvnd[X]
@@ -82,6 +82,7 @@ src_configure() {
                -Dxace=true
                -Dxdmcp=true
                -Dxinerama=true
+               -Dxwayland_ei=false
                -Dxvfb=true
                -Dxv=true
                -Dxwayland-path="${EPREFIX}"/usr/bin