diff --git a/devel/py-python-gitlab/Makefile b/devel/py-python-gitlab/Makefile
index cc24b1f59393e..e70fd8b87f346 100644
--- a/devel/py-python-gitlab/Makefile
+++ b/devel/py-python-gitlab/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	python-gitlab
-DISTVERSION=	3.15.0
+DISTVERSION=	4.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,14 +11,16 @@ WWW=		https://github.com/python-gitlab/python-gitlab
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.10.1:www/py-requests-toolbelt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.25.0:www/py-requests@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-console-scripts>0:devel/py-pytest-console-scripts@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
@@ -37,21 +39,23 @@ DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR}
 			${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.10.1:www/py-requests-toolbelt@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests>=2.25.0:www/py-requests@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=4.3.1,1:textproc/py-sphinx@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-autoprogram>0:textproc/py-sphinxcontrib-autoprogram@${PY_FLAVOR}
 DOCS_PORTDOCS=		*
-DOCS_VARS=		PYDISTUTILS_BUILD_TARGET=build_sphinx \
-			PYDISTUTILS_BUILDARGS="--all-files --fresh-env"
 
 YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.2:devel/py-yaml@${PY_FLAVOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}/etc|g' ${WRKSRC}/gitlab/config.py
 
+do-build-DOCS-on::
+	(cd ${WRKSRC} && sphinx-build -j auto -n -W --keep-going -b html docs build/sphinx/html)
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/sphinx/html && \
-	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv")
+	${RM} -r .doctrees && \
+	${RM} .buildinfo objects.inv && \
+	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= tests/unit
diff --git a/devel/py-python-gitlab/distinfo b/devel/py-python-gitlab/distinfo
index d5dfc58ffb729..862fafa42d862 100644
--- a/devel/py-python-gitlab/distinfo
+++ b/devel/py-python-gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1686350222
-SHA256 (python-gitlab-3.15.0.tar.gz) = c9e65eb7612a9fbb8abf0339972eca7fd7a73d4da66c9b446ffe528930aff534
-SIZE (python-gitlab-3.15.0.tar.gz) = 273270
+TIMESTAMP = 1699058975
+SHA256 (python-gitlab-4.1.1.tar.gz) = e4912083d5d40a79b57875a033083e2c860e34bcc4644ef64ca377a755c5b0c9
+SIZE (python-gitlab-4.1.1.tar.gz) = 453057
diff --git a/devel/py-python-gitlab/files/patch-setup.py b/devel/py-python-gitlab/files/patch-setup.py
deleted file mode 100644
index fd7cf8c9345eb..0000000000000
--- a/devel/py-python-gitlab/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2023-06-09 09:51:25 UTC
-+++ setup.py
-@@ -55,7 +55,7 @@ setup(
-         "Programming Language :: Python :: 3.11",
-     ],
-     extras_require={
--        "autocompletion": ["argcomplete>=1.10.0,<3"],
-+        "autocompletion": ["argcomplete>=1.10.0,<4"],
-         "yaml": ["PyYaml>=5.2"],
-     },
- )