From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1476107-garchives=archives.gentoo.org@lists.gentoo.org>
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 6DFAA15800F
	for <garchives@archives.gentoo.org>; Wed, 11 Jan 2023 14:52:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 6230BE0C5A;
	Wed, 11 Jan 2023 14:52:32 +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 46C23E0C5A
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jan 2023 14:52:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(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 2E860340E49
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jan 2023 14:52:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 7377B803
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Jan 2023 14:52:29 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1673448632.b8f82c6e626d1f16e082cc62694354de4203f5bb.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfdesktop/
X-VCS-Repository: repo/gentoo
X-VCS-Files: xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
X-VCS-Directories: xfce-base/xfdesktop/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: b8f82c6e626d1f16e082cc62694354de4203f5bb
X-VCS-Branch: master
Date: Wed, 11 Jan 2023 14:52:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 649d0572-28a2-436c-a808-5e3b555d8597
X-Archives-Hash: 678639280ec7db66cd3df1abaa1c7d69

commit:     b8f82c6e626d1f16e082cc62694354de4203f5bb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 14:50:32 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 14:50:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f82c6e

xfce-base/xfdesktop: Require || ( wayland X )

Closes: https://bugs.gentoo.org/890437
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
index c92e7011f80c..59e3d0085c86 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
@@ -15,12 +15,13 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="X libnotify +thunar wayland"
+IUSE="libnotify +thunar wayland X"
+REQUIRED_USE="|| ( wayland X )"
 
 DEPEND="
 	>=x11-libs/cairo-1.16
 	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3[X?,wayland?]
+	>=x11-libs/gtk+-3.24.0:3[wayland?,X?]
 	x11-libs/libX11
 	>=xfce-base/exo-0.11:=
 	>=xfce-base/garcon-0.6:=
@@ -43,9 +44,9 @@ BDEPEND="
 
 src_configure() {
 	local myconf=(
-		$(use_enable X x11)
 		$(use_enable wayland)
 		$(use_enable wayland gtk-layer-shell)
+		$(use_enable X x11)
 		$(use_enable thunar file-icons)
 		$(use_enable thunar thunarx)
 		$(use_enable libnotify notifications)