From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EFF19158086 for ; Thu, 16 Dec 2021 03:50:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA3022BC020; Thu, 16 Dec 2021 03:50:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 898032BC020 for ; Thu, 16 Dec 2021 03:50:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E1D213432BE for ; Thu, 16 Dec 2021 03:49:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BBEE23E for ; Thu, 16 Dec 2021 03:49:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1639626583.62bbff21656cf9bd32ea79802a16bde39b2089ce.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/xorg-server-21.1.2.ebuild x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 62bbff21656cf9bd32ea79802a16bde39b2089ce X-VCS-Branch: master Date: Thu, 16 Dec 2021 03:49:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1adeb191-2111-46eb-acda-1f6a203cd849 X-Archives-Hash: 2a4eb21c910a14c446228fcb44836ef8 commit: 62bbff21656cf9bd32ea79802a16bde39b2089ce Author: Sam James gentoo org> AuthorDate: Thu Dec 16 03:48:40 2021 +0000 Commit: Sam James gentoo 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 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