diff --git a/devel/py-argcomplete/Makefile b/devel/py-argcomplete/Makefile
index 9a68f3151555..7be888fad170 100644
--- a/devel/py-argcomplete/Makefile
+++ b/devel/py-argcomplete/Makefile
@@ -1,30 +1,33 @@
-# $NetBSD: Makefile,v 1.30 2023/03/29 09:34:05 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2023/04/30 12:50:12 wiz Exp $
 
-DISTNAME=	argcomplete-1.12.3
+DISTNAME=	argcomplete-3.0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/argcomplete/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/kislyuk/argcomplete
-COMMENT=	Bash tab completion for argparse
+COMMENT=	Bash and other shells tab completion for argparse
 LICENSE=	apache-2.0
 
+TEST_DEPENDS+=	${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
+TEST_DEPENDS+=	${PYPKGPREFIX}-mypy-[0-9]*:../../lang/py-mypy
 TEST_DEPENDS+=	${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
 TEST_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 
+USE_TOOLS+=	bash:test
+
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
 .include "../../lang/python/pyversion.mk"
 
 .if ${PYTHON_VERSION} < 308
-PYTHON_VERSIONED_DEPENDENCIES+=	importlib-metadata
+DEPENDS+=	${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
 .endif
-PYTHON_VERSIONED_DEPENDENCIES+=	coverage:test flake8:test
 
 USE_LANGUAGES=	# none
 
 USE_PKG_RESOURCES=	yes
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-argcomplete/PLIST b/devel/py-argcomplete/PLIST
index 3bf9547f793f..e23b30357aa8 100644
--- a/devel/py-argcomplete/PLIST
+++ b/devel/py-argcomplete/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2020/02/11 17:21:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2023/04/30 12:50:12 wiz Exp $
 bin/activate-global-python-argcomplete
 bin/python-argcomplete-check-easy-install-script
-bin/python-argcomplete-tcsh
 bin/register-python-argcomplete
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -19,18 +18,31 @@ ${PYSITELIB}/argcomplete/_check_module.py
 ${PYSITELIB}/argcomplete/_check_module.pyc
 ${PYSITELIB}/argcomplete/_check_module.pyo
 ${PYSITELIB}/argcomplete/bash_completion.d/python-argcomplete
-${PYSITELIB}/argcomplete/compat.py
-${PYSITELIB}/argcomplete/compat.pyc
-${PYSITELIB}/argcomplete/compat.pyo
 ${PYSITELIB}/argcomplete/completers.py
 ${PYSITELIB}/argcomplete/completers.pyc
 ${PYSITELIB}/argcomplete/completers.pyo
-${PYSITELIB}/argcomplete/my_argparse.py
-${PYSITELIB}/argcomplete/my_argparse.pyc
-${PYSITELIB}/argcomplete/my_argparse.pyo
-${PYSITELIB}/argcomplete/my_shlex.py
-${PYSITELIB}/argcomplete/my_shlex.pyc
-${PYSITELIB}/argcomplete/my_shlex.pyo
+${PYSITELIB}/argcomplete/exceptions.py
+${PYSITELIB}/argcomplete/exceptions.pyc
+${PYSITELIB}/argcomplete/exceptions.pyo
+${PYSITELIB}/argcomplete/finders.py
+${PYSITELIB}/argcomplete/finders.pyc
+${PYSITELIB}/argcomplete/finders.pyo
+${PYSITELIB}/argcomplete/io.py
+${PYSITELIB}/argcomplete/io.pyc
+${PYSITELIB}/argcomplete/io.pyo
+${PYSITELIB}/argcomplete/lexers.py
+${PYSITELIB}/argcomplete/lexers.pyc
+${PYSITELIB}/argcomplete/lexers.pyo
+${PYSITELIB}/argcomplete/packages/__init__.py
+${PYSITELIB}/argcomplete/packages/__init__.pyc
+${PYSITELIB}/argcomplete/packages/__init__.pyo
+${PYSITELIB}/argcomplete/packages/_argparse.py
+${PYSITELIB}/argcomplete/packages/_argparse.pyc
+${PYSITELIB}/argcomplete/packages/_argparse.pyo
+${PYSITELIB}/argcomplete/packages/_shlex.py
+${PYSITELIB}/argcomplete/packages/_shlex.pyc
+${PYSITELIB}/argcomplete/packages/_shlex.pyo
+${PYSITELIB}/argcomplete/py.typed
 ${PYSITELIB}/argcomplete/shell_integration.py
 ${PYSITELIB}/argcomplete/shell_integration.pyc
 ${PYSITELIB}/argcomplete/shell_integration.pyo
diff --git a/devel/py-argcomplete/distinfo b/devel/py-argcomplete/distinfo
index ef87df0141fe..69b3cd0d999e 100644
--- a/devel/py-argcomplete/distinfo
+++ b/devel/py-argcomplete/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.24 2021/10/26 10:18:10 nia Exp $
+$NetBSD: distinfo,v 1.25 2023/04/30 12:50:12 wiz Exp $
 
-BLAKE2s (argcomplete-1.12.3.tar.gz) = 8825437eace45b8d61604f030270462416c85fca0faa91a10561d97728c9eaa5
-SHA512 (argcomplete-1.12.3.tar.gz) = b302d2b1250b7159177a8491b2595c2166a2b96ac4d98cf45202282541f7da53c9f272ec778133d1734a22a07d490652b9d4c956af727397b2f6767a9a445b63
-Size (argcomplete-1.12.3.tar.gz) = 76128 bytes
+BLAKE2s (argcomplete-3.0.8.tar.gz) = bcb08e18d63b9038e4669482f5d64a7f2e73cb614a2b967706a2e354a2019932
+SHA512 (argcomplete-3.0.8.tar.gz) = 4667f0d03485c81048c53ecfd53fa1bbe50beea15f723f3ebd8a92aae37dd2bbca709f9b6a1e0a5a682f9e769883f94614b4fcefc1fd7c9fad9f1d8cbc1429f3
+Size (argcomplete-3.0.8.tar.gz) = 56035 bytes
+SHA1 (patch-setup.py) = 02a39926125ad244350d49799ebcce0d08c62948
diff --git a/devel/py-argcomplete/patches/patch-setup.py b/devel/py-argcomplete/patches/patch-setup.py
new file mode 100644
index 000000000000..0a92e64a282c
--- /dev/null
+++ b/devel/py-argcomplete/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2023/04/30 12:50:12 wiz Exp $
+
+ruff is not packaged yet.
+
+--- setup.py.orig	2023-04-23 21:44:59.000000000 +0000
++++ setup.py
+@@ -5,7 +5,7 @@ import glob
+ from setuptools import find_packages, setup
+ 
+ install_requires = []
+-tests_require = ["coverage", "pexpect", "wheel", "ruff", "mypy"]
++tests_require = ["coverage", "pexpect", "wheel", "mypy"]
+ importlib_backport_requires = ["importlib-metadata >= 0.23, < 7"]
+ 
+ setup(