gentoo resync : 13.06.2020

3 files changed, 29 insertions, 220 deletions

diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index b3243cfd705b..2bff4750f25e 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,6 +1,7 @@
-AUX hg-git-0.8.12-hg-4.8.patch 6647 BLAKE2B 86e0fb6bd9f9b9d10e38024cecf447857ae5339085a3f919cd924d3a397003d85b59014ba920ee5f5f62ef54acb862feeef325a9d76168e5f5ba37c34dfa9dad SHA512 8536ba20dbe5e8d1e3872a058d3e4f402ee39a7f91d1fc0102e6d169bc246ed728bfac517ef620b157d563644b18982f7f8d2fd63ab1f5138e5550b4280b8619
 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.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 812 BLAKE2B a557f0fa65ff915134724c71e56ad8e11eeaebb8bad0340bfa6310a88e9a489eb34efc48602d24a37bb4126fcb0956c5a77fe0764d70536035cf9f23d50a0876 SHA512 093127093bf151ec78792a13db12a8c1aba3f9140ad5d65a7aefef6aa6c42271fa6fbb70e34376d87e0de2312660ebdedb167acdb65aef36b410c06b0ff355d2
 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09
diff --git a/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch b/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch
deleted file mode 100644
index c456ce53c740..000000000000
--- a/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-https://bitbucket.org/durin42/hg-git/commits/ae6b1ba7482963bc9de51f299891e99005794e4e/raw
-https://bitbucket.org/durin42/hg-git/commits/143b7511eadbea7507d847c805241a6db290ffe7/raw
-https://bitbucket.org/durin42/hg-git/commits/8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6/raw
-
-# HG changeset patch
-# User Alain Leufroy
-# Date 1541695757 -3600
-# Node ID ae6b1ba7482963bc9de51f299891e99005794e4e
-# Parent  6ae26ba7b928019e48dd1c73358c18d6dd2d86f3
-compat: fix for hg 4.8
-
-089fc0db0954 introduced a new `createopts` parameter.
-
-`hggit` does not support repository creation, so we can just ignore
-it.
-
-diff --git a/hggit/gitrepo.py b/hggit/gitrepo.py
---- a/hggit/gitrepo.py
-+++ b/hggit/gitrepo.py
-@@ -13,7 +13,7 @@
- 
- 
- class gitrepo(peerrepository):
--    def __init__(self, ui, path, create, intents=None):
-+    def __init__(self, ui, path, create, intents=None, **kwargs):
-         if create:  # pragma: no cover
-             raise error.Abort('Cannot create a git repository.')
-         self._ui = ui
-
-# HG changeset patch
-# User Kevin Bullock <kbullock@ringworld.org>
-# Date 1543713965 21600
-# Node ID 143b7511eadbea7507d847c805241a6db290ffe7
-# Parent  ae6b1ba7482963bc9de51f299891e99005794e4e
-compat: glob some verify output that changed in hg 4.8
-
-diff --git a/tests/test-push-r.t b/tests/test-push-r.t
---- a/tests/test-push-r.t
-+++ b/tests/test-push-r.t
-@@ -64,7 +64,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 1 changesets, 1 total revisions
-+  *1 changesets* (glob)
-   pushing to test-1
-   searching for changes
-   adding changesets
-@@ -75,7 +75,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 2 changesets, 2 total revisions
-+  *2 changesets* (glob)
-   pushing to test-2
-   searching for changes
-   adding changesets
-@@ -86,7 +86,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 3 changesets, 3 total revisions
-+  *3 changesets* (glob)
-   pushing to test-3
-   searching for changes
-   adding changesets
-@@ -97,7 +97,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 4 changesets, 4 total revisions
-+  *4 changesets* (glob)
-   pushing to test-4
-   searching for changes
-   adding changesets
-@@ -108,7 +108,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 2 changesets, 2 total revisions
-+  *2 changesets* (glob)
-   pushing to test-5
-   searching for changes
-   adding changesets
-@@ -119,7 +119,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  1 files, 3 changesets, 3 total revisions
-+  *3 changesets* (glob)
-   pushing to test-6
-   searching for changes
-   adding changesets
-@@ -130,7 +130,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  2 files, 4 changesets, 5 total revisions
-+  *4 changesets* (glob)
-   pushing to test-7
-   searching for changes
-   adding changesets
-@@ -141,7 +141,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  3 files, 5 changesets, 6 total revisions
-+  *5 changesets* (glob)
-   pushing to test-8
-   searching for changes
-   adding changesets
-@@ -152,7 +152,7 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  2 files, 5 changesets, 5 total revisions
-+  *5 changesets* (glob)
-   $ cd test-8
-   $ hg pull ../test-7
-   pulling from ../test-7
-@@ -168,4 +168,4 @@
-   checking manifests
-   crosschecking files in changesets and manifests
-   checking files
--  4 files, 9 changesets, 7 total revisions
-+  *9 changesets* (glob)
-
-# HG changeset patch
-# User Kevin Bullock <kbullock@ringworld.org>
-# Date 1543713996 21600
-# Node ID 8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6
-# Parent  143b7511eadbea7507d847c805241a6db290ffe7
-compat: update how we register gitnode template keyword
-
-diff --git a/hggit/__init__.py b/hggit/__init__.py
---- a/hggit/__init__.py
-+++ b/hggit/__init__.py
-@@ -94,9 +94,11 @@
-     command = registrar.command(cmdtable)
-     configitem = registrar.configitem(configtable)
-     compat.registerconfigs(configitem)
-+    templatekeyword = registrar.templatekeyword()
- 
- except (ImportError, AttributeError):
-     command = cmdutil.command(cmdtable)
-+    templatekeyword = compat.templatekeyword()
- 
- # support for `hg clone git://github.com/defunkt/facebox.git`
- # also hg clone git+ssh://git@github.com/schacon/simplegit.git
-@@ -207,7 +209,6 @@
- 
- 
- def extsetup(ui):
--    templatekw.keywords.update({'gitnode': gitnodekw})
-     revset.symbols.update({
-         'fromgit': revset_fromgit, 'gitnode': revset_gitnode
-     })
-@@ -455,12 +456,30 @@
-     raise LookupError(rev, git.map_file, _('ambiguous identifier'))
- 
- 
--def gitnodekw(**args):
--    """:gitnode: String. The Git changeset identification hash, as a 40 hexadecimal
--digit string."""
--    node = args['ctx']
--    repo = args['repo']
-+def _gitnodekw(node, repo):
-     gitnode = repo.githandler.map_git_get(node.hex())
-     if gitnode is None:
-         gitnode = ''
-     return gitnode
-+
-+
-+if (hgutil.safehasattr(templatekw, 'templatekeyword') and
-+        hgutil.safehasattr(templatekw.templatekeyword._table['node'],
-+                           '_requires')):
-+    @templatekeyword('gitnode', requires={'ctx', 'repo'})
-+    def gitnodekw(context, mapping):
-+        """:gitnode: String. The Git changeset identification hash, as a
-+        40 hexadecimal digit string."""
-+        node = context.resource(mapping, 'ctx')
-+        repo = context.resource(mapping, 'repo')
-+        return _gitnodekw(node, repo)
-+
-+else:
-+    # COMPAT: hg < 4.6 - templatekeyword API changed
-+    @templatekeyword('gitnode')
-+    def gitnodekw(**args):
-+        """:gitnode: String. The Git changeset identification hash, as a
-+        40 hexadecimal digit string."""
-+        node = args['ctx']
-+        repo = args['repo']
-+        return _gitnodekw(node, repo)
-diff --git a/hggit/compat.py b/hggit/compat.py
---- a/hggit/compat.py
-+++ b/hggit/compat.py
-@@ -2,6 +2,7 @@
-     bookmarks,
-     context,
-     phases,
-+    templatekw,
-     url,
-     util as hgutil,
- )
-@@ -192,3 +193,14 @@
-     if hasconfigitems:
-         return getconfig(section, item)
-     return getconfig(section, item, CONFIG_DEFAULTS[section][item])
-+
-+
-+class templatekeyword(object):
-+    def __init__(self):
-+        self._table = {}
-+
-+    def __call__(self, name):
-+        def decorate(func):
-+            templatekw.keywords.update({name: func})
-+            return func
-+        return decorate
diff --git a/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild b/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild
new file mode 100644
index 000000000000..5db03cc9263d
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 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="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"
+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}"