From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 16 Jul 2017 18:25:11 +0000 (+0200)
Subject: xfce-base/exo: Fix conflict with www-client/vivaldi, #624546
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6d69df1e5c859d38ecdf644023b4270c1b5e198;p=gentoo.git

xfce-base/exo: Fix conflict with www-client/vivaldi, #624546
---

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 582fbc77050b..44f902b7be99 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() {