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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 14DF513933E for ; Sun, 4 Jul 2021 23:31:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17854E07D8; Sun, 4 Jul 2021 23:31:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 59D84E07D8 for ; Sun, 4 Jul 2021 23:31:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1CB4C335D12 for ; Sun, 4 Jul 2021 23:31:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F84F7A3 for ; Sun, 4 Jul 2021 23:31:51 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1625441418.a63e0d6818b8ffc78e55c5c5a8ae9f6c0e44af4e.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xwayland/xwayland-21.1.1-r1.ebuild x11-base/xwayland/xwayland-21.1.1.901.ebuild X-VCS-Directories: x11-base/xwayland/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: a63e0d6818b8ffc78e55c5c5a8ae9f6c0e44af4e X-VCS-Branch: master Date: Sun, 4 Jul 2021 23:31:51 +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: 42cb4e9f-d6d1-4536-bb4a-d740728e2676 X-Archives-Hash: 4374ed8919c624d3386f438a0578bf11 commit: a63e0d6818b8ffc78e55c5c5a8ae9f6c0e44af4e Author: Mike Gilbert gentoo org> AuthorDate: Sun Jul 4 23:26:57 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Jul 4 23:30:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a63e0d68 x11-base/xwayland: drop pointless CDEPEND variable The xorg-server blocker in DEPEND is pointless. Putting it in RDEPEND is sufficient to avoid file collisions. Signed-off-by: Mike Gilbert gentoo.org> x11-base/xwayland/xwayland-21.1.1-r1.ebuild | 8 ++------ x11-base/xwayland/xwayland-21.1.1.901.ebuild | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild index 7b2b33d787c..06ad6c677a3 100644 --- a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild +++ b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild @@ -15,7 +15,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -CDEPEND=" +DEPEND=" >=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 @@ -38,13 +38,9 @@ CDEPEND=" >=x11-misc/xkeyboard-config-2.4.1-r3 " -DEPEND=" - ${CDEPEND} - !<=x11-base/xorg-server-1.20.11 -" - RDEPEND=" ${DEPEND} + !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver ) " BDEPEND=" diff --git a/x11-base/xwayland/xwayland-21.1.1.901.ebuild b/x11-base/xwayland/xwayland-21.1.1.901.ebuild index 5551c688c60..ad2989c660e 100644 --- a/x11-base/xwayland/xwayland-21.1.1.901.ebuild +++ b/x11-base/xwayland/xwayland-21.1.1.901.ebuild @@ -15,7 +15,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="" -CDEPEND=" +DEPEND=" >=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 @@ -39,13 +39,9 @@ CDEPEND=" >=x11-misc/xkeyboard-config-2.4.1-r3 " -DEPEND=" - ${CDEPEND} - !<=x11-base/xorg-server-1.20.11 -" - RDEPEND=" ${DEPEND} + !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver ) " BDEPEND="