From: Jimi Huotari <chiitoo@gentoo.org>
Date: Tue, 12 Mar 2019 21:14:45 +0000 (+0200)
Subject: x11-terms/qterminal: block 'lxqt-base/lxqt-l10n'
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a4d81e8721b687633ca891aae6d9bb6c4892afd9;p=gentoo.git

x11-terms/qterminal: block 'lxqt-base/lxqt-l10n'

Otherwise files may collide.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/11351
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/x11-terms/qterminal/qterminal-0.14.1.ebuild b/x11-terms/qterminal/qterminal-0.14.1.ebuild
index 49fa71664d17..a16a34b51c33 100644
--- a/x11-terms/qterminal/qterminal-0.14.1.ebuild
+++ b/x11-terms/qterminal/qterminal-0.14.1.ebuild
@@ -28,7 +28,9 @@ DEPEND="
 	x11-libs/libX11
 	~x11-libs/qtermwidget-${PV}
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
 
 pkg_postinst() {
 	xdg_icon_cache_update