gentoo auto-resync : 27:06:2023 - 13:35:02

4 files changed, 2 insertions, 141 deletions

diff --git a/dev-python/python-lsp-black/Manifest b/dev-python/python-lsp-black/Manifest
index da6d2dac00dc..c3192925dddf 100644
--- a/dev-python/python-lsp-black/Manifest
+++ b/dev-python/python-lsp-black/Manifest
@@ -1,6 +1,3 @@
-AUX python-lsp-black-1.2.1-tomli.patch 2955 BLAKE2B 9627be0dcae6a723242e22831384caa772082842a1ae4758534ad40e99402a2f9adc8677b547a2ba899e5763e0d9785c51afced6aafc620d0e0927f6bf719997 SHA512 3fcea10adfd6f25abcf5dda95c4d2ed4e86666d06522baa014fe805dbc6c06a825af1491a931610eabdd5e907f4d34b94513aa3caa4ba43cc584859ae5a76035
-DIST python-lsp-black-1.2.1.gh.tar.gz 9355 BLAKE2B f9c70ff07d9dfa31e3af919143deb8a49f43269469e8c64525f514624f4db67636da8254dae5274685ba2d883c8ddfd6dd9cb99981a337d7837d4007f15af11c SHA512 289b8f3642ed806409671d25e32997fb473720d0abd642c58c07d8c894831fa00f56dbc39e7d0fc8d98cad7de9f95ebdb6a0f637b8b4bbcc2a0716690feb647e
 DIST python-lsp-black-1.3.0.gh.tar.gz 9781 BLAKE2B d079d7a95dff682b86df23825796d2fa6e89d1aa3e66da1452e576fd1e96a4c298da181f53840fe5fcdcbbc8a0ca55aa53cbc4885a0178b6402365ef41a239be SHA512 9e3d081ac022854626c120128949ab5e58c44f9e76ddd566e3b80a697fbc02a96f62994f43195b02f899e770768d55d223984267133eedd6f642b70560d46c09
-EBUILD python-lsp-black-1.2.1-r1.ebuild 798 BLAKE2B af637a16edf52a16c791db28c3eeb853f9e4848dd13dbcb925d51ab92bfe707da00e0797f09a5cb9a96984e88236195c62e18f336b58085acddf3402c8f7bcb4 SHA512 f62b8f0963533539ca964d5bd823c094131d6c544bd12a703e58e3f3fb8de870c2574f773f0b6cfa2578be7687fe0e72d658b8c4909b007c7f431622aa25b844
-EBUILD python-lsp-black-1.3.0.ebuild 751 BLAKE2B e937e4c903f46a036b4ee337df2a1ae1f25cddec19dc3d0152d08971581435457bc928aee9a775b8c55c64316c7b4aa06ee9829e79410929568600b76e0d315b SHA512 82dfca6b7a88c65aa1a9ff2852dcee104ebb422cf41af0d7699265f8a4548a4809a6d4726724818ee3ba0586fa83f139c89716c2cecb87b51eb9d23e181dc1ea
+EBUILD python-lsp-black-1.3.0.ebuild 749 BLAKE2B 3adb82f4bce3b0352dac5407b341c382f8f5f8460c978a89cf1626e4e9e38f27b4ab989aadcb2f0c24dcd8dae79abf76735f9afc245aed5a91a05c9bedf48f6a SHA512 057e3c89bab0d77adf0e4e4ce7cd670679a5a24c535648eded12c5f95db052a35473bb9476ad0b095e20f41232a777f1ea46fb1aba1f4c87349a28a23db62bba
 MISC metadata.xml 530 BLAKE2B 385bef4e8337f4a4fbcdbd32f52dec0b0758dd0eba50c9492465caee46dbbc96402b744d5835043f50f6c89147576c96305d8fcc4cedd42254ca2a19caf9234b SHA512 121b726a498e17b6244ecad14edd8fa3fcf23297516280f10b6b4fd5c1cb784f3a6caf902764977f8abd3cd3967db6d8fbac594c773969711dd572a487cae717
diff --git a/dev-python/python-lsp-black/files/python-lsp-black-1.2.1-tomli.patch b/dev-python/python-lsp-black/files/python-lsp-black-1.2.1-tomli.patch
deleted file mode 100644
index 8ecef0287f40..000000000000
--- a/dev-python/python-lsp-black/files/python-lsp-black-1.2.1-tomli.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 80d34ca4f35baa654e5f1fee7860214950f1ae37 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 26 Jan 2023 12:07:11 +0100
-Subject: [PATCH] Replace the obsolete toml package with tomllib/tomli
-
-Use the modern `tomllib` module (in Python 3.11+) or its drop-in
-replacement `tomli` (for older Python versions) instead of the obsolete
-`toml` module.  The latter is unmaintained and does not support TOML
-1.0.
----
- .pre-commit-config.yaml |  2 +-
- pylsp_black/plugin.py   | 12 +++++++++---
- setup.cfg               |  7 +++++--
- 3 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
-index 304770e..d5bd147 100644
---- a/.pre-commit-config.yaml
-+++ b/.pre-commit-config.yaml
-@@ -17,7 +17,7 @@ repos:
-   rev: v0.942
-   hooks:
-   - id: mypy
--    additional_dependencies: [black, types-pkg_resources, types-setuptools, types-toml]
-+    additional_dependencies: [black, types-pkg_resources, types-setuptools]
- - repo: https://github.com/pre-commit/pre-commit-hooks
-   rev: v4.1.0
-   hooks:
-diff --git a/pylsp_black/plugin.py b/pylsp_black/plugin.py
-index f013171..090b1b0 100644
---- a/pylsp_black/plugin.py
-+++ b/pylsp_black/plugin.py
-@@ -1,15 +1,20 @@
- import logging
- import os
-+import sys
- from functools import lru_cache
- from pathlib import Path
- from typing import Dict, Optional
- 
- import black
--import toml
- from pylsp import hookimpl
- from pylsp._utils import get_eol_chars
- from pylsp.config.config import Config
- 
-+if sys.version_info >= (3, 11):
-+    import tomllib
-+else:
-+    import tomli as tomllib
-+
- logger = logging.getLogger(__name__)
- 
- 
-@@ -154,8 +159,9 @@ def _load_config(filename: str, client_config: Config) -> Dict:
-             return defaults
- 
-     try:
--        pyproject_toml = toml.load(str(pyproject_filename))
--    except (toml.TomlDecodeError, OSError):
-+        with open(pyproject_filename, "rb") as f:
-+            pyproject_toml = tomllib.load(f)
-+    except (tomllib.TOMLDecodeError, OSError):
-         logger.warning(
-             "Error decoding pyproject.toml, using defaults: %r",
-             defaults,
-diff --git a/setup.cfg b/setup.cfg
-index 47510d5..257add6 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -18,7 +18,10 @@ classifiers =
- 
- [options]
- packages = find:
--install_requires = python-lsp-server>=1.4.0; black>=22.3.0; toml
-+install_requires =
-+    python-lsp-server>=1.4.0
-+    black>=22.3.0
-+    tomli; python_version<'3.11'
- python_requires = >= 3.7
- 
- [options.entry_points]
-@@ -26,7 +29,7 @@ pylsp = pylsp_black = pylsp_black.plugin
- 
- [options.extras_require]
- # add any types-* packages to .pre-commit-config.yaml mypy additional_dependencies
--dev = isort>=5.0; flake8; pre-commit; pytest; mypy; pytest; types-pkg_resources; types-setuptools; types-toml
-+dev = isort>=5.0; flake8; pre-commit; pytest; mypy; pytest; types-pkg_resources; types-setuptools
- 
- [flake8]
- max-line-length = 88
--- 
-2.39.1
-
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.2.1-r1.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.2.1-r1.ebuild
deleted file mode 100644
index 8f0d2139bf47..000000000000
--- a/dev-python/python-lsp-black/python-lsp-black-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Black plugin for the Python LSP Server"
-HOMEPAGE="
-	https://github.com/python-lsp/python-lsp-black/
-	https://pypi.org/project/python-lsp-black/
-"
-SRC_URI="
-	https://github.com/python-lsp/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/black-22.3.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.{8..10})
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tomli.patch
-)
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild
index 9274bf63b458..21fba9103693 100644
--- a/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild
+++ b/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]