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

[Sam James]

commit:     62bbff21656cf9bd32ea79802a16bde39b2089ce
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 03:48:40 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 03:49:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62bbff21

x11-base/xorg-server: disable xwayland conditionally for 9999

It's already gone from 21.1.2.

See: 2fbc32dd698fab913b1a913b8f1aea5d30d31eb9
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-base/xorg-server/xorg-server-21.1.2.ebuild | 5 +++++
 x11-base/xorg-server/xorg-server-9999.ebuild   | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/x11-base/xorg-server/xorg-server-21.1.2.ebuild 
b/x11-base/xorg-server/xorg-server-21.1.2.ebuild
index 3778a969a5f0..8e9f6cb25f32 100644
--- a/x11-base/xorg-server/xorg-server-21.1.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.2.ebuild
@@ -133,6 +133,11 @@ src_configure() {
                -Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
        )
 
+       if [[ ${PV} == 9999 ]] ; then
+               # Gone in 21.1.x, but not in master.
+               emesonargs+=( -Dxwayland=false )
+       fi
+
        if use systemd || use elogind; then
                emesonargs+=(
                        -Dsystemd_logind=true

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild 
b/x11-base/xorg-server/xorg-server-9999.ebuild
index 22b2c81c0888..8e9f6cb25f32 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -131,9 +131,13 @@ src_configure() {
                -Dsecure-rpc=false
                -Dsha1=libcrypto
                -Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
-               -Dxwayland=false
        )
 
+       if [[ ${PV} == 9999 ]] ; then
+               # Gone in 21.1.x, but not in master.
+               emesonargs+=( -Dxwayland=false )
+       fi
+
        if use systemd || use elogind; then
                emesonargs+=(
                        -Dsystemd_logind=true