diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-vcs/hg-git | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-vcs/hg-git')
-rw-r--r-- | dev-vcs/hg-git/Manifest | 10 | ||||
-rw-r--r-- | dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch | 43 | ||||
-rw-r--r-- | dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch | 73 | ||||
-rw-r--r-- | dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild | 29 | ||||
-rw-r--r-- | dev-vcs/hg-git/hg-git-0.8.10.ebuild | 24 | ||||
-rw-r--r-- | dev-vcs/hg-git/hg-git-0.8.11.ebuild | 24 | ||||
-rw-r--r-- | dev-vcs/hg-git/hg-git-0.8.8.ebuild | 24 | ||||
-rw-r--r-- | dev-vcs/hg-git/metadata.xml | 11 |
8 files changed, 238 insertions, 0 deletions
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest new file mode 100644 index 000000000000..b45d9b76bd78 --- /dev/null +++ b/dev-vcs/hg-git/Manifest @@ -0,0 +1,10 @@ +AUX hg-git-0.8.10-hg45-memctx.patch 1817 BLAKE2B 73e638b88698950e3f178c30c063ea269717738923c4f81a25795eb3ac90b14b5477a08c185a37931a174d18855709cf55089819e5c73859c8af7323959adc6f SHA512 63b24d3a5cf0f553521184049b9c8452e1d66af9a89bb20960ca5198c58af53b0e106dead0cbe2b61f1b6a786ef33547eb9215483eafb57191dd1c053ec124be +AUX hg-git-0.8.10-hg45-memfilectx.patch 2586 BLAKE2B c40212ab0d201993d2f97b425e84e0f09cabe94e804078c680dd3084859e65d3beb4a570d717f57c1eb2bfeda10d3fdc1440d3d12fcf816d05cf2ea033bb8969 SHA512 3211680a1ebcd508f7a4794ac796bd25fda22087a98f51b7d06e8b9ba16314db061ac8a0085dd0ccecf834c316f27bca54acd87c2152b3bb72df7d6580d5dff9 +DIST hg-git-0.8.10.tar.gz 116019 BLAKE2B 425a066864051f03e3a3305e74a5920055a7f4c79826711c567a59fcb32171db3ca732ba3bb61edac4ac9847fff897cca4fe0d02e65f69e7b0f0440fa2f32cf4 SHA512 ea6de91114005d38568eae1fa5f38aafe73c472c480496ea05b4472c1d8fbc89e76c9bb34eef2641b89e6d0c3f2a9a187d844687214f5599d0b4d0f6b7928c32 +DIST hg-git-0.8.11.tar.gz 118537 BLAKE2B 05a63633f8909260428197334812d314cdba115324fa7dd70ccb5d0ee1e21089be0b8bb0cb1cf09f5f738cbee00e3e688646daa3debed9fa36fac2ff62bfcb8b SHA512 ced6b8b522f75b0e2b59c5113b3afd7b02eb2e3798a7aecdc211a15aba1363d3785234e909644626b5c16d7e8b158a6fe1f1120dcd85b5709d8a84ff1f4b6655 +DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac +EBUILD hg-git-0.8.10-r1.ebuild 800 BLAKE2B c8cdbe02f8d1b72922d1143a3cbd7f8f971d13de62f2841c59e52cac107ec5ff25d977ae29fc27444783bed30db955f88ebda714bf3df3f0ea43071cd13afa31 SHA512 848a5b4cc539da8fb4e578a11602e279f562211bcde22d5e7a0b8fe49e0f8fe01d4d560b90bfd17d7a502f5ad80cd664fad0ada8d02b60f42c60d7fcd648f9b6 +EBUILD hg-git-0.8.10.ebuild 707 BLAKE2B d0013bc65ff7b9470d40728d9fc4393fc552cbefa710ca340ff894069e0e2af56415313eb632f117a85674bfa68e57d401f0dc28eb85fdb1ccaa700773b9c9ab SHA512 11e15d0520c9371175706bb633e71101f179072270987a952628d7fe6b11294d67501b9e934e7fbf61270794ce57ce81941e5109e42b41c88f8ee04995bc9fe9 +EBUILD hg-git-0.8.11.ebuild 707 BLAKE2B 6bf0f75ecf2877a5b3d4775949aea77332dbb57d874c21acf36c10c0a377e543f6087e882a34127c56b92931ab47456f36a10019091c247cd81e0e84c4fa0b71 SHA512 b404e426bbfe1cefe5d56db9ef463ca4833c1e40dd7ec5ef9c4fd2eb249301fafcc8e321417557058307b8992420a56244245e1a908485c30977b30428849123 +EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2 +MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09 diff --git a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch new file mode 100644 index 000000000000..ff9d4d66d15f --- /dev/null +++ b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch @@ -0,0 +1,43 @@ +# HG changeset patch +# User Tony Tung <tonytung@merly.org> +# Date 1517901695 28800 +# Node ID 843f409526fbea3ffde674922b730075d5cfd4d3 +# Parent 6dc827703bfb995b89b0da5b2e9eaffe3479ea45 +compat: pass memctx to memfilectx constructor on hg 4.5+ + +diff --git a/hggit/git_handler.py b/hggit/git_handler.py +--- a/hggit/git_handler.py ++++ b/hggit/git_handler.py +@@ -985,16 +985,22 @@ + if copied: + copied_path = copied[0] + +- try: +- return context.memfilectx(self.repo, f, data, +- islink='l' in e, +- isexec='x' in e, +- copied=copied_path) +- except TypeError: +- return context.memfilectx(f, data, +- islink='l' in e, +- isexec='x' in e, +- copied=copied_path) ++ # Different versions of mercurial have different parameters to ++ # memfilectx. Try them from newest to oldest. ++ args_to_try = ( ++ (self.repo, memctx, f, data), # hg 4.5+ ++ (self.repo, f, data), # hg 3.1 - 4.5 ++ (f, data), # hg < 3.1 ++ ) ++ for args in args_to_try: ++ try: ++ return context.memfilectx(*args, ++ islink='l' in e, ++ isexec='x' in e, ++ copied=copied_path) ++ except TypeError as ex: ++ last_ex = ex ++ raise last_ex + + p1, p2 = (nullid, nullid) + octopus = False diff --git a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch new file mode 100644 index 000000000000..5c94617f881b --- /dev/null +++ b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch @@ -0,0 +1,73 @@ +# HG changeset patch +# User Kevin Bullock <kbullock@ringworld.org> +# Date 1517928348 21600 +# Node ID e326b349eba6b6ee57ac8df221727f79c313d04a +# Parent 89303af1c4aa76b37e6d16f99f6279012eda7100 +compat: extract function for memfilectx signature variants + +diff --git a/hggit/compat.py b/hggit/compat.py +--- a/hggit/compat.py ++++ b/hggit/compat.py +@@ -1,4 +1,5 @@ + from mercurial import ( ++ context, + url, + util as hgutil, + ) +@@ -96,6 +97,26 @@ + return refs, set(server_capabilities) + + ++def memfilectx(repo, changectx, path, data, islink=False, ++ isexec=False, copied=None): ++ # Different versions of mercurial have different parameters to ++ # memfilectx. Try them from newest to oldest. ++ args_to_try = ( ++ (repo, changectx, path, data), # hg 4.5+ ++ (repo, path, data), # hg 3.1 - 4.5 ++ (path, data), # hg < 3.1 ++ ) ++ for args in args_to_try: ++ try: ++ return context.memfilectx(*args, ++ islink=islink, ++ isexec=isexec, ++ copied=copied) ++ except TypeError as ex: ++ last_ex = ex ++ raise last_ex ++ ++ + CONFIG_DEFAULTS = { + 'git': { + 'authors': None, +diff --git a/hggit/git_handler.py b/hggit/git_handler.py +--- a/hggit/git_handler.py ++++ b/hggit/git_handler.py +@@ -985,22 +985,10 @@ + if copied: + copied_path = copied[0] + +- # Different versions of mercurial have different parameters to +- # memfilectx. Try them from newest to oldest. +- args_to_try = ( +- (self.repo, memctx, f, data), # hg 4.5+ +- (self.repo, f, data), # hg 3.1 - 4.5 +- (f, data), # hg < 3.1 +- ) +- for args in args_to_try: +- try: +- return context.memfilectx(*args, +- islink='l' in e, +- isexec='x' in e, +- copied=copied_path) +- except TypeError as ex: +- last_ex = ex +- raise last_ex ++ return compat.memfilectx(self.repo, memctx, f, data, ++ islink='l' in e, ++ isexec='x' in e, ++ copied=copied_path) + + p1, p2 = (nullid, nullid) + octopus = False diff --git a/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild b/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild new file mode 100644 index 000000000000..d35e34623578 --- /dev/null +++ b/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild @@ -0,0 +1,29 @@ +# 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 ~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-2.8.2[${PYTHON_USEDEP}] + >=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" + +PATCHES=( + "${FILESDIR}"/${P}-hg45-memctx.patch + "${FILESDIR}"/${P}-hg45-memfilectx.patch +) diff --git a/dev-vcs/hg-git/hg-git-0.8.10.ebuild b/dev-vcs/hg-git/hg-git-0.8.10.ebuild new file mode 100644 index 000000000000..acf6cae2bdae --- /dev/null +++ b/dev-vcs/hg-git/hg-git-0.8.10.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2017 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 ~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-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.8.11.ebuild b/dev-vcs/hg-git/hg-git-0.8.11.ebuild new file mode 100644 index 000000000000..c8f0f56632ed --- /dev/null +++ b/dev-vcs/hg-git/hg-git-0.8.11.ebuild @@ -0,0 +1,24 @@ +# 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 ~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-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.8.8.ebuild b/dev-vcs/hg-git/hg-git-0.8.8.ebuild new file mode 100644 index 000000000000..cf1461ddfdee --- /dev/null +++ b/dev-vcs/hg-git/hg-git-0.8.8.ebuild @@ -0,0 +1,24 @@ +# 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/metadata.xml b/dev-vcs/hg-git/metadata.xml new file mode 100644 index 000000000000..d755c79481f8 --- /dev/null +++ b/dev-vcs/hg-git/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>grobian@gentoo.org</email> + <name>Fabian Groffen</name> + </maintainer> + <upstream> + <remote-id type="pypi">hg-git</remote-id> + </upstream> +</pkgmetadata> |