[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-machete/, dev-vcs/git-machete/files/

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-machete/, dev-vcs/git-machete/files/

[Marek Szuba]

commit:     64e5e87b8052428e0b048c082f77218aac9d959e
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 23:48:56 2024 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 01:03:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e5e87b

dev-vcs/git-machete: add 3.24.2, drop 3.22.0

Closes: https://bugs.gentoo.org/922815
Closes: https://bugs.gentoo.org/925302
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-vcs/git-machete/Manifest                                  |  2 +-
 .../files/git-machete-3.24.2_no-strays-in-site-packages.patch | 11 +++++++++++
 .../{git-machete-3.22.0.ebuild => git-machete-3.24.2.ebuild}  |  8 +++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest
index 929f825c8a6c..5ed74f4c0339 100644
--- a/dev-vcs/git-machete/Manifest
+++ b/dev-vcs/git-machete/Manifest
@@ -1,2 +1,2 @@
 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

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.24.2.ebuild
similarity index 89%
rename from dev-vcs/git-machete/git-machete-3.22.0.ebuild
rename to dev-vcs/git-machete/git-machete-3.24.2.ebuild
index c26324c6913a..550b46b65536 100644
--- a/dev-vcs/git-machete/git-machete-3.22.0.ebuild
+++ b/dev-vcs/git-machete/git-machete-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,10 @@ BDEPEND="test? (
 	>=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
@@ -35,6 +39,8 @@ EPYTEST_DESELECT=(
 src_install() {
 	distutils-r1_src_install
 
+	doman docs/man/${PN}.1
+
 	newbashcomp completion/${PN}.completion.bash ${PN}
 
 	insinto /usr/share/fish/vendor_completions.d