commit: a63e0d6818b8ffc78e55c5c5a8ae9f6c0e44af4e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 4 23:26:57 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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="