5 files changed, 1 insertions, 54 deletions

diff --git a/MOVED b/MOVED
index 391b5154090f..c310d5933aa2 100644
--- a/MOVED
+++ b/MOVED
@@ -16475,3 +16475,4 @@ multimedia/mlt|multimedia/mlt6|2021-07-30|Moved to a versioned directory to make
 multimedia/mlt-qt5|multimedia/mlt6-qt5|2021-07-30|Moved to a versioned directory to make place for future versions
 multimedia/py-mlt|multimedia/py-mlt6|2021-07-30|Moved to a versioned directory to make place for future versions
 net/openldap24-sasl-client|net/openldap24-client|2021-08-01|SASL is always enabled for OpenLDAP
+textproc/py-python-language-server|textproc/py-python-lsp-server|2021-08-01|Has expired: Upstream forked and replaced by py-python-lsp-server
diff --git a/textproc/Makefile b/textproc/Makefile
index 029d5b36b43e..8e8a32dbf4f3 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1398,7 +1398,6 @@
     SUBDIR += py-python-docs-theme
     SUBDIR += py-python-docx
     SUBDIR += py-python-gettext
-    SUBDIR += py-python-language-server
     SUBDIR += py-python-lsp-jsonrpc
     SUBDIR += py-python-lsp-server
     SUBDIR += py-python-slugify
diff --git a/textproc/py-python-language-server/Makefile b/textproc/py-python-language-server/Makefile
deleted file mode 100644
index e36a60a9495d..000000000000
--- a/textproc/py-python-language-server/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Created by: Rainer Hurling <rhurlin@gwdg.de>
-
-PORTNAME=	python-language-server
-PORTVERSION=	0.36.2
-PORTREVISION=	2
-CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	rhurlin@FreeBSD.org
-COMMENT=	Python implementation of the Language Server Protocol
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Upstream forked and replaced by py-python-lsp-server
-EXPIRATION_DATE=	2021-07-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}autopep8>0:textproc/py-autopep8@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mccabe>0:devel/py-mccabe@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pydocstyle>0:devel/py-pydocstyle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-jsonrpc-server>0:devel/py-python-jsonrpc-server@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}rope>0:devel/py-rope@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yapf>0:textproc/py-yapf@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
-
-NO_ARCH=	yes
-
-# Until upstream is merged, do it here
-# https://github.com/palantir/python-language-server/pull/918
-post-patch:
-	@${REINPLACE_CMD} -e 's|<0.18.0,||g' \
-		${WRKSRC}/python_language_server.egg-info/requires.txt
-	@${REINPLACE_CMD} -e 's|,<0.18.0||g' \
-		${WRKSRC}/setup.py
-
-.include <bsd.port.mk>
diff --git a/textproc/py-python-language-server/distinfo b/textproc/py-python-language-server/distinfo
deleted file mode 100644
index a08348f7b0e5..000000000000
--- a/textproc/py-python-language-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1614410166
-SHA256 (python-language-server-0.36.2.tar.gz) = 9984c84a67ee2c5102c8e703215f407fcfa5e62b0ae86c9572d0ada8c4b417b0
-SIZE (python-language-server-0.36.2.tar.gz) = 74499
diff --git a/textproc/py-python-language-server/pkg-descr b/textproc/py-python-language-server/pkg-descr
deleted file mode 100644
index 2e26fd91e916..000000000000
--- a/textproc/py-python-language-server/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-An implementation of the Language Server Protocol for Python.
-
-The base language server provide Completions, Definitions,
-Hover, References, Signature Help, and Symbols.
-
-WWW: https://github.com/palantir/python-language-server