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 61412139694 for ; Sun, 16 Jul 2017 19:17:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC40DE0E68; Sun, 16 Jul 2017 19:17:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9B799E0E68 for ; Sun, 16 Jul 2017 19:17:25 +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 86C58341A88 for ; Sun, 16 Jul 2017 19:17:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0472B2601 for ; Sun, 16 Jul 2017 19:17:23 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1500232637.c6d69df1e5c859d38ecdf644023b4270c1b5e198.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/ X-VCS-Repository: repo/gentoo X-VCS-Files: xfce-base/exo/exo-0.11.4-r1.ebuild xfce-base/exo/exo-0.11.4.ebuild X-VCS-Directories: xfce-base/exo/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c6d69df1e5c859d38ecdf644023b4270c1b5e198 X-VCS-Branch: master Date: Sun, 16 Jul 2017 19:17:23 +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-Archives-Salt: 45a970bb-f90f-4a68-8d7a-8267150fd012 X-Archives-Hash: 60d13f2ba3a08c517583b122c05100ed commit: c6d69df1e5c859d38ecdf644023b4270c1b5e198 Author: Michał Górny gentoo org> AuthorDate: Sun Jul 16 18:25:11 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jul 16 19:17:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d69df1 xfce-base/exo: Fix conflict with www-client/vivaldi, #624546 xfce-base/exo/{exo-0.11.4.ebuild => exo-0.11.4-r1.ebuild} | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xfce-base/exo/exo-0.11.4.ebuild b/xfce-base/exo/exo-0.11.4-r1.ebuild similarity index 83% rename from xfce-base/exo/exo-0.11.4.ebuild rename to xfce-base/exo/exo-0.11.4-r1.ebuild index 582fbc77050..44f902b7be9 100644 --- a/xfce-base/exo/exo-0.11.4.ebuild +++ b/xfce-base/exo/exo-0.11.4-r1.ebuild @@ -30,6 +30,9 @@ DEPEND="${RDEPEND} src_install() { default find "${D}" -name '*.la' -delete || die + # installed by www-client/vivaldi, xfce4 upstream already removed + # it per https://bugzilla.xfce.org/show_bug.cgi?id=13712 + rm "${ED%/}"/usr/share/xfce4/helpers/vivaldi.desktop || die } pkg_postinst() {