From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- dev-vcs/Manifest.gz | Bin 11161 -> 11327 bytes dev-vcs/breezy/Manifest | 3 + dev-vcs/breezy/breezy-3.2.1-r1.ebuild | 85 +++++++++++++++ dev-vcs/breezy/metadata.xml | 13 +++ dev-vcs/git-cola/Manifest | 5 +- .../files/git-cola-3.5-py3.8-line-buffering.patch | 29 ------ dev-vcs/git-cola/git-cola-3.10.1.ebuild | 111 ++++++++++++++++++++ dev-vcs/git-cola/git-cola-3.5-r1.ebuild | 116 --------------------- dev-vcs/hg-git/Manifest | 4 +- dev-vcs/hg-git/hg-git-0.10.1.ebuild | 28 ----- dev-vcs/hg-git/hg-git-0.10.2.ebuild | 27 +++++ dev-vcs/tortoisehg/Manifest | 2 + dev-vcs/tortoisehg/tortoisehg-5.9.1.ebuild | 81 ++++++++++++++ 13 files changed, 326 insertions(+), 178 deletions(-) create mode 100644 dev-vcs/breezy/Manifest create mode 100644 dev-vcs/breezy/breezy-3.2.1-r1.ebuild create mode 100644 dev-vcs/breezy/metadata.xml delete mode 100644 dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch create mode 100644 dev-vcs/git-cola/git-cola-3.10.1.ebuild delete mode 100644 dev-vcs/git-cola/git-cola-3.5-r1.ebuild delete mode 100644 dev-vcs/hg-git/hg-git-0.10.1.ebuild create mode 100644 dev-vcs/hg-git/hg-git-0.10.2.ebuild create mode 100644 dev-vcs/tortoisehg/tortoisehg-5.9.1.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index 9c9c712b993b..86fd724d4bd6 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/breezy/Manifest b/dev-vcs/breezy/Manifest new file mode 100644 index 000000000000..71b9c8638533 --- /dev/null +++ b/dev-vcs/breezy/Manifest @@ -0,0 +1,3 @@ +DIST breezy-3.2.1.tar.gz 9445046 BLAKE2B 67de39c93351d2f78b1b64764a6ad11f26bd31c9bb2d73ef65f8722764d7db8c574f0e116f77dca1b93a53a360f984fb2861f94e0e7f41ce97ad0f703332e25e SHA512 bfbbff1301f7cc13a2d59b1add80c196f3b45b69994194dcae96c0be151f807c965854047c86e43f54dd8c7aa24d56b25afdd00f0063e83b362a8c46d5858226 +EBUILD breezy-3.2.1-r1.ebuild 2954 BLAKE2B edbc050d43509cc3f8c042d71cc5230b3adb7b4e81e8f82769c8cde3465c4d913f99f5913d083fc88587b238669a6ee434d940207fdb8d31413745ab159a69f4 SHA512 a7b5b2370256781c9b25aeb299237e0fa9fbef6c426137a4af79f2ca9497870a3a5bb5ea60648f86033937d719c8d369dd3e6cd8cac7ab3df1c473f1590cf19b +MISC metadata.xml 424 BLAKE2B 485d8ba011693c021b649e37c76ea715b5a64b3356b7acd30abf841782ced63261cb34a254bf82e282c5e4ac8fd9550fd8d68504b35b4d540482c33ee4d50c83 SHA512 6ae1b97af9d955eae016ea7c9c87f7fe3fa80a6a3c8cfed4a962b6974eaaa14f0a02c4846ba387b4dc7d643c134e9d17526ff5b275c3f7e46a098204505bfc3b diff --git a/dev-vcs/breezy/breezy-3.2.1-r1.ebuild b/dev-vcs/breezy/breezy-3.2.1-r1.ebuild new file mode 100644 index 000000000000..9c4d300b8a94 --- /dev/null +++ b/dev-vcs/breezy/breezy-3.2.1-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 optfeature + +DESCRIPTION="Distributed Version Control System with a Friendly UI" +HOMEPAGE="https://www.breezy-vcs.org/ https://github.com/breezy-team/breezy" +SRC_URI="https://launchpad.net/brz/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# Most tests don't need tests, but deselecting those that need is too hard +RESTRICT="test" +PROPERTIES="test_network" + +RDEPEND=" + dev-python/configobj[${PYTHON_USEDEP}] + dev-python/dulwich[${PYTHON_USEDEP}] + dev-python/fastimport[${PYTHON_USEDEP}] + dev-python/patiencediff[${PYTHON_USEDEP}] + !dev-vcs/bzr +" +BDEPEND=" + sys-devel/gettext + dev-python/cython[${PYTHON_USEDEP}] + test? ( + app-crypt/gpgme[python,${PYTHON_USEDEP}] + dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/testtools[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/subunit[${PYTHON_USEDEP}] + ' python3_{8,9}) + ) +" + +distutils_enable_tests --install unittest + +src_prepare() { + distutils-r1_src_prepare + # Fix man instal location + sed -e '/DATA_FILES/s/man\//share\/&/' -i setup.py || die + + # Fix call to unittest's stuff + grep -r breezy -le 'loadTestsFromModuleNames' | xargs sed -i -e 's/loadTestsFromModuleNames/loadTestsFromNames/' || die + + # Very horrible, looks like too much, but only ~250 tests out of ~30,000. + # Before every bump, check the need for every disable, using direct test + # for only a specific file. + # Don't disable tests by removing files, as this results in bad imports. + sed -e 's/test_bzr_connect_to_bzr_ssh/_&/' -i breezy/tests/test_transport.py || die + sed -e 's/test_is_compatible_and_registered/_&/' \ + -e 's/test_make_repository/_&/' -i breezy/plugins/weave_fmt/test_repository.py || die + sed -e 's/test_server_exception_with_hook/_&/' -i breezy/tests/blackbox/test_serve.py || die + sed -e 's/test_dump_/_&/' -i breezy/bzr/tests/blackbox/test_dump_btree.py || die + sed -e 's/test_/_&/' -i breezy/plugins/fastimport/tests/test_head_tracking.py || die + + sed -e '/test_vfs_ratchet/d' -i breezy/bzr/tests/__init__.py || die + sed -e '/test_blackbox/d' -i breezy/git/tests/__init__.py || die + sed -e '/test_upload/d' -i breezy/plugins/upload/tests/__init__.py || die + sed -e '/test_bzrdir/d' -i breezy/plugins/weave_fmt/__init__.py || die + sed -e '/test_big_file/d' -i breezy/tests/blackbox/__init__.py || die + sed -e '/breezy.tests.test_gpg/d' \ + -e '/breezy.tests.test_plugins/d' \ + -e '/breezy.tests.test_source/d' \ + -i breezy/tests/__init__.py || die +} + +src_install() { + distutils-r1_src_install + + # Symlink original bzr's bin names to new names + dosym brz /usr/bin/bzr +} + +pkg_postinst() { + optfeature "access branches over sftp" "dev-python/pycryptodome dev-python/paramiko" + optfeature "PGP sign and verify commits" "app-crypt/gpgme[python]" +} diff --git a/dev-vcs/breezy/metadata.xml b/dev-vcs/breezy/metadata.xml new file mode 100644 index 000000000000..abd73e6a6b97 --- /dev/null +++ b/dev-vcs/breezy/metadata.xml @@ -0,0 +1,13 @@ + + + + + arthurzam@gentoo.org + Arthur Zamarin + + + breezy-team/breezy + brz + breezy + + diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest index c727d165387a..9f183ed0b608 100644 --- a/dev-vcs/git-cola/Manifest +++ b/dev-vcs/git-cola/Manifest @@ -1,10 +1,9 @@ AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d -AUX git-cola-3.5-py3.8-line-buffering.patch 1342 BLAKE2B e13e576a8e4d88975b59e3f9b58f3a0b1f7cb903a0469729005e04f8dc43b5d4459d4dc85436713519cce72a408cedf9784b6fa69bd9a0cbb0fdc1e49b66588e SHA512 445106e675df96386e1b995c9bd8ea496bf029f7bde6c81390b657034769580a7ef448bcb2f5c9c79ade19f2d490f4bef19b7a0e0d51e43c01cdc6e2594e7535 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac -DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793 +DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0 DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395 -EBUILD git-cola-3.5-r1.ebuild 2660 BLAKE2B a050b4ab593d2e50044162069c3fc993839490417c525aee6883b3ea8e39ca8803ce952610a53dc7aae43c9698ed2b2c9707a17ad667e6a3d975bf32ea548463 SHA512 1ca2ffb28b7bd31459e4ab26683cf12601723a562b8296fedc1568d556e9ad0b4387ec15ddf215e1c66cde798a3b365fa0ebca9fa6b55dec1cc0c48561e9a939 +EBUILD git-cola-3.10.1.ebuild 2488 BLAKE2B c866ce1934780c48e19a1d6bcb796048ba7fd4af5b54d0567f4e8194d640b852e9c24f0f16705dc839514342ad4fcb5062176a5bef87a61f7e4646db04d6ae3c SHA512 df5b1e44cc3200b2e0080fd39b1d3e7a753f61e9e812f05fa864020724624bd07495f8c1618a0ffa58147d2177cbdac4357cab63112987ce735a1654a50eb1c6 EBUILD git-cola-3.8.ebuild 2477 BLAKE2B 6cc1a0d6f61526d6f145adfbce03ce98d117ebef4de0153e18220c2dc216f3fc046ce36f11751bba07d5a6e0e86298ddfa7203c22a7f94fe8721dc9d0aedc4ca SHA512 ce381d9f2dc31ccbf09930ad1dea21ab20cbe83080a1f86add25be93f38d117cfeed36d878693d20fb9d7e71f398e16caab2a4cf458add1312dddb49003c9012 EBUILD git-cola-3.9.ebuild 2437 BLAKE2B d645c01f2291a0e0edaa25fd42f3e40e58ca7a0e366ae69cf229abee74d72c936f21377590e4090eaf33cdee46bb0f27f32be883b05d77fd78250a5283225721 SHA512 751c5e2aea3ebe73614a07d30bdf42ff395329ab5c63697df4659244e114f269ac43c526bb9a981e55111f3df43f1535cfe1aa76653019bfff6c3f31ae2a805c MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379 diff --git a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch deleted file mode 100644 index 4938d6a30eca..000000000000 --- a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ed00653d43b00b18e89c8c4d9e733ef156c02579 Mon Sep 17 00:00:00 2001 -From: Simon Peeters -Date: Mon, 18 Nov 2019 21:15:32 +0100 -Subject: [PATCH] Only use line buffering in text mode when calling Popen - -Python3.8 started complaining loudly when trying to open a stream in binary mode but with line buffering enabled. -So we should only try to set `bufsize` to `1` when we enable `text` or `universal_newlines` mode. - -see https://docs.python.org/3/library/subprocess.html#subprocess.Popen under bufsize ---- - cola/core.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/cola/core.py b/cola/core.py -index 0fabfcf3d..5ad719f05 100644 ---- a/cola/core.py -+++ b/cola/core.py -@@ -208,7 +208,10 @@ def start_command(cmd, cwd=None, add_env=None, - CREATE_NO_WINDOW = 0x08000000 - extra['creationflags'] = CREATE_NO_WINDOW - -- return subprocess.Popen(cmd, bufsize=1, stdin=stdin, stdout=stdout, -+ # Use line buffering when in text/universal_newlines mode, -+ # otherwise use the system default buffer size. -+ bufsize = 1 if universal_newlines else -1 -+ return subprocess.Popen(cmd, bufsize=bufsize, stdin=stdin, stdout=stdout, - stderr=stderr, cwd=cwd, env=env, - universal_newlines=universal_newlines, **extra) - diff --git a/dev-vcs/git-cola/git-cola-3.10.1.ebuild b/dev-vcs/git-cola/git-cola-3.10.1.ebuild new file mode 100644 index 000000000000..0d5c7bc503d4 --- /dev/null +++ b/dev-vcs/git-cola/git-cola-3.10.1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_SINGLE_IMPL=true +DISTUTILS_USE_SETUPTOOLS=no +inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils + +DESCRIPTION="The highly caffeinated git GUI" +HOMEPAGE="https://git-cola.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/PyQt5[network,${PYTHON_USEDEP}] + dev-python/QtPy[gui,${PYTHON_USEDEP}] + dev-python/send2trash[${PYTHON_USEDEP}] + ') + dev-vcs/git +" +BDEPEND="sys-devel/gettext + $(python_gen_cond_dep " + doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] ) + test? ( + ${VIRTUALX_DEPEND} + dev-python/mock[\${PYTHON_USEDEP}] + dev-python/nose[\${PYTHON_USEDEP}] + dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets] + dev-python/pytest[\${PYTHON_USEDEP}] + ) + ") +" + +python_prepare_all() { + # make sure that tests also use the system provided QtPy + rm -r qtpy || die + + rm share/git-cola/bin/*askpass* || die + + # don't install docs into wrong location + sed -i -e '/doc/d' setup.py || die + + # fix doc directory reference + sed -i \ + -e "s/'doc', 'git-cola'/'doc', '${PF}'/" \ + cola/resources.py || die + + # fix ssh-askpass directory reference + sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die + + distutils-r1_python_prepare_all +} + +python_configure_all() { + DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs ) +} + +python_compile_all() { + cd share/doc/${PN}/ || die + if use doc ; then + emake all + else + sed \ + -e '/^install:/s:install-html::g' \ + -e '/^install:/s:install-man::g' \ + -i Makefile || die + fi +} + +python_test() { + GIT_CONFIG_NOSYSTEM=true \ + PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \ + virtx nosetests --verbose --with-id --with-doctest \ + --exclude=sphinxtogithub +} + +python_install_all() { + cd share/doc/${PN}/ || die + emake \ + DESTDIR="${D}" \ + docdir="${EPREFIX}/usr/share/doc/${PF}" \ + prefix="${EPREFIX}/usr" \ + install + + # remove empty bin folder + rm -R "${ED}"/usr/share/git-cola/bin || die + + use doc || HTML_DOCS=( "${FILESDIR}"/index.html ) + + distutils-r1_python_install_all + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild deleted file mode 100644 index 4dae0de9e541..000000000000 --- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_8 ) -DISTUTILS_SINGLE_IMPL=true -DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils - -DESCRIPTION="The highly caffeinated git GUI" -HOMEPAGE="https://git-cola.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[network,${PYTHON_USEDEP}] - dev-python/QtPy[gui,${PYTHON_USEDEP}] - dev-python/send2trash[${PYTHON_USEDEP}] - ') - dev-vcs/git" -BDEPEND="sys-devel/gettext - $(python_gen_cond_dep " - doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] ) - test? ( - ${VIRTUALX_DEPEND} - dev-python/mock[\${PYTHON_USEDEP}] - dev-python/nose[\${PYTHON_USEDEP}] - ) - ")" - -PATCHES=( "${FILESDIR}/${P}-py3.8-line-buffering.patch" ) - -python_prepare_all() { - # make sure that tests also use the system provided QtPy - rm -r qtpy || die - - rm share/git-cola/bin/*askpass* || die - - # don't install docs into wrong location - sed -i -e '/doc/d' setup.py || die - - # fix doc directory reference - sed -i \ - -e "s/'doc', 'git-cola'/'doc', '${PF}'/" \ - cola/resources.py || die - - # fix ssh-askpass directory reference - sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - mydistutilsargs=( --no-vendor-libs ) -} - -python_compile_all() { - cd share/doc/${PN}/ || die - if use doc ; then - emake all - else - sed \ - -e '/^install:/s:install-html::g' \ - -e '/^install:/s:install-man::g' \ - -i Makefile || die - fi -} - -python_test() { - GIT_CONFIG_NOSYSTEM=true \ - PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \ - virtx nosetests --verbose --with-id --with-doctest \ - --exclude=sphinxtogithub -} - -src_install() { - distutils-r1_src_install -} - -python_install_all() { - cd share/doc/${PN}/ || die - emake \ - DESTDIR="${D}" \ - docdir="${EPREFIX}/usr/share/doc/${PF}" \ - prefix="${EPREFIX}/usr" \ - install - - python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola - python_optimize "${ED}/usr/share/git-cola/lib/cola" - - # fix appdata installation - mv "${D}"/usr/share/appdata "${D}"/usr/share/metainfo || die "moving appdata failed" - - use doc || HTML_DOCS=( "${FILESDIR}"/index.html ) - - distutils-r1_python_install_all - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest index ca048a81b753..94405bc0e01e 100644 --- a/dev-vcs/hg-git/Manifest +++ b/dev-vcs/hg-git/Manifest @@ -1,7 +1,7 @@ -DIST hg-git-0.10.1.tar.bz2 145345 BLAKE2B 6d8b7fbc2fa8994fea8d619606f2c6f03cb16e0438e07ee566545fb23d053fae3d28cbf120170b77023f5d17fa0d38fb816d8d9e82fe4ef911a9734d791503b8 SHA512 6fffc560c95985d121c8306b7562a50b72aa24e877f97301f67dde0bd435043519cbff0e6e0635111b352a89555d974ff9567f560bb7c60d3fa6bf67f660ef7c +DIST hg-git-0.10.2.tar.bz2 146423 BLAKE2B 7a8a24bbbcd9e46b4a8e58028baed5638e124dd7d1eacdae4031c74b1ed8bde916142a3d8df6ab74268e98669b7683aa1a9c77c780a74b1d95f102ab71ea11b2 SHA512 232bbefc88e989a771b364cc80a19e6a631b40248ac747a58e2cac2705c06a2547c711863726d69ef16d34e095c5743a2c2dba2c7f50f12b64c5ee8830453bb3 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.10.1.ebuild 818 BLAKE2B a3fb018aacf852070a041484cfb1424f7c36b35222cd98561556e452f41a894c9ecb4668a6b354a4507ee317114b0301b5f00a460f0aa6147ee01f4d0dd86609 SHA512 051def295c8f70f3cea3af2656a77fe348266858eab28a61892571dbaa242f3a9499de35e4b1dbf3bce17bdf0040242c05cc4541f650d5435d4e9066174edc86 +EBUILD hg-git-0.10.2.ebuild 790 BLAKE2B f3f7cd34fef06c515754ea0d0596fc2791acd0f8c151a3ff27b764b9d640cca14ab61931f2a1dc9d7b2566d9463033329ef904c6111fc25db67c968df04116ce SHA512 ea9fc251692e938340034a32f19628d3f5cc829269d34e516c0f8b7aa9344479bb3fb4f5fac1a7c125fca0ce42a5119c34e6681493ba850509be9d9a3efaa99d EBUILD hg-git-0.9.0.ebuild 816 BLAKE2B 83917189f748ab8d8a3f1cea4d3f1b71a3e79d0e42d79c4318be724a45acc2c98b2207e1beaefe62fade43f04b1feee73217e1fa5e6434de46e6be926ebb5eec SHA512 dee9b5a84425aeedc48d3b41d0ea0ca1476e21aebc75b3bbefae7425212af1f406c53a538294d6231a857973228dd4b293f6b18c2254d2d41f46f87df0249829 EBUILD hg-git-0.9.0_rc1-r1.ebuild 786 BLAKE2B d4b149d3c34d63750f2bdd3d4af23ac290e6069c9067badece26d3f1cbbb70864cb1ae533e548017c1f2f0f1cd1fa0bec0d26d0689a6325b8cd097040e3301b9 SHA512 0a98580e0b923df1ad39c1712ef8ce32b43df82cd7bfdd1cea0b7601f3cc8baf3f38c57e1308f72c79ea05eb2e6a56e2b13e27af5e8198edc214f3950730fa48 MISC metadata.xml 318 BLAKE2B 542f1ba6089efe6c9950e4032d682b3921df3c67226b9841bdc73d9c5b08492d3297c7725023d25fd281aafd4690cb31ebe67ea48369e03ab0700aff2d74234b SHA512 bc4fb056c2af59211d3dd6b997a0f50b40b1effe726de1adc91ff8783814e2d1367b12344a2dc03cd3f0f9de04699bf2291c0b5ec12193c27e9286eecf5c156e diff --git a/dev-vcs/hg-git/hg-git-0.10.1.ebuild b/dev-vcs/hg-git/hg-git-0.10.1.ebuild deleted file mode 100644 index d65dc94f4e0e..000000000000 --- a/dev-vcs/hg-git/hg-git-0.10.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=no - -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 ~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}" diff --git a/dev-vcs/hg-git/hg-git-0.10.2.ebuild b/dev-vcs/hg-git/hg-git-0.10.2.ebuild new file mode 100644 index 000000000000..ea4096b11730 --- /dev/null +++ b/dev-vcs/hg-git/hg-git-0.10.2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python3_{7..9} ) + +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 ~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}" diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest index 37a237f08814..8c62a570114c 100644 --- a/dev-vcs/tortoisehg/Manifest +++ b/dev-vcs/tortoisehg/Manifest @@ -1,8 +1,10 @@ DIST tortoisehg-5.8.1.tar.gz 8636858 BLAKE2B 66473695e1364ff676ab314ce8b5a5e59cbe6ece68795d92278e450f70386a9e047dfd8975e7312bda10c183879d9634767f64a9c916f889f3edcf4847bf2468 SHA512 29903240c5522841e0ddc0f78741d20d589b6b48e82bf38023b87184e987721111a6a9675ccb85a31d9781cf1b8fa3d28801fef5bae187ae467d7da8f1ef982f DIST tortoisehg-5.8.tar.gz 8636455 BLAKE2B 1f4171ca4eb465aabacaf53b97785c5f05fc501a11329af008695f706d8d2cb9c5eee5e64bb5a60fdf7234f33ed6a937dfacce49cb36ac9e9b8505be271b4f35 SHA512 b9fe80a98cfafe0dbc90be5fe6f83b466fe596b4ec135d0eacc5618e39c0249a3a352bed640a7cecb99d53eaf60908d60d7748009492cbd8202fc191ef428278 +DIST tortoisehg-5.9.1.tar.gz 8637928 BLAKE2B 57687359eb00018a811e28449dccce260569f7a26c91bf25a6473427f9942fd536c4458cae593baa371c65713f626208e6627e952e78001947b8f952988c3103 SHA512 8df24a66e24ddb95af353a363149dcee37bc678ebd741f578a8bc09d6844b52537f287b908bce2dab4e4603310867095821b52332bd5bdc55b0f114bad647eff DIST tortoisehg-5.9.tar.gz 8637690 BLAKE2B 818b866314a04857838ea971d9a26df6604fc97a7968ee1419337fccc413d228e5597bef80256b35a2084956f356e9015c2c9c00181ab600ee75b5a86f8ec358 SHA512 14b91a2193f0eaeb39d49b131ec9214732b6898e7ee2a57091cf5be61a37ec5a0b71d8eea5d67b30ea8796565c25aa1bd1fd23ff178ae1a7dcdbfd5b333e525f EBUILD tortoisehg-5.8.1.ebuild 2164 BLAKE2B 14da93c64160f5a6c91f149c7a288d5a881d434475ebf7fd3ea3a083d9ff4979351a4cbe6c0aa63d80a54c3ce4add40ced1740455ca7f070af601283055487d9 SHA512 242b69d6694fe007cf99c22a815add13e177243475d03006272a4757d7fc0e1892be03986626cc00aada6d8fb316dd0bfa2738197ab8ed50f60eca033eeb04b5 EBUILD tortoisehg-5.8.ebuild 2166 BLAKE2B 203d7f67301c454e992646afa656365f0bd8f220a7865f3da4f48d2440de4f34d371e9f39c728955bd694dab7d34862d9b52f48be448dedea5b98f40709cdfda SHA512 f0634d3da8794c73e8b2e55e8043ff9077d59162f00e2ce8d1fb617f4fdba81765d4180c0caae55ee085f230c2c1b064e43473404d13cbfb0bab7f77460a7051 +EBUILD tortoisehg-5.9.1.ebuild 2168 BLAKE2B 593ff9ef0ed0d866f3359ade29cd6cdaa46a8fa6c425781a990253f84a59495384e2ce0afdebaf691b9a5c70bd085116bfe75ec42361ccac17875855b9dcf16f SHA512 93ab9bca5768facf35e6ccc6d02efda53f14e557e4161e96305c319ff9ed9be7f9f00aee35337765c98cadacd0ef64a2abe97b0f2e8fc5a7945a9249cfda8db7 EBUILD tortoisehg-5.9.ebuild 2167 BLAKE2B 0c1237de6a4b74cf252937f5d47abc8485f14931a4a3d88f7c7eee133402bbd039cefdfc25319c72aea6e077c188234c567123e5f0fbe6f48d609d9576a432d7 SHA512 b94e7458441b661d61feb203812ba903d5f2f3c8d43681a8878137f8fe8965f2ac712868cd860e7229d8a134bd42e272c9e74c9e355693a701047603d86cfcb9 EBUILD tortoisehg-9999.ebuild 2167 BLAKE2B 0c1237de6a4b74cf252937f5d47abc8485f14931a4a3d88f7c7eee133402bbd039cefdfc25319c72aea6e077c188234c567123e5f0fbe6f48d609d9576a432d7 SHA512 b94e7458441b661d61feb203812ba903d5f2f3c8d43681a8878137f8fe8965f2ac712868cd860e7229d8a134bd42e272c9e74c9e355693a701047603d86cfcb9 MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc diff --git a/dev-vcs/tortoisehg/tortoisehg-5.9.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.9.1.ebuild new file mode 100644 index 000000000000..04d471e79909 --- /dev/null +++ b/dev-vcs/tortoisehg/tortoisehg-5.9.1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..9} ) + +DISTUTILS_USE_SETUPTOOLS=no + +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}] + =mercurial-4.0 (bug #599266). + rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py" + + sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die + distutils-r1_python_prepare_all +} + +python_test() { + ${EPYTHON} tests/run-tests.py -m 'not largefiles' --doctest-modules tests || die + ${EPYTHON} tests/run-tests.py -m largefiles tests || die +} + +python_install_all() { + distutils-r1_python_install_all + dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc + newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg + domenu contrib/thg.desktop +} + +pkg_postinst() { + xdg_icon_cache_update + elog "When startup of ${PN} fails with an API version mismatch error" + elog "between dev-python/sip and dev-python/PyQt5 please rebuild" + elog "dev-python/qscintilla-python." + + optfeature "the core git extension support" dev-python/pygit2 +} + +pkg_postrm() { + xdg_icon_cache_update +} -- cgit v1.2.3