Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/tortoisehg/
Date: Wed, 16 Sep 2020 17:43:54
Message-Id: 1600278221.b48367143260d18e0f997573f3eb23650dadbca8.juippis@gentoo
1 commit: b48367143260d18e0f997573f3eb23650dadbca8
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 25 23:20:34 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 16 17:43:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4836714
7
8 dev-vcs/tortoisehg: update live version
9
10 Update HG_URI_REPO and SRC_URI, fix keywords, misc fixes.
11 Closes: https://bugs.gentoo.org/737902
12 Package-Manager: Portage-2.3.103, Repoman-2.3.23
13 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
14 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
15
16 dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 29 +++++++++++++++++------------
17 1 file changed, 17 insertions(+), 12 deletions(-)
18
19 diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
20 index 6f020170726..fd6e1dce5cd 100644
21 --- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
22 +++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
23 @@ -4,18 +4,18 @@
24 EAPI=7
25 PYTHON_COMPAT=( python3_{6,7,8} )
26
27 -inherit desktop distutils-r1
28 +inherit desktop distutils-r1 xdg-utils
29
30 if [[ ${PV} != *9999* ]]; then
31 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
32 - SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
33 - HG_DEPEND=" >=dev-vcs/mercurial-5.3.1
34 - <dev-vcs/mercurial-5.4"
35 + KEYWORDS="~amd64 ~arm64 ~x86"
36 + SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz"
37 + HG_DEPEND=">=dev-vcs/mercurial-5.4
38 + <dev-vcs/mercurial-5.6"
39 else
40 inherit mercurial
41 - EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
42 + EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg"
43 EHG_REVISION="stable"
44 - HG_DEPEND="dev-vcs/mercurial"
45 + HG_DEPEND=">=dev-vcs/mercurial-5.4"
46 fi
47
48 DESCRIPTION="Set of graphical tools for Mercurial"
49 @@ -23,17 +23,17 @@ HOMEPAGE="https://tortoisehg.bitbucket.io/"
50
51 LICENSE="GPL-2"
52 SLOT="0"
53 -IUSE="doc"
54
55 -distutils_enable_sphinx html
56 -
57 -RDEPEND="${HG_DEPEND}
58 +RDEPEND="
59 + ${HG_DEPEND}
60 dev-python/iniparse[${PYTHON_USEDEP}]
61 dev-python/pygments[${PYTHON_USEDEP}]
62 - dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
63 + dev-python/PyQt5:=[network,svg,${PYTHON_USEDEP}]
64 >=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
65 DEPEND="${RDEPEND}"
66
67 +distutils_enable_sphinx doc/source
68 +
69 python_prepare_all() {
70 # Remove file that collides with >=mercurial-4.0 (bug #599266).
71 rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py"
72 @@ -48,7 +48,12 @@ python_install_all() {
73 }
74
75 pkg_postinst() {
76 + xdg_icon_cache_update
77 elog "When startup of ${PN} fails with an API version mismatch error"
78 elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
79 elog "dev-python/qscintilla-python."
80 }
81 +
82 +pkg_postrm() {
83 + xdg_icon_cache_update
84 +}