Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/qterminal/
Date: Wed, 13 Mar 2019 19:50:19
Message-Id: 1552506584.a4d81e8721b687633ca891aae6d9bb6c4892afd9.asturm@gentoo
1 commit: a4d81e8721b687633ca891aae6d9bb6c4892afd9
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 12 21:14:45 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 13 19:49:44 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d81e87
7
8 x11-terms/qterminal: block 'lxqt-base/lxqt-l10n'
9
10 Otherwise files may collide.
11
12 Package-Manager: Portage-2.3.62, Repoman-2.3.12
13 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
14 Closes: https://github.com/gentoo/gentoo/pull/11351
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 x11-terms/qterminal/qterminal-0.14.1.ebuild | 4 +++-
18 1 file changed, 3 insertions(+), 1 deletion(-)
19
20 diff --git a/x11-terms/qterminal/qterminal-0.14.1.ebuild b/x11-terms/qterminal/qterminal-0.14.1.ebuild
21 index 49fa71664d1..a16a34b51c3 100644
22 --- a/x11-terms/qterminal/qterminal-0.14.1.ebuild
23 +++ b/x11-terms/qterminal/qterminal-0.14.1.ebuild
24 @@ -28,7 +28,9 @@ DEPEND="
25 x11-libs/libX11
26 ~x11-libs/qtermwidget-${PV}
27 "
28 -RDEPEND="${DEPEND}"
29 +RDEPEND="${DEPEND}
30 + !lxqt-base/lxqt-l10n
31 +"
32
33 pkg_postinst() {
34 xdg_icon_cache_update