commit: 9fc6180baa64a04c5069da93a4c67d158ce6e3fa Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Wed Mar 23 00:24:08 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Mar 31 13:36:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc6180b
dev-vcs/tortoisehg: 6.1 version bump; 9999.ebuild update Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/24718 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-vcs/tortoisehg/Manifest | 1 + .../{tortoisehg-9999.ebuild => tortoisehg-6.1.ebuild} | 17 ++++++++++------- dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 10 +++++----- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest index cdda41fa58eb..e19701cd6968 100644 --- a/dev-vcs/tortoisehg/Manifest +++ b/dev-vcs/tortoisehg/Manifest @@ -1,3 +1,4 @@ DIST tortoisehg-5.8.1.tar.gz 8636858 BLAKE2B 66473695e1364ff676ab314ce8b5a5e59cbe6ece68795d92278e450f70386a9e047dfd8975e7312bda10c183879d9634767f64a9c916f889f3edcf4847bf2468 SHA512 29903240c5522841e0ddc0f78741d20d589b6b48e82bf38023b87184e987721111a6a9675ccb85a31d9781cf1b8fa3d28801fef5bae187ae467d7da8f1ef982f DIST tortoisehg-5.9.1.tar.gz 8637928 BLAKE2B 57687359eb00018a811e28449dccce260569f7a26c91bf25a6473427f9942fd536c4458cae593baa371c65713f626208e6627e952e78001947b8f952988c3103 SHA512 8df24a66e24ddb95af353a363149dcee37bc678ebd741f578a8bc09d6844b52537f287b908bce2dab4e4603310867095821b52332bd5bdc55b0f114bad647eff DIST tortoisehg-5.9.3.tar.gz 8637453 BLAKE2B 9fa90c108f32b1e15c233e7ccbadbda08e434f23aa5c5fe7c235c743c98f54f4222a1804c06b0ca300cc3d0b049c117007a53452ff20ae4411bca30d8ed9013b SHA512 870b3b717962b8450d07fca5300f971d187236edce5a9d2926144b832c0771b8f5a324bdfd05a1fed3d2b4de4bad913c0c8f4435908e602e268c561ed64abbb2 +DIST tortoisehg-6.1.tar.gz 8651665 BLAKE2B ed476683b5a9f64ad94a9c8d5ab0b0bf5693292985d7583b76e166ac9a472015e8f7ba62c0f98211a2784f52171f4d25c91c15c97750b395297a19b77eb2d18e SHA512 056959de987de5a5058d26b148e2edf16424554f13d5125c50bb79c49c31b8a2093ef381d15638739461b2d7597e0b7f19edc0ed621dead4cce72d5a8cd5a620 diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.1.ebuild similarity index 83% copy from dev-vcs/tortoisehg/tortoisehg-9999.ebuild copy to dev-vcs/tortoisehg/tortoisehg-6.1.ebuild index b2992eb0f27b..1141a498eeb4 100644 --- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-6.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) @@ -9,17 +9,20 @@ DISTUTILS_USE_SETUPTOOLS=no inherit desktop distutils-r1 optfeature xdg-utils +# Tag isn't provided this time +COMMIT_SHA="cdfdf8c593f98863b4034b38001c71bc9fb970c3" + if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64 ~arm64 ~x86" - SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-5.8[${PYTHON_USEDEP}] - <dev-vcs/mercurial-5.10[${PYTHON_USEDEP}]" - S="${WORKDIR}/thg-${PV}" + SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${COMMIT_SHA}/thg-${COMMIT_SHA}.tar.gz -> ${P}.tar.gz" + HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}] + <dev-vcs/mercurial-6.2[${PYTHON_USEDEP}]" + S="${WORKDIR}/thg-${COMMIT_SHA}" else inherit mercurial EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg" EHG_REVISION="stable" - HG_DEPEND=">=dev-vcs/mercurial-5.8[${PYTHON_USEDEP}]" + HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]" fi DESCRIPTION="Set of graphical tools for Mercurial" diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild index b2992eb0f27b..fbf56b913fc3 100644 --- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) @@ -12,14 +12,14 @@ inherit desktop distutils-r1 optfeature xdg-utils if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64 ~arm64 ~x86" SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-5.8[${PYTHON_USEDEP}] - <dev-vcs/mercurial-5.10[${PYTHON_USEDEP}]" + HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}] + <dev-vcs/mercurial-6.2[${PYTHON_USEDEP}]" S="${WORKDIR}/thg-${PV}" else inherit mercurial EHG_REPO_URI="https://foss.heptapod.net/mercurial/${PN}/thg" EHG_REVISION="stable" - HG_DEPEND=">=dev-vcs/mercurial-5.8[${PYTHON_USEDEP}]" + HG_DEPEND=">=dev-vcs/mercurial-5.9[${PYTHON_USEDEP}]" fi DESCRIPTION="Set of graphical tools for Mercurial"
