From aa5e68216506241291158404bd2cb32c4630a88c Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Mon, 23 Oct 2023 11:09:04 +0000
Subject: [PATCH] py-cmake-language-server: updated to 0.1.8

v0.1.8

Revert "Fix release workflow"
Update pygls
Update build backend
---
 lang/py-cmake-language-server/Makefile        | 13 +++++-----
 lang/py-cmake-language-server/distinfo        | 10 +++----
 .../patches/patch-pyproject.toml              | 26 ++++++++-----------
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/lang/py-cmake-language-server/Makefile b/lang/py-cmake-language-server/Makefile
index e09354a6aa0c..a6aac42815fe 100644
--- a/lang/py-cmake-language-server/Makefile
+++ b/lang/py-cmake-language-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2023/10/23 06:21:27 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2023/10/23 11:09:04 adam Exp $
 
-DISTNAME=	cmake-language-server-0.1.7
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+DISTNAME=	cmake_language_server-0.1.8
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/}
 CATEGORIES=	lang python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cmake-language-server/}
 
@@ -18,18 +18,17 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov>=4.0.0:../../devel/py-test-cov
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-datadir>=1.4.1:../../devel/py-test-datadir
 #TEST_DEPENDS+=	${PYPKGPREFIX}-cmakelang>=0.6.13:../../devel/py-cmakelang
 
-# does not support 3.12 as of 0.1.8
-PYTHON_VERSIONS_INCOMPATIBLE=	27 312
-
 # only for tests
 USE_LANGUAGES=	c c++
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 	${MV} cmake-language-server cmake-language-server-${PYVERSSUFFIX} || ${TRUE}
 
 do-test:
-	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py-cmake-language-server/distinfo b/lang/py-cmake-language-server/distinfo
index bf615c378f83..4ec99425192c 100644
--- a/lang/py-cmake-language-server/distinfo
+++ b/lang/py-cmake-language-server/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2023/05/05 09:56:30 wiz Exp $
+$NetBSD: distinfo,v 1.8 2023/10/23 11:09:04 adam Exp $
 
-BLAKE2s (cmake-language-server-0.1.7.tar.gz) = 5c8b95c519d496a201e20d239231e5db96efea807563b0e6e170d1e91a4e9873
-SHA512 (cmake-language-server-0.1.7.tar.gz) = d8efcb0a3104f618e15a6b4b116713d2436f44bce1e816a7aceda6ea5b664479a6079ece21159f626feaf41ca2fb1812dc842390d2b45b71f556de267ad08090
-Size (cmake-language-server-0.1.7.tar.gz) = 11361 bytes
-SHA1 (patch-pyproject.toml) = 5c012f3516efa5e641c61686557893359237a843
+BLAKE2s (cmake_language_server-0.1.8.tar.gz) = 2bc1127818855899b9b42b9d5a80d5cb8b7dd9b6f6c15fec5ca80137a49c2d97
+SHA512 (cmake_language_server-0.1.8.tar.gz) = 975196ff5206233a3a588c6142c80daa6327b786965c34ce0ae54f66fc7b4d41f6dd6173107ea59ed878e7cc8c765ed43aff4d4bbe85c81b735e2b082b583857
+Size (cmake_language_server-0.1.8.tar.gz) = 11364 bytes
+SHA1 (patch-pyproject.toml) = c57efb291fa1e668f15e0f296438962dde3242bc
diff --git a/lang/py-cmake-language-server/patches/patch-pyproject.toml b/lang/py-cmake-language-server/patches/patch-pyproject.toml
index c8a9b9ea0d53..561118761465 100644
--- a/lang/py-cmake-language-server/patches/patch-pyproject.toml
+++ b/lang/py-cmake-language-server/patches/patch-pyproject.toml
@@ -1,19 +1,15 @@
-$NetBSD: patch-pyproject.toml,v 1.2 2023/05/05 09:56:30 wiz Exp $
+$NetBSD: patch-pyproject.toml,v 1.3 2023/10/23 11:09:04 adam Exp $
 
-Switch to pdm-backend
-https://github.com/regen100/cmake-language-server/issues/76
+Allow Python 3.12
 
---- pyproject.toml.orig	2023-03-09 10:01:30.924441300 +0000
+--- pyproject.toml.orig	2023-10-17 14:00:48.524893800 +0000
 +++ pyproject.toml
-@@ -38,9 +38,9 @@ cmake-language-server = "cmake_language_
- 
- [build-system]
- requires = [
--    "pdm-pep517>=1.0.0",
-+    "pdm-backend>=1.0.0",
+@@ -8,7 +8,7 @@ authors = [
+ dependencies = [
+     "pygls>=1.1.1",
  ]
--build-backend = "pdm.pep517.api"
-+build-backend = "pdm.backend"
- 
- [tool.pdm.version]
- source = "scm"
+-requires-python = ">=3.7.9,<3.12"
++requires-python = ">=3.7.9,<3.13"
+ readme = "README.md"
+ keywords = [
+     "cmake",