Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/tortoisehg/
Date: Sat, 09 Dec 2017 23:52:40
Message-Id: 1512863520.35a0fba7b2afe6c0ccf348518aff0afb8f79ba6c.asturm@gentoo
1 commit: 35a0fba7b2afe6c0ccf348518aff0afb8f79ba6c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 9 23:38:56 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 9 23:52:00 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a0fba7
7
8 dev-vcs/tortoisehg: 9999 collides as well
9
10 Bug: https://bugs.gentoo.org/599266
11 Package-Manager: Portage-2.3.17, Repoman-2.3.6
12
13 dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 4 ++++
14 1 file changed, 4 insertions(+)
15
16 diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
17 index 006534e30ee..10ea4192888 100644
18 --- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
19 +++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
20 @@ -66,6 +66,10 @@ python_install_all() {
21 fi
22 newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
23 domenu contrib/thg.desktop
24 +
25 + # Remove file that collides with >=mercurial-4.0 (bug #599266).
26 + rm "${ED}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
27 + || die
28 }
29
30 pkg_postinst() {