Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libX11/
Date: Tue, 05 Jul 2022 15:41:03
Message-Id: 1657035466.24e063e91b91e7a82746027d9adad3d18e07be32.mattst88@gentoo
1 commit: 24e063e91b91e7a82746027d9adad3d18e07be32
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 5 15:37:46 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 5 15:37:46 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24e063e9
7
8 x11-libs/libX11: Add blocker against xfce4-settings
9
10 Closes: https://bugs.gentoo.org/841857
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 x11-libs/libX11/libX11-1.8.1.ebuild | 8 ++++++--
14 1 file changed, 6 insertions(+), 2 deletions(-)
15
16 diff --git a/x11-libs/libX11/libX11-1.8.1.ebuild b/x11-libs/libX11/libX11-1.8.1.ebuild
17 index 25866e82c700..b3cf1311675e 100644
18 --- a/x11-libs/libX11/libX11-1.8.1.ebuild
19 +++ b/x11-libs/libX11/libX11-1.8.1.ebuild
20 @@ -17,10 +17,14 @@ RESTRICT="!test? ( test )"
21
22 RDEPEND="
23 >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
24 - x11-misc/compose-tables"
25 + x11-misc/compose-tables
26 +
27 + !<xfce-base/xfce4-settings-4.16.3
28 +"
29 DEPEND="${RDEPEND}
30 x11-base/xorg-proto
31 - x11-libs/xtrans"
32 + x11-libs/xtrans
33 +"
34 BDEPEND="test? ( dev-lang/perl )"
35
36 src_configure() {