[gentoo-commits] repo/gentoo:master commit in: dev-vcs/hg-git/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     ecc442dc0bb76835900a0fc227604e84bd5b72e9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 08:58:24 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May 12 08:58:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc442dc

dev-vcs/hg-git-1.1.1: version bump

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-vcs/hg-git/Manifest                            |  2 +-
 dev-vcs/hg-git/hg-git-0.10.3.ebuild                | 27 ----------------------
 dev-vcs/hg-git/hg-git-1.0.2-r1.ebuild              |  5 ++--
 .../{hg-git-1.0.2.ebuild => hg-git-1.1.1.ebuild}   | 13 +++++------
 4 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 881a484d9500..7ddba70d6162 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,3 +1,3 @@
 DIST 1.0.2-hg65.patch 1697 BLAKE2B a620b6624eaad4ff233e9cda97d160acc11402e668a7837385bbf3d6384b19106084054e45d0f63dbe686267e636c3bd862a45b09f52ff93bb588ed3439dc69a SHA512 3ac84637f89b97347cd01c243df9af8b37a8c694fab3e560c8e5fd8baed6e0d695c1cd2cb22580378c57afa01aeee25915ac033444e833d0719bc1defdebc305
-DIST hg-git-0.10.3.tar.bz2 146867 BLAKE2B cad4103cbb517c7126787fcfd5c6a9d20b814048e8277eddd1f398bb4e040cdf61d1a83ffb1a121ca62c9f038124049864c9d792ec500fd15614e7a1e2c70084 SHA512 61122084d89b62faaabfc93a8b3ef346c1c34ac3a4eea927f3f32a50490ce537333fb9e19452c2a02e172c216095d6a9db83f79d1f3ecb8afc7ae4cd554e0abc
 DIST hg-git-1.0.2.tar.bz2 171241 BLAKE2B fd953178daff4e283cdacfacafd64c40efff73d0e4a175faa4e032bf38ccc1ef04bd715c4f38dd5d83ab1b0f52a1f329d2a1fb95c13ea83311c47786c3738600 SHA512 8df398c059131b4a8f4ab68fde743cfd82b19b3a184ea92f53ac69ba74e0b9cb94366d4a22d595ea44667493f050bd31ee3e9d7632cdb16507c57e156cd611e9
+DIST hg-git-1.1.1.tar.bz2 179321 BLAKE2B 8f6083be5c123d079dec0ca5ae150faa2658b1bd0ca235516fe13c99df19a570f3f6721c2760947a14356aa261568ac61e53000b1be6a5ee806dea3ccf3ff65e SHA512 fc7f880683f423f2d44342f51325bb522749e33bedc418397bb2f42e46d90fd3b7c949d97ccb6e776bbfc8543bb6ecaef191b271fd7e618612bba5596f6849ef

diff --git a/dev-vcs/hg-git/hg-git-0.10.3.ebuild b/dev-vcs/hg-git/hg-git-0.10.3.ebuild
deleted file mode 100644
index 6e3f520c2622..000000000000
--- a/dev-vcs/hg-git/hg-git-0.10.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_rc/a}
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="https://hg-git.github.io https://pypi.org/project/hg-git/"
-SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-vcs/mercurial-4.3[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.19.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"

diff --git a/dev-vcs/hg-git/hg-git-1.0.2-r1.ebuild b/dev-vcs/hg-git/hg-git-1.0.2-r1.ebuild
index 6cff7305c62b..e53d2bdf3fc4 100644
--- a/dev-vcs/hg-git/hg-git-1.0.2-r1.ebuild
+++ b/dev-vcs/hg-git/hg-git-1.0.2-r1.ebuild
@@ -12,18 +12,17 @@ DESCRIPTION="push to and pull from a Git repository using Mercurial"
 HOMEPAGE="https://hg-git.github.io https://pypi.org/project/hg-git/"
 SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2 https://foss.heptapod.net/mercurial/hg-git/-/commit/9a52223a95e9821b2f2b544ab5a35e06963da3f1.patch -> ${MY_PV}-hg65.patch"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
 
 RDEPEND="
 	>=dev-vcs/mercurial-5.2[${PYTHON_USEDEP}]
 	>=dev-python/dulwich-0.19.3[${PYTHON_USEDEP}]
 "
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_prepare() {
 	default
 

diff --git a/dev-vcs/hg-git/hg-git-1.0.2.ebuild b/dev-vcs/hg-git/hg-git-1.1.1.ebuild
similarity index 67%
rename from dev-vcs/hg-git/hg-git-1.0.2.ebuild
rename to dev-vcs/hg-git/hg-git-1.1.1.ebuild
index edc70f375964..3b13b528170f 100644
--- a/dev-vcs/hg-git/hg-git-1.0.2.ebuild
+++ b/dev-vcs/hg-git/hg-git-1.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
@@ -12,14 +12,13 @@ DESCRIPTION="push to and pull from a Git repository using Mercurial"
 HOMEPAGE="https://hg-git.github.io https://pypi.org/project/hg-git/"
 SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
-	>=dev-vcs/mercurial-5.2[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.19.3[${PYTHON_USEDEP}]
+	>=dev-vcs/mercurial-6.1[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.20.11[${PYTHON_USEDEP}]
 "
-
-S="${WORKDIR}/${PN}-${MY_PV}"