summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-07-16 20:25:11 +0200
committerMichał Górny <mgorny@gentoo.org>2017-07-16 21:17:17 +0200
commitc6d69df1e5c859d38ecdf644023b4270c1b5e198 (patch)
treefcb832d9af5ba548c01ccd0d14ca4d0e8c267b7e /xfce-base
parentsys-kernel/gentoo-sources: Linux patch 4.11.11 (diff)
downloadgentoo-c6d69df1e5c859d38ecdf644023b4270c1b5e198.tar.gz
gentoo-c6d69df1e5c859d38ecdf644023b4270c1b5e198.tar.bz2
gentoo-c6d69df1e5c859d38ecdf644023b4270c1b5e198.zip
xfce-base/exo: Fix conflict with www-client/vivaldi, #624546
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/exo/exo-0.11.4-r1.ebuild (renamed from xfce-base/exo/exo-0.11.4.ebuild)3
1 files changed, 3 insertions, 0 deletions
diff --git a/xfce-base/exo/exo-0.11.4.ebuild b/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() {