Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/
Date: Sun, 04 Jul 2021 23:31:56
Message-Id: 1625441418.a63e0d6818b8ffc78e55c5c5a8ae9f6c0e44af4e.floppym@gentoo
1 commit: a63e0d6818b8ffc78e55c5c5a8ae9f6c0e44af4e
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 4 23:26:57 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 4 23:30:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a63e0d68
7
8 x11-base/xwayland: drop pointless CDEPEND variable
9
10 The xorg-server blocker in DEPEND is pointless. Putting it in RDEPEND is
11 sufficient to avoid file collisions.
12
13 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
14
15 x11-base/xwayland/xwayland-21.1.1-r1.ebuild | 8 ++------
16 x11-base/xwayland/xwayland-21.1.1.901.ebuild | 8 ++------
17 2 files changed, 4 insertions(+), 12 deletions(-)
18
19 diff --git a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
20 index 7b2b33d787c..06ad6c677a3 100644
21 --- a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
22 +++ b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
23 @@ -15,7 +15,7 @@ LICENSE="MIT"
24 SLOT="0"
25 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
26
27 -CDEPEND="
28 +DEPEND="
29 >=x11-libs/pixman-0.27.2
30 dev-libs/libbsd
31 >=x11-libs/libXfont2-2.0.1
32 @@ -38,13 +38,9 @@ CDEPEND="
33 >=x11-misc/xkeyboard-config-2.4.1-r3
34 "
35
36 -DEPEND="
37 - ${CDEPEND}
38 - !<=x11-base/xorg-server-1.20.11
39 -"
40 -
41 RDEPEND="
42 ${DEPEND}
43 + !<=x11-base/xorg-server-1.20.11
44 selinux? ( sec-policy/selinux-xserver )
45 "
46 BDEPEND="
47
48 diff --git a/x11-base/xwayland/xwayland-21.1.1.901.ebuild b/x11-base/xwayland/xwayland-21.1.1.901.ebuild
49 index 5551c688c60..ad2989c660e 100644
50 --- a/x11-base/xwayland/xwayland-21.1.1.901.ebuild
51 +++ b/x11-base/xwayland/xwayland-21.1.1.901.ebuild
52 @@ -15,7 +15,7 @@ LICENSE="MIT"
53 SLOT="0"
54 KEYWORDS=""
55
56 -CDEPEND="
57 +DEPEND="
58 >=x11-libs/pixman-0.27.2
59 dev-libs/libbsd
60 >=x11-libs/libXfont2-2.0.1
61 @@ -39,13 +39,9 @@ CDEPEND="
62 >=x11-misc/xkeyboard-config-2.4.1-r3
63 "
64
65 -DEPEND="
66 - ${CDEPEND}
67 - !<=x11-base/xorg-server-1.20.11
68 -"
69 -
70 RDEPEND="
71 ${DEPEND}
72 + !<=x11-base/xorg-server-1.20.11
73 selinux? ( sec-policy/selinux-xserver )
74 "
75 BDEPEND="