1 |
commit: 9fc6180baa64a04c5069da93a4c67d158ce6e3fa |
2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
3 |
AuthorDate: Wed Mar 23 00:24:08 2022 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 31 13:36:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc6180b |
7 |
|
8 |
dev-vcs/tortoisehg: 6.1 version bump; 9999.ebuild update |
9 |
|
10 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/24718 |
12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
13 |
|
14 |
dev-vcs/tortoisehg/Manifest | 1 + |
15 |
.../{tortoisehg-9999.ebuild => tortoisehg-6.1.ebuild} | 17 ++++++++++------- |
16 |
dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 10 +++++----- |
17 |
3 files changed, 16 insertions(+), 12 deletions(-) |
18 |
|
19 |
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest |
20 |
index cdda41fa58eb..e19701cd6968 100644 |
21 |
--- a/dev-vcs/tortoisehg/Manifest |
22 |
+++ b/dev-vcs/tortoisehg/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST tortoisehg-5.8.1.tar.gz 8636858 BLAKE2B 66473695e1364ff676ab314ce8b5a5e59cbe6ece68795d92278e450f70386a9e047dfd8975e7312bda10c183879d9634767f64a9c916f889f3edcf4847bf2468 SHA512 29903240c5522841e0ddc0f78741d20d589b6b48e82bf38023b87184e987721111a6a9675ccb85a31d9781cf1b8fa3d28801fef5bae187ae467d7da8f1ef982f |
25 |
DIST tortoisehg-5.9.1.tar.gz 8637928 BLAKE2B 57687359eb00018a811e28449dccce260569f7a26c91bf25a6473427f9942fd536c4458cae593baa371c65713f626208e6627e952e78001947b8f952988c3103 SHA512 8df24a66e24ddb95af353a363149dcee37bc678ebd741f578a8bc09d6844b52537f287b908bce2dab4e4603310867095821b52332bd5bdc55b0f114bad647eff |
26 |
DIST tortoisehg-5.9.3.tar.gz 8637453 BLAKE2B 9fa90c108f32b1e15c233e7ccbadbda08e434f23aa5c5fe7c235c743c98f54f4222a1804c06b0ca300cc3d0b049c117007a53452ff20ae4411bca30d8ed9013b SHA512 870b3b717962b8450d07fca5300f971d187236edce5a9d2926144b832c0771b8f5a324bdfd05a1fed3d2b4de4bad913c0c8f4435908e602e268c561ed64abbb2 |
27 |
+DIST tortoisehg-6.1.tar.gz 8651665 BLAKE2B ed476683b5a9f64ad94a9c8d5ab0b0bf5693292985d7583b76e166ac9a472015e8f7ba62c0f98211a2784f52171f4d25c91c15c97750b395297a19b77eb2d18e SHA512 056959de987de5a5058d26b148e2edf16424554f13d5125c50bb79c49c31b8a2093ef381d15638739461b2d7597e0b7f19edc0ed621dead4cce72d5a8cd5a620 |
28 |
|
29 |
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.1.ebuild |
30 |
similarity index 83% |
31 |
copy from dev-vcs/tortoisehg/tortoisehg-9999.ebuild |
32 |
copy to dev-vcs/tortoisehg/tortoisehg-6.1.ebuild |
33 |
index b2992eb0f27b..1141a498eeb4 100644 |
34 |
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild |
35 |
+++ b/dev-vcs/tortoisehg/tortoisehg-6.1.ebuild |
36 |
@@ -1,7 +1,7 @@ |
37 |
-# Copyright 1999-2021 Gentoo Authors |
38 |
+# Copyright 1999-2022 Gentoo Authors |
39 |
# Distributed under the terms of the GNU General Public License v2 |
40 |
|
41 |
-EAPI=7 |
42 |
+EAPI=8 |
43 |
|
44 |
PYTHON_COMPAT=( python3_{8..10} ) |
45 |
|
46 |
@@ -9,17 +9,20 @@ DISTUTILS_USE_SETUPTOOLS=no |
47 |
|
48 |
inherit desktop distutils-r1 optfeature xdg-utils |
49 |
|
50 |
+# Tag isn't provided this time |
51 |
+COMMIT_SHA="cdfdf8c593f98863b4034b38001c71bc9fb970c3" |
52 |
+ |
53 |
if [[ ${PV} != *9999* ]]; then |
54 |
KEYWORDS="~amd64 ~arm64 ~x86" |
55 |
- SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz" |
56 |
- HG_DEPEND=">=dev-vcs/mercurial-5.8[${PYTHON_USEDEP}] |
57 |
- <dev-vcs/mercurial-5.10[${PYTHON_USEDEP}]" |
58 |
- S="${WORKDIR}/thg-${PV}" |
59 |
+ SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${COMMIT_SHA}/thg-${COMMIT_SHA}.tar.gz -> ${P}.tar.gz" |
60 |
+ HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}] |
61 |
+ <dev-vcs/mercurial-6.2[${PYTHON_USEDEP}]" |
62 |
+ S="${WORKDIR}/thg-${COMMIT_SHA}" |
63 |
else |
64 |
inherit mercurial |
65 |
EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg" |
66 |
EHG_REVISION="stable" |
67 |
- HG_DEPEND=">=dev-vcs/mercurial-5.8[${PYTHON_USEDEP}]" |
68 |
+ HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]" |
69 |
fi |
70 |
|
71 |
DESCRIPTION="Set of graphical tools for Mercurial" |
72 |
|
73 |
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild |
74 |
index b2992eb0f27b..fbf56b913fc3 100644 |
75 |
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild |
76 |
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild |
77 |
@@ -1,7 +1,7 @@ |
78 |
-# Copyright 1999-2021 Gentoo Authors |
79 |
+# Copyright 1999-2022 Gentoo Authors |
80 |
# Distributed under the terms of the GNU General Public License v2 |
81 |
|
82 |
-EAPI=7 |
83 |
+EAPI=8 |
84 |
|
85 |
PYTHON_COMPAT=( python3_{8..10} ) |
86 |
|
87 |
@@ -12,14 +12,14 @@ inherit desktop distutils-r1 optfeature xdg-utils |
88 |
if [[ ${PV} != *9999* ]]; then |
89 |
KEYWORDS="~amd64 ~arm64 ~x86" |
90 |
SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz" |
91 |
- HG_DEPEND=">=dev-vcs/mercurial-5.8[${PYTHON_USEDEP}] |
92 |
- <dev-vcs/mercurial-5.10[${PYTHON_USEDEP}]" |
93 |
+ HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}] |
94 |
+ <dev-vcs/mercurial-6.2[${PYTHON_USEDEP}]" |
95 |
S="${WORKDIR}/thg-${PV}" |
96 |
else |
97 |
inherit mercurial |
98 |
EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg" |
99 |
EHG_REVISION="stable" |
100 |
- HG_DEPEND=">=dev-vcs/mercurial-5.8[${PYTHON_USEDEP}]" |
101 |
+ HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]" |
102 |
fi |
103 |
|
104 |
DESCRIPTION="Set of graphical tools for Mercurial" |