From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED8E2138334 for ; Wed, 13 Mar 2019 19:50:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E128E096D; Wed, 13 Mar 2019 19:50:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EE8EE096C for ; Wed, 13 Mar 2019 19:50:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8A82335CDE for ; Wed, 13 Mar 2019 19:50:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F24D454D for ; Wed, 13 Mar 2019 19:50:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1552506584.a4d81e8721b687633ca891aae6d9bb6c4892afd9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/qterminal/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/qterminal/qterminal-0.14.1.ebuild X-VCS-Directories: x11-terms/qterminal/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a4d81e8721b687633ca891aae6d9bb6c4892afd9 X-VCS-Branch: master Date: Wed, 13 Mar 2019 19:50:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6ad1e520-1ffe-4f5b-97c9-936edcb43cab X-Archives-Hash: 0c4a21aad963eb3683d356b46ad4a062 commit: a4d81e8721b687633ca891aae6d9bb6c4892afd9 Author: Jimi Huotari gentoo org> AuthorDate: Tue Mar 12 21:14:45 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 13 19:49:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d81e87 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 gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/11351 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-terms/qterminal/qterminal-0.14.1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x11-terms/qterminal/qterminal-0.14.1.ebuild b/x11-terms/qterminal/qterminal-0.14.1.ebuild index 49fa71664d1..a16a34b51c3 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