| 1 |
commit: c6d69df1e5c859d38ecdf644023b4270c1b5e198 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 16 18:25:11 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 16 19:17:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d69df1 |
| 7 |
|
| 8 |
xfce-base/exo: Fix conflict with www-client/vivaldi, #624546 |
| 9 |
|
| 10 |
xfce-base/exo/{exo-0.11.4.ebuild => exo-0.11.4-r1.ebuild} | 3 +++ |
| 11 |
1 file changed, 3 insertions(+) |
| 12 |
|
| 13 |
diff --git a/xfce-base/exo/exo-0.11.4.ebuild b/xfce-base/exo/exo-0.11.4-r1.ebuild |
| 14 |
similarity index 83% |
| 15 |
rename from xfce-base/exo/exo-0.11.4.ebuild |
| 16 |
rename to xfce-base/exo/exo-0.11.4-r1.ebuild |
| 17 |
index 582fbc77050..44f902b7be9 100644 |
| 18 |
--- a/xfce-base/exo/exo-0.11.4.ebuild |
| 19 |
+++ b/xfce-base/exo/exo-0.11.4-r1.ebuild |
| 20 |
@@ -30,6 +30,9 @@ DEPEND="${RDEPEND} |
| 21 |
src_install() { |
| 22 |
default |
| 23 |
find "${D}" -name '*.la' -delete || die |
| 24 |
+ # installed by www-client/vivaldi, xfce4 upstream already removed |
| 25 |
+ # it per https://bugzilla.xfce.org/show_bug.cgi?id=13712 |
| 26 |
+ rm "${ED%/}"/usr/share/xfce4/helpers/vivaldi.desktop || die |
| 27 |
} |
| 28 |
|
| 29 |
pkg_postinst() { |
Archives