[gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/

[Michał Górny]

commit:     c6d69df1e5c859d38ecdf644023b4270c1b5e198
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 18:25:11 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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() {