5 files changed, 9 insertions, 47 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f34414b61994..612018b4ea95 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest
index c0e45236e4c1..37c4feac8067 100644
--- a/dev-vcs/git-machete/Manifest
+++ b/dev-vcs/git-machete/Manifest
@@ -1,7 +1,5 @@
-DIST git-machete-3.16.3.gh.tar.gz 1618456 BLAKE2B e8207b11bfea6dd50965aaa300ec7303684503b900912b031f08378c7d80b388b341d23769cea5fe4aef0d78bc8457b0118aa3e05a49b0c1c4a3f9a97019c46e SHA512 fcd856c0fefecd2cf97ba149f1d1df57eb6fab0345c00c3d3df763041cc86226e3f815dda7c0050f8669d7d082e329dd76304de2092c7b43219e0c50a2e3467a
 DIST git-machete-3.17.6.gh.tar.gz 1638444 BLAKE2B 91995dec3dba53cd538db549248d9c42932ab4f4c3b7f016d60e4999617bd428c1c4fcfae3bc2aca75bba7bf62b4466e139ddada47a962f0f7d876cd220dbe34 SHA512 0766997db950a04ed5eec560be7fe1e76370d2c5f747bf121241280d44a3aff094c5828535bd11831ce1b326e05d48c8e4edf620c1dcccfbeb20e9d94c3cf023
-DIST git-machete-3.17.8.gh.tar.gz 1638014 BLAKE2B 2820d2bf6310fb2967970ef50c0e8afff84342bcc2e8feee49f49cd480501291dd08fbd18f384234b7c947ec9c16f57971b06c64afa18a740aabba5fb0938aae SHA512 6bde604a10d34d87903a88ef1932705d8f2a80047ed3348f6df8c6fd9ffb6faa4ef55d2a074f99aa0711a050bb41612aa02a94e9bfb4eea40072890c40273189
-EBUILD git-machete-3.16.3.ebuild 1113 BLAKE2B 2a6a42b99966e5f3f1f48ee1154d72aef41bc274cd28dcf2ada2c92d09d6419a237ebbcce34318304e791a4786fd8dea6b07e7cdbb05734bba266f3cd38e4b92 SHA512 4b12e321b6f6960ded2d7a31eb0827fa66274270e0af1e42b659aa580b3ea6f2bd56ee342cd155ae96029b69c47a7a05da2c9cc6f2cae144294ea4442e31d70d
-EBUILD git-machete-3.17.6.ebuild 1116 BLAKE2B 0d6f1eccb290bb1a3a1805149a653bf977617025ff9fb2c68fc7891006dce8bf7cc6ba6856fb07eefc0920056cadd707170edbf382da61379c9bcc4141dceed0 SHA512 987fccb73684c5619bc5683f8c4340ee013e3d2000b18278909d6b239222b89322d41038fe2ec7ce772bc2926352ebc6ca252bf34b74034555fe89c69bfbab42
-EBUILD git-machete-3.17.8.ebuild 1116 BLAKE2B 0d6f1eccb290bb1a3a1805149a653bf977617025ff9fb2c68fc7891006dce8bf7cc6ba6856fb07eefc0920056cadd707170edbf382da61379c9bcc4141dceed0 SHA512 987fccb73684c5619bc5683f8c4340ee013e3d2000b18278909d6b239222b89322d41038fe2ec7ce772bc2926352ebc6ca252bf34b74034555fe89c69bfbab42
+DIST git-machete-3.18.0.gh.tar.gz 1639576 BLAKE2B cd77ef6c86dc2eee6430bec5d371566082dd9243dc9a99d7b60e78155ce7340f8f798d59073acbb65e75483389d8ffd9a6f75520ed9f1aaa517ea31281dbd672 SHA512 ca070000020defa69e4b8592ee77e8b7f6e7a8b0397b90f0f5b6b31a9d46a85f3d17ed96b7795fab145794182d7b40dd8acd9bda498533deada6e6efae24dbca
+EBUILD git-machete-3.17.6.ebuild 1115 BLAKE2B e5220140ae2a0a9cbea014ebec1bfb02efb8d781538f7ed6dc713b63a96c7a600b02fd44f39e37694913d4a01f062ba89e9bd6699eb38876c8a31a0c5ded98b1 SHA512 539effa43f80e201130c62b864dc3c9b15eb76bec0198cd892b2ac125c3bd9cdea52a1d16f56d7994c3767ed403948f36b0c50264d7bbbadc00652af764791ee
+EBUILD git-machete-3.18.0.ebuild 1292 BLAKE2B cf978188498e9044c8543978a0be34c9dd888d19befd066f4738ce4d65567ad19bba51483088c8528cf5bd2bb277634d34ba3fb7c3159928635f28784ebb652f SHA512 bf0d03b4f0b570a339dcd19b30b2f30ef8fd6547988df6be554586bb06a91dde1e07b2946ff8e35dcde0948f675040eb67b70a2b701bd0913d34deb44a6ef11f
 MISC metadata.xml 835 BLAKE2B f59f4070f862a09fb74c57b5ef093e4c8d1394887f71b8f490e49e49f64722b48ab44f15907edb0eff322227f5a97aaf5d2d92512c818b8aa1020e6f735971c8 SHA512 d31266b47abfef805f0f0ae5f13c1f89ec13907fc7e33e126eefee5600087ffadf8f55e48c5c42c295dc7de8d901a3231db0756a79d666651569a150d7016cea
diff --git a/dev-vcs/git-machete/git-machete-3.16.3.ebuild b/dev-vcs/git-machete/git-machete-3.16.3.ebuild
deleted file mode 100644
index 11fab108fd67..000000000000
--- a/dev-vcs/git-machete/git-machete-3.16.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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.8.2[${PYTHON_USEDEP}]
-	>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
-)"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-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.17.6.ebuild b/dev-vcs/git-machete/git-machete-3.17.6.ebuild
index a8fc208cd9e1..6558af28a767 100644
--- a/dev-vcs/git-machete/git-machete-3.17.6.ebuild
+++ b/dev-vcs/git-machete/git-machete-3.17.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-vcs/git"
 BDEPEND="test? (
diff --git a/dev-vcs/git-machete/git-machete-3.17.8.ebuild b/dev-vcs/git-machete/git-machete-3.18.0.ebuild
index a8fc208cd9e1..9e7f668fa993 100644
--- a/dev-vcs/git-machete/git-machete-3.17.8.ebuild
+++ b/dev-vcs/git-machete/git-machete-3.18.0.ebuild
@@ -28,6 +28,11 @@ DOCS=( CONTRIBUTING.md README.md )
 distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
 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