From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16091139083 for ; Sat, 9 Dec 2017 23:52:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2783EE1067; Sat, 9 Dec 2017 23:52:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0178EE1067 for ; Sat, 9 Dec 2017 23:52:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA9A633BEC7 for ; Sat, 9 Dec 2017 23:52:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54ABCAE77 for ; Sat, 9 Dec 2017 23:52:36 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1512863520.35a0fba7b2afe6c0ccf348518aff0afb8f79ba6c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/tortoisehg/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/tortoisehg/tortoisehg-9999.ebuild X-VCS-Directories: dev-vcs/tortoisehg/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 35a0fba7b2afe6c0ccf348518aff0afb8f79ba6c X-VCS-Branch: master Date: Sat, 9 Dec 2017 23:52:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bc0df019-72b7-4ac7-bc2b-38adef54b29c X-Archives-Hash: 3fd1e47e20ff0396f3ed2a064468a8fb commit: 35a0fba7b2afe6c0ccf348518aff0afb8f79ba6c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 9 23:38:56 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 9 23:52:00 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a0fba7 dev-vcs/tortoisehg: 9999 collides as well Bug: https://bugs.gentoo.org/599266 Package-Manager: Portage-2.3.17, Repoman-2.3.6 dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild index 006534e30ee..10ea4192888 100644 --- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild @@ -66,6 +66,10 @@ python_install_all() { fi newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg domenu contrib/thg.desktop + + # Remove file that collides with >=mercurial-4.0 (bug #599266). + rm "${ED}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \ + || die } pkg_postinst() {