gentoo resync : 23.09.2020

4 files changed, 12 insertions, 35 deletions

diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 130e84d63cd9..880feceb4452 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,7 +1,5 @@
-DIST hg-git-0.8.13.tar.gz 127399 BLAKE2B 0cf47df27dfc19cb66d546c1647af4f6b112035ee089c42331c0f2c045ead9e9abf796f0ed0747f52efe1452a9a2ccec237ae4c0296173ae283c180ae5cdb75b SHA512 55eed0704dc2829e6f027bc842e69aa5d193c824521e4c96171cecabd0155b0635a06b5ff2be61cdf0fff1bcb075190a324087b4171fba05df8db76527878a4a
-DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac
+DIST hg-git-0.9.0.tar.bz2 129138 BLAKE2B a3758d3ff4daae98bccb71ac5471418b191596d7605c5fe867fde230a8deaacb3097b7f5f6f34ee55ba871a850c1c6f7cb6c1e9c05e388419136aecd66b775ea SHA512 03982292f042b9b48f58eeb04413f563b35fa8be1c31ca27825db8fbf293e4dfcb4bb62b6f504d82438a11c967496fb9bbd6aff5d77ae7eefdeb7747c53fcb82
 DIST hg-git-0.9.0a1.tar.bz2 128165 BLAKE2B dfe415a26554d6de714b64aa79f771e08f2c7ac02ee42732524b85a6572003bd428ea29823774d5ea4fa0eee251629bcbc78d9421773c312925a0114e51098ff SHA512 43119bacd4bfc169c8403b3d67e14609ada454a7635c50af5db3683ccd36e1d3be2ec0896204f0850b0cb0c09ded24ae723ad3eb6ddc381553f8c2b2ff2c84a1
-EBUILD hg-git-0.8.13.ebuild 704 BLAKE2B d7d392beca63439af85f5e862c79e01487798d56d1958d15af5df7aa0a0fd4720cc29528b9eec17507c2862318b86e8184598d7beca0802362fd186a83085f0a SHA512 fca80ff4da4219162f8caa1af56a6b982081198a69d2663bdd97f560a869191162b0dc93320be763c9872f28cefa2d85d1c8ab57b57b6c1f63658fbc18605819
-EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2
-EBUILD hg-git-0.9.0_rc1.ebuild 810 BLAKE2B 075e8622820d3d0f7e2f1ea07f568c1e81b4718f4e0e3d19bfbd214f96ac41c93242351542bc2edbd201567c6f849d7e64f6187de76be866ad14f6682b0e18d5 SHA512 2516ff8415ceb5bf9022ccad3eeb592a3288a4797a84cb5cd18b56e641bdd9cd7fd012e6034ae0d6ef2414d8dc97c386d19af0d9b687305c2dc3ac526993936f
+EBUILD hg-git-0.9.0.ebuild 802 BLAKE2B d8228a596755e72319cc660e1a9f076c48dca55d7234a2955e4341a2a66c16f96ab4e559c37ddd6d3bad18051fe97e21cacde63d398773654ea0d2b95f065688 SHA512 a66826818433034d955cb1f0b4a38517d86f746639e3fc244a681e364bebf9adceede5d023fa02cfe22788b1ee3f6de7cdb0648e6fb7d67daa0e29af4af207f4
+EBUILD hg-git-0.9.0_rc1-r1.ebuild 799 BLAKE2B 09dc14d7fb1d1a4d8da4dfb655791933f64986d1311332d8c3fb0b7f26667bb2c63cd6cbd5b2666095c5efed9598af87472875168c7bd875ff954232b78ee164 SHA512 bd74c97a578af03a0642fc8c85585ce3e37a15cf8b9d8a0f603fcc1d5e97ce02badbee06043181a73da8075d5b1af125690e2b39807fa970e2cb82d50204b9b8
 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09
diff --git a/dev-vcs/hg-git/hg-git-0.8.8.ebuild b/dev-vcs/hg-git/hg-git-0.8.8.ebuild
deleted file mode 100644
index cf1461ddfdee..000000000000
--- a/dev-vcs/hg-git/hg-git-0.8.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild b/dev-vcs/hg-git/hg-git-0.9.0.ebuild
index e369cbc472b7..96c5e8576a8e 100644
--- a/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-vcs/hg-git/hg-git-0.8.13.ebuild b/dev-vcs/hg-git/hg-git-0.9.0_rc1-r1.ebuild
index 966cb0bea758..a2653658ef55 100644
--- a/dev-vcs/hg-git/hg-git-0.8.13.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.9.0_rc1-r1.ebuild
@@ -2,23 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
-	>=dev-vcs/mercurial-3.6[${PYTHON_USEDEP}]
+	>=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}"