From 7336b11bd5bd8f1cc6d445b150a6c466736c3d9d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Apr 2024 06:30:50 +0100 Subject: gentoo auto-resync : 07:04:2024 - 06:30:49 --- dev-vcs/Manifest.gz | Bin 11489 -> 11485 bytes dev-vcs/git-machete/Manifest | 7 +-- ...machete-3.24.2_no-strays-in-site-packages.patch | 11 +++++ dev-vcs/git-machete/git-machete-3.22.0.ebuild | 45 ------------------ dev-vcs/git-machete/git-machete-3.24.2.ebuild | 51 +++++++++++++++++++++ dev-vcs/git-machete/metadata.xml | 1 + 6 files changed, 67 insertions(+), 48 deletions(-) create mode 100644 dev-vcs/git-machete/files/git-machete-3.24.2_no-strays-in-site-packages.patch delete mode 100644 dev-vcs/git-machete/git-machete-3.22.0.ebuild create mode 100644 dev-vcs/git-machete/git-machete-3.24.2.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index 739dbf943785..cf6640bd6d14 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest index ef5067790f9d..1ab41df15614 100644 --- a/dev-vcs/git-machete/Manifest +++ b/dev-vcs/git-machete/Manifest @@ -1,5 +1,6 @@ +AUX git-machete-3.24.2_no-strays-in-site-packages.patch 424 BLAKE2B b4297d32b881f4e10e1023ed81d2dae6ce50273252e374b46c228444da3f9ca3d40d4e9d3d40f4bce907b180b6f60beb5c26a1618d5067683e0d2eefb59ea861 SHA512 2265f11800736842fc8145fdd0bdfc91b3035eb3e7ff7fe5c96388754655ef813a884875b4e7af2d59d5ebdef2b7223707cf1550d69d277f1a977a939f28339d DIST git-machete-3.20.0.gh.tar.gz 1645348 BLAKE2B d07a7a78e835eb1afbed40d4133ba9ed914492cce03fbcd5c63bdd4260e65b6300e77d1f33175c7471667f044960b2948278db27b2d29731e7afe86564207311 SHA512 ba2a7e6741ad6cf47577301dd810fcd2bf7b2436fedf4b5fd566faad62fae54861d21b14ffa9395297e28e4176a9710b13e22dbb917bc7a8cc7f9f286c9f8afc -DIST git-machete-3.22.0.gh.tar.gz 1651504 BLAKE2B f9e196043a1e3728414565e68f9d3cdd7326048098ce6d25be39ff60b14d7aec1c9bbc3594342c38c99476f23530271dc576264934ad3d764ac25ef2b5e3a805 SHA512 3b9edd00c6b135c0f408a4f76dc99fb191a72a2b61e807897e5f043e5d63398574821ab666e3528607df039adffa2cc3a7d4a2970e734d62b0e7580295eeec97 +DIST git-machete-3.24.2.gh.tar.gz 1866234 BLAKE2B c8b5fa711af3f4cdbb9449c4bc34f3e0b629f22c33a6b1f2e84954ece20545e68605dedc2203ddfc5334132fcdf4b0f2fc20739e65e67425bcb483e480ef3f81 SHA512 37cdd1f76946cb14bdcd819fe270e521ef3fac9802b44c6fb3f172b5508003562e2f6ba541ca6eaac37516129d2a4be67d972be29cef1f09aea48f96b00068ab EBUILD git-machete-3.20.0.ebuild 1227 BLAKE2B fd51a8ab6e4cb9f87e2bbd9e325d799df6ae1c5bbdc139f40e55fc1120912c95f1aac1a81510e3d57e8987796bc4adb1166123d1645ee2a2217567a935539874 SHA512 d72daa8320528501f781b62f0bc1f448fd16563015cc70a8fb09ad90a307c7559a57f82df971c0bf03a78865bf3dbe94193261dc5d30959cfd2ca30d5baef1df -EBUILD git-machete-3.22.0.ebuild 1228 BLAKE2B 7f67d17361c481615335eefb22cf8e1177adf29b83ae11f219b640f7dc39dfb9201ecc49c7fb98988230baa36cbd857892729bdbbf087801ac7406b63726b349 SHA512 736dbe924ded5ea10df35ac99e5ace3ad61f5f653134a426d6eee1fa568bed6ee36d04fa4b6fbfc1933d691f798a3a9427c8aa0cdb0877d4847bed21c987e171 -MISC metadata.xml 835 BLAKE2B f59f4070f862a09fb74c57b5ef093e4c8d1394887f71b8f490e49e49f64722b48ab44f15907edb0eff322227f5a97aaf5d2d92512c818b8aa1020e6f735971c8 SHA512 d31266b47abfef805f0f0ae5f13c1f89ec13907fc7e33e126eefee5600087ffadf8f55e48c5c42c295dc7de8d901a3231db0756a79d666651569a150d7016cea +EBUILD git-machete-3.24.2.ebuild 1327 BLAKE2B e8c557754283627bb1c004d02e721260eef9b89b505b2920b1142f76a26094f695e2ac39dd7675c9e0a6e91c0f7f46f0cb3889e002a8dd1e3cedb58184db6dfe SHA512 909f0d41811d83fe5307543cc63254c372d332029e615fa3b02c934c152d5987f8f49024666653bd779ded75ade78484702f48839d24ef693f5fe1e173059cef +MISC metadata.xml 859 BLAKE2B 1d09715e0d28160cfe3ae1a7e62a77afee5c9a38273c168a23cf3c395b02c504d525f404bd7fecae4d0eb70844d51fb9f929d4934956a52bea9eb33078418f10 SHA512 217550ff44fafa4a89d4f0bb41ba62331c200a75fc8dbf3279fec0ca2e6955e706895f0af4906547e0072d862b390d7a2ef847061782de04520fe5840a3f8e85 diff --git a/dev-vcs/git-machete/files/git-machete-3.24.2_no-strays-in-site-packages.patch b/dev-vcs/git-machete/files/git-machete-3.24.2_no-strays-in-site-packages.patch new file mode 100644 index 000000000000..912644e6ab78 --- /dev/null +++ b/dev-vcs/git-machete/files/git-machete-3.24.2_no-strays-in-site-packages.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -25,7 +25,7 @@ + keywords='git', + # Non-python directories are only included in `packages` for the sake of bdist_wheel; + # they have apparently no effect on sdists (only MANIFEST.in matters). +- packages=['git_machete', 'completion', 'docs/man'], ++ packages=['git_machete'], + entry_points={ + 'console_scripts': [ + 'git-machete = git_machete.bin:main' diff --git a/dev-vcs/git-machete/git-machete-3.22.0.ebuild b/dev-vcs/git-machete/git-machete-3.22.0.ebuild deleted file mode 100644 index c26324c6913a..000000000000 --- a/dev-vcs/git-machete/git-machete-3.22.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Probably the sharpest git repo organizer & rebase/merge workflow automation tool" -HOMEPAGE="https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/" -# No tests in PyPI tarballs -SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv" - -RDEPEND="dev-vcs/git" -BDEPEND="test? ( - >=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}] - >=dev-python/pytest-xdist-3.2.1[${PYTHON_USEDEP}] -)" - -DOCS=( CONTRIBUTING.md README.md ) - -distutils_enable_tests pytest - -# Several of the fish- and zsh-completion tests appear to be broken -EPYTEST_DESELECT=( - tests/completion_e2e/test_completion_e2e.py::TestCompletionEndToEnd::test_completion -) - -src_install() { - distutils-r1_src_install - - newbashcomp completion/${PN}.completion.bash ${PN} - - insinto /usr/share/fish/vendor_completions.d - doins completion/${PN}.fish - - insinto /usr/share/zsh/site-functions - newins completion/${PN}.completion.zsh _${PN} -} diff --git a/dev-vcs/git-machete/git-machete-3.24.2.ebuild b/dev-vcs/git-machete/git-machete-3.24.2.ebuild new file mode 100644 index 000000000000..550b46b65536 --- /dev/null +++ b/dev-vcs/git-machete/git-machete-3.24.2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Probably the sharpest git repo organizer & rebase/merge workflow automation tool" +HOMEPAGE="https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/" +# No tests in PyPI tarballs +SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +RDEPEND="dev-vcs/git" +BDEPEND="test? ( + >=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}] + >=dev-python/pytest-xdist-3.2.1[${PYTHON_USEDEP}] +)" + +PATCHES=( + "${FILESDIR}"/${PN}-3.24.2_no-strays-in-site-packages.patch +) + +DOCS=( CONTRIBUTING.md README.md ) + +distutils_enable_tests pytest + +# Several of the fish- and zsh-completion tests appear to be broken +EPYTEST_DESELECT=( + tests/completion_e2e/test_completion_e2e.py::TestCompletionEndToEnd::test_completion +) + +src_install() { + distutils-r1_src_install + + doman docs/man/${PN}.1 + + newbashcomp completion/${PN}.completion.bash ${PN} + + insinto /usr/share/fish/vendor_completions.d + doins completion/${PN}.fish + + insinto /usr/share/zsh/site-functions + newins completion/${PN}.completion.zsh _${PN} +} diff --git a/dev-vcs/git-machete/metadata.xml b/dev-vcs/git-machete/metadata.xml index c10080a3b72a..94d5e16ec71e 100644 --- a/dev-vcs/git-machete/metadata.xml +++ b/dev-vcs/git-machete/metadata.xml @@ -16,6 +16,7 @@ Using this tool, you can maintain small, focused, easy-to-review pull requests with little effort. + VirtusLab/git-machete git-machete -- cgit v1.2.3